wip

sequentech · Jul 3, 2023 · d974023 · d974023
1 parent 0f56351
commit d974023
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/avBooth/2questions-conditional-screen-directive/2questions-conditional-screen-directive.html b/avBooth/2questions-conditional-screen-directive/2questions-conditional-screen-directive.html
@@ -7,7 +7,7 @@
       <div class="hidden unfixed-top-height"></div>
       <h1 ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')">
       </h1>
-      <p class="description" ng-bind-html="election.description | addTargetBlank"></p>
+      <p class="description" ng-bind-html="(election | customI18n : 'description') | addTargetBlank"></p>
     </div>
   </div>
 </div>
@@ -16,15 +16,15 @@ <h1 ng-bind-html="(election.presentation | customI18n : 'public_title') || (elec
   <div class="container">
     <div class="row options-row">
       <div class="col-xs-12">
-        <h3>{{election.questions[0].title}}</h3>
+        <h3>{{election.questions[0] | customI18n : 'title'}}</h3>
       </div>
       <div class="col-xs-6">
         <div class="opt" ng-click="toggleOption(0, 0)">
           <span class="glyphicon"
             ng-class="{'glyphicon-unchecked': election.questions[0].answers[0].selected === -1,
                        'glyphicon-check': election.questions[0].answers[0].selected === 0}">
           </span>
-          {{election.questions[0].answers[0].text}}
+          {{election.questions[0].answers[0] | customI18n : 'text'}}
         </div>
       </div>
       <div class="col-xs-6 left-border">
@@ -33,20 +33,20 @@ <h3>{{election.questions[0].title}}</h3>
             ng-class="{'glyphicon-unchecked': election.questions[0].answers[1].selected === -1,
                        'glyphicon-check': election.questions[0].answers[1].selected === 0}">
           </span>
-          {{election.questions[0].answers[1].text}}
+          {{election.questions[0].answers[1] | customI18n : 'text'}}
         </div>
         <div class="container-fluid" ng-if="election.questions.length > 1">
           <div class="row">
             <div class="col-xs-12">
-              <h3>{{election.questions[1].title}}</h3>
+              <h3>{{election.questions[1] | customI18n : 'title'}}</h3>
             </div>
             <div class="col-xs-12 col-sm-{{12/election.questions[1].answers.length}}" ng-repeat="answer in election.questions[1].answers">
               <div class="opt" ng-click="toggleOption(1, $index)">
                 <span class="glyphicon"
                   ng-class="{'glyphicon-unchecked': election.questions[1].answers[$index].selected === -1,
                             'glyphicon-check': election.questions[1].answers[$index].selected === 0}">
                 </span>
-                {{election.questions[1].answers[$index].text}}
+                {{election.questions[1].answers[$index] | customI18n : 'text'}}
               </div>
             </div>
           </div>

diff --git a/avBooth/booth-children-elections-directive/booth-children-elections-directive.html b/avBooth/booth-children-elections-directive/booth-children-elections-directive.html
@@ -3,7 +3,7 @@
     ng-if="!category.hidden"
     class="election-category"
 >
-    <h2 class="category-title">{{category.title}}</h2>
+    <h2 class="category-title">{{category | customI18n : 'title'}}</h2>
     <div class="category-elections-wrapper">
         <div 
             ng-repeat="election in category.events" 
@@ -15,8 +15,8 @@ <h2 class="category-title">{{category.title}}</h2>
             ng-click="canVoteElection(election) && click(election)"
         >
             <div class="text-container">
-                <h3 class="election-title">{{election.title}}</h3>
-                <p class="election-description" ng-if="!!election.description">{{election.description}}</p>
+                <h3 class="election-title">{{election | customI18n : 'title'}}</h3>
+                <p class="election-description" ng-if="!!election.description">{{election | customI18n : 'description'}}</p>
                 <a
                     href="election/{{ election.event_id }}/public/home"
                     ng-if="checkElectionStarted(election.electionData)"

diff --git a/avBooth/review-ballot-directive/review-ballot-directive.html b/avBooth/review-ballot-directive/review-ballot-directive.html
@@ -9,16 +9,16 @@
   <div class="title-container">
     <h3 aria-level="2" class="text-brand-success question-title">
       <span>{{$index + 1}}.</span>
-      <span class="question-title title-text" ng-bind-html="question.title"></span>
+      <span class="question-title title-text" ng-bind-html="question | customI18n : 'title'"></span>
     </h3>
     <span class="edit-btn">
       <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
     </span>
   </div>
   <p
     class="question-description"
-    ng-if="question.extra_options.review_screen__show_question_description && question.description" 
-    ng-bind-html="question.description | addTargetBlank"
+    ng-if="question.extra_options.review_screen__show_question_description && (question.description || question.description_i18n)" 
+    ng-bind-html="(question | customI18n : 'description') | addTargetBlank"
   ></p>
 
   <!-- Selected items line -->
@@ -43,7 +43,7 @@ <h3 aria-level="2" class="text-brand-success question-title">
     <li
       ng-repeat="pair in question.selection"
       class="animate-repeat selected-answer" ng-i18next>
