xlawrence 2005/10/06 12:35:54 CEST
Modified files:
core/src/webapp/jsp/jahia/engines engine.jsp
multilanguage_links.inc
Log:
Fix for JAHIA-408
Revision Changes Path
1.18 +3 -2 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.17&r2=1.18&f=h
1.2 +10 -8
jahia/core/src/webapp/jsp/jahia/engines/multilanguage_links.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/multilanguage_links.inc.diff?r1=1.1&r2=1.2&f=h
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- engine.jsp 5 Oct 2005 15:17:29 -0000 1.17
+++ engine.jsp 6 Oct 2005 10:35:53 -0000 1.18
@@ -153,8 +153,9 @@
}
}
- function handleLanguageChange(action) {
- document.mainForm.action = action;
+ function handleLanguageChange(lang) {
+ document.mainForm.screen.value = "<%=theScreen%>";
+ document.mainForm.engine_lang.value = lang;
if (check()) {
saveContent();
teleportCaptainFlam(document.mainForm);
Index: multilanguage_links.inc
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/multilanguage_links.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multilanguage_links.inc 29 Sep 2005 15:02:04 -0000 1.1
+++ multilanguage_links.inc 6 Oct 2005 10:35:53 -0000 1.2
@@ -31,25 +31,27 @@
elh.getCurrentLanguageCode(), // previous Lang
elh.getCurrentLanguageCode());
- final Enumeration langsEnum = langLinksFactory.getLinks();
- while (langsEnum.hasMoreElements()) { %>
+ final Enumeration langsEnum = langLinksFactory.getLinks(); %>
<div id="langs">
+ <% while (langsEnum.hasMoreElements()) { %>
<span>
<%
final LangLink link = (LangLink) langsEnum.nextElement();
- final String href = "javascript:handleLanguageChange('" + link.getUrl()
+ "');";
+ final String href = "javascript:handleLanguageChange('" +
link.getLanguageCode() + "');";
if (link.getLocale().toString().equals(elh.getCurrentLanguageCode())) {
%>
-
<jahia:displayLanguageFlag code="<%=link.getLocale().getLanguage()%>"
alt="<%=link.getLocale().getDisplayName()%>"/>
- <% } else { %>
+ <% } else { %>
<jahia:displayLanguageFlag href="<%=href%>"
code="<%=link.getLocale().getLanguage()%>"
alt="<%=link.getLocale().getDisplayName()%>"/>
- <% } %>
-</span>
+ <% } %>
+ </span>
<% } %>
<span class="label"><jahia:engineResourceBundle
resourceName="org.jahia.curLang.label"/>: </span>
<jahia:displayLanguageFlag
code="<%=elh.getCurrentLocale().getLanguage()%>"
alt="<%=elh.getCurrentLocale().getDisplayName()%>"/>
-</div>
\ No newline at end of file
+</div>
+
+<input type="hidden" name="engine_lang"
value="<%=elh.getCurrentLanguageCode()%>"/>
+<input type="hidden" name="prev_engine_lang"
value="<%=elh.getCurrentLanguageCode()%>"/>
\ No newline at end of file
