Mercurial > dive4elements > river

changeset 1479:2f525f54e429

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue 427. Changed visible strings in theme editor window to i18n strings. flys-client/trunk@3532 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 22 Dec 2011 17:28:15 +0000
parents 237e7450ae2e
children 1f2f08211a5f
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/StyleEditorWindow.java
diffstat 6 files changed, 83 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/ChangeLog	Thu Dec 22 17:28:15 2011 +0000
@@ -1,3 +1,16 @@
+2011-12-22  Raimund Renkert <raimund.renkert@intevation.de>
+
+	Issue 427.
+
+	* src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java:
+	  Changed visible strings in editor window to i18n strings.
+
+	* 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:
+	  Added i18n strings for editor window.
+
 2011-12-22  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Save output settings.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Thu Dec 22 17:28:15 2011 +0000
@@ -655,5 +655,29 @@
     String subtitle();
 
     String display_grid();
+
+    String linetype();
+
+    String textstyle();
+
+    String linecolor();
+
+    String textcolor();
+
+    String textsize();
+
+    String font();
+
+    String showpoints();
+
+    String showbackground();
+
+    String backgroundcolor();
+
+    String textorientation();
+
+    String linesize();
+
+    String showlines();
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Thu Dec 22 17:28:15 2011 +0000
@@ -341,3 +341,16 @@
 title = Title
 subtitle = Subtitle
 display_grid = Display grid
+
+linetype = Linetype
+textstyle = Textstyle
+linecolor = Linecolor
+textcolor = Textcolor
+textsize = Textsize
+font = Font
+showpoints = Show points
+showbackground = Show background
+backgroundcolor = Backgroundcolor
+textorientation = Textorientation
+linesize = Linesize
+showlines = Show lines
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Thu Dec 22 17:28:15 2011 +0000
@@ -341,3 +341,16 @@
 title = Titel
 subtitle = Untertitel
 display_grid = Gitterlinien anzeigen
+
+linetype = Linientyp
+textstyle = Textstil
+linecolor = Linienfarbe
+textcolor = Textfarbe
+textsize = Textgröße
+font = Schriftart
+showpoints = Punkte anzeigen
+showbackground = Hintergrund anzeigen
+backgroundcolor = Hintergrundfarbe
+textorientation = Textausrichtung
+linesize = Liniendicke
+showlines = Linien anzeigen
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Thu Dec 22 17:28:15 2011 +0000
@@ -341,3 +341,16 @@
 title = Title
 subtitle = Subtitle
 display_grid = Display grid
+
+linetype = Linetype
+textstyle = Textstyle
+linecolor = Linecolor
+textcolor = Textcolor
+textsize = Textsize
+font = Font
+showpoints = Show points
+showbackground = Show background
+backgroundcolor = Backgroundcolor
+textorientation = Textorientation
+linesize = Linesize
+showlines = Show lines
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Thu Dec 22 12:46:23 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Thu Dec 22 17:28:15 2011 +0000
@@ -236,7 +236,7 @@
 
         FormItem f;
         if(type.equals("int")) {
-            f = new SelectItem(name, dname);
+            f = new SelectItem(name, MSG.getString(name));
             if (name.equals("linesize")) {
                 f = createLineSizeUI(f);
             }
@@ -256,7 +256,7 @@
         }
         else if (type.equals("boolean")) {
             if(name.equals("textorientation")) {
-                f = new SelectItem(name, dname);
+                f = new SelectItem(name, MSG.getString(name));
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
                 valueMap.put("true", "horizontal");
                 valueMap.put("false", "vertical");
@@ -264,7 +264,7 @@
                 f.setValue(value);
             }
             else {
-                CheckboxItem c = new CheckboxItem(name, dname);
+                CheckboxItem c = new CheckboxItem(name, MSG.getString(name));
                 if(value.equals("true")) {
                     c.setValue(true);
                 }
@@ -276,12 +276,12 @@
             }
         }
         else if (type.equals("Color")) {
-            ColorPickerItem c = new ColorPickerItem(name, dname);
+            ColorPickerItem c = new ColorPickerItem(name, MSG.getString(name));
             c.setValue(rgbToHtml(value));
             f = c;
         }
         else if (type.equals("Dash")) {
-            f = new SelectItem(name, dname);
+            f = new SelectItem(name, MSG.getString(name));
             LinkedHashMap<String, String> valueIcons = new LinkedHashMap<String, String>();
             f.setImageURLPrefix(GWT.getHostPageBaseURL() + "images/linestyle-dash-");
             f.setImageURLSuffix(".png");
@@ -303,7 +303,7 @@
             f.setValue(value);
         }
         else if (type.equals("Font")) {
-            f = new SelectItem(name, dname);
+            f = new SelectItem(name, MSG.getString(name));
             LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
             valueMap.put("arial", "<span style='font-family:arial'>Arial</span>");
             valueMap.put("courier", "<span style='font-family:courier'>Courier</span>");
@@ -313,7 +313,7 @@
             f.setValue(value);
         }
         else if (type.equals("Style")) {
-            f = new SelectItem(name, dname);
+            f = new SelectItem(name, MSG.getString(name));
             LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
             valueMap.put("standard", "<span style='font-style:normal'>Normal</span>");
             valueMap.put("bold", "<span style='font-weight:bold'>Bold</span>");
http://dive4elements.wald.intevation.org