# HG changeset patch # User Ingo Weinzierl # Date 1315834520 0 # Node ID d7c322a3bb325be73767a5d0a6225c59aedc3863 # Parent f343b4c2d135b4b89407ed4f5fc8172650ffecfa Introduced i18n for the loading panel used during floodmap calculation. flys-client/trunk@2707 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/ChangeLog --- a/flys-client/ChangeLog Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/ChangeLog Mon Sep 12 13:35:20 2011 +0000 @@ -1,3 +1,15 @@ +2011-09-12 Ingo Weinzierl + + * src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java: + Introduced i18n for messages in the loading panel. Note that messages + parsed from Artifact's DESCRIBE are _NOT_ based on the client's locale! + + * 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 strings used in the loading panel. + 2011-09-12 Raimund Renkert * src/main/java/de/intevation/flys/client/client/ui/ProjectList.java: diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Mon Sep 12 13:35:20 2011 +0000 @@ -357,5 +357,9 @@ String measureLine(); String measurePolygon(); + + String step(); + + String calculationStarted(); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Mon Sep 12 13:35:20 2011 +0000 @@ -183,3 +183,5 @@ removeFeature = images/removeFeature.png measureLine = images/measureLine.png measurePolygon = images/measurePolygon.png +step = Step +calculationStarted = Calculation started. diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Mon Sep 12 13:35:20 2011 +0000 @@ -183,3 +183,5 @@ removeFeature = images/removeFeature.png measureLine = images/measureLine.png measurePolygon = images/measurePolygon.png +step = Schritt +calculationStarted = Berechnung wurde gestarted. diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Mon Sep 12 13:35:20 2011 +0000 @@ -178,3 +178,5 @@ removeFeature = images/removeFeature.png measureLine = images/measureLine.png measurePolygon = images/measurePolygon.png +step = Step +calculationStarted = Calculation started. diff -r f343b4c2d135 -r d7c322a3bb32 flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Mon Sep 12 12:37:42 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Mon Sep 12 13:35:20 2011 +0000 @@ -16,6 +16,7 @@ import com.smartgwt.client.widgets.layout.VLayout; import de.intevation.flys.client.client.Config; +import de.intevation.flys.client.client.FLYSConstants; import de.intevation.flys.client.client.FLYSImages; import de.intevation.flys.client.client.services.DescribeArtifactService; import de.intevation.flys.client.client.services.DescribeArtifactServiceAsync; @@ -30,7 +31,8 @@ public static final DescribeArtifactServiceAsync describe = GWT.create(DescribeArtifactService.class); - private FLYSImages IMAGES = GWT.create(FLYSImages.class); + private FLYSImages IMAGES = GWT.create(FLYSImages.class); + private FLYSConstants MSG = GWT.create(FLYSConstants.class); protected CollectionView parent; @@ -164,13 +166,13 @@ msg.setContents(calcMsg.getMessage()); } else { - title.setContents("Berechnung wurde gestartet."); + title.setContents(MSG.calculationStarted()); } } protected String getStepTitle(CalculationMessage msg) { - return "Schritt " + msg.getCurrentStep() + "/" + msg.getSteps(); + return MSG.step() + " " + msg.getCurrentStep() + "/" + msg.getSteps(); }