Mercurial > dive4elements > river
changeset 888:d6b88f8f88dd
Fix issue flys/issue311 (i18n crossection).
flys-client/trunk@2726 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 14 Sep 2011 08:00:56 +0000 |
| parents | 6a27949c7022 |
| children | 2c9c3448e499 |
| 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/chart/CrossSectionChartThemePanel.java |
| diffstat | 6 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/ChangeLog Wed Sep 14 08:00:56 2011 +0000 @@ -1,3 +1,19 @@ +2011-09-14 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix flys/issue311 (i18n of crosssection). + + * 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/FLYSConstants_de.properties: + Added translation for crosssections "actions" and w-diff export. + + * src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java: + Use translated "actions" string. + + * src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java: + Use constant instead of spelled-out string. + 2011-09-13 Raimund Renkert <raimund.renkert@intevation.de> Issue234/266
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Wed Sep 14 08:00:56 2011 +0000 @@ -264,6 +264,8 @@ String dataexport(); + String w_differences_export(); + String csv(); String wst(); @@ -272,6 +274,8 @@ String chart_themepanel_header_themes(); + String chart_themepanel_header_actions(); + // ERRORS String error_read_minmax_values();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Sep 14 08:00:56 2011 +0000 @@ -122,6 +122,7 @@ cross_section = Cross Section w_differences = Differences +w_differences_export = Differences Export waterlevel_export = Waterlevel Export waterlevel_report = Waterlevel Report @@ -137,6 +138,7 @@ at = AT computed_dischargecurve_at_export = AT Export chart_themepanel_header_themes = Theme +chart_themepanel_header_actions = Actions unexpected_exception = There occured an unexpected exception error_read_minmax_values = Error while reading min/max values for the location input.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Sep 14 08:00:56 2011 +0000 @@ -122,6 +122,7 @@ cross_section = Querprofil w_differences = Differenzen +w_differences_export = Differenzen Export waterlevel_export = Wasserstand/Wasserspiegellagen Export waterlevel_report = Wasserstand/Wasserspiegellagen Bericht @@ -137,6 +138,7 @@ at = AT computed_dischargecurve_at_export = AT Export chart_themepanel_header_themes = Thema +chart_themepanel_header_action = Aktionen unexpected_exception = Ein unerwarteter Fehler ist aufgetreten error_read_minmax_values = Fehler beim Lesen der min/max Werte. Es kann keine Validierung der eingegebenen Strecke durchgef\u00fchrt werden.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Sep 14 08:00:56 2011 +0000 @@ -117,6 +117,7 @@ cross_section = Cross Section w_differences = Differences +w_differences_export = Differences Export waterlevel_export = Waterlevel Export waterlevel_report = Waterlevel Report @@ -132,6 +133,7 @@ at = AT computed_dischargecurve_at_export = AT Export chart_themepanel_header_themes = Theme +chart_themepanel_header_actions = Actions unexpected_exception = There occured an unexpected exception error_read_minmax_values = Error while reading min/max values for the location input.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Tue Sep 13 16:51:26 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java Wed Sep 14 08:00:56 2011 +0000 @@ -28,7 +28,6 @@ import de.intevation.flys.client.shared.model.FacetRecord; - /** * ThemePanel much like ChartThemePanel, but shows an "Actions" column, * needed for interaction in the CrossSection Charts. @@ -64,7 +63,7 @@ String fieldName = this.getFieldName(colNum); - if (fieldName.equals("actions")) { + if (fieldName.equals(GRID_FIELD_ACTIONS)) { HLayout recordCanvas = new HLayout(3); recordCanvas.setHeight(22); recordCanvas.setAlign(Alignment.CENTER);