Mercurial > dive4elements > river

changeset 3520:0b576ca67cd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n for logo placement. flys-client/trunk@5299 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 29 Aug 2012 16:09:39 +0000
parents f9ef72f4c6d5
children ffbdd093da74
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/ChartPropertiesEditor.java
diffstat 6 files changed, 52 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/ChangeLog	Wed Aug 29 16:09:39 2012 +0000
@@ -1,27 +1,36 @@
-2012-08-30	Björn Ricks	<bjoern.ricks@intevation.de>
+2012-08-29	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java,
+	  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_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties:
+	  i18n for logo placement.
+
+2012-08-29	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java:
 	  Load modules from the ModuleService instead of using hardcoded strings.
 
-2012-08-30	Björn Ricks	<bjoern.ricks@intevation.de>
+2012-08-29	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java:
 	  Hardcode German translations for module names until real translations are
 	  available.
 
-2012-08-30	Björn Ricks	<bjoern.ricks@intevation.de>
+2012-08-29	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/webapp/WEB-INF/features.xml:
 	  Add roles and features for GGinA
 
-2012-08-30	Björn Ricks	<bjoern.ricks@intevation.de>
+2012-08-29	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/services/ModuleServiceAsync.java,
 	  src/main/java/de/intevation/flys/client/client/services/ModuleService.java,
 	  src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java:
 	  Added service to list available modules for a user.
 
-2012-08-30	Björn Ricks	<bjoern.ricks@intevation.de>
+2012-08-29	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/shared/model/DefaultModule.java,
 	  src/main/java/de/intevation/flys/client/shared/model/Module.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Wed Aug 29 16:09:39 2012 +0000
@@ -849,6 +849,18 @@
 
     String logo_placev();
 
+    String top();
+
+    String bottom();
+
+    String center();
+
+    String left();
+
+    String right();
+
+    String none();
+
     String linetype();
 
     String textstyle();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Wed Aug 29 16:09:39 2012 +0000
@@ -434,6 +434,12 @@
 display_logo = Display logo
 logo_placeh = Horiz. Place for logo
 logo_placev = Vertic. Place for logo
+top = top
+bottom = bottom
+center = center
+left = left
+right = right
+none = none
 
 linetype = Linetype
 textstyle = Textstyle
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Wed Aug 29 16:09:39 2012 +0000
@@ -434,6 +434,12 @@
 display_logo = Logo anzeigen
 logo_placeh = Horizontale Ausrichtung Logo
 logo_placev = Vertikale Ausrichtung Logo
+top = oben
+bottom = unten
+center = mittig
+left = links
+right = rechts
+none = keines
 
 linetype = Linientyp
 textstyle = Textstil
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Wed Aug 29 16:09:39 2012 +0000
@@ -435,6 +435,12 @@
 display_logo = Display logo
 logo_placeh = Horiz. Place for logo
 logo_placev = Vertic. Place for logo
+top = top
+bottom = bottom
+center = center
+left = left
+right = right
+none = none
 
 linetype = Linetype
 textstyle = Textstyle
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java	Wed Aug 29 13:55:40 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java	Wed Aug 29 16:09:39 2012 +0000
@@ -313,9 +313,11 @@
         }
 
         String choiceAttribute = sp.getAttribute("choice");
+
         if (choiceAttribute != null && choiceAttribute.equals("logo")) {
             SelectItem logoChooser = new SelectItem();
             LinkedHashMap valueMap = new LinkedHashMap<String, String>();
+            valueMap.put("none", MSG.getString("none"));
             valueMap.put("BfG", "Bfg");
             valueMap.put("Intevation", "Intevation");
             logoChooser.setValueMap(valueMap);
@@ -340,9 +342,9 @@
         else if (choiceAttribute != null && choiceAttribute.equals("placeh")) {
             SelectItem placeChooser = new SelectItem();
             LinkedHashMap valueMap = new LinkedHashMap<String, String>();
-            valueMap.put("right", "right");
-            valueMap.put("left", "left");
-            valueMap.put("center", "center");
+            valueMap.put("right", MSG.getString("right"));
+            valueMap.put("left", MSG.getString("left"));
+            valueMap.put("center", MSG.getString("center"));
             placeChooser.setValueMap(valueMap);
             placeChooser.setTitleStyle("color:#000;");
             placeChooser.setTitleAlign(Alignment.LEFT);
@@ -365,9 +367,9 @@
         else if (choiceAttribute != null && choiceAttribute.equals("placev")) {
             SelectItem placeChooser = new SelectItem();
             LinkedHashMap valueMap = new LinkedHashMap<String, String>();
-            valueMap.put("top", "top");
-            valueMap.put("bottom", "bottom");
-            valueMap.put("center", "center");
+            valueMap.put("top", MSG.getString("top"));
+            valueMap.put("bottom", MSG.getString("bottom"));
+            valueMap.put("center", MSG.getString("center"));
             placeChooser.setValueMap(valueMap);
             placeChooser.setTitleStyle("color:#000;");
             placeChooser.setTitleAlign(Alignment.LEFT);
http://dive4elements.wald.intevation.org