From e46dda1471765c15289c45c8f845ddc23f6cd265 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Wed, 18 May 2016 15:40:47 +0200
Subject: [PATCH] MOBILE-1571 quiz: Fix strings (they belong to question)

It includes a fix in the translate of mm.question.information in to.html
---
 www/addons/mod_quiz/lang/en.json          | 2 --
 www/addons/mod_quiz/templates/player.html | 6 +++---
 www/addons/mod_quiz/templates/review.html | 4 ++--
 www/addons/mod_quiz/templates/toc.html    | 4 ++--
 www/core/components/question/lang/en.json | 2 ++
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/addons/mod_quiz/lang/en.json b/www/addons/mod_quiz/lang/en.json
index cbe283343d6..46450b98958 100644
--- a/www/addons/mod_quiz/lang/en.json
+++ b/www/addons/mod_quiz/lang/en.json
@@ -34,7 +34,6 @@
 	"grademethod": "Grading method",
 	"gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
 	"hasdatatosync": "This quiz has offline data to be synchronized.",
-	"information": "Information",
 	"marks": "Marks",
 	"mustbesubmittedby": "This attempt must be submitted by {{$a}}.",
 	"noquestions": "No questions have been added yet",
@@ -49,7 +48,6 @@
 	"preview": "Preview",
 	"previewquiznow": "Preview quiz now",
 	"question": "Question",
-	"questionno": "Question {{$a}}",
 	"quizpassword": "Quiz password",
 	"reattemptquiz": "Re-attempt quiz",
 	"requirepasswordmessage": "To attempt this quiz you need to know the quiz password",
diff --git a/www/addons/mod_quiz/templates/player.html b/www/addons/mod_quiz/templates/player.html
index ec6fe37cb1f..337d08022c1 100644
--- a/www/addons/mod_quiz/templates/player.html
+++ b/www/addons/mod_quiz/templates/player.html
@@ -29,8 +29,8 @@
                 <div ng-repeat="question in questions">
                     <section class="card" id="mma-mod_quiz-question-{{question.slot}}">
                         <div class="item item-divider">
-                            <h2 ng-if="question.number" class="inline">{{ 'mma.mod_quiz.questionno' | translate:{$a: question.number} }}</h2>
-                            <h2 ng-if="!question.number" class="inline">{{ 'mma.mod_quiz.information' | translate }}</h2>
+                            <h2 ng-if="question.number" class="inline">{{ 'mm.question.questionno' | translate:{$a: question.number} }}</h2>
+                            <h2 ng-if="!question.number" class="inline">{{ 'mm.question.information' | translate }}</h2>
                             <div class="item-text-wrap item-note" ng-if="question.status || question.readableMark">
                                 <span ng-if="question.status" class="block">{{question.status}}</span>
                                 <span ng-if="question.readableMark" class="block"><mm-format-text watch="true">{{question.readableMark}}</mm-format-text></span>
@@ -54,7 +54,7 @@ <h2>{{ 'mma.mod_quiz.summaryofattempt' | translate }}</h2>
                     <p class="col col-25 text-center">{{ question.number }}</p>
                     <p class="col col-65 text-center">{{ question.status }}</p>
                     <p class="col col-10 text-center" ng-if="!quiz.isSequential && canReturn">
-                        <a class="button button-block button-icon ion-ios-arrow-forward" ng-click="loadPage(question.page, false, question.slot)" aria-label="{{ 'mma.mod_quiz.questionno' | translate:{$a: question.number} }}"></a>
+                        <a class="button button-block button-icon ion-ios-arrow-forward" ng-click="loadPage(question.page, false, question.slot)" aria-label="{{ 'mm.question.questionno' | translate:{$a: question.number} }}"></a>
                     </p>
                 </div>
                 <div class="item" ng-if="canReturn">
diff --git a/www/addons/mod_quiz/templates/review.html b/www/addons/mod_quiz/templates/review.html
index db42bfc96b2..65f8a0f81d8 100644
--- a/www/addons/mod_quiz/templates/review.html
+++ b/www/addons/mod_quiz/templates/review.html
@@ -51,8 +51,8 @@ <h2 ng-if="!attempt.preview">{{ 'mma.mod_quiz.reviewofattempt' | translate:{$a:
                 <div ng-repeat="question in questions">
                     <section class="card" id="mma-mod_quiz-question-{{question.slot}}">
                         <div class="item item-divider">
-                            <h2 ng-if="question.number" class="inline">{{ 'mma.mod_quiz.questionno' | translate:{$a: question.number} }}</h2>
-                            <h2 ng-if="!question.number" class="inline">{{ 'mma.mod_quiz.information' | translate }}</h2>
+                            <h2 ng-if="question.number" class="inline">{{ 'mm.question.questionno' | translate:{$a: question.number} }}</h2>
+                            <h2 ng-if="!question.number" class="inline">{{ 'mm.question.information' | translate }}</h2>
                             <div class="item-text-wrap item-note" ng-if="question.status || question.readableMark">
                                 <span ng-if="question.status" class="block">{{question.status}}</span>
                                 <span ng-if="question.readableMark" class="block"><mm-format-text watch="true">{{question.readableMark}}</mm-format-text></span>
diff --git a/www/addons/mod_quiz/templates/toc.html b/www/addons/mod_quiz/templates/toc.html
index b27290027ba..9ab5f647207 100644
--- a/www/addons/mod_quiz/templates/toc.html
+++ b/www/addons/mod_quiz/templates/toc.html
@@ -11,8 +11,8 @@
                 <span ng-if="rsmScope.showAll">{{ 'mma.mod_quiz.showeachpage' | translate }}</span>
             </a>
             <a menu-close ng-repeat="question in rsmScope.toc" class="item item-text-wrap {{question.stateClass}}" ng-class='{"mma-mod-quiz-selected": !rsmScope.showSummary && rsmScope.attempt.currentpage == question.page, "mma-mod-quiz-last-of-page": $last || rsmScope.toc[$index + 1].page != question.page}' ng-click="rsmScope.loadPage(question.page, true, question.slot)">
-                <span ng-if="question.number">{{ 'mma.mod_quiz.questionno' | translate:{$a: question.number} }}</span>
-                <span ng-if="!question.number">{{ 'mma.mod_quiz.information' | translate:{$a: question.number} }}</span>
+                <span ng-if="question.number">{{ 'mm.question.questionno' | translate:{$a: question.number} }}</span>
+                <span ng-if="!question.number">{{ 'mm.question.information' | translate }}</span>
             </a>
             <!-- In player, show button to finish attempt. -->
             <a ng-if="!rsmScope.isReview" menu-close class="item item-text-wrap" ng-click="rsmScope.loadPage(-1, true)">
diff --git a/www/core/components/question/lang/en.json b/www/core/components/question/lang/en.json
index 3dd8f89c385..9e792b7133a 100644
--- a/www/core/components/question/lang/en.json
+++ b/www/core/components/question/lang/en.json
@@ -9,11 +9,13 @@
 	"feedback": "Feedback",
 	"howtodraganddrop": "Tap to select then tap to drop.",
 	"incorrect": "Incorrect",
+	"information": "Information",
 	"invalidanswer": "Incomplete answer",
 	"notanswered": "Not answered",
 	"notyetanswered": "Not yet answered",
 	"partiallycorrect": "Partially correct",
 	"questionmessage": "Question {{$a}}: {{$b}}",
+	"questionno": "Question {{$a}}",
 	"requiresgrading": "Requires grading",
 	"unknown": "Cannot determine status"
 }