dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4839
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-10-05 15:46:03 +0200
message:
  Changed some labels in settings menu
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js
  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/webapp/dhis-web-maintenance-settings/appearanceSettings.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/emailSettings.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/generalSettings.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userSettings.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-10-05 10:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2011-10-05 13:46:03 +0000
@@ -436,15 +436,13 @@
 	},
 	"emailSettings" : {
 		"smtpHostName" : {
-			"required" : true,
-			"url" : true
+			"required" : true
 		},
 		"smtpUsername" : {
 			"required" : true
 		},
 		"smtpPassword" : {
-			"required" : true,
-			"password" : true
+			"required" : true
 		}
 	}
 };

=== 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-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-10-05 13:46:03 +0000
@@ -11,7 +11,7 @@
 general_settings = General settings
 appearance_settings = Appearance settings
 smtp_settings = Email settings
-host_name = Host name (URL)
+host_name = Host name
 username = User name
 password = Password
 shortname = Short name
@@ -85,10 +85,17 @@
 start_page = Start page
 forum_integration = Forum integration
 no_start_page = No start page
-intro_user_settings = Customize the system with user specific settings for locale, sort order, display property, style and more.
-intro_general_settings = Customize the system behavior with regard to aggregation strategy, infrastructural data elements, infrastructural period type, disable data entry when data set completed and more.
-intro_appearance_settings = Customize the system behavior with regard to application title, style, flag, start page.
-intro_smtp_settings = Customize the system behavior with regard to e-mail (SMTP).
+intro_user_general_settings = Customize the system with user specific settings for locale, sort order, display property, style and more.
+intro_system_general_settings = Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more.
+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
+system_general_settings = System General Settings
+system_appearance_settings = System Appearance Settings
+system_email_settings = System Email Settings
+general = General
+appearance = Appearance
+email = Email
 disable_dataentry_when_dataset_completed = Disable data entry when data set completed
 max_attempts = Max number of login attempts
 lockout_timeframe = Lockout minutes after max number of login attempts

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/appearanceSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/appearanceSettings.vm	2011-10-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/appearanceSettings.vm	2011-10-05 13:46:03 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "appearance_settings" )</h3>
+<h3>$i18n.getString( "system_appearance_settings" )</h3>
 
 <form id="appearanceSettingForm" method="post" action="setAppearanceSettings.action">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/emailSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/emailSettings.vm	2011-10-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/emailSettings.vm	2011-10-05 13:46:03 +0000
@@ -9,7 +9,7 @@
 </script>
 
 
-<h3>$i18n.getString( "smtp_settings" )</h3>
+<h3>$i18n.getString( "system_email_settings" )</h3>
 
 <form id="emailSettingForm" method="post" action="setEmailSettings.action">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/generalSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/generalSettings.vm	2011-10-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/generalSettings.vm	2011-10-05 13:46:03 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "general_settings" )</h3>
+<h3>$i18n.getString( "system_general_settings" )</h3>
 
 <form id="generalSettingForm" method="post" action="setGeneralSettings.action">
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2011-10-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2011-10-05 13:46:03 +0000
@@ -8,9 +8,9 @@
 <h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
 
 <ul id="introList">
-    #introListImgItem( "userSettings.action" "user_settings" "usersettings" )
-    #introListImgItem( "generalSettings.action" "general_settings" "systemsettings" )
-    #introListImgItem( "appearanceSettings.action" "appearance_settings" "systemsettings" )
-    #introListImgItem( "emailSettings.action" "smtp_settings" "systemsettings" )
+    #introListImgItem( "userSettings.action" "user_general_settings" "usersettings" )
+    #introListImgItem( "generalSettings.action" "system_general_settings" "systemsettings" )
+    #introListImgItem( "appearanceSettings.action" "system_appearance_settings" "systemsettings" )
+    #introListImgItem( "emailSettings.action" "system_email_settings" "systemsettings" )
 </ul>
     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2011-10-05 07:03:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2011-10-05 13:46:03 +0000
@@ -1,11 +1,11 @@
 <h2>$i18n.getString( "user_settings" )&nbsp;</h2>
 <ul>
-	<li><a href="userSettings.action">$i18n.getString( "user_settings" )&nbsp;</a></li>
+	<li><a href="userSettings.action">$i18n.getString( "general" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "system_settings" )&nbsp;</h2>
 <ul>
-	<li><a href="generalSettings.action">$i18n.getString( "general_settings" )&nbsp;</a></li>
-	<li><a href="appearanceSettings.action">$i18n.getString( "appearance_settings" )&nbsp;</a></li>
-	<li><a href="emailSettings.action">$i18n.getString( "smtp_settings" )&nbsp;</a></li>
+	<li><a href="generalSettings.action">$i18n.getString( "general" )&nbsp;</a></li>
+	<li><a href="appearanceSettings.action">$i18n.getString( "appearance" )&nbsp;</a></li>
+	<li><a href="emailSettings.action">$i18n.getString( "email" )&nbsp;</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userSettings.vm	2011-04-06 11:39:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userSettings.vm	2011-10-05 13:46:03 +0000
@@ -43,7 +43,7 @@
 </script>
 
 <form>
-<h3>$i18n.getString("user_settings")</h3>
+<h3>$i18n.getString("user_general_settings")</h3>
 
 <h4>$i18n.getString( "language" )</h4>