Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into …

…1.10.x
chamilo · Oct 14, 2015 · 0b3caa9 · 0b3caa9
2 parents b6d1107 + a5e2432
commit 0b3caa9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/.htaccess b/.htaccess
@@ -37,3 +37,6 @@ RewriteRule ^courses/([^/]+)/course-pic.png$ app/courses/$1/course-pic.png [QSA,
 
 # About session
 RewriteRule ^session/(\d{1,})/about/?$ main/session/about.php?session_id=$1 [L]
+
+# Issued badges friendly URL
+RewriteRule ^badge/(\d{1,})/user/(\d{1,}) main/badge/issued.php?skill=$1&user=$2 [QSA,L]
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
@@ -7563,4 +7563,6 @@
 $RecipientDetails = "Recipient details";
 $SkillAcquiredAt = "Skill acquired at";
 $BasicSkills = "Basic skills";
+$TimeXThroughCourseY = "<strong>%s</strong> through <em>%s</em>";
+$ExportBadge = "Export badge";
 ?>
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
@@ -7550,4 +7550,6 @@
 $RecipientDetails = "Données du bénéficiaire";
 $SkillAcquiredAt = "Compétence acquise le";
 $BasicSkills = "Compétences simples";
+$TimeXThroughCourseY = "%s par le cours %s";
+$ExportBadge = "Exporter ce badge";
 ?>
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
@@ -7588,4 +7588,6 @@
 $RecipientDetails = "Datos del beneficiario";
 $SkillAcquiredAt = "Competencia adquirida el";
 $BasicSkills = "Competencias simples";
+$TimeXThroughCourseY = "%s en el curso %s";
+$ExportBadge = "Exportar la insignia";
 ?>
diff --git a/main/template/default/social/skills_block.tpl b/main/template/default/social/skills_block.tpl
@@ -32,7 +32,7 @@
                     <ul class="list-unstyled list-badges">
                         {% for skill in skills %}
                             <li class="thumbnail">
-                                <a href="{{ _p.web_main ~ 'badge/issued.php?' ~ {'skill': skill.id, 'user': user_id}|url_encode() }}" target="_blank">
+                                <a href="{{ _p.web }}badge/{{ skill.id }}/user/{{ user_id }}" target="_blank">
                                     <img title="{{ skill.name }}" class="img-responsive" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
                                     <div class="caption">
                                         <p class="text-center">{{ skill.name }}</p>