dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2098 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-09-13 12:28:46 +0200
message:
  (GIS) Mirror fixed.
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-09-09 19:19:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2010-09-13 10:16:51 +0000
@@ -75,7 +75,7 @@
 return_to_DHIS_2_dashboard			= Return to DHIS2 dashboard
 exit_gis							= Exit GIS
 help								= Get help with GIS
-i18n_create_legend_sets_for_legend_type = Create legend sets for legend type
+create_predefined_legend_sets		= Create predefined legend sets
 export_map_as_excel					= Export map as Excel spreadsheet
 export_map_as_image					= Export map as image
 favorite_map_views					= Favorite map views

=== 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-09-09 19:19:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2010-09-13 10:16:51 +0000
@@ -76,7 +76,7 @@
 var i18n_return_to_DHIS_2_dashboard = '$encoder.jsEscape($i18n.getString( 'return_to_DHIS_2_dashboard' ) , "'")';
 var i18n_exit_gis = '$encoder.jsEscape($i18n.getString( 'exit_gis' ) , "'")';
 var i18n_help = '$encoder.jsEscape($i18n.getString( 'help' ) , "'")';
-var i18n_create_legend_sets_for_legend_type	 = '$encoder.jsEscape($i18n.getString( 'i18n_create_legend_sets_for_legend_type' ) , "'")';
+var i18n_create_predefined_legend_sets = '$encoder.jsEscape($i18n.getString( 'i18n_create_predefined_legend_sets' ) , "'")';
 var i18n_export_map_as_excel = '$encoder.jsEscape($i18n.getString( 'export_map_as_excel' ) , "'")';
 var i18n_favorite_map_views = '$encoder.jsEscape($i18n.getString( 'favorite_map_views' ) , "'")';	
 var i18n_show_hide_labels = '$encoder.jsEscape($i18n.getString( 'show_hide_labels' ) , "'")';	

=== 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-09-09 19:19:51 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-09-13 10:16:51 +0000
@@ -3498,7 +3498,7 @@
 	
 	var predefinedMapLegendSetButton = new Ext.Button({
 		iconCls: 'icon-predefinedlegendset',
-		tooltip: i18n_create_legend_sets_for_legend_type + ' "' + i18n_predefined + '"',
+		tooltip: i18n_create_predefined_legend_sets,
 		handler: function() {
 			var x = Ext.getCmp('center').x + 15;
 			var y = Ext.getCmp('center').y + 41;