dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2195 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2010-11-27 18:49:07 +0100
message:
  (GIS) Fixed bug: Overlay registration error.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2010-11-17 16:20:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2010-11-27 17:46:54 +0000
@@ -120,15 +120,11 @@
 error_while_saving_data				= Error while saving data
 is_saved_as_map_source				= is saved as map source
 is_already_selected					= is already selected
-
-
-
 overlays							= Overlays
 was_registered						= was registered
 is_already_in_use					= is already in use
 new_overlay							= New overlay
 name								= Name
-overlay_name_cannot_be_longer_than_25_characters = Overlay name cannot be longer than 25 characters
 overlay_form_is_not_complete		= Overlay form is not complete
 display_name						= Display name
 map_source_file						= Map source file
@@ -178,7 +174,6 @@
 save								= Save
 saving_current_thematic_map_selection = Saving current thematic map selection.
 new_legend_set						= New legend set
-name_can_not_longer_than_25			= Name cannot contain more than 25 characters
 already_exists						= already exists
 a_legend_set_called					= A legend set called
 assign_to_indicator					= Assign to indicators
@@ -214,7 +209,6 @@
 layer								= Layer
 new_baselayer						= New base layer
 baselayer_form_is_not_complete		= Base layer form is not complete
-baselayer_name_cannot_be_longer_than_25_characters = Base layer name cannot contain more than 25 characters
 mapvaluetype						= Map value type
 dataelement_group					= Data el. group
 dataelement							= Data element
@@ -235,4 +229,6 @@
 feature_filter						= Feature filter
 locate_features						= Locate features
 no_coordinates_found				= No coordinates found
-image_resolution					= Resolution
\ No newline at end of file
+image_resolution					= Resolution
+max									= max
+characters							= characters
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2010-11-17 16:20:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2010-11-27 17:46:54 +0000
@@ -168,13 +168,11 @@
 var i18n_delete_map_view = '$encoder.jsEscape($i18n.getString( 'delete_map_view' ) , "'")';
 var i18n_new_map_view = '$encoder.jsEscape($i18n.getString( 'new_map_view' ) , "'")';
 var i18n_there_is_already_a_map_view_called	 = '$encoder.jsEscape($i18n.getString( 'there_is_already_a_map_view_called' ) , "'")';
-var i18n_map_view_name_cannot_be_longer_than_25_characters	 = '$encoder.jsEscape($i18n.getString( 'map_view_name_cannot_be_longer_than_25_characters' ) , "'")';
 var i18n_thematic_map_form_is_not_complete = '$encoder.jsEscape($i18n.getString( 'thematic_map_form_is_not_complete' ) , "'")';	
 var i18n_map_view_form_is_not_complete = '$encoder.jsEscape($i18n.getString( 'map_view_form_is_not_complete' ) , "'")';	
 var i18n_save = '$encoder.jsEscape($i18n.getString( 'save' ) , "'")';
 var i18n_saving_current_thematic_map_selection	 = '$encoder.jsEscape($i18n.getString( 'saving_current_thematic_map_selection' ) , "'")';
 var i18n_new_legend_set = '$encoder.jsEscape($i18n.getString( 'new_legend_set' ) , "'")';
-var i18n_name_can_not_longer_than_25 = '$encoder.jsEscape($i18n.getString( 'name_can_not_longer_than_25' ) , "'")';
 var i18n_already_exists = '$encoder.jsEscape($i18n.getString( 'already_exists' ) , "'")';
 var i18n_a_legend_set_called = '$encoder.jsEscape($i18n.getString( 'a_legend_set_called' ) , "'")';
 var i18n_assign_to_indicator = '$encoder.jsEscape($i18n.getString( 'assign_to_indicator' ) , "'")';
@@ -209,7 +207,6 @@
 var i18n_layer = '$encoder.jsEscape($i18n.getString( 'layer' ) , "'")';
 var i18n_new_baselayer = '$encoder.jsEscape($i18n.getString( 'new_baselayer' ) , "'")';
 var i18n_baselayer_form_is_not_complete = '$encoder.jsEscape($i18n.getString( 'baselayer_form_is_not_complete' ) , "'")';
-var i18n_baselayer_name_cannot_be_longer_than_25_characters = '$encoder.jsEscape($i18n.getString( 'baselayer_name_cannot_be_longer_than_25_characters' ) , "'")';
 var i18n_mapvaluetype = '$encoder.jsEscape($i18n.getString( 'mapvaluetype' ) , "'")';
 var i18n_dataelement_group = '$encoder.jsEscape($i18n.getString( 'dataelement_group' ) , "'")';
 var i18n_dataelement = '$encoder.jsEscape($i18n.getString( 'dataelement' ) , "'")';
@@ -231,4 +228,7 @@
 var i18n_feature_filter = '$encoder.jsEscape($i18n.getString( 'feature_filter' ) , "'")';
 var i18n_locate_features = '$encoder.jsEscape($i18n.getString( 'locate_features' ) , "'")';
 var i18n_no_coordinates_found = '$encoder.jsEscape($i18n.getString( 'no_coordinates_found' ) , "'")';
-var i18n_image_resolution = '$encoder.jsEscape($i18n.getString( 'image_resolution' ) , "'")';
\ No newline at end of file
+var i18n_image_resolution = '$encoder.jsEscape($i18n.getString( 'image_resolution' ) , "'")';
+
+var i18n_max = '$encoder.jsEscape($i18n.getString( 'max' ) , "'")';
+var i18n_characters = '$encoder.jsEscape($i18n.getString( 'characters' ) , "'")';
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-11-26 17:56:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-11-27 17:46:54 +0000
@@ -845,7 +845,7 @@
                     }
                     
                     if (!GLOBAL.util.validateInputNameLength(mln)) {
-                        Ext.message.msg(false, i18n_name_can_not_longer_than_25);
+                        Ext.message.msg(false, i18n_name + ': ' + i18n_max + ' 25 ' + i18n_characters);
                         return;
                     }
                     
@@ -1554,8 +1554,8 @@
 						return;
 					}
 					
-					if (GLOBAL.util.validateInputNameLength(mln)) {
-						Ext.message.msg(false, i18n_overlay_name_cannot_be_longer_than_25_characters);
+					if (!GLOBAL.util.validateInputNameLength(mln)) {
+						Ext.message.msg(false, i18n_name + ': ' + i18n_max + ' 25 ' + i18n_characters);
 						return;
 					}
                     
@@ -1729,8 +1729,8 @@
 						return;
 					}
 					
-					if (GLOBAL.util.validateInputNameLength(mlbn)) {
-						Ext.message.msg(false, i18n_baselayer_name_cannot_be_longer_than_25_characters);
+					if (!GLOBAL.util.validateInputNameLength(mlbn)) {
+						Ext.message.msg(false, i18n_name + ': ' + i18n_max + ' 25 ' + i18n_characters);
 						return;
 					}
                     
@@ -2720,4 +2720,4 @@
     symbol.prepareMapViewLegend();
     
 	}});
-});
\ No newline at end of file
+});