adjusted some tranlations and placeholders

geosolutions-it · Apr 7, 2017 · efc6399 · efc6399
1 parent 68aec64
commit efc6399
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/web/client/components/data/query/ComboField.jsx b/web/client/components/data/query/ComboField.jsx
@@ -14,14 +14,15 @@ const OverlayTrigger = require('../../misc/OverlayTrigger');
 
 const {DropdownList, Multiselect} = require('react-widgets');
 
-const LocaleUtils = require('../../../utils/LocaleUtils');
+const Message = require('../../../components/I18N/Message');
 
 const ComboField = React.createClass({
     propTypes: {
         busy: React.PropTypes.bool,
         style: React.PropTypes.object,
         valueField: React.PropTypes.string,
         textField: React.PropTypes.string,
+        placeholder: React.PropTypes.string,
         fieldOptions: React.PropTypes.array,
         fieldName: React.PropTypes.string,
         fieldRowId: React.PropTypes.number,
@@ -64,6 +65,7 @@ const ComboField = React.createClass({
             style: {
                 width: "100%"
             },
+            placeholder: <Message msgId="queryform.attributefilter.combo_placeholder"/>,
             multivalue: false,
             disabled: false,
             valueField: null,
@@ -89,8 +91,6 @@ const ComboField = React.createClass({
             style = assign({}, style, {borderColor: "#FF0000"});
         }
 
-        let placeholder = LocaleUtils.getMessageById(this.context.messages, "queryform.attributefilter.combo_placeholder");
-
         const ListComponent = this.props.multivalue ? Multiselect : DropdownList;
 
         const list = this.props.valueField !== null && this.props.textField !== null ? (
@@ -104,7 +104,7 @@ const ComboField = React.createClass({
                 value={this.props.fieldValue}
                 caseSensitive={false}
                 minLength={3}
-                placeholder={placeholder}
+                placeholder={this.props.placeholder}
                 filter={this.props.comboFilter}
                 style={style}
                 groupBy={this.props.groupBy}
@@ -121,7 +121,7 @@ const ComboField = React.createClass({
                 value={this.props.fieldValue}
                 caseSensitive={false}
                 minLength={3}
-                placeholder={placeholder}
+                placeholder={this.props.placeholder}
                 filter={this.props.comboFilter}
                 style={style}
                 groupBy={this.props.groupBy}

diff --git a/web/client/components/data/query/SpatialFilter.jsx b/web/client/components/data/query/SpatialFilter.jsx
@@ -90,6 +90,7 @@ const SpatialFilter = React.createClass({
                         return LocaleUtils.getMessageById(this.context.messages, opt.name);
                     })
                 }
+                placeholder={LocaleUtils.getMessageById(this.context.messages, "queryform.spatialfilter.placeholder")}
                 fieldName="method"
                 style={{width: "140px"}}
                 fieldRowId={new Date().getUTCMilliseconds()}
@@ -118,7 +119,7 @@ const SpatialFilter = React.createClass({
         const methodSelector = this.props.spatialField.geometry ? (
             <Row className="logicHeader filter-field-row">
                 <Col xs={5}>
-                    <div><I18N.Message msgId={"queryform.spatialfilter.selection_method"}/></div>
+                    <div><I18N.Message msgId="queryform.spatialfilter.filterType"/></div>
                 </Col>
                 <Col xs={3}>
                     {methodCombo}
@@ -133,7 +134,7 @@ const SpatialFilter = React.createClass({
         ) : (
             <Row className="logicHeader filter-field-row">
                 <Col xs={5}>
-                    <div><I18N.Message msgId={"queryform.spatialfilter.selection_method"}/></div>
+                    <div><I18N.Message msgId={"queryform.spatialfilter.filterType"}/></div>
                 </Col>
                 <Col xs={7}>
                     {methodCombo}

diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -108,7 +108,7 @@
                     }
                 }
             }, "Login",
-            "OmniBar", "GridContainer", "BurgerMenu", "Expander"
+            "OmniBar", "BurgerMenu", "Expander"
         ],
         "desktop": ["Map", "Help", "Share", "DrawerMenu", {
                 "name": "Identify",
@@ -202,7 +202,7 @@
                     }
                 }
             },
-            "OmniBar", "GridContainer", "Login", "Save", "SaveAs", "BurgerMenu", "Expander", "Undo", "Redo", "FullScreen"
+            "OmniBar", "Login", "Save", "SaveAs", "BurgerMenu", "Expander", "Undo", "Redo", "FullScreen"
         ],
         "embedded": [{
                 "name": "Map",

diff --git a/web/client/translations/data.de-DE b/web/client/translations/data.de-DE
@@ -423,9 +423,10 @@
                 }
             },
             "spatialfilter": {
-                "selection_method": "Auswahl Methode",
+                "filterType": "Filtertyp",
                 "geometric_operation": "Geometrische Operation",
                 "spatial_filter_header": "Räumlicher Filter",
+                "placeholder": "Wählen...",
                 "draw_start_label": "Zeichne die Region von Interesse auf der Karte",
                 "dwithin_label": "Meter",
                 "details": {

diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US
@@ -423,8 +423,9 @@
                 }
             },
             "spatialfilter": {
-                "selection_method": "Selection Method",
+                "filterType": "Filter Type",
                 "geometric_operation": "Geometric Operation",
+                "placeholder": "Select...",
                 "spatial_filter_header": "Spatial Filter",
                 "draw_start_label": "Draw the region of interest on the map",
                 "dwithin_label": "meters",

diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR
@@ -425,8 +425,9 @@
                 }
             },
             "spatialfilter": {
-                "selection_method": "Méthode de sélection",
+                "filterType": "Type de filtre",
                 "geometric_operation": "Opération géométrique",
+                "placeholder": "Sélectionner...",
                 "spatial_filter_header": "Filtre spatial",
                 "draw_start_label": "Dessiner la région d'intérêt sur la carte",
                 "dwithin_label": "mètres",

diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT
@@ -423,8 +423,9 @@
                 }
             },
             "spatialfilter": {
-                "selection_method": "Metodo di selezione",
+                "filterType": "Tipo di filtro",
                 "geometric_operation": "Operazione Geometrica",
+                "placeholder": "Seleziona...",
                 "spatial_filter_header": "Filtro Spaziale",
                 "draw_start_label": "Disegna sulla mappa l'area di interesse",
                 "dwithin_label": "metri",