=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/account.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/account.js 2013-10-01 16:44:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/account.js 2013-10-07 09:33:02 +0000 @@ -39,8 +39,19 @@ } }; + +var login = {}; +login.localeCookie = "dhis2.locale"; + $( document ).ready( function() { - + + var locale = $.cookie( login.localeCookie ); + + if ( undefined !== locale && locale ) + { + login.changeLocale( locale ); + } + Recaptcha.create( "6LcM6tcSAAAAANwYsFp--0SYtcnze_WdYn8XwMMk", "recaptchaDiv", { theme: "white" } ); @@ -84,3 +95,22 @@ { Recaptcha.reload(); } + +login.changeLocale = function( locale ) +{ + $.get( 'accountStrings.action?loc=' + locale, function( json ) { + $('#create_new_account').html( json.create_new_account ); + $('#label_firstName').html( json.name ); + $('#firstName').attr( "placeholder", json.first_name ); + $('#surname').attr( "placeholder", json.last_name ); + $('#label_username').html( json.user_name ); + $('#label_password').html( json.password ); + $('#label_retypePassword').html( json.confirm_password ); + $('#label_email').html( json.email ); + $('#label_mobile_phone').html( json.mobile_phone ); + $('#label_employer').html( json.employer ); + $('#label_recaptchaDiv').html( json.prove_not_robot ); + $('#cant_read_words').html( json.cant_read_words ); + $('#submitButton').val( json.create ); + } ); +} === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js 2013-10-06 11:32:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js 2013-10-07 09:33:02 +0000 @@ -3,7 +3,14 @@ login.localeCookie = "dhis2.locale"; $( document ).ready( function() { - + + var locale = $.cookie( login.localeCookie ); + + if ( undefined !== locale && locale ) + { + login.changeLocale( locale ); + } + } ); function recoverAccount() @@ -31,3 +38,15 @@ } } ); } + + +login.changeLocale = function( locale ) +{ + $.get( 'recoveryStrings.action?loc=' + locale, function( json ) { + $('#account_recovery').html( json.account_recovery ); + $('#label_username').html( json.user_name ); + $('#recoveryButton').val( json.recover ); + $('#recoverySuccessMessage').html( json.recover_success_message ); + $('#recoveryErrorMessage').html( json.recover_error_message ); + } ); +} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js 2013-10-06 11:32:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js 2013-10-07 09:33:02 +0000 @@ -29,13 +29,13 @@ if ( locale ) { login.changeLocale( locale ); - $.cookie( login.localeCookie, locale ); + $.cookie( login.localeCookie, locale, { expires : 356*10 } ); } } login.changeLocale = function( locale ) { - $.get( 'loginStrings.action?loc=' + locale, function( json ) { + $.get( 'loginStrings.action?keyApplication=Y&loc=' + locale, function( json ) { $( '#createAccountButton' ).html( json.create_an_account ); $( '#usernameLabel' ).html( json.login_username ); $( '#passwordLabel' ).html( json.login_password ); === 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 2013-10-06 11:32:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm 2013-10-07 09:33:02 +0000 @@ -21,47 +21,47 @@
-

$i18n.getString( "create_new_account" )

+

$i18n.getString( "create_new_account" )

- + - + - + - + - + - + - + - + - + === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/accountStrings.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/accountStrings.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/accountStrings.vm 2013-10-07 09:33:02 +0000 @@ -0,0 +1,15 @@ +{ +"create_new_account": "$!i18nObject.getString( "create_new_account" )", +"name": "$!i18nObject.getString( "new_user_account_name" )", +"first_name": "$!i18nObject.getString( "new_user_account_first_name" )", +"last_name": "$!i18nObject.getString( "new_user_account_last_name" )", +"user_name": "$!i18nObject.getString( "user_name" )", +"password": "$!i18nObject.getString( "password" )", +"confirm_password": "$!i18nObject.getString( "confirm_password" )", +"email": "$!i18nObject.getString( "email" )", +"mobile_phone": "$!i18nObject.getString( "mobile_phone" )", +"employer": "$!i18nObject.getString( "employer" )", +"prove_not_robot": "$!i18nObject.getString( "prove_you_are_not_a_robot" )", +"cant_read_words": "$!i18nObject.getString( "cant_read_the_words_try_another_one" )", +"create": "$!i18nObject.getString( "create" )" +} === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm 2013-10-06 11:32:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm 2013-10-07 09:33:02 +0000 @@ -17,13 +17,13 @@
-

$i18n.getString( "account_recovery" )

+

$i18n.getString( "account_recovery" )
$i18n.getString( "cant_read_the_words_try_another_one" )$i18n.getString( "cant_read_the_words_try_another_one" )
- + @@ -34,16 +34,10 @@ - - - + + + + === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recoveryStrings.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recoveryStrings.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recoveryStrings.vm 2013-10-07 09:33:02 +0000 @@ -0,0 +1,7 @@ +{ +"account_recovery": "$!i18nObject.getString( "account_recovery" )", +"user_name": "$!i18nObject.getString( "user_name" )", +"recover": "$!i18nObject.getString( "recover" )", +"recover_success_message": "$!i18nObject.getString( "recover_success_message" )", +"recover_error_message": "$!i18nObject.getString( "recover_error_message" )" +} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java 2013-10-06 07:45:05 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java 2013-10-07 09:33:02 +0000 @@ -52,6 +52,13 @@ this.loc = loc; } +// private String type; +// +// public void setType( String type ) +// { +// this.type = type; +// } + private I18n i18nObject; public I18n getI18nObject() === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2013-10-01 16:44:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2013-10-07 09:33:02 +0000 @@ -122,6 +122,14 @@ /dhis-web-commons/security/loginStrings.vm + + /dhis-web-commons/useraccount/accountStrings.vm + + + + /dhis-web-commons/useraccount/recoveryStrings.vm + + /dhis-web-commons/useraccount/account.vm login.action === 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-10-05 17:11:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-10-07 09:33:02 +0000 @@ -743,4 +743,15 @@ forgot_password=Forgot password? wrong_username_or_password=Wrong username or password powered_by=Powered by -login=Login \ No newline at end of file +login=Login + +#-- New User Account page ----------------------------------------------------------------# + +new_user_account_name=Name +new_user_account_first_name=First +new_user_account_last_name=Last + +#-- Recovery page ----------------------------------------------------------------# + +recover_success_message=Please check the email account which you registered for this username. We have sent you instructions on how to restore your password. +recover_error_message=Sorry, we were not able to restore your account. The user name might be invalid, your account might not permit restore or you might have entered an invalid email address for your account. === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties 2013-10-05 17:11:35 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties 2013-10-07 09:33:02 +0000 @@ -605,10 +605,24 @@ algeria=Algeria global_fund=El Fondo Mundial timor_leste=Timor Oriental + +#-- Login page ----------------------------------------------------------------# + create_an_account=Crear una cuenta login_password=Contrasena login_username=Nombre de usuario forgot_password=¿Olvido su contrasena? wrong_username_or_password=Nombre de usuario o contrasena incorrecta powered_by=Impulsado por -login=Login \ No newline at end of file +login=Login + +#-- New User Account page ----------------------------------------------------------------# + +new_user_account_name=Nombre +new_user_account_first_name=Primero +new_user_account_last_name=Ultimo + +#-- Recovery page ----------------------------------------------------------------# + +recover_success_message=Compruebe la cuenta de correo electronico que se registro para este nombre de usuario. tenemos te enviaran las instrucciones para restablecer tu contrasena. +recover_error_message=Lo sentimos, pero no hemos podido recuperar su cuenta. El nombre de usuario no sea valida, su cuenta podria no permitir la restauracion o que podría haber entrado en un e-mail valida electronico de su cuenta.