Skip to content

MOBILE-1547 cbe: Solve problem with translation strings #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2016
Merged

MOBILE-1547 cbe: Solve problem with translation strings #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion www/addons/competency/controllers/competency.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
18 changes: 9 additions & 9 deletions www/addons/competency/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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."
}
2 changes: 1 addition & 1 deletion www/addons/competency/templates/coursecompetencies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion www/addons/competency/templates/plan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down