dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6008
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 13:58:48 +0700
message:
  made lock message a bit smaller to better fit with notification area, also removed code from alert dialog
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js


--
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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-02-16 19:55:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-02-17 06:58:48 +0000
@@ -49,7 +49,7 @@
 value_must_integer=Value must be an integer and maximum length not exceeds 255 characters
 saving_value_failed_status_code=Saving value failed with status code
 saving_value_failed_error_code=Saving value failed with error code
-saving_value_failed_dataset_is_locked=Saving data value failed, data set is locked, please contact the system administrator
+saving_value_failed_dataset_is_locked=Data set is locked, please contact admin
 saving_comment_failed_status_code=Saving comment failed with status code
 saving_comment_failed_error_code=Saving comment failed with error code
 saving_minmax_failed_error_code=Saving min/max values failed with error code

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2012-02-16 19:55:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2012-02-17 06:58:48 +0000
@@ -272,7 +272,7 @@
         else if(code == 2)
         {
             markValue( COLOR_RED );
-            window.alert( i18n_saving_value_failed_dataset_is_locked + '\n\n' + code );
+            window.alert( i18n_saving_value_failed_dataset_is_locked );
         }
         else // Server error during save
         {

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-02-17 06:19:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-02-17 06:58:48 +0000
@@ -253,7 +253,7 @@
                 if(data.c == 2) {
                     log( 'DataSet is now locked' );
 
-                    setHeaderMessage( i18n_dataset_is_locked );
+                    setHeaderMessage( i18n_saving_value_failed_dataset_is_locked );
                 } else {
                     storageManager.clearDataValueJSON( value );
                     log( 'Successfully saved data value with value: ' + value );