-        [html:i18next]({one: pair[0].text, two: pair[1].text})avBooth.reviewScreen.pair
+        [html:i18next]({one: (pair[0] | customI18n : 'text'), two: (pair[1] | customI18n : 'text')})avBooth.reviewScreen.pair
     </li>
   </ul>
   <ul 
@@ -55,7 +55,7 @@ <h3 aria-level="2" class="text-brand-success question-title">
       ng-class="{'striked-text': markedAsInvalid(question)}"
       ng-if="!question.invalidVoteAnswer || answer.id !== question.invalidVoteAnswer.id"
       class="animate-repeat selected-answer">
-        <span ng-bind-html="answer.text"></span>
+        <span ng-bind-html="answer | customI18n : 'text'"></span>
         <span
           ng-if="showPoints(question) && !isWriteIn(answer)"
           ng-i18next="[i18next]({points: getPoints(question, answer)})avBooth.showSelectedOptionPoints">
@@ -89,7 +89,7 @@ <h3 aria-level="2" class="text-brand-success question-title">
       ng-if="!question.invalidVoteAnswer || answer.id !== question.invalidVoteAnswer.id"
       ng-class="{'striked-text': markedAsInvalid(question)}"
       class="animate-repeat selected-answer">
-        <span ng-bind-html="answer.text"></span>
+        <span ng-bind-html="answer | customI18n : 'text'"></span>
         <span
           ng-if="showPoints(question) && !isWriteIn(answer)"
           ng-i18next="[i18next]({points: getPoints(question, answer)})avBooth.showSelectedOptionPoints">

diff --git a/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html b/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html
@@ -8,14 +8,14 @@
   <div class="title-container">
     <h1 aria-level="2" class="text-brand-success question-title">
       <span>{{$index + 1}}.</span>
-      <span class="question-title title-text" ng-bind-html="question.title"></span>
+      <span class="question-title title-text" ng-bind-html="question | customI18n : 'title'"></span>
     </h1>
   </div>
 
   <p
     class="question-description"
-    ng-if="question.extra_options.review_screen__show_question_description && question.description" 
-    ng-bind-html="question.description | addTargetBlank"
+    ng-if="question.extra_options.review_screen__show_question_description && (question.description || question.description_i18n)" 
+    ng-bind-html="(question | customI18n : 'description') | addTargetBlank"
   >
   </p>
 
@@ -141,7 +141,7 @@ <h1 aria-level="2" class="text-brand-success question-title">
       ng-if="!question.invalidVoteAnswer || answer.id !== question.invalidVoteAnswer.id"
       ng-class="{'striked-text': markedAsInvalid(question)}"
       class="animate-repeat selected-answer">
-        <span ng-bind-html="answer.text"></span>
+        <span ng-bind-html="answer | customI18n : 'text'"></span>
         <span
           ng-if="showPoints(question) && !isWriteIn(answer)"
           ng-i18next="[i18next]({points: getPoints(question, answer)})avBooth.showSelectedOptionPoints">

diff --git a/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html b/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html
@@ -9,19 +9,19 @@
         ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')"
       ></h1>
       <p
-        ng-if="election.description"
+        ng-if="election.description || election.description_i18n"
         class="election-description"
-        ng-bind-html="election.description | addTargetBlank">
+        ng-bind-html="(election | customI18n : 'description') | addTargetBlank">
       </p>
     </div>
     <div class="row options-row" ng-repeat="question in groupQuestions">
       <div class="col-xs-12">
-        <h2 class="question-title text-center" aria-level="2" ng-bind-html="question.title">
+        <h2 class="question-title text-center" aria-level="2" ng-bind-html="question | customI18n : 'title'">
         </h2>
         <p
           class="question-description"
-          ng-if="question.description"
-          ng-bind-html="question.description | addTargetBlank">
+          ng-if="question.description || question.description_i18n"
+          ng-bind-html="question | customI18n : 'description' | addTargetBlank">
         </p>
       </div>
 

diff --git a/...imultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html b/...imultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html
@@ -33,18 +33,18 @@ <h1 class="election-header">
     <i class="pull-right fa fa-lg fa-question-circle" ng-click="showHelp()"></i>
   </h1>
   <p
-    ng-if="election.description"
+    ng-if="election.description || election.description_i18n"
     class="election-description"
-    ng-bind-html="election.description | addTargetBlank">
+    ng-bind-html="election | customI18n : 'description' | addTargetBlank">
   </p>
   <div class="notifications"></div>
   <div class="question" ng-repeat="question in groupQuestions">
-    <h2 class="question-title" aria-level="2" ng-bind-html="question.title">
+    <h2 class="question-title" aria-level="2" ng-bind-html="question | customI18n : 'title'">
     </h2>
     <p
       class="question-description"
-      ng-if="question.description"
-      ng-bind-html="question.description | addTargetBlank">
+      ng-if="question.description || question.description_i18n"
+      ng-bind-html="question | customI18n : 'description' | addTargetBlank">
     </p>
 
     <!-- QUESTION OPTIONS START -->