dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10522 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-04-11 20:08:50 +0200
message:
  (GIS) Classification method renamed to 'Equal counts'.
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/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.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-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	2013-04-11 09:46:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2013-04-11 16:47:32 +0000
@@ -335,7 +335,7 @@
 share_interpretation=Share interpretation
 organisation_unit_level_parent=Organisation unit level / parent
 value_type=Value type
-equal_numbers=Equal numbers
+equal_counts=Equal counts
 classes_method=Classes / method
 low_color_size=Low color / size
 high_color_size=High color / size

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-04-10 15:15:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-04-11 16:47:32 +0000
@@ -3914,7 +3914,7 @@
 				fields: ['id', 'name'],
 				data: [
 					[2, GIS.i18n.equal_intervals],
-					[3, GIS.i18n.quantiles]
+					[3, GIS.i18n.equal_counts]
 				]
 			})
 		});

=== 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	2013-04-11 09:46:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2013-04-11 16:47:32 +0000
@@ -359,7 +359,7 @@
     share_interpretation: '$encoder.jsEscape($i18n.getString( 'share_interpretation' ) , "'")',
     organisation_unit_level_parent: '$encoder.jsEscape($i18n.getString( 'organisation_unit_level_parent' ) , "'")',
     value_type: '$encoder.jsEscape($i18n.getString( 'value_type' ) , "'")',
-    equal_numbers: '$encoder.jsEscape($i18n.getString( 'equal_numbers' ) , "'")',
+    equal_counts: '$encoder.jsEscape($i18n.getString( 'equal_counts' ) , "'")',
     classes_method: '$encoder.jsEscape($i18n.getString( 'classes_method' ) , "'")',
     low_color_size: '$encoder.jsEscape($i18n.getString( 'low_color_size' ) , "'")',
     high_color_size: '$encoder.jsEscape($i18n.getString( 'high_color_size' ) , "'")',