You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/06 22:21:33 UTC
svn commit: r453750 - in /incubator/roller/trunk/web: WEB-INF/classes/
WEB-INF/jsps/admin/ WEB-INF/jsps/authoring/ WEB-INF/jsps/tiles/
themes/frontpage/
Author: snoopdave
Date: Fri Oct 6 13:21:32 2006
New Revision: 453750
URL: http://svn.apache.org/viewvc?view=rev&rev=453750
Log:
JSP I18N fixes from Jian Liu and some comment changes
Added:
incubator/roller/trunk/web/themes/frontpage/sm-theme-frontpage.png (with props)
Modified:
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp
incubator/roller/trunk/web/WEB-INF/jsps/tiles/search.jsp
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Fri Oct 6 13:21:32 2006
@@ -95,6 +95,14 @@
bookmarksImport.imported=Imported OPML bookmarks into folder [{0}]
bookmarksImport.error=Error importing bookmarks: {0}
+# ----------------------------------------------------------------- cacheInfo.jsp
+
+cacheInfo.title=Cache Information
+cacheInfo.subtitle=Monitor cache statistics
+cacheInfo.prompt=This page offers instrumentation data about what is happening \
+in the system caches.
+cacheInfo.clear=Clear
+
# -------------------------------------------------------------------- Calendars
calendar.summary=Blog Archive Calendar
@@ -142,6 +150,7 @@
categoriesForm.checkNone=Check None
categoriesForm.delete=Delete
categoriesForm.move=Move
+categoriesForm.move.confirm=Move selected categories?
categoriesForm.path=Path
categoriesForm.parent=Category
categoriesForm.remove=Remove
@@ -1137,12 +1146,6 @@
referers.deletedReferers=Deleted specified referrers
referers.noReferersSpecified=You did not specify any referrers to delete
-# ----------------------------------------------------------------- cacheInfo.jsp
-
-cacheInfo.title=Cache Information
-cacheInfo.subtitle=Monitor cache statistics
-cacheInfo.prompt=This page offers instrumentation data about what is happening \
-in the system caches.
# ------------------------------------------------------------------ Statistics
@@ -1449,7 +1452,7 @@
weblogEdit.days90=90 days
weblogEdit.pluginsToApply=Plugins To Apply
-weblogEdit.miscSettings=Misc. Settings
+weblogEdit.miscSettings=Advanced Settings
weblogEdit.rightToLeft=Text reads right-to-left
weblogEdit.pinnedToMain=Pinned to main
@@ -1465,10 +1468,14 @@
weblogEdit.hasComments=Comments [{0}]
-weblogEdit.mediaCastFailedFetchingInfo=Unable to reach the MediaCast server. Check the hostname in the URL.
-weblogEdit.mediaCastUrlMalformed=The MediaCast URL was malformed.
-weblogEdit.mediaCastResponseError=The MediaCast server returned an error. Do you have the right URL?
-weblogEdit.mediaCastLacksContentTypeOrLength=Unable to use MediaCast URL. Server provided no content type or no length.
+weblogEdit.enclosureURL=Enclosure URL
+weblogEdit.enclosureType=Type
+weblogEdit.encosureLegnth=Length
+weblogEdit.encosureInvalid=Enclosure URL is invalid
+weblogEdit.mediaCastFailedFetchingInfo=Unable to reach the enclosure. Check the hostname in the URL.
+weblogEdit.mediaCastUrlMalformed=The enclosure URL was malformed.
+weblogEdit.mediaCastResponseError=The enclosure server returned an error. Do you have the right URL?
+weblogEdit.mediaCastLacksContentTypeOrLength=Unable to use enclosure URL. Server provided no content type or no length.
weblogEdit.error.incompleteEntry=Entry must have a title
# -------------------------------------------------------- Weblog entries Pager
@@ -1703,6 +1710,8 @@
websiteRemove.websiteId=Weblog ID
websiteRemove.websiteName=Weblog Name
+websiteSettings.label1=Default Entry Formatters
+websiteSettings.label2=(applied in the listed order)
# ------------------------------------------------------------- Welcome new user
Modified: incubator/roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/admin/cacheInfo.jsp Fri Oct 6 13:21:32 2006
@@ -17,8 +17,8 @@
-->
<%@ include file="/taglibs.jsp" %>
-<p class="subtitle"><fmt:message key="cacheInfo.subtitle" /></a>
-<p><fmt:message key="cacheInfo.prompt" /></a>
+<p class="subtitle"><fmt:message key="cacheInfo.subtitle" />
+<p><fmt:message key="cacheInfo.prompt" />
<c:forEach var="cache" items="${cacheStats}">
<c:if test="${!empty cache.value}">
@@ -37,8 +37,9 @@
<tr>
<td colspan="2">
<form action="cacheInfo.do" method="POST">
- <input type="hidden" name="cache" value="<c:out value='${cache.key}'/>">
- <input type="submit" name="method" value="clear">
+ <input type="hidden" name="cache" value="<c:out value='${cache.key}'/>" />
+ <input type="hidden" name="method" value="clear" />
+ <input type="submit" value="<fmt:message key='cacheInfo.clear' />" />
</form>
</td>
</tr>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoriesForm.jsp Fri Oct 6 13:21:32 2006
@@ -31,7 +31,7 @@
}
function onMove()
{
- if ( confirm("Move selected categories?") )
+ if ( confirm("<fmt:message key='categoriesForm.move.confirm' />") )
{
document.categoriesForm.method.value = "moveSelected";
document.categoriesForm.submit();
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp Fri Oct 6 13:21:32 2006
@@ -66,8 +66,8 @@
<strong><fmt:message key="categoryDeleteOK.areYouSure" /></strong>
</p>
- <input type="button" value="Yes" onclick="deleteYes()" />
- <input type="button" value="No" onclick="deleteNo()" />
+ <input type="button" value="<fmt:message key='application.yes' />" onclick="deleteYes()" />
+ <input type="button" value="<fmt:message key='application.no' />" onclick="deleteNo()" />
</html:form>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/CategoryForm.jsp Fri Oct 6 13:21:32 2006
@@ -33,10 +33,10 @@
<p>
<b><fmt:message key="categoriesForm.path" /></b>:
-<c:if test="${!empty parentCategory.parent.path}">
- <c:out value="${parentCategory.parent.path}" />
+<c:if test="${!empty parentCategory.path}">
+ <c:out value="${parentCategory.path}" />
</c:if>
-<c:if test="${empty parentCategory.parent.path}">
+<c:if test="${empty parentCategory.path}">
/
</c:if>
</p>
@@ -71,7 +71,7 @@
<c:url var="categoriesUrl" value="/roller-ui/authoring/categories.do">
<c:param name="method" value="selectCategory" />
<c:param name="weblog" value="${model.website.handle}" />
- <c:param name="categoryid" value="${requestScope.parentId}" />
+ <c:param name="categoryId" value="${requestScope.parentCategory.id}" />
</c:url>
<input type="button" value="<fmt:message key='categoryForm.cancel' />"
onclick="window.location = '<c:out value="${categoriesUrl}" />'" />
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/CommentManagement.jsp Fri Oct 6 13:21:32 2006
@@ -209,23 +209,29 @@
<c:if test="${!empty model.website}">
<td align="center">
<fmt:message key="commentManagement.select" /><br/>
+
<a href="#" onclick='setChecked(1,"approvedComments")'>
<fmt:message key="commentManagement.all" /></a><br />
+
<a href="#" onclick='setChecked(0,"approvedComments")'>
<fmt:message key="commentManagement.none" /></a>
</td>
</c:if>
<td align="center">
<fmt:message key="commentManagement.select" /><br/>
+
<a href="#" onclick='setChecked(1,"spamComments")'>
<fmt:message key="commentManagement.all" /></a><br />
+
<a href="#" onclick='setChecked(0,"spamComments")'>
<fmt:message key="commentManagement.none" /></a>
</td>
<td align="center">
<fmt:message key="commentManagement.select" /><br/>
+
<a href="#" onclick='setChecked(1,"deleteComments")'>
<fmt:message key="commentManagement.all" /></a><br />
+
<a href="#" onclick='setChecked(0,"deleteComments")'>
<fmt:message key="commentManagement.none" /></a>
</td>
@@ -362,11 +368,11 @@
<c:choose>
<c:when test="${!empty model.weblogEntry}">
- <input type="button" name="Cancel" value='Cancel'
+ <input type="button" name="Cancel" value='<fmt:message key="application.cancel" />'
onclick="window.location.href='<c:out value="${entryLink}" />'" />
</c:when>
<c:otherwise>
- <input type="button" name="Cancel" value='Cancel'
+ <input type="button" name="Cancel" value='<fmt:message key="application.cancel" />'
onclick="window.location.href='<c:out value="${model.link}" />'" />
</c:otherwise>
</c:choose>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp Fri Oct 6 13:21:32 2006
@@ -34,7 +34,7 @@
<p><fmt:message key="weblogEntryQuery.sidebarDescription" /></p>
-<html:form action="/roller-ui/authoring/weblogEntryManagement" method="post" focus="title">
+<html:form action="/roller-ui/authoring/weblogEntryManagement" method="post" focus="categoryId">
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<html:hidden name="method" property="method" value="query"/>
<html:hidden property="count" />
@@ -52,17 +52,17 @@
</html:select>
</div>
<br />
- <br />
-
- <%-- ========================================================= --%>
- <%-- filter by tag --%>
-
- <div class="sideformrow">
- <label for="tags" class="sideformrow">
- <fmt:message key="weblogEntryQuery.label.tags" /></label>
- <html:text property="tags" />
- </div>
- <br />
+ <br />
+
+ <%-- ========================================================= --%>
+ <%-- filter by tag --%>
+
+ <div class="sideformrow">
+ <label for="tags" class="sideformrow">
+ <fmt:message key="weblogEntryQuery.label.tags" /></label>
+ <html:text property="tags" />
+ </div>
+ <br />
<br />
<%-- ========================================================= --%>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-website.jsp Fri Oct 6 13:21:32 2006
@@ -233,7 +233,7 @@
<c:choose>
<c:when test="${model.hasPagePlugins}">
<tr>
- <td class="label">Default Entry Formatters <br />(applied in the listed order)</td>
+ <td class="label"><fmt:message key="websiteSettings.label1" /> <br /><fmt:message key="websiteSettings.label2" /></td>
<td class="field">
<logic:iterate id="plugin" type="org.apache.roller.model.WeblogEntryPlugin"
collection="<%= model.getPagePlugins() %>">
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-nosidebar.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-/*
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-*/
+--%>
#centercontent_wrap {
width: 100%;
}
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/css-sidebar.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-/*
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-*/
+--%>
#centercontent_wrap {
width: 70%;
}
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/empty.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--->
+--%>
<%-- empty tile --%>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/footer.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--->
+--%>
<%@ include file="/taglibs.jsp" %>
Powered by <a href="http://www.rollerweblogger.org">Roller Weblogger</a>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/messages.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,36 +14,36 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
+--%>
+<%@ include file="/taglibs.jsp" %>
+<script type="text/javascript">
+<!--
+function dirty() {
+ messages = document.getElementById("messages");
+ if (messages != null) {
+ messages.className = "warnings";
+ var n1 = messages.childNodes[0];
+ var n2 = document.createTextNode("Unsaved changes");
+ messages.replaceChild(n2, n1);
+ }
+}
-->
-<%@ include file="/taglibs.jsp" %>
-<script type="text/javascript">
-<!--
-function dirty() {
- messages = document.getElementById("messages");
- if (messages != null) {
- messages.className = "warnings";
- var n1 = messages.childNodes[0];
- var n2 = document.createTextNode("Unsaved changes");
- messages.replaceChild(n2, n1);
- }
-}
--->
-</script>
-
-<%-- Success Messages --%>
-<logic:messagesPresent message="true">
- <div id="messages" class="messages">
- <html:messages id="message" message="true">
- <c:out value="${message}" escapeXml="false"/><br />
- </html:messages>
- </div>
-</logic:messagesPresent>
-
-<%-- Error Messages --%>
-<logic:messagesPresent>
- <div id="errors" class="errors">
- <html:messages id="error">
- <c:out value="${error}" /><br />
- </html:messages>
- </div>
-</logic:messagesPresent>
+</script>
+
+<%-- Success Messages --%>
+<logic:messagesPresent message="true">
+ <div id="messages" class="messages">
+ <html:messages id="message" message="true">
+ <c:out value="${message}" escapeXml="false"/><br />
+ </html:messages>
+ </div>
+</logic:messagesPresent>
+
+<%-- Error Messages --%>
+<logic:messagesPresent>
+ <div id="errors" class="errors">
+ <html:messages id="error">
+ <c:out value="${error}" /><br />
+ </html:messages>
+ </div>
+</logic:messagesPresent>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/tiles/search.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/tiles/search.jsp?view=diff&rev=453750&r1=453749&r2=453750
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/tiles/search.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/tiles/search.jsp Fri Oct 6 13:21:32 2006
@@ -1,4 +1,4 @@
-<!--
+<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. The ASF licenses this file to You
under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
limitations under the License. For additional information regarding
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
--->
+--%>
<%@ include file="/taglibs.jsp" %>
<div class="searchSidebarHead">
Added: incubator/roller/trunk/web/themes/frontpage/sm-theme-frontpage.png
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/themes/frontpage/sm-theme-frontpage.png?view=auto&rev=453750
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/web/themes/frontpage/sm-theme-frontpage.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream