Mercurial > dive4elements > river

changeset 2462:d45059aa8507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n and moved reference selectbox for cross section master to top. flys-client/trunk@4168 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 20 Mar 2012 11:08:20 +0000
parents 4e81439ffa28
children 0eeceffd50e3
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, 30 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/ChangeLog	Tue Mar 20 11:08:20 2012 +0000
@@ -1,3 +1,16 @@
+2012-03-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Fix flys/issue462, hinted to by Raimund Renkert.
+
+	* src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java:
+	  Changed location of reference selectbox to top, resolved i18n todos.
+	 
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties:
+	  Added and modified i18n strings.
+
 2012-03-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix flys/issue462, hinted to by Raimund Renkert.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Tue Mar 20 11:08:20 2012 +0000
@@ -118,6 +118,8 @@
 
     String show_legend();
 
+    String aggregation_threshold();
+
     String scale();
 
     String databasket();
@@ -423,9 +425,9 @@
 
     String chart_themepanel_header_actions();
 
-    String chart_themepanel_snychron();
+    String chart_themepanel_synchron();
 
-    String chart_themepanel_asnychron();
+    String chart_themepanel_asynchron();
 
     String chart_themepanel_set_master();
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Tue Mar 20 11:08:20 2012 +0000
@@ -52,6 +52,7 @@
 y3_axis = Y3-Axis
 legend_name = Name
 show_legend = Show
+aggregation_threshold = Threshold for aggregation of legend entries
 scale = Scale
 databasket = Databasket
 databasket_loading = Loading Databasket content
@@ -204,8 +205,8 @@
 
 chart_themepanel_header_themes = Theme
 chart_themepanel_header_actions = Actions
-chart_themepanel_snychron = Navigate synchronously
-chart_themepanel_asnychron = Navigate independently
+chart_themepanel_synchron = Navigate synchronously
+chart_themepanel_asynchron = Navigate independently
 chart_themepanel_set_master = Reference
 chart_themepanel_new_area = New Area...
 chart_themepanel_area_under = under ...
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Tue Mar 20 11:08:20 2012 +0000
@@ -42,7 +42,7 @@
 chart_title = Titel
 chart_subtitle = Untertitel
 grid = Gitternetz
-antialiasing = Kantenglättung
+antialiasing = Kantengl\u00e4ttung
 axis_name = Name
 chart_start = von
 chart_end = bis
@@ -52,6 +52,7 @@
 y3_axis = Y3-Achse
 legend_name = Name
 show_legend = Anzeigen
+aggregation_threshold = Schwellwert zur Aggregation von Legendeneintr\u00e4gen
 scale = Skalierung
 databasket = Datenkorb
 databasket_loading=Lade Datenkorb Inhalt
@@ -204,8 +205,8 @@
 
 chart_themepanel_header_themes = Thema
 chart_themepanel_header_actions = Aktionen
-chart_themepanel_snychron = Synchron navigieren
-chart_themepanel_asnychron = Einzeln navigieren
+chart_themepanel_synchron = Synchron navigieren
+chart_themepanel_asynchron = Einzeln navigieren
 chart_themepanel_set_master = Referenz
 chart_themepanel_new_area = Erzeuge Fl\u00e4che ...
 chart_themepanel_area_under = unter ...
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Tue Mar 20 11:08:20 2012 +0000
@@ -52,6 +52,7 @@
 y3_axis = Y3-Axis
 legend_name = Name
 show_legend = Show
+aggregation_threshold = Threshold for aggregation of legend entries
 scale = Scale
 databasket = Databasket
 databasket_loading = Loading Databasket content
@@ -202,8 +203,8 @@
 
 chart_themepanel_header_themes = Theme
 chart_themepanel_header_actions = Actions
-chart_themepanel_snychron = Navigate synchronously
-chart_themepanel_asnychron = Navigate independently
+chart_themepanel_synchron = Navigate synchronously
+chart_themepanel_asynchron = Navigate independently
 chart_themepanel_set_master = Reference
 chart_themepanel_new_area = New Area...
 chart_themepanel_area_under = under ...
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java	Tue Mar 20 10:09:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java	Tue Mar 20 11:08:20 2012 +0000
@@ -205,7 +205,7 @@
         final DynamicForm form = new DynamicForm();
         form.setWidth(200);
         form.setFields(masterCb);
-        layout.addMember(form);
+        layout.addMember(form, 0);
 
         Config config       = Config.getInstance();
         final String locale = config.getLocale();
@@ -662,12 +662,10 @@
             // Synchron checking.
             MenuItem synchronNavigationMenuItem = new MenuItem();
             if (synchronNavigation == true) {
-                // TODO i18n
-                synchronNavigationMenuItem.setTitle("Einzeln navigieren");
+                synchronNavigationMenuItem.setTitle(MSG.chart_themepanel_asynchron());
             }
             else {
-                // TODO i18n
-                synchronNavigationMenuItem.setTitle("Synchron navigieren");
+                synchronNavigationMenuItem.setTitle(MSG.chart_themepanel_synchron());
             }
             synchronNavigationMenuItem.addClickHandler(new ClickHandler() {
                 public void onClick(MenuItemClickEvent evt) {
http://dive4elements.wald.intevation.org