Mercurial > dive4elements > gnv-client
diff gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java @ 706:2659a5b1fa1e
Added a link (and a controller) to toggle between german and english language (issue254).
gnv/trunk@970 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 23 Apr 2010 07:55:05 +0000 |
| parents | 21ad44ccdb84 |
| children | 0aeac0fe5db2 |
line wrap: on
line diff
--- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Thu Apr 22 12:58:44 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Fri Apr 23 07:55:05 2010 +0000 @@ -15,6 +15,7 @@ import de.intevation.gnv.util.XMLUtils; import de.intevation.gnv.util.XSLTransformer; +import java.util.Locale; import java.util.ResourceBundle; import javax.servlet.http.HttpServletRequest; @@ -73,10 +74,12 @@ // render describe document and create user interface SessionModel sm = SessionModelFactory.getInstance().getSessionModel( request); + Locale tmp = sm.getCurrentLocale(); + Locale locale = tmp != null ? tmp : request.getLocale(); ArtifactDatabaseClient adc = ArtifactDatabaseClientFactory - .getInstance().getArtifactDatabaseClient(request.getLocale()); - request.getSession().setAttribute(Globals.LOCALE_KEY, request.getLocale()); + .getInstance().getArtifactDatabaseClient(locale); + request.getSession().setAttribute(Globals.LOCALE_KEY, locale); ArtifactDescription artifactDescription = adc.getCurrentStepDescription( @@ -87,7 +90,7 @@ Node currentUI = artifactDescription.getCurrentUI(); if (currentUI != null) { ResourceBundle res = ResourceBundle.getBundle( - "applicationMessages", adc.getLocale()); + "applicationMessages", locale); String editText = res.getString("gnviewer.history.back.button"); XSLTransformer transformer = new XSLTransformer();