NA | Ram/Raj | capitalize sms instruction message

mangroveorg · Feb 17, 2016 · 3dee5fc · 3dee5fc
1 parent 80d2a19
commit 3dee5fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/datawinners/locale/fr/LC_MESSAGES/django.po b/datawinners/locale/fr/LC_MESSAGES/django.po
@@ -5045,10 +5045,10 @@ msgstr "Instructions pour les Expéditeurs de Données"
 msgid "%s with Identification Number %s successfully registered."
 msgstr "Le/la %s portant le Numéro d'Identification %s a été enregistré avec succès."
 
-msgid "Choose a %(entity_type)s from this list."
-msgstr "Choisissez un %(entity_type)s dans la liste."
+msgid "Choose a %(entity_type)s from this list"
+msgstr "Choisissez un %(entity_type)s dans la liste"
 
-msgid "%(entity_type)s is an identification number"
+msgid "%(entity_type)s is an Identification Number"
 msgstr "%(entity_type)s est un numéro d’identification"
 
 msgid "Advanced Answer Types"

diff --git a/datawinners/media/javascript/subjects/definitions.js b/datawinners/media/javascript/subjects/definitions.js
@@ -17,9 +17,7 @@ DW.SubjectSMSPreviewPage = function () {
         if (query_element_object.is('select')) {
             query_element_object.attr("hidden", "hidden");
             query_element_object.hide();
-            query_element_object.parents(".answer").before(
-                '<p class="sms_instruction instructions italic hide">' + query_element_object.attr('sms_help_text') + '</p>'
-            );
+
             if(!query_element_object.hasClass('linked_subject_field')) {
                 var options_html = "<ul class='multiple_select' style='clear:both'>";
                 options = query_element_object.find("option");
@@ -30,6 +28,10 @@ DW.SubjectSMSPreviewPage = function () {
                     }
                 }
                 options_html += "</ul>";
+            } else {
+                query_element_object.parents(".answer").before(
+                    '<p class="sms_instruction instructions italic hide">' + query_element_object.attr('sms_help_text') + '</p>'
+                );
             }
 
         } else {

diff --git a/datawinners/project/subject_question_creator.py b/datawinners/project/subject_question_creator.py
@@ -27,7 +27,7 @@ def _get_choice_field(self, subject_choices, subject_field, help_text, widget=No
         if (self.has_linked_idnr):            
             subject_choice_field.widget.attrs['class'] = 'linked_subject_field'
             subject_choice_field.widget.attrs["sms_help_text"] = \
-                _("%(entity_type)s is an identification number") % {'entity_type': subject_field.unique_id_type.capitalize()}
+                _("%(entity_type)s is an Identification Number") % {'entity_type': subject_field.unique_id_type.capitalize()}
 
         else:
             subject_choice_field.widget.attrs['class'] = 'subject_field'