Skip to content

Commit c555867

Browse files
rkodevrkodev
authored
Merge pull request #353 from OpenSRP/translations_0507
Updated Forms to support translated spinner values
2 parents 79af13c + 6d16b3f commit c555867

10 files changed

+98
-13
lines changed

‎opensrp-chw/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ tasks.withType(Test) {
112112
}
113113

114114
dependencies {
115-
implementation('org.smartregister:opensrp-client-native-form:1.6.1-RTL-SNAPSHOT@aar') {
115+
implementation('org.smartregister:opensrp-client-native-form:1.6.3-SNAPSHOT@aar') {
116116
transitive = true
117117
exclude group: 'com.android.support', module: 'recyclerview-v7'
118118
exclude group: 'com.android.support', module: 'appcompat-v7'

‎opensrp-chw/src/main/assets/json.form/birth_certification_fr.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
"Oui",
6262
"Non"
6363
],
64+
"keys": [
65+
"Yes",
66+
"No"
67+
],
6468
"openmrs_choice_ids": {
6569
"Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
6670
"Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -124,6 +128,10 @@
124128
"Oui",
125129
"Non"
126130
],
131+
"keys": [
132+
"Yes",
133+
"No"
134+
],
127135
"openmrs_choice_ids": {
128136
"Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
129137
"Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

‎opensrp-chw/src/main/assets/json.form/child_enrollment_fr.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@
262262
"Mâle",
263263
"Femelle"
264264
],
265+
"keys": [
266+
"Male",
267+
"Female"
268+
],
265269
"v_required": {
266270
"value": "true",
267271
"err": "Veuillez entrer le sexe"
@@ -278,6 +282,10 @@
278282
"Oui",
279283
"Non"
280284
],
285+
"keys": [
286+
"Yes",
287+
"No"
288+
],
281289
"openmrs_choice_ids": {
282290
"Oui": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
283291
"Non": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

‎opensrp-chw/src/main/assets/json.form/family_details_register_fr.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,19 @@
155155
"Communications, services sociaux et personnelles",
156156
"Autre"
157157
],
158+
"keys": [
159+
"Petty trade",
160+
"Agriculture, hunting and fishing",
161+
"Exploitation of mines and quarries",
162+
"Manufacturing industry",
163+
"Construction",
164+
"Electricity, gas and water",
165+
"Commercial, hotels and restaurants",
166+
"Transport, storage and communications",
167+
"Financial institutions",
168+
"Communication, social and personal services",
169+
"Other"
170+
],
158171
"openmrs_choice_ids": {
159172
"Petit commerce": "1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
160173
"Agriculture, chasse et pêche": "165411AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",

‎opensrp-chw/src/main/assets/json.form/family_details_remove_child_fr.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@
9999
"Déménagé",
100100
"Autre"
101101
],
102+
"keys": [
103+
"Died",
104+
"Moved away",
105+
"Other"
106+
],
102107
"v_required": {
103108
"value": "true",
104109
"err": "Sélectionnez la raison pour déplacer le dossier de l'enfant."
@@ -145,7 +150,7 @@
145150
"relevance": {
146151
"step1:remove_reason": {
147152
"type": "string",
148-
"ex": "equalTo(., \"Moved away\")"
153+
"ex": "equalTo(., \"Déménagé\")"
149154
}
150155
}
151156
},
@@ -175,7 +180,7 @@
175180
"relevance": {
176181
"step1:remove_reason": {
177182
"type": "string",
178-
"ex": "equalTo(., \"Died\")"
183+
"ex": "equalTo(., \"Décédé\")"
179184
}
180185
}
181186
},
@@ -191,7 +196,7 @@
191196
"relevance": {
192197
"step1:remove_reason": {
193198
"type": "string",
194-
"ex": "equalTo(., \"Died\")"
199+
"ex": "equalTo(., \"Décédé\")"
195200
}
196201
},
197202
"calculation": {

‎opensrp-chw/src/main/assets/json.form/family_details_remove_family_fr.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@
107107
"Déménagé",
108108
"Autre"
109109
],
110+
"keys": [
111+
"Moved away",
112+
"Other"
113+
],
110114
"v_required": {
111115
"value": "true",
112116
"err": "Sélectionnez la raison pour enlever le dossier de la famille"
@@ -141,7 +145,7 @@
141145
"relevance": {
142146
"step1:remove_reason": {
143147
"type": "string",
144-
"ex": "equalTo(., \"Moved away\")"
148+
"ex": "equalTo(., \"Déménagé\")"
145149
}
146150
}
147151
}

‎opensrp-chw/src/main/assets/json.form/family_details_remove_member_fr.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
"Déménagé",
104104
"Autre"
105105
],
106+
"keys": [
107+
"Died",
108+
"Moved away",
109+
"Other"
110+
],
106111
"openmrs_choice_ids": {
107112
"Décédé": "160034AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
108113
"Déménagé": "160415AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -145,7 +150,7 @@
145150
"relevance": {
146151
"step1:remove_reason": {
147152
"type": "string",
148-
"ex": "equalTo(., \"Moved away\")"
153+
"ex": "equalTo(., \"Déménagé\")"
149154
}
150155
}
151156
},

