dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5870 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-06 15:55:52 +0100
message:
  (DV) Minor tooltip and example chart fixes + (GIS) Minor i18n updates.
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/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css


--
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	2012-01-20 15:06:41 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2012-02-06 14:43:00 +0000
@@ -273,7 +273,7 @@
 assign_dataelements_to_legend_set=Assign data elements to legend set
 export_thematic_map_to_png=Export thematic map to PNG
 total_distance=Total distance
-symbol_layer=Symbol layer
+symbol_layer=Facility layer
 set_thematic_map_date_type=Set thematic map date type
 manage_favorites=Manage favorites
 tools=Tools

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties	2012-01-16 06:35:50 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties	2012-02-06 14:48:59 +0000
@@ -273,7 +273,7 @@
 assign_dataelements_to_legend_set=Assigner les \u00e9l\u00e9ments de donn\u00e9es \u00e0 un jeu de l\u00e9gende
 export_thematic_map_to_png=Exporter carte th\u00e9matique en PNG
 total_distance=Distance totale
-symbol_layer=Couche de symboles
+symbol_layer=Couche de centre de sant\u00e9
 set_thematic_map_date_type=D\u00e9finir le type de date de la carte th\u00e9matique
 manage_favorites=G\u00e9rer les favoris
 tools=Outils
@@ -295,3 +295,4 @@
 wms_overlays=Superpositions WMS
 file_overlays=fichier de superpositions
 centroid_layer=Couche de symboles
+no_values_found=Aucune valeurs trouv\u00e9e

=== 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	2012-01-20 15:06:41 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2012-02-06 14:43:00 +0000
@@ -296,7 +296,6 @@
     export_image: '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")',
     export_thematic_map_to_png: '$encoder.jsEscape($i18n.getString( 'export_thematic_map_to_png' ) , "'")',
     total_distance: '$encoder.jsEscape($i18n.getString( 'total_distance' ) , "'")',
-    symbol_layer: '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")',
     set_thematic_map_date_type: '$encoder.jsEscape($i18n.getString( 'set_thematic_map_date_type' ) , "'")',
     date: '$encoder.jsEscape($i18n.getString( 'date' ) , "'")',
     legend_symbolizer: '$encoder.jsEscape($i18n.getString( 'legend_symbolizer' ) , "'")',

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-01-31 15:55:11 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-02-06 14:43:00 +0000
@@ -14,6 +14,7 @@
 				DV.state.filter.names = DV.conf.init.example.filter;
 				DV.state.targetLineValue = 80;
 				DV.state.rangeAxisLabel = 'Range axis label';
+				DV.state.domainAxisLabel = 'Domain axis label';
 			},
 			setValues: function() {
 				var obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {}, obj8 = {}, obj9 = {}, obj10 = {}, obj11 = {}, obj12 = {};
@@ -662,7 +663,7 @@
 							trackMouse: true,
 							cls: 'dv-chart-tips',
 							renderer: function(si, item) {
-								this.update(item.value[1]);
+								this.update('' + item.value[1]);
 							}
 						};
 					},

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-01-31 15:55:11 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-02-06 14:43:00 +0000
@@ -1,5 +1,5 @@
 body {
-    font: normal 10px arial, ubuntu;
+    font: normal 10px arial, ubuntu, sans-serif;
 }
 
 .x-panel-body {