Mercurial > dive4elements > river
changeset 5318:7fa94b793cbe 2.9.13
I18n for empty selection in new uesk states.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 15 Mar 2013 09:41:20 +0100 |
| parents | 7c17e3022c73 |
| children | 0324a5dfdfef |
| files | 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/HWSDatacagePanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/UserRGDProvider.java |
| diffstat | 6 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Fri Mar 15 09:41:20 2013 +0100 @@ -956,6 +956,8 @@ String none(); + String notselected(); + String linetype(); String textstyle();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Fri Mar 15 09:41:20 2013 +0100 @@ -498,6 +498,8 @@ right = right none = none +notselected = none + linetype = Linetype textstyle = Textstyle linecolor = Linecolor
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Fri Mar 15 09:41:20 2013 +0100 @@ -499,6 +499,8 @@ right = rechts none = keines +notselected = keine + linetype = Linientyp textstyle = Textstil linecolor = Linienfarbe
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Fri Mar 15 09:41:20 2013 +0100 @@ -500,6 +500,8 @@ right = right none = none +notselected = none + linetype = Linetype textstyle = Textstyle linecolor = Linecolor
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/HWSDatacagePanel.java Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/HWSDatacagePanel.java Fri Mar 15 09:41:20 2013 +0100 @@ -116,7 +116,7 @@ } } if (result.length() == 0) { - result = "none"; + result = MSG.notselected(); } Data[] data = new Data[1]; DataItem item = new DefaultDataItem(
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/UserRGDProvider.java Fri Mar 15 09:40:52 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/UserRGDProvider.java Fri Mar 15 09:41:20 2013 +0100 @@ -113,7 +113,7 @@ @Override protected Data[] getData() { Data[] total = new Data[1]; -GWT.log("uploadfile: "+ uploadFile); + if (uploadFile != null && uploadFile.length() > 0) { DataItem item = new DefaultDataItem( "uesk.user-rgd", "uesk.user-rgd", uploadFile); @@ -123,7 +123,7 @@ else { // Happens when OpenLayers is missing DataItem item = new DefaultDataItem( - "uesk.user-rgd", "uesk.user-rgd", "none"); + "uesk.user-rgd", "uesk.user-rgd", MSG.notselected()); total[0] = new DefaultData( "uesk.user-rgd", null, null, new DataItem[] { item }); }