From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:48 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r664 - in trunk/coser-web/src/main:
	java/fr/ifremer/coser/web/actions webapp/WEB-INF/decorators
Date: Fri, 04 Feb 2011 11:38:36 +0100
Message-ID: <20110204103836.CD9072F108@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0724104335130850572=="

--===============0724104335130850572==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2011-02-04 10:38:36 +0000 (Fri, 04 Feb 2011)
New Revision: 664

Log:
Restore locale switch for index redirect (don't work on post)

Added:
   trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.ja=
va
Modified:
   trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp
   trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp

Copied: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleActi=
on.java (from rev 645, trunk/coser-web/src/main/java/fr/ifremer/coser/web/act=
ions/LocaleAction.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.j=
ava	                        (rev 0)
+++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/LocaleAction.j=
ava	2011-02-04 10:38:36 UTC (rev 664)
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published =
by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *=20
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *=20
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package fr.ifremer.coser.web.actions;
+
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Result;
+
+import fr.ifremer.coser.web.actions.common.CoserAction;
+
+/**
+ * Action index, recupere la liste des resultats.
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class LocaleAction extends CoserAction {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 1663244944108703571L;
+
+    @Override
+    @Action(results=3D{@Result(location=3D"index", type=3D"redirect")})
+    public String execute() {
+        return SUCCESS;
+    }
+}

Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2011-02-04 =
10:05:16 UTC (rev 663)
+++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2011-02-04 =
10:38:36 UTC (rev 664)
@@ -55,10 +55,10 @@
                <div class=3D"degrade">
                  <div class=3D"top_content">
                    <a href=3D"<s:url action=3D'index' namespace=3D'/' />" cl=
ass=3D"accueil"><s:text name=3D"message.index.title" /></a>
-                   <a href=3D"<s:url includeParams=3D"get">
+                   <a href=3D"<s:url namespace=3D"/" action=3D"locale">
                      <s:param name=3D"request_locale">en</s:param>
                    </s:url>" class=3D"anglais">Anglais</a>
-                   <a href=3D"<s:url includeParams=3D"get">
+                   <a href=3D"<s:url namespace=3D"/" action=3D"locale">
                      <s:param name=3D"request_locale">fr</s:param>
                    </s:url>" class=3D"francais">Francais</a>
                  </div>

Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp	2011-02-=
04 10:05:16 UTC (rev 663)
+++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp	2011-02-=
04 10:38:36 UTC (rev 664)
@@ -51,10 +51,10 @@
=20
            <div class=3D"top_content clearfix">
              <a href=3D"<s:url action=3D'index' namespace=3D'/' />" class=3D=
"accueil"><s:text name=3D"message.index.title" /></a>
-             <a href=3D"<s:url includeParams=3D"get">
+             <a href=3D"<s:url namespace=3D"/" action=3D"locale">
                <s:param name=3D"request_locale">en</s:param>
              </s:url>" class=3D"anglais">Anglais</a>
-             <a href=3D"<s:url includeParams=3D"get">
+             <a href=3D"<s:url namespace=3D"/" action=3D"locale">
                <s:param name=3D"request_locale">fr</s:param>
              </s:url>" class=3D"francais">Francais</a>
            </div>


--===============0724104335130850572==--