dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8642
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 13:37:45 +0200
message:
  Translations
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java	2012-10-22 11:30:52 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java	2012-10-22 11:37:45 +0000
@@ -56,7 +56,7 @@
 {
     private static final Log log = LogFactory.getLog( AccountController.class );
     
-    private static final String RECAPTCHA_VERIFY_URL = "http://www.google.com/recaptcha/api/verify";;
+    private static final String RECAPTCHA_VERIFY_URL = "https://www.google.com/recaptcha/api/verify";;
     private static final String KEY = "6LcM6tcSAAAAAFnHo1f3lLstk3rZv3EVinNROfRq";
     private static final String TRUE = "true";
     private static final String FALSE = "false";

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm	2012-10-19 18:29:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm	2012-10-22 11:37:45 +0000
@@ -17,7 +17,7 @@
 
 <div id="accountInput">
 
-<h3>Create a new account</h3>
+<h3>$i18n.getString( "create_new_account" )</h3>
 
 <form id="accountForm" action="../../api/account" method="post">
 
@@ -48,7 +48,7 @@
         <td style="padding-bottom: 5px"><input type="text" id="phoneNumber" name="phoneNumber"></td>
     </tr>
     <tr>
-    	<td><label>Prove you are not a robot</label></td>
+    	<td><label>$i18n.getString( "prove_you_are_not_a_robot" )</label></td>
     	<td style="padding-bottom: 5px">
 		<script type="text/javascript" src="https://www.google.com/recaptcha/api/challenge?k=6LcM6tcSAAAAANwYsFp--0SYtcnze_WdYn8XwMMk";></script>
 		<noscript>
@@ -61,7 +61,7 @@
 	</tr>
     <tr>
     	<td></td>
-    	<td><input type="submit" value="Create" style="width:10em"></td>
+    	<td><input type="submit" value="$i18n.getString( 'create' )" style="width:10em"></td>
     </tr>
 </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-19 08:00:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-22 11:37:45 +0000
@@ -123,6 +123,9 @@
 password=Password
 confirm_password=Confirm password
 mobile_phone=Mobile phone
+create_new_account=Create a new account
+prove_you_are_not_a_robot=Prove you are not a robot
+create=Create
 
 #-- PeriodTypes ----------------------------------------------------------------#