dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4869
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-07 10:04:44 +0700
message:
  User settings - Minor fixed and updated i18n.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userEmailSettings.vm


--
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-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-10-06 09:36:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-10-07 03:04:44 +0000
@@ -91,6 +91,7 @@
 intro_system_appearance_settings = Customize the system behavior with regard to application title, style, flag, start page.
 intro_system_email_settings = Configure the email SMTP setup with regard to host name, user name and password.
 user_general_settings = User General Settings
+user_email_settings = User Email Settings
 system_general_settings = System General Settings
 system_appearance_settings = System Appearance Settings
 system_email_settings = System Email Settings

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties	2011-10-06 09:36:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties	2011-10-07 03:04:44 +0000
@@ -128,4 +128,9 @@
 username = T\u00ean \u0111\u0103ng nh\u1eadp
 password = M\u1eadt kh\u1ea9u
 settings_updated = C\u00e1c thi\u1ebft l\u1eadp \u0111\u00e3 \u0111\u01b0\u1ee3c thay \u0111\u1ed5i
-message_email_notification = Th\u00f4ng b\u00e1o tin nh\u1eafn qua th\u01b0 \u0111i\u1ec7n t\u1eed
\ No newline at end of file
+message_email_notification = Th\u00f4ng b\u00e1o tin nh\u1eafn qua th\u01b0 \u0111i\u1ec7n t\u1eed
+user_general_settings = C\u00e1c thi\u1ebft l\u1eadp chung cho ng\u01b0\u1eddi d\u00f9ng
+user_email_settings = C\u00e1c thi\u1ebft l\u1eadp c\u1ea5u h\u00ecnh th\u01b0 \u0111i\u1ec7n t\u1eed cho ng\u01b0\u1eddi d\u00f9ng
+system_general_settings = C\u00e1c thi\u1ebft l\u1eadp chung cho h\u1ec7 th\u1ed1ng
+system_appearance_settings = C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 giao di\u1ec7n cho h\u1ec7 th\u1ed1ng
+system_email_settings = C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 th\u01b0 \u0111i\u1ec7n t\u1eed cho h\u1ec7 th\u1ed1ng
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userEmailSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userEmailSettings.vm	2011-10-06 09:36:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userEmailSettings.vm	2011-10-07 03:04:44 +0000
@@ -1,4 +1,3 @@
-#if( $availableLocales )
 <script type="text/javascript">
 	
 	jQuery(document).ready(function() {
@@ -13,11 +12,9 @@
 	});
 </script>
 
-<h3>$i18n.getString("email_settings")</h3>
+<h3>$i18n.getString("user_email_settings")</h3>
 
 <h4>$i18n.getString( "message_email_notification" )</h4>
 <input type="checkbox" id="messageEmailNotification" name="messageEmailNotification" #if( $messageEmailNotification ) checked="checked"#end/>
 
-<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
-
-#end
\ No newline at end of file
+<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
\ No newline at end of file