From 50787b8fcbf527b6685003b9c5b6b1a4f6401506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 18 May 2016 16:00:30 +0200
Subject: [PATCH] MOBILE-1547 cbe: Solve problem with translation strings

---
 .../competency/controllers/competency.js       |  1 -
 www/addons/competency/lang/en.json             | 18 +++++++++---------
 .../templates/coursecompetencies.html          |  2 +-
 www/addons/competency/templates/plan.html      |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/www/addons/competency/controllers/competency.js b/www/addons/competency/controllers/competency.js
index 2c50d41fd87..cb60f640569 100644
--- a/www/addons/competency/controllers/competency.js
+++ b/www/addons/competency/controllers/competency.js
@@ -58,7 +58,6 @@ angular.module('mm.addons.competency')
 
                 // Get the user profile image from the returned object.
                 $scope.user = competency.usercompetencysummary.user;
-                console.log($scope.user);
             }
 
             angular.forEach(competency.usercompetencysummary.evidence, function(evidence) {
diff --git a/www/addons/competency/lang/en.json b/www/addons/competency/lang/en.json
index bc9cc38a4cf..8f28ed53826 100644
--- a/www/addons/competency/lang/en.json
+++ b/www/addons/competency/lang/en.json
@@ -10,14 +10,14 @@
     "errornocompetenciesfound": "No competencies found",
     "evidence": "Evidence",
     "evidence_competencyrule": "The rule of the competency was met.",
-    "evidence_coursecompleted": "The course {{a}} was completed.",
-    "evidence_coursemodulecompleted": "The activity {{a}} was completed.",
-    "evidence_courserestored": "The rating was restored along with the course {{a}}.",
-    "evidence_evidenceofpriorlearninglinked": "The evidence of prior learning {{a}} was linked.",
-    "evidence_evidenceofpriorlearningunlinked": "The evidence of prior learning {{a}} was unlinked.",
+    "evidence_coursecompleted": "The course '{{$a}}' was completed.",
+    "evidence_coursemodulecompleted": "The activity '{{$a}}' was completed.",
+    "evidence_courserestored": "The rating was restored along with the course '{{$a}}'.",
+    "evidence_evidenceofpriorlearninglinked": "The evidence of prior learning '{{$a}}' was linked.",
+    "evidence_evidenceofpriorlearningunlinked": "The evidence of prior learning '{{$a}}' was unlinked.",
     "evidence_manualoverride": "The competency rating was manually set.",
-    "evidence_manualoverrideincourse": "The competency rating was manually set in the course {{a}}.",
-    "evidence_manualoverrideinplan": "The competency rating was manually set in the learning plan {{a}}.",
+    "evidence_manualoverrideincourse": "The competency rating was manually set in the course '{{$a}}'.",
+    "evidence_manualoverrideinplan": "The competency rating was manually set in the learning plan '{{$a}}'.",
     "learningplancompetencies": "Learning plan competencies",
     "learningplans": "Learning plans",
     "noactivities": "No activities",
@@ -42,6 +42,6 @@
     "usercompetencystatus_inreview": "In review",
     "usercompetencystatus_waitingforreview": "Waiting for review",
     "userplans": "Learning plans",
-    "xcompetenciesproficientoutofy": "{{x}} out of {{y}} competencies are proficient",
-    "xcompetenciesproficientoutofyincourse": "You are proficient in {{x}} out of {{y}} competencies in this course."
+    "xcompetenciesproficientoutofy": "{{$a.x}} out of {{$a.y}} competencies are proficient",
+    "xcompetenciesproficientoutofyincourse": "You are proficient in {{$a.x}} out of {{$a.y}} competencies in this course."
 }
diff --git a/www/addons/competency/templates/coursecompetencies.html b/www/addons/competency/templates/coursecompetencies.html
index 123a3b10b3a..3c86496087a 100644
--- a/www/addons/competency/templates/coursecompetencies.html
+++ b/www/addons/competency/templates/coursecompetencies.html
@@ -16,7 +16,7 @@
                     </li>
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.progress' | translate }}</strong>:
-                        {{ 'mma.competency.xcompetenciesproficientoutofyincourse' | translate:{x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} }} ({{ competencies.statistics.proficientcompetencypercentageformatted }}%)
+                        {{ 'mma.competency.xcompetenciesproficientoutofyincourse' | translate:{$a: {x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} } }} ({{ competencies.statistics.proficientcompetencypercentageformatted }}%)
                         <progress max="100" value="{{ competencies.statistics.proficientcompetencypercentage }}"></progress>
                     </li>
                     <li class="item item-text-wrap" ng-if="competencies.statistics.leastproficientcount > 0">
diff --git a/www/addons/competency/templates/plan.html b/www/addons/competency/templates/plan.html
index 145b6a4f499..96cab639c0c 100644
--- a/www/addons/competency/templates/plan.html
+++ b/www/addons/competency/templates/plan.html
@@ -30,7 +30,7 @@
                     </li>
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.progress' | translate }}</strong>:
-                        {{ 'mma.competency.xcompetenciesproficientoutofy' | translate:{x: plan.proficientcompetencycount, y: plan.competencycount} }} ({{ plan.proficientcompetencypercentageformatted }}%)
+                        {{ 'mma.competency.xcompetenciesproficientoutofy' | translate: {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }} ({{ plan.proficientcompetencypercentageformatted }}%)
                         <progress max="100" value="{{ plan.proficientcompetencypercentage }}"></progress>
                     </li>
                 </ul>