✨ Multilingualism (#346)

Parent issue: sequentech/meta#122
sequentech · Sep 6, 2023 · 2f63fb7 · 2f63fb7
1 parent 01f2065
commit 2f63fb7
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 68 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
@@ -5,9 +5,9 @@
   <div class="navbar-unfixed-top text-center">
     <div class="container">
       <div class="hidden unfixed-top-height"></div>
-      <h1 ng-bind-html="election.presentation.extra_options.public_title || election.title">
+      <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.extra_options.public_title || election.t
   <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/accordion-option-directive/accordion-option-directive.html b/avBooth/accordion-option-directive/accordion-option-directive.html
@@ -45,7 +45,7 @@
         parent
         ng-if="!isYoutube(option) && !!urls['Image URL']"
         ng-src="{{urls['Image URL']}}"
-        alt="{{option.text}}" />
+        alt="{{option | customI18n : 'text'}}" />
     </div>
 
     <!-- texts -->
@@ -56,7 +56,7 @@
               {{option.selected + 1}}.
           </span>
           <span>
-              <span class="answer-text" ng-bind-html="option.text"></span>
+              <span class="answer-text" ng-bind-html="option | customI18n : 'text'"></span>
               <span
               ng-if="showPoints && option.selected > -1"
               ng-i18next="[i18next]({points: getPoints()})avBooth.showSelectedOptionPoints">
@@ -107,7 +107,7 @@
         parent
         ng-if="!isYoutube(option) && !!urls['Image URL']"
         ng-src="{{urls['Image URL']}}"
-        alt="{{option.text}}" />
+        alt="{{option | customI18n : 'text'}}" />
     </div>
 
     <!-- remove action -->
@@ -154,15 +154,15 @@
               {{option.selected + 1}}.
           </span>
           <span>
-              <span class="answer-text" ng-bind-html="option.text"></span>
+              <span class="answer-text" ng-bind-html="option | customI18n : 'text'"></span>
               <span
               ng-if="showPoints && option.selected > -1"
               ng-i18next="[i18next]({points: getPoints()})avBooth.showSelectedOptionPoints">
               </span>
           </span>
           </strong>
-          <p class="answer-description details visible-lg" ng-if="(dnd_disable || !selectedOptions || (!!selectedOptions && !isTouchDevice)) && option.details && option.details.length > 1" ng-bind-html="option.details">
-          <p class="answer-description details hidden-lg" ng-if="!selectedOptions && option.details && option.details.length > 1" ng-bind-html="option.details">
+          <p class="answer-description details visible-lg" ng-if="(dnd_disable || !selectedOptions || (!!selectedOptions && !isTouchDevice)) && ((option.details && option.details.length > 1) || option.details_i18n)" ng-bind-html="option | customI18n : 'details'">
+          <p class="answer-description details hidden-lg" ng-if="!selectedOptions && ((option.details && option.details.length > 1) || option.details_i18n)" ng-bind-html="option | customI18n : 'details'">
           </p>
       </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) && !hidePublicHome"

diff --git a/avBooth/help-screen-directive/help-screen-directive.html b/avBooth/help-screen-directive/help-screen-directive.html
@@ -6,9 +6,9 @@
   <div class="navbar-unfixed-top text-center">
     <div class="container">
       <div class="hidden unfixed-top-height"></div>
-      <h1 ng-bind-html="election.presentation.extra_options.public_title || election.title">
+      <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>

diff --git a/avBooth/multi-question-directive/multi-question-directive.html b/avBooth/multi-question-directive/multi-question-directive.html
@@ -30,13 +30,13 @@
     <h1
       class="question-title"
       ng-if="!showingPreset"
-      ng-bind-html="stateData.question.title"
+      ng-bind-html="stateData.question | customI18n : 'title'"
     ></h1>
   </div>
   <p
     ng-if="!showingPreset"
     class="question-description"
-    ng-bind-html="stateData.question.description | addTargetBlank">
+    ng-bind-html="(stateData.question | customI18n : 'description') | addTargetBlank">
   </p>
 
   <div class="content avb-content" ng-if="!showingPreset">
@@ -161,7 +161,7 @@ <h4 aria-level="2" class="text-brand-success" ng-i18next="avBooth.questionAvaila
         <div class="col-xs-12">
           <span ng-if="showingPreset">
             <h3 ng-bind-html="stateData.question.extra_options.recommended_preset__title | addTargetBlank"></h3>
