# HG changeset patch # User Ingo Weinzierl # Date 1274797825 0 # Node ID 13de46229f636b18605b3c6c1bce50ad111db401 # Parent b7c6bf3cd7c9a8a08f6ea7778becb2361e9408b0 I18N of links to insert example linestrings/polygons (issue272). gnv/trunk@1123 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r b7c6bf3cd7c9 -r 13de46229f63 gnv/ChangeLog --- a/gnv/ChangeLog Tue May 25 07:41:31 2010 +0000 +++ b/gnv/ChangeLog Tue May 25 14:30:25 2010 +0000 @@ -1,3 +1,19 @@ +2010-05-25 Ingo Weinzierl + + Issue272 + + * src/main/java/de/intevation/gnv/action/DescribeUIAction.java: Read strings + for example linestring/polygon from resource bundle and put them into the + XSL-transformator. + + * src/main/resources/applicationMessages.properties, + src/main/resources/applicationMessages_en.properties: Added labels for + links to insert example linestring/polygon. + + * src/main/webapp/WEB-INF/config/templates/describe-ui.xsl: Don't use static + strings for example linestring/polygon links but use the parameter that + have been added in DescribeUIAction - which are i18n. + 2010-05-25 Ingo Weinzierl Issue266 diff -r b7c6bf3cd7c9 -r 13de46229f63 gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Tue May 25 07:41:31 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Tue May 25 14:30:25 2010 +0000 @@ -98,7 +98,12 @@ if (currentUI != null) { ResourceBundle res = ResourceBundle.getBundle( "applicationMessages", locale); - String editText = res.getString("gnviewer.history.back.button"); + String editText = res.getString( + "gnviewer.history.back.button"); + String exampleLinestring = res.getString( + "gnviewer.example.linestring"); + String examplePolygon = res.getString( + "gnviewer.example.polygon"); XSLTransformer transformer = new XSLTransformer(); @@ -106,6 +111,10 @@ mapping.findForward("back").getPath()); transformer.addParameter("back-url", url); transformer.addParameter("edit", editText); + transformer.addParameter("example-polygon", examplePolygon); + transformer.addParameter( + "example-linestring", + exampleLinestring); String fisUrl = response.encodeURL( mapping.findForward("selectfis").getPath()); diff -r b7c6bf3cd7c9 -r 13de46229f63 gnv/src/main/resources/applicationMessages.properties --- a/gnv/src/main/resources/applicationMessages.properties Tue May 25 07:41:31 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Tue May 25 14:30:25 2010 +0000 @@ -44,6 +44,8 @@ gnviewer.select.button = Ausw\u00e4hlen gnviewer.select.button.src = ./images/auswaehlen.png gnviewer.draw.button = Aktualisieren +gnviewer.example.linestring=Beispiel WKT-Linestring einf\u00fcgen +gnviewer.example.polygon=Beispiel WKT-Polygon einf\u00fcgen gnviewer.productselection.overlay.title = Die Anfrage wird bearbeitet. Bitte gedulden Sie sich einen Moment. gnviewer.productselection.fisselection.title = Fachinformationssystem diff -r b7c6bf3cd7c9 -r 13de46229f63 gnv/src/main/resources/applicationMessages_en.properties --- a/gnv/src/main/resources/applicationMessages_en.properties Tue May 25 07:41:31 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages_en.properties Tue May 25 14:30:25 2010 +0000 @@ -44,6 +44,8 @@ gnviewer.select.button = Choose gnviewer.select.button.src = ./images/choose.png gnviewer.draw.button = Update +gnviewer.example.linestring=Insert an example linestring as wkt +gnviewer.example.polygon=Insert an example polygon as wkt gnviewer.productselection.overlay.title = Your request will be processed. Please wait... gnviewer.productselection.fisselection.title = Data set diff -r b7c6bf3cd7c9 -r 13de46229f63 gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl --- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Tue May 25 07:41:31 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Tue May 25 14:30:25 2010 +0000 @@ -9,6 +9,9 @@ + + + @@ -157,10 +160,10 @@ - Beispiel WKT-Linestring einfügen:
+ :
- Beispiel WKT-Polygon einfügen:
+ :