Author: brushed
Date: Mon Aug 11 13:35:10 2008
New Revision: 684907
URL: http://svn.apache.org/viewvc?rev=684907&view=rev
Log:
v2.7.0-alpha-10: [JSPWIKI-333] Language cookie is now set to default browser
setting when initializing the Preferences.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Aug 11 13:35:10 2008
@@ -1,3 +1,12 @@
+2008-08-11 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-10
+
+ * [JSPWIKI-333] Language cookie is now set to default browser setting
+ when initializing the Preferences. Previously this was not required as
long as the
+ user preferences were not modified by the user. Don't know why this
stopped working.
+
+
2008-08-11 Harry Metske <[EMAIL PROTECTED]>
* no version bump
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Mon Aug 11
13:35:10 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "9";
+ public static final String BUILD = "10";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp Mon Aug 11
13:35:10 2008
@@ -32,7 +32,7 @@
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
- <body class="view"><div id="wikibody">
+ <body><div id="wikibody">
<h1>Disabled</h1>
<p>JSPWiki SecurityConfig UI has been disabled. This page could
reveal important security
details about your configuration to a potential attacker, so it has
been turned off by
@@ -60,7 +60,7 @@
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
-<body class="view">
+<body>
<div id="wikibody">
<div id="page">
<div id="pagecontent">
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Mon
Aug 11 13:35:10 2008
@@ -12,7 +12,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
public void jspInit()
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp Mon
Aug 11 13:35:10 2008
@@ -5,7 +5,7 @@
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
<%@ page import="java.security.Permission" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
int MAXATTACHNAMELENGTH = 30;
@@ -102,7 +102,7 @@
<td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype
%></div></td>
<td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
<td style="white-space:nowrap;text-align:right;">
- <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>'
groupingUsed='false' maxFractionDigits='1'
minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
+ <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>'
maxFractionDigits='1' minFractionDigits='1'/> <fmt:message
key="info.kilobytes"/>
</td>
<td style="text-align:center;">
<a href="<wiki:PageInfoLink format='url' />" title="<fmt:message
key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
Mon Aug 11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
Mon Aug 11 13:35:10 2008
@@ -1,7 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection >
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp Mon Aug
11 13:35:10 2008
@@ -5,7 +5,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Mon
Aug 11 13:35:10 2008
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
Mon Aug 11 13:35:10 2008
@@ -8,7 +8,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp Mon Aug
11 13:35:10 2008
@@ -1,7 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Mon
Aug 11 13:35:10 2008
@@ -7,7 +7,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Mon Aug 11
13:35:10 2008
@@ -2,7 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Mon
Aug 11 13:35:10 2008
@@ -9,7 +9,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Mon Aug
11 13:35:10 2008
@@ -11,7 +11,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
String printWikiGroupPutGroup( Group group, String name, boolean cursor,
PageContext pageContext)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Mon Aug 11
13:35:10 2008
@@ -1,7 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Mon
Aug 11 13:35:10 2008
@@ -6,7 +6,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
String postURL = "";
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
Mon Aug 11 13:35:10 2008
@@ -9,7 +9,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
// Extract the group name and members
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
Mon Aug 11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
Mon Aug 11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<div id="actionsTop" class="pageactions">
<ul>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Mon
Aug 11 13:35:10 2008
@@ -3,7 +3,7 @@
<%@ page import="com.ecyrd.jspwiki.attachment.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp Mon Aug
11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed
--%>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
Mon Aug 11 13:35:10 2008
@@ -3,7 +3,7 @@
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext context = WikiContext.findContext( pageContext );
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
Mon Aug 11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%-- Inserts page content for preview. --%>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp Mon
Aug 11 13:35:10 2008
@@ -6,7 +6,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
/* dateformatting not yet supported by wiki:UserProfile tag - diy */
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp Mon Aug
11 13:35:10 2008
@@ -1,6 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox that can be easily included anywhere on the
page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp Mon Aug
11 13:35:10 2008
@@ -2,7 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
@@ -34,7 +34,7 @@
<wiki:CheckRequestContext context='!login'>
<wiki:Permission permission="login">
<a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param
- name='redirect' value='<%=c.getPage().getName()%>'/></wiki:Link>"
+ name='redirect'
value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
class="action login"
title="<fmt:message key='actions.login.title'/>"><fmt:message
key="actions.login"/></a>
</wiki:Permission>
@@ -51,7 +51,7 @@
<wiki:CheckRequestContext context='!prefs'>
<wiki:CheckRequestContext context='!preview'>
<a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param
name='redirect'
- value='<%=c.getPage().getName()%>'/></wiki:Link>"
+ value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
class="action prefs" accesskey="p"
title="<fmt:message key='actions.prefs.title'/>"><fmt:message
key="actions.prefs" />
</a>
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
Mon Aug 11 13:35:10 2008
@@ -4,7 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
Mon Aug 11 13:35:10 2008
@@ -6,7 +6,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script>
function constructdate(date)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Mon
Aug 11 13:35:10 2008
@@ -6,7 +6,7 @@
<%@ page import="java.util.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
This file provides a common header which includes the important JSPWiki
scripts and other files.
@@ -54,6 +54,7 @@
<meta name="wikiPageName" content='<wiki:Variable var="pagename" />'
/><%--pagename without blanks--%>
<meta name="wikiUserName" content='<wiki:UserName />' />
<meta name="wikiTemplateUrl" content='<wiki:Link format="url" templatefile=""
/>' />
+<meta name="wikiApplicationName" content='<wiki:Variable var="ApplicationName"
/>' />
<script type="text/javascript">//<![CDATA[
/* Localized javascript strings: LocalizedStrings[] */
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp?rev=684907&r1=684906&r2=684907&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
Mon Aug 11 13:35:10 2008
@@ -5,7 +5,7 @@
<%@ page import="com.ecyrd.jspwiki.filters.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<fmt:setLocale value="${prefs['Language']}" />
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
This is a special editor component for JSPWiki preview storage.
