Skip to content

Commit

Permalink
Changed the default placeholder
Browse files Browse the repository at this point in the history
  • Loading branch information
MV88 committed Apr 7, 2017
1 parent efc6399 commit dc39f86
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 6 deletions.
2 changes: 1 addition & 1 deletion web/client/components/data/query/ComboField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ComboField = React.createClass({
style: {
width: "100%"
},
placeholder: <Message msgId="queryform.attributefilter.combo_placeholder"/>,
placeholder: <Message msgId="queryform.comboField.default_placeholder"/>,
multivalue: false,
disabled: false,
valueField: null,
Expand Down
5 changes: 5 additions & 0 deletions web/client/components/data/query/FilterField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const {Row, Col} = require('react-bootstrap');

const ComboField = require('./ComboField');
const assign = require('object-assign');
const LocaleUtils = require('../../../utils/LocaleUtils');

const FilterField = React.createClass({
propTypes: {
Expand All @@ -20,6 +21,9 @@ const FilterField = React.createClass({
onUpdateExceptionField: React.PropTypes.func,
onChangeCascadingValue: React.PropTypes.func
},
contextTypes: {
messages: React.PropTypes.object
},
getDefaultProps() {
return {
attributes: [],
Expand Down Expand Up @@ -68,6 +72,7 @@ const FilterField = React.createClass({
valueField={'id'}
textField={'name'}
fieldOptions={this.props.attributes.map((attribute) => { return {id: attribute.attribute, name: attribute.label}; })}
placeholder={LocaleUtils.getMessageById(this.context.messages, "queryform.attributefilter.combo_placeholder")}
fieldValue={this.props.filterField.attribute}
fieldName="attribute"
fieldRowId={this.props.filterField.rowId}
Expand Down
2 changes: 1 addition & 1 deletion web/client/components/data/query/SpatialFilter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const SpatialFilter = React.createClass({
return LocaleUtils.getMessageById(this.context.messages, opt.name);
})
}
placeholder={LocaleUtils.getMessageById(this.context.messages, "queryform.spatialfilter.placeholder")}
placeholder={LocaleUtils.getMessageById(this.context.messages, "queryform.spatialfilter.combo_placeholder")}
fieldName="method"
style={{width: "140px"}}
fieldRowId={new Date().getUTCMilliseconds()}
Expand Down
5 changes: 4 additions & 1 deletion web/client/translations/data.de-DE
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@
"config": {
"load_config_exception": "Fehler beim Laden der Konfiguration"
},
"comboField": {
"default_placeholder": "Wählen..."
},
"form": {
"header": "Finde im Datensatz",
"dataset_header": "Datensatz"
Expand Down Expand Up @@ -426,7 +429,7 @@
"filterType": "Filtertyp",
"geometric_operation": "Geometrische Operation",
"spatial_filter_header": "Räumlicher Filter",
"placeholder": "Wählen...",
"combo_placeholder": "Wählen...",
"draw_start_label": "Zeichne die Region von Interesse auf der Karte",
"dwithin_label": "Meter",
"details": {
Expand Down
5 changes: 4 additions & 1 deletion web/client/translations/data.en-US
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@
"config": {
"load_config_exception": "Error Loading Configuration"
},
"comboField": {
"default_placeholder": "Select..."
},
"form": {
"header": "Find in the dataset",
"dataset_header": "Dataset"
Expand Down Expand Up @@ -425,7 +428,7 @@
"spatialfilter": {
"filterType": "Filter Type",
"geometric_operation": "Geometric Operation",
"placeholder": "Select...",
"combo_placeholder": "Select...",
"spatial_filter_header": "Spatial Filter",
"draw_start_label": "Draw the region of interest on the map",
"dwithin_label": "meters",
Expand Down
5 changes: 4 additions & 1 deletion web/client/translations/data.fr-FR
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,9 @@
"config": {
"load_config_exception": "Erreur lors du chargement de la configuration"
},
"comboField": {
"default_placeholder": "Sélectionner..."
},
"form": {
"header": "Rechercher dans les données",
"dataset_header": "Ensemble des données"
Expand Down Expand Up @@ -427,7 +430,7 @@
"spatialfilter": {
"filterType": "Type de filtre",
"geometric_operation": "Opération géométrique",
"placeholder": "Sélectionner...",
"combo_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",
Expand Down
5 changes: 4 additions & 1 deletion web/client/translations/data.it-IT
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@
"config": {
"load_config_exception": "Errore Caricamento Configurazione"
},
"comboField": {
"default_placeholder": "Seleziona..."
},
"form": {
"header": "Cerca nel dataset",
"dataset_header": "Dataset"
Expand Down Expand Up @@ -425,7 +428,7 @@
"spatialfilter": {
"filterType": "Tipo di filtro",
"geometric_operation": "Operazione Geometrica",
"placeholder": "Seleziona...",
"combo_placeholder": "Seleziona...",
"spatial_filter_header": "Filtro Spaziale",
"draw_start_label": "Disegna sulla mappa l'area di interesse",
"dwithin_label": "metri",
Expand Down

0 comments on commit dc39f86

Please sign in to comment.