-            <p class="description" ng-bind-html="stateData.question.description | addTargetBlank"></p>
+            <p class="description" ng-bind-html="(stateData.question | customI18n : 'description') | addTargetBlank"></p>
           </span>
         </div>
       </div>

diff --git a/avBooth/pairwise-beta-directive/pairwise-beta-directive.html b/avBooth/pairwise-beta-directive/pairwise-beta-directive.html
@@ -26,7 +26,7 @@
         class="col-md-7 text-center center-col"
       >
         <div class="top-navbar-title">
-          {{election.presentation.extra_options.public_title || election.title}}
+          {{(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title')}}
         </div>
 
         <div
@@ -73,7 +73,7 @@ <h1>{{stateData.question.title}}</h1>
   <div class="container">
     <div class="row question-details">
       <p
-      ng-bind-html="stateData.question.description | addTargetBlank"
+      ng-bind-html="stateData.question | customI18n : 'description' | addTargetBlank"
       class="description">
       </p>
       <span class="selection-info" ng-i18next>
@@ -97,11 +97,11 @@ <h1>{{stateData.question.title}}</h1>
             </iframe>
             <img
               ng-if="!isYoutube(one) && !!getUrls(one)['Image URL']"
-              alt="{{one.text}}"
+              alt="{{one | customI18n : 'text'}}"
               ng-if="!!getUrls(one)['Image URL']"
               ng-src="{{getUrls(one)['Image URL']}}" />
           </div>
-          <h2 ng-bind-html="one.text"></h2>
+          <h2 ng-bind-html="one | customI18n : 'text'"></h2>
           <div class="links">
             <a
               class="text-left"
@@ -117,7 +117,7 @@ <h2 ng-bind-html="one.text"></h2>
               {{one.category}}
             </div>
           </div>
-          <p class="description" ng-bind-html="one.details"></p>
+          <p class="description" ng-bind-html="one | customI18n : 'details'"></p>
         </div>
       </div>
 
@@ -135,11 +135,11 @@ <h2 ng-bind-html="one.text"></h2>
             </iframe>
             <img
               ng-if="!isYoutube(two) && !!getUrls(two)['Image URL']"
-              alt="{{two.text}}"
+              alt="{{two | customI18n : 'text'}}"
               ng-if="!!getUrls(two)['Image URL']"
               ng-src="{{getUrls(two)['Image URL']}}" />
           </div>
-          <h2 ng-bind-html="two.text"></h2>
+          <h2 ng-bind-html="two | customI18n : 'text'"></h2>
           <div class="links">
             <a
               class="text-left"
@@ -155,7 +155,7 @@ <h2 ng-bind-html="two.text"></h2>
               {{two.category}}
             </div>
           </div>
-          <p class="description" ng-bind-html="two.details"></p>
+          <p class="description" ng-bind-html="two | customI18n : 'details'"></p>
         </div>
       </div>
     </div>

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>
 
@@ -142,7 +142,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/show-pdf-directive/show-pdf-directive.html b/avBooth/show-pdf-directive/show-pdf-directive.html
@@ -7,7 +7,13 @@
       <div class="hidden unfixed-top-height"></div>
       <h1
         class="election-title"
-        ng-bind-html="parentElection && (parentElection.presentation.extra_options.public_title || parentElection.title) || !parentElection && (election.presentation.extra_options.public_title || election.title) || ''"
+        ng-if="parentElection"
+        ng-bind-html="(parentElection.presentation | customI18n : 'public_title') || (parentElection | customI18n : 'title') || ''"
+      ></h1>
+      <h1
+        class="election-title"
+        ng-if="!parentElection"
+        ng-bind-html="(election.presentation | customI18n : 'public_title') || (election | customI18n : 'title') || ''"
       ></h1>
       <p
         class="pdf-text-description description" 

diff --git a/avBooth/simultaneous-question-answer-directive/simultaneous-question-answer-directive.html b/avBooth/simultaneous-question-answer-directive/simultaneous-question-answer-directive.html
@@ -30,7 +30,7 @@
           tabindex="0"
           role="checkbox"
           ng-if="!isInvalidVoteAnswer && question.tally_type === 'cumulative'"
-          aria-label="{{answer.text}} {{isWriteIn && 'write in ' || ''}}check {{check + 1}}"
+          aria-label="{{answer | customI18n : 'text'}} {{isWriteIn && 'write in ' || ''}}check {{check + 1}}"
           ng-repeat="check in answer_cumulative_checks"
           aria-checked="{{isCheckSelected(answer, check) ? 'true' : 'false'}}"
           ng-click="!readOnly() && toggleSelectItemCumulative(question, answer, check)"
@@ -45,7 +45,7 @@
           tabindex="0"
           role="checkbox"
           aria-checked="{{isCheckSelected(answer, 0) ? 'true' : 'false'}}"
-          aria-label="{{answer.text}} check invalid"
+          aria-label="{{answer | customI18n : 'text'}} check invalid"
           ng-if="!!isInvalidVoteAnswer && question.tally_type === 'cumulative'"
           ng-click="!readOnly() && toggleSelectItemCumulative(question, answer, 0)"
           ng-class="{
@@ -61,7 +61,7 @@
           parent
           ng-if="!!answer.urlsObject['Image URL']"
           ng-src="{{answer.urlsObject['Image URL']}}"
-          alt="{{answer.text}}" 
+          alt="{{answer | customI18n : 'text'}}" 
         />
       </div>
 
@@ -73,12 +73,12 @@
         <span 
           id="question_{{question.index}}_answer_{{answer.id}}"
           class="answer-text" 
-          ng-bind-html="answer.text"
+          ng-bind-html="answer | customI18n : 'text'"
         ></span>
         <p
-          ng-if="answer.details && answer.details.length > 1"
+          ng-if="answer.details && answer.details.length > 1 || answer.details_i18n"
           class="answer-details"
-          ng-bind-html="answer.details | addTargetBlank"
+          ng-bind-html="(answer | customI18n : 'details') | addTargetBlank"
         ></p>
       </div>
 

diff --git a/.../simultaneous-question-answer-v2-directive/simultaneous-question-answer-v2-directive.html b/.../simultaneous-question-answer-v2-directive/simultaneous-question-answer-v2-directive.html
@@ -34,7 +34,7 @@
           id="question_{{question.index}}_answer_{{answer.id}}"
           ng-if="!isBlankVoteAnswer"
           class="answer-text" 
-          ng-bind-html="answer.text"
+          ng-bind-html="answer | customI18n : 'text'"
         ></span>
         <span
           id="question_{{question.index}}_answer_blank"
@@ -43,9 +43,9 @@
           ng-i18next="avBooth.emptyAnswer"
         ></span>
         <p
-          ng-if="!isBlankVoteAnswer && answer.details && answer.details.length > 1"
+          ng-if="!isBlankVoteAnswer && ((answer.details && answer.details.length > 1) || answer.details_i18n)"
           class="answer-details"
-          ng-bind-html="answer.details | addTargetBlank"
+          ng-bind-html="(answer | customI18n : 'details') | addTargetBlank"
         ></p>
       </div>
 
@@ -158,7 +158,7 @@
           tabindex="0"
           role="checkbox"
           ng-if="!isBlankVoteAnswer && !isInvalidVoteAnswer && question.tally_type === 'cumulative'"
-          aria-label="{{answer.text}} {{isWriteIn && 'write in ' || ''}}check {{check + 1}}"
+          aria-label="{{answer | customI18n : 'text'}} {{isWriteIn && 'write in ' || ''}}check {{check + 1}}"
           ng-repeat="check in answer_cumulative_checks"
           aria-checked="{{isCheckSelected(answer, check) ? 'true' : 'false'}}"
           ng-click="$event.stopPropagation(); !readOnly() && toggleSelectItemCumulative(question, answer, check)"
@@ -172,7 +172,7 @@
           class="invalid-checkbox"
           role="checkbox"
           aria-checked="{{isCheckSelected(answer, 0) ? 'true' : 'false'}}"
-          aria-label="{{answer.text}} check invalid"
+          aria-label="{{answer | customI18n : 'text'}} check invalid"
           ng-if="!!isInvalidVoteAnswer && question.tally_type === 'cumulative'"
           ng-click="!readOnly() && toggleSelectItemCumulative(question, answer, 0)"
         >