------------------------------------------------------------
revno: 11312
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2013-07-02 19:02:54 +0200
message:
First step in front page internationalization
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.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-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2013-06-25 18:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2013-07-02 17:02:54 +0000
@@ -35,7 +35,7 @@
</div>
#if ( $keyConfig.selfRegistrationAllowed() )
<div id="accountArea">
- <a class="greenButtonLink" href="account.action">Create an account</a>
+ <a class="greenButtonLink" href="account.action">$i18n.getString( "create_an_account" )</a>
</div>
#end
<div id="loginField">
@@ -44,11 +44,11 @@
<form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
<table>
<tr>
- <td><label for="j_username">Username</label></td>
+ <td><label for="j_username">$i18n.getString( "login_username" )</label></td>
<td><input type="text" id="j_username" name="j_username"></td>
</tr>
<tr>
- <td><label for="j_password">Password</label></td>
+ <td><label for="j_password">$i18n.getString( "login_password" )</label></td>
<td><input type="password" id="j_password" name="j_password" autocomplete="off"></td>
</tr>
<tr>
@@ -63,10 +63,10 @@
<td style="padding-top:8px">
<span id="loginFormFooter">
#if( $keyAccountRecovery )
- <a href="recovery.action">Forgot password?</a>
+ <a href="recovery.action">$i18n.getString( "forgot_password" )</a>
#end
#if( $keyConfig.selfRegistrationAllowed() )
- <a href="account.action">Create an account</a>
+ <a href="account.action">$i18n.getString( "create_an_account" )</a>
#end
</span>
</td>
@@ -74,12 +74,12 @@
</table>
</form>
#if( $failed == true )
- <span id="loginMessage">Wrong username or password</span>
+ <span id="loginMessage">$i18n.getString( "wrong_username_or_password" )</span>
#end
#if ( $keyApplicationNotification )
<div id="notificationArea">$!{keyApplicationNotification}</div>
#end
</div>
- <div id="footerArea"><span>Powered by <a href="http://www.dhis2.org";>DHIS 2</a> $!{keyApplicationFooter}</div>
+ <div id="footerArea"><span>$i18n.getString( "powered_by" ) <a href="http://www.dhis2.org";>DHIS 2</a> $!{keyApplicationFooter}</div>
</body>
</html>
=== 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 2013-06-30 11:36:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-07-02 17:02:54 +0000
@@ -111,9 +111,9 @@
online=Online
online_notification=You are online
offline_notification=You are offline, data will be stored locally
+ajax_login_failed=Login failed, check your username and password and try again
need_to_sync_notification=There is data stored locally, please upload to server
uploading_data_notification=Uploading locally stored data to the server
-ajax_login_failed=Login failed, check your username and password and try again
sync_now=Upload
sync_success=Upload to server was successful
sync_failed=Upload to server failed, please try again later
@@ -642,7 +642,8 @@
#-- Sharing ------------------------------------------------------------------#
public_access=Public access
-user_group_access=User group access
+user_group_access=Us
+ajax_login_failed=Login failed, check your username and password and try againer group access
group_name=Group name
sharing_settings=Sharing settings
no_access=None
@@ -719,4 +720,14 @@
timor_leste=Timor-Leste
bhutan=Bhutan
nepal=Nepal
-psi=PSI
\ No newline at end of file
+psi=PSI
+
+#-- Login page ----------------------------------------------------------------#
+
+create_an_account=Create an account
+login_password=Password
+login_username=Username
+forgot_password=Forgot password?
+create_an_account=Create an account
+wrong_username_or_password=Wrong username or password
+powered_by=Powered by
\ No newline at end of file
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
