dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3993 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-06-22 23:51:07 +0300
message:
  Minor fix.
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/resources/mapfish/widgets/geostat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.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	2011-05-19 12:57:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2011-06-22 19:38:25 +0000
@@ -60,7 +60,7 @@
 predefined							= Predefined
 equal_intervals						= Equal intervals
 equal_group_count					= Equal group count
-fixed_breaks						= Fixed breaks
+fixed_intervals						= Fixed intervals
 administrator						= Administrator
 map_source							= Map source
 base_coordinate						= Base coordinate

=== 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	2011-05-20 11:27:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-06-22 19:38:25 +0000
@@ -63,7 +63,7 @@
     predefined: '$encoder.jsEscape($i18n.getString( 'predefined' ) , "'")',	
     equal_intervals: '$encoder.jsEscape($i18n.getString( 'equal_intervals' ) , "'")',	
     equal_group_count: '$encoder.jsEscape($i18n.getString( 'equal_group_count' ) , "'")',	
-    fixed_breaks: '$encoder.jsEscape($i18n.getString( 'fixed_breaks' ) , "'")',	
+    fixed_intervals: '$encoder.jsEscape($i18n.getString( 'fixed_intervals' ) , "'")',	
     administrator: '$encoder.jsEscape($i18n.getString( 'administrator' ) , "'")',	
     map_source: '$encoder.jsEscape($i18n.getString( 'map_source' ) , "'")',	
     base_coordinate: '$encoder.jsEscape($i18n.getString( 'base_coordinate' ) , "'")',	

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-06-22 05:50:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-06-22 19:38:25 +0000
@@ -767,7 +767,7 @@
                 data: [
 					[2, G.i18n.equal_intervals],
 					[3, G.i18n.equal_group_count],
-					[1, G.i18n.fixed_breaks]
+					[1, G.i18n.fixed_intervals]
 				]
             }),
             listeners: {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-06-22 06:24:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-06-22 19:38:25 +0000
@@ -738,7 +738,7 @@
                 data: [
 					[2, G.i18n.equal_intervals],
 					[3, G.i18n.equal_group_count],
-					[1, G.i18n.fixed_breaks]
+					[1, G.i18n.fixed_intervals]
 				]
             }),
             listeners: {