‎opensrp-chw/src/main/assets/json.form/family_member_register_fr.json‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,10 @@
271271
"Mâle",
272272
"Femelle"
273273
],
274+
"keys": [
275+
"Male",
276+
"Female"
277+
],
274278
"v_required": {
275279
"value": "true",
276280
"err": "Veuillez entrer le sexe"
@@ -286,6 +290,10 @@
286290
"values": [
287291
"Oui",
288292
"Non"
293+
],
294+
"keys": [
295+
"Yes",
296+
"No"
289297
]
290298
},
291299
{
@@ -310,7 +318,7 @@
310318
"relevance": {
311319
"step1:primary_caregiver": {
312320
"type": "string",
313-
"ex": "equalTo(., \"Yes\")"
321+
"ex": "equalTo(., \"Oui\")"
314322
}
315323
}
316324
},
@@ -332,7 +340,7 @@
332340
"relevance": {
333341
"step1:primary_caregiver": {
334342
"type": "string",
335-
"ex": "equalTo(., \"Yes\")"
343+
"ex": "equalTo(., \"Oui\")"
336344
}
337345
}
338346
},
@@ -350,16 +358,22 @@
350358
"Secondaire",
351359
"Postsecondaire"
352360
],
361+
"keys": [
362+
"None",
363+
"Primary",
364+
"Secondary",
365+
"Post-secondary"
366+
],
353367
"openmrs_choice_ids": {
354-
"Aucun": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
355-
"Primaire": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
356-
"Secondaire": "1714AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
357-
"Postsecondaire": "159785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
368+
"None": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
369+
"Primary": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
370+
"Secondary": "1714AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
371+
"Post-secondary": "159785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
358372
},
359373
"relevance": {
360374
"step1:primary_caregiver": {
361375
"type": "string",
362-
"ex": "equalTo(., \"Yes\")"
376+
"ex": "equalTo(., \"Oui\")"
363377
}
364378
}
365379
}

‎opensrp-chw/src/main/assets/json.form/family_register_fr.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,19 @@
163163
"Communications, services sociaux et personnelles",
164164
"Autre"
165165
],
166+
"keys": [
167+
"Petty trade",
168+
"Agriculture, hunting and fishing",
169+
"Exploitation of mines and quarries",
170+
"Manufacturing industry",
171+
"Construction",
172+
"Electricity, gas and water",
173+
"Commercial, hotels and restaurants",
174+
"Transport, storage and communications",
175+
"Financial institutions",
176+
"Communication, social and personal services",
177+
"Other"
178+
],
166179
"openmrs_choice_ids": {
167180
"Petty trade": "1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
168181
"Agriculture, hunting and fishing": "165411AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -390,6 +403,10 @@
390403
"Mâle",
391404
"Femelle"
392405
],
406+
"keys": [
407+
"Male",
408+
"Female"
409+
],
393410
"v_required": {
394411
"value": "true",
395412
"err": "Veuillez entrer le sexe"
@@ -445,6 +462,12 @@
445462
"Secondaire",
446463
"Postsecondaire"
447464
],
465+
"keys": [
466+
"None",
467+
"Primary",
468+
"Secondary",
469+
"Post-secondary"
470+
],
448471
"openmrs_choice_ids": {
449472
"Aucun": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
450473
"Primaire": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",

‎opensrp-chw/src/main/assets/json.form/observation_illness_fr.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@
9494
"Référé",
9595
"Aucun mesure prise"
9696
],
97+
"keys": [
98+
"Managed",
99+
"Referred",
100+
"No action taken"
101+
],
97102
"openmrs_choice_ids": {
98103
"Géré": "140959AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
99104
"Référé": "1648AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",

0 commit comments

Comments
 (0)