Mercurial > dive4elements > river
changeset 3832:7d58d90d6b96
i18n
flys-client/trunk@5532 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Wed, 19 Sep 2012 21:59:54 +0000 |
| parents | dc505433173f |
| children | 611cb0f1761e |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java |
| diffstat | 6 files changed, 58 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/ChangeLog Wed Sep 19 21:59:54 2012 +0000 @@ -1,3 +1,12 @@ +2012-09-19 Christian Lins <christian.lins@intevation.de> + + * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + i18n (#858) + 2012-09-19 Björn Ricks <bjoern.ricks@intevation.de> * src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Wed Sep 19 21:59:54 2012 +0000 @@ -367,6 +367,17 @@ String zoomboxTooltip(); String chartPropertiesTooltip(); + + // Gauges + + String gauge_mnq(); + + String gauge_mq(); + + String gauge_mhq(); + + String gauge_hq5(); + // Elevation window String ele_window_title();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Sep 19 21:59:54 2012 +0000 @@ -175,8 +175,8 @@ main_channel = Main Channel total_channel = Total Channel footerHome = Home -footerContact = Kontakt -footerImpressum = Impressum +footerContact = Contact +footerImpressum = Legal info buttonNext = Next imageBack = images/back_en.png @@ -261,6 +261,11 @@ chart_themepanel_area_between = between ... against_x_axis = Over X-Axis +gauge_mnq = around MNQ +gauge_mq = around MQ +gauge_mhq = around MHQ +gauge_hq5 = above HQ5 + ele_window_title = Elevation Node ele_window_label = Elevation settings in m \u00fc. NN. ele_window_x_col = X
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Sep 19 21:59:54 2012 +0000 @@ -261,6 +261,11 @@ chart_themepanel_area_between = zwischen ... against_x_axis = \u00fcber X-Achse +gauge_mnq = um MNQ +gauge_mq = um MQ +gauge_mhq = um MHQ +gauge_hq5 = \u00fcber HQ5 + ele_window_title = H\u00f6henknoten setzen ele_window_label = H\u00f6henangaben in m \u00fc. NN. ele_window_x_col = X
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Sep 19 21:59:54 2012 +0000 @@ -55,8 +55,8 @@ scale = Scale databasket = Databasket databasket_loading = Loading Databasket content -fix = TODO FIX ANALYSE TODO -fixanalysis = TODO FIX ANALYSE TODO +fix = Fixing +fixanalysis = Fixing Analysis next = Next location_distance_state = Choose calculation location(s) / range [km] distance_state = Choose calculation range [km] @@ -176,8 +176,8 @@ main_channel = Main Channel total_channel = Total Channel footerHome = Home -footerContact = Kontakt -footerImpressum = Impressum +footerContact = Contact +footerImpressum = Legal info buttonNext = Next imageBack = images/back_en.png @@ -262,6 +262,11 @@ chart_themepanel_area_between = between ... against_x_axis = Over X-Axis +gauge_mnq = around MNQ +gauge_mq = around MQ +gauge_mhq = around MHQ +gauge_hq5 = above HQ5 + ele_window_title = Elevation Node ele_window_label = Elevation settings in m \u00fc. NN. ele_window_x_col = X
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java Wed Sep 19 13:18:36 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java Wed Sep 19 21:59:54 2012 +0000 @@ -1,29 +1,26 @@ package de.intevation.flys.client.client.ui.fixation; -import java.util.List; -import java.util.ArrayList; -import java.util.LinkedHashMap; - import com.google.gwt.core.client.GWT; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Label; - +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.StaticTextItem; - import de.intevation.flys.client.client.FLYSConstants; - import de.intevation.flys.client.shared.model.Data; import de.intevation.flys.client.shared.model.DataItem; import de.intevation.flys.client.shared.model.DataList; import de.intevation.flys.client.shared.model.DefaultData; import de.intevation.flys.client.shared.model.DefaultDataItem; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + /** * This UIProvider creates a panel for location or distance input. * @@ -41,18 +38,19 @@ protected SelectItem from; protected SelectItem to; - protected LinkedHashMap mapValues; + protected LinkedHashMap<String, String> mapValues; public FixGaugeSelectPanel() { htmlOverview = ""; - // TODO: i18n - mapValues = new LinkedHashMap(); - mapValues.put("0", "um MNQ"); - mapValues.put("1", "um MQ"); - mapValues.put("2", "um MHQ"); - mapValues.put("3", "\u00fcber HQ5"); + + mapValues = new LinkedHashMap<String, String>(); + mapValues.put("0", MESSAGES.gauge_mnq()); + mapValues.put("1", MESSAGES.gauge_mq()); + mapValues.put("2", MESSAGES.gauge_mhq()); + mapValues.put("3", MESSAGES.gauge_hq5()); } + @Override public Canvas createWidget(DataList data) { instances.put(this.artifact.getUuid(), this); @@ -122,6 +120,7 @@ * * @return the selected/inserted data. */ + @Override public Data[] getData() { List<Data> data = new ArrayList<Data>(); @@ -157,6 +156,7 @@ } + @Override public void success() {} protected boolean saveClassValues() {