=== 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-15 13:33:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2012-01-20 15:06:41 +0000
@@ -295,3 +295,4 @@
 wms_overlays=WMS overlays
 file_overlays=File overlays
 centroid_layer=Symbol layer
+no_values_found=No values found

=== 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-15 13:33:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2012-01-20 15:06:41 +0000
@@ -324,6 +324,6 @@
     wms_overlays:  '$encoder.jsEscape($i18n.getString( 'wms_overlays' ) , "'")',
     file_overlays:  '$encoder.jsEscape($i18n.getString( 'file_overlays' ) , "'")' ,
     symbol_layer:    '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")',
-    centroid_layer:    '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")'
-
+    centroid_layer:    '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")',
+    no_values_found:    '$encoder.jsEscape($i18n.getString( 'no_values_found' ) , "'")'
 };
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-01-18 13:04:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-01-20 15:06:41 +0000
@@ -1101,7 +1101,6 @@
     },
 
     applyValues: function() {
-        this.layer.features = this.featureStorage.slice(0);
         for (var i = 0; i < this.layer.features.length; i++) {
             var f = this.layer.features[i];
             if (!f.attributes.value) {
@@ -1114,8 +1113,8 @@
             }
         }
         if (!this.layer.features.length) {
-            Ext.message.msg(false, G.i18n.current_selection_no_data);
             G.vars.mask.hide();
+            Ext.message.msg(false, G.i18n.no_values_found);
             return;
         }
         

=== 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	2012-01-18 13:04:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-01-20 15:06:41 +0000
@@ -1731,7 +1731,6 @@
     },
     
     applyValues: function() {
-        this.layer.features = this.featureStorage.slice(0);
         for (var i = 0; i < this.layer.features.length; i++) {
             var f = this.layer.features[i];            
             if (!f.attributes.value) {
@@ -1744,8 +1743,8 @@
             }
         }
         if (!this.layer.features.length) {
-            Ext.message.msg(false, G.i18n.current_selection_no_data);
             G.vars.mask.hide();
+            Ext.message.msg(false, G.i18n.no_values_found);
             return;
         }
         

=== 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	2012-01-18 13:04:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-01-20 15:06:41 +0000
@@ -1731,7 +1731,6 @@
     },
     
     applyValues: function() {
-        this.layer.features = this.featureStorage.slice(0);
         for (var i = 0; i < this.layer.features.length; i++) {
             var f = this.layer.features[i];
             if (!f.attributes.value) {
@@ -1744,8 +1743,8 @@
             }
         }
         if (!this.layer.features.length) {
-            Ext.message.msg(false, G.i18n.current_selection_no_data);
             G.vars.mask.hide();
+            Ext.message.msg(false, G.i18n.no_values_found);
             return;
         }
 

=== 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-20 13:40:57 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-01-23 08:05:42 +0000
@@ -810,9 +810,10 @@
         favorite: {
             validate: function(f) {
                 if (!f.organisationUnits || !f.organisationUnits.length) {
-                    alert('Favorite has no organisation units');
-                    return;
-                }                
+                    alert(DV.i18n.favorite_no_orgunits);
+                    return false;
+                }
+                return true;
             }
         }
     };
@@ -1081,7 +1082,7 @@
                         if (!DV.util.favorite.validate(f)) {
                             return;
                         }
-                            
+                        
                         f.type = f.type.toLowerCase();
                         f.series = f.series.toLowerCase();
                         f.category = f.category.toLowerCase();