From 82546cd1f4d558e2dab5cd569aa2b2c8c55b446a Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Wed, 21 Feb 2018 11:39:33 +0100
Subject: [PATCH] MOBILE-2367 feedback: Apply format text for multilang

---
 www/addons/mod/feedback/templates/attempt.html |  2 +-
 www/addons/mod/feedback/templates/form.html    | 15 +++++++++++----
 www/addons/mod/feedback/templates/index.html   |  6 ++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/feedback/templates/attempt.html b/www/addons/mod/feedback/templates/attempt.html
index db0b33fa6dc..643876cf398 100644
--- a/www/addons/mod/feedback/templates/attempt.html
+++ b/www/addons/mod/feedback/templates/attempt.html
@@ -13,7 +13,7 @@ <h2>{{ 'mma.mod_feedback.response_nr' |translate }}: {{attempt.number}} ({{ 'mma
                     <p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
                 </div>
                 <div ng-if="items && items.length" ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0}">
-                    <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
+                    <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span><mm-format-text watch="true">{{ item.name }}</mm-format-text></p>
                     <p ng-if="item.submittedValue"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ item.submittedValue }}</mm-format-text></p>
                 </div>
             </div>
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 61a43c861f9..1639577783b 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -12,7 +12,9 @@
                 </div>
                 <div class="list" ng-if="items && items.length">
                     <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0, 'mm-error-item': item.isEmpty || item.hasError}">
-                        <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
+                        <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>
+                            <mm-format-text watch="true">{{ item.name }}</mm-format-text>
+                        </p>
                         <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>
                 </div>
@@ -35,15 +37,20 @@
                 </script>
 
                 <script type="text/ng-template" id="multichoice-r">
-                    <ion-radio ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
+                    <ion-radio ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">
+                        <mm-format-text watch="true">{{option.label}}</mm-format-text>
+                    </ion-radio>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-c">
-                    <ion-checkbox ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
+                    <ion-checkbox ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">
+                        <mm-format-text watch="true">{{option.label}}</mm-format-text>
+                    </ion-checkbox>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-d">
-                    <select ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-options="option.value as option.label for option in item.choices" mm-ios-select-fix>
+                    <select ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" mm-ios-select-fix>
+                        <option ng-value="option.value" ng-repeat="option in item.choices"><mm-format-text watch="true">{{option.label}}</mm-format-text></option>
                     </select>
                 </script>
 
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 2f8ecc74b26..a66c4839139 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -96,8 +96,10 @@
                     </div>
                     <div class="list" ng-if="items && items.length">
                         <div ng-repeat="item in items track by $index" class="item item-text-wrap">
-                            <p class="item-heading">{{item.number}}. {{ item.name }}</p>
-                            <p>{{ item.label }}</p>
+                            <p class="item-heading">{{item.number}}.
+                                <mm-format-text watch="true">{{ item.name }}</mm-format-text>
+                            </p>
+                            <p><mm-format-text watch="true">{{ item.label }}</mm-format-text></p>
                             <div ng-if="item.template" ng-include="item.template"></div>
                         </div>