Cleaned some of the wording to match the tracker stories

unicefuganda · Sep 27, 2012 · 5775c6b · 5775c6b
1 parent ce58a9a
commit 5775c6b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/mobilevrs_project/mobilevrs/fixtures/initial_data.json b/mobilevrs_project/mobilevrs/fixtures/initial_data.json
@@ -364,13 +364,13 @@
         "pk" : "user_management"
     },
     { "fields" : { "next" : "thank_msg",
-        "question_text" : "Enter Pin to comfirm or 0 to cancel"
+        "question_text" : "Enter Pin to confirm or \"0\" to cancel"
     },
         "model" : "ussd.question",
         "pk" : "birth_summary"
     },
     { "fields" : { "next" : "birth_summary",
-        "question_text" : "Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\nOthers (Type in the country manually)"
+        "question_text" : "Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)"
     },
         "model" : "ussd.question",
         "pk" : "father_nationality"
@@ -382,7 +382,7 @@
         "pk" : "father_name"
     },
     { "fields" : { "next" : "father_name",
-        "question_text" : "Select mother's nationality:\n1. Uganda \n2. Kenya \n3. Tanzania \n4. Rwanda \nOthers (Type in the country manually)"
+        "question_text" : "Select mother's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)"
     },
         "model" : "ussd.question",
         "pk" : "mother_nationality"
@@ -412,7 +412,7 @@
         "pk" : "other_name"
     },
     { "fields" : { "next" : "death_thank_you",
-        "question_text" : "Enter Pin to comfirm or 0 to cancel"
+        "question_text" : "Enter Pin to confirm or \"0\" to cancel"
     },
         "model" : "ussd.question",
         "pk" : "death_summary"
@@ -671,7 +671,7 @@
     { "fields" : { "command" : "e",
         "field_type" : "int",
         "order" : 1,
-        "question" : "Enter Pin to comfirm or 0 to cancel",
+        "question" : "Enter Pin to confirm or \"0\" to cancel",
         "xform" : 1
     },
         "model" : "rapidsms_xforms.xformfield",
@@ -680,7 +680,7 @@
     { "fields" : { "command" : "e1",
         "field_type" : "text",
         "order" : 1,
-        "question" : "Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\nOthers (Type in the country manually)",
+        "question" : "Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)",
         "xform" : 1
     },
         "model" : "rapidsms_xforms.xformfield",
@@ -698,7 +698,7 @@
     { "fields" : { "command" : "e3",
         "field_type" : "text",
         "order" : 1,
-        "question" : "Select mother's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\nOthers (Type in the country manually)",
+        "question" : "Select mother's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)",
         "xform" : 1
     },
         "model" : "rapidsms_xforms.xformfield",
@@ -743,7 +743,7 @@
     { "fields" : { "command" : "e8",
         "field_type" : "int",
         "order" : 1,
-        "question" : "Enter Pin to comfirm or 0 to cancel",
+        "question" : "Enter Pin to confirm or \"0\" to cancel",
         "xform" : 1
     },
         "model" : "rapidsms_xforms.xformfield",

diff --git a/mobilevrs_project/mobilevrs/tests.py b/mobilevrs_project/mobilevrs/tests.py
@@ -114,7 +114,7 @@ def testBirthNotify(self):
                                     ussdRequestString = 'the mother', \
                                     response = True\
                                     )
-        self.assertEquals(urllib2.unquote(response.content), "responseString=Select mother's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\nOthers (Type in the country manually)&action=request")
+        self.assertEquals(urllib2.unquote(response.content), "responseString=Select mother's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)&action=request")
         response = self.sendRequest(transactionId = self.transactionId,\
                                     transactionTime = self.transactionTime, \
                                     msisdn = self.msisdn, \
@@ -130,15 +130,15 @@ def testBirthNotify(self):
                                     ussdRequestString = 'the father', \
                                     response = True\
                                     )
-        self.assertEquals(urllib2.unquote(response.content), "responseString=Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\nOthers (Type in the country manually)&action=request")
+        self.assertEquals(urllib2.unquote(response.content), "responseString=Select father's nationality:\n1. Uganda\n2. Kenya\n3. Tanzania\n4. Rwanda\n5. Burundi\n6. South Sudan\n7. DR Congo\nOthers (Type in the country manually)&action=request")
         response = self.sendRequest(transactionId = self.transactionId,\
                                     transactionTime = self.transactionTime, \
                                     msisdn = self.msisdn, \
                                     ussdServiceCode = self.msisdn, \
                                     ussdRequestString = '1', \
                                     response = True\
                                     )
-#        self.assertEquals(urllib2.unquote(response.content), "responseString=Summary child first name: my first guy child other name: the other name date of birth: 1 child sex 1 mother nationality: 1 father name: the father father nationality: 1  Enter Pin to comfirm or 0 to cancel &action=request")
+        self.assertEquals(urllib2.unquote(response.content), "responseString=Enter Pin to confirm or \"0\" to cancel&action=request")
         response = self.sendRequest(transactionId = self.transactionId,\
                                     transactionTime = self.transactionTime, \
                                     msisdn = self.msisdn, \
@@ -258,7 +258,7 @@ def testDeathNotify(self):
                                     ussdRequestString = '1', \
                                     response = True\
                                     )
-#        self.assertEquals(urllib2.unquote(response.content), "responseString=Summary deceased name: my first dead guy deacesed age: 42 Deceased Sex: 1 Death date 12072012 declarant name: some woman declarant phone: 256782998903 declarant capacity: 1  Death Summary: &action=request")
+        self.assertEquals(urllib2.unquote(response.content), "responseString=Enter Pin to confirm or \"0\" to cancel&action=request")
         response = self.sendRequest(transactionId = '123345',\
                                     transactionTime = self.transactionTime, \
                                     msisdn = self.msisdn, \
@@ -477,7 +477,7 @@ def testUserManagementUserCreation(self):
             ussdRequestString = 'kampala',\
             response = True\
         )
-        self.assertEquals(urllib2.unquote(response.content), "responseString=Summary Surname user register Other Names Other names Sex 1 Date of Birth 12121999 Phone 078942422424 Parish or Ward kampala  Enter  PIN to confirm or \"0\" to cancel &action=request")
+        self.assertEquals(urllib2.unquote(response.content), 'responseString=Enter  PIN to confirm or "0" to cancel&action=request')
         response = self.sendRequest(transactionId = self.transactionId,\
             transactionTime = self.transactionTime,\
             msisdn = self.msisdn,\

diff --git a/mobilevrs_project/mobilevrs/views.py b/mobilevrs_project/mobilevrs/views.py
@@ -86,7 +86,7 @@ def ussd_menu(req, input_form=YoForm, output_template='ussd/yo.txt'):
             logger.info('Preparing to submit this data...')
             response = forward_to_utl(session)
             if request_string == '0' or response.getcode() != 200:
-                resp = "The information was not saved. Please start again"
+                resp = "The information was not recorded. Please start again"
                 logging.info('Sending response to Yo " %s "'%render_to_string(output_template,{
                     'response_content':urllib.quote(str(response_screen)),
                     'action':'end',
@@ -101,7 +101,7 @@ def ussd_menu(req, input_form=YoForm, output_template='ussd/yo.txt'):
 
         #Pre-pend a summary to the second last question
         if response_screen.slug in ["birth_summary","death_summary","e_confirm"]:
-            response_screen = "Summary %s %s " % (get_summary(session), str(response_screen))
+#            response_screen = "Summary %s %s " % (get_summary(session), str(response_screen))
             logger.info('Returning Summary Screen: %s' % response_screen)
 
         #Determine if a resume option has been selected and serve the last dropped session