fixed measure panel and tooltip translations

geosolutions-it · Feb 15, 2017 · e62a337 · e62a337
1 parent c999ddb
commit e62a337
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/web/client/components/map/leaflet/MeasurementSupport.jsx b/web/client/components/map/leaflet/MeasurementSupport.jsx
@@ -33,11 +33,6 @@ const MeasurementSupport = React.createClass({
         };
     },
     componentWillReceiveProps(newProps) {
-        var drawingStrings = this.props.messages || (this.context.messages) ? this.context.messages.drawLocal : false;
-        if (drawingStrings) {
-            L.drawLocal = drawingStrings;
-        }
-
         if (newProps.measurement.geomType && newProps.measurement.geomType !== this.props.measurement.geomType ) {
             this.addDrawInteraction(newProps);
         }
@@ -66,6 +61,12 @@ const MeasurementSupport = React.createClass({
         }
     },
     render() {
+        // moved here the translations because when language changes it is forced a render of this component. (see connect of measure plugin)
+        var drawingStrings = this.props.messages || (this.context.messages) ? this.context.messages.drawLocal : false;
+        if (drawingStrings) {
+            L.drawLocal = drawingStrings;
+        }
+
         return null;
     },
     updateMeasurementResults() {

diff --git a/web/client/plugins/Measure.jsx b/web/client/plugins/Measure.jsx
@@ -41,7 +41,7 @@ const MeasurePlugin = connect((state) => {
     };
 }, {
     toggleMeasure: changeMeasurement
-})(MeasureComponent);
+}, null, {pure: false})(MeasureComponent);
 
 module.exports = {
     MeasurePlugin: assign(MeasurePlugin, {