Merge pull request #260 from kobotoolbox/259-fix-or-other-label-trans…

…lation-issue Fix label handling for `or_other` with translations
kobotoolbox · Sep 15, 2021 · f3cdf12 · f3cdf12
2 parents 55f3aa4 + 3c776fe
commit f3cdf12
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/src/formpack/version.py b/src/formpack/version.py
@@ -212,8 +212,7 @@ def __init__(self, form_pack, schema):
     # def __repr__(self):
     #    return '<FormVersion %s>' % self._stats()
 
-    @staticmethod
-    def _append_pseudo_questions(survey):
+    def _append_pseudo_questions(self, survey):
         _survey = []
         for item in survey:
             _survey.append(item)
@@ -222,7 +221,7 @@ def _append_pseudo_questions(survey):
                     {
                         'type': 'text',
                         'name': f'{item["name"]}_other',
-                        'label': [None],
+                        'label': [None] * len(self.translations),
                     }
                 )
         return _survey

diff --git a/tests/fixtures/or_other/v1.json b/tests/fixtures/or_other/v1.json
@@ -5,35 +5,60 @@
       {
         "type": "select_one emperors or_other",
         "name": "fav_emperor",
-        "label": "Who is your favourite emperor?"
+        "label": [
+            "Who is your favourite emperor?",
+            "Kiu estas via plej ŝatata imperiestro?"
+        ]
       },
       {
         "type": "select_multiple emperors or_other",
         "name": "fav_emperors",
-        "label": "Who are your favourite emperors?"
+        "label": [
+            "Who are your favourite emperors?",
+            "Kiuj estas viaj plej ŝatataj imperiestroj?"
+        ]
       }
     ],
     "choices": [
       {
         "list_name": "emperors",
         "name": "julius",
-        "label": "Julius Caesar"
+        "label": [
+            "Julius Caesar",
+            "Julius Caesar"
+        ]
       },
       {
         "list_name": "emperors",
         "name": "augustus",
-        "label": "Augustus"
+        "label": [
+            "Augustus",
+            "Augustus"
+        ]
       },
       {
         "list_name": "emperors",
         "name": "tiberius",
-        "label": "Tiberius"
+        "label": [
+            "Tiberius",
+            "Tiberius"
+        ]
       },
       {
         "list_name": "emperors",
         "name": "caligula",
-        "label": "Caligula"
+        "label": [
+            "Caligula",
+            "Caligula"
+        ]
       }
+    ],
+    "translated": [
+        "label"
+    ],
+    "translations": [
+        "English (en)",
+        "Esperanto (eo)"
     ]
   },
   "submissions": [