You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/02 04:06:40 UTC
svn commit: r1607232 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/struts2/admin/
java/org/apache/roller/weblogger/ui/struts2/editor/ resources/
webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/core/
webapp/WEB-INF/jsps/editor/ web...
Author: gmazza
Date: Wed Jul 2 02:06:39 2014
New Revision: 1607232
URL: http://svn.apache.org/r1607232
Log:
Switching to greater use of the generic strings to reduce the total number of strings that need translation.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Wed Jul 2 02:06:39 2014
@@ -325,7 +325,7 @@ public class GlobalCommentManagement ext
List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
- opts.add(new KeyValueObject("ALL", getText("commentManagement.all")));
+ opts.add(new KeyValueObject("ALL", getText("generic.all")));
opts.add(new KeyValueObject("ONLY_PENDING", getText("commentManagement.onlyPending")));
opts.add(new KeyValueObject("ONLY_APPROVED", getText("commentManagement.onlyApproved")));
opts.add(new KeyValueObject("ONLY_DISAPPROVED", getText("commentManagement.onlyDisapproved")));
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Wed Jul 2 02:06:39 2014
@@ -423,7 +423,7 @@ public class Comments extends UIAction {
List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
- opts.add(new KeyValueObject("ALL", getText("commentManagement.all")));
+ opts.add(new KeyValueObject("ALL", getText("generic.all")));
opts.add(new KeyValueObject("ONLY_PENDING",
getText("commentManagement.onlyPending")));
opts.add(new KeyValueObject("ONLY_APPROVED",
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul 2 02:06:39 2014
@@ -14,13 +14,22 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
+# -- Common terms used to reduce the number of strings that need translation.
+# -- Switching from application.* to generic.* as application.name, application.description
+# -- can be confusing.
-application.none=None
+generic.all=All
+generic.none=None
application.cancel=Cancel
application.done=Done
application.yes=Yes
application.no=No
-
+#future use:
+#generic.name=Name
+#generic.description=Description
+#generic.save=Save
+#generic.edit=Edit
+#generic.delete=Delete
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -28,7 +37,6 @@ bookmarkForm.add.title=Add New Bookmark
bookmarkForm.add.subtitle=Adding new bookmark in folder [{0}]
bookmarkForm.edit.title=Edit Bookmark
bookmarkForm.edit.subtitle=Editing bookmark in folder [{0}]
-bookmarkForm.cancel=Cancel
bookmarkForm.description=Description
bookmarkForm.image=Image URL
bookmarkForm.name=Name
@@ -101,7 +109,6 @@ other bookmark folders if you wish.
bookmarksImport.imported=Imported OPML bookmarks into folder [{0}]
bookmarksImport.error=Error importing bookmarks: {0}
bookmarksImport.import=Import
-bookmarksImport.cancel=Cancel
# ----------------------------------------------------------------- cacheInfo.jsp
@@ -128,7 +135,6 @@ categoryForm.name=Name
categoryForm.description=Description
categoryForm.image=Image URL
categoryForm.save=Save
-categoryForm.cancel=Cancel
categoryForm.created=Category created
categoryForm.changesSaved=Changes saved
@@ -272,13 +278,10 @@ commentManagement.postTime=Posted at
commentManagement.entryTitled=Regarding
commentManagement.select=Select
-commentManagement.all=All
-commentManagement.none=None
commentManagement.readmore=View Entire Comment
commentManagement.editComment=Edit Comment
commentManagement.saveComment=Save
-commentManagement.cancelComment=Cancel
commentManagement.saveError=Error saving comment
# -------------------------------------------------------------- CommentServlet
@@ -393,12 +396,8 @@ createWebsite.locale=Locale
createWebsite.timeZone=Timezone
createWebsite.theme=Theme
createWebsite.weblogUrl=URL
-
createWebsite.button.save=Create Weblog
-createWebsite.button.cancel=Cancel
-
createWebsite.created=New weblog [{0}] has been successfully created.
-
createWebsite.oneBlogLimit=Sorry, only one weblog per user is allowed.
# errors from validation
@@ -492,8 +491,6 @@ folderForm.edit.subtitle=Editing bookmar
folderForm.name=Name
folderForm.save=Save
-folderForm.cancel=Cancel
-
folderForm.add.success=Folder added
folderForm.update.success=Folder updated
@@ -667,10 +664,6 @@ loginPage.reset=Reset
macro.bookmark.urlFeed=URL of site''s RSS feed
-# -------------------------------------------------------------------- RSS Macro
-
-macro.rss.all=All
-
# --------------------------------------------------------- Search Results Macro
macro.searchresults.hits_1=<strong>{0}</strong> entries found.<br /><em>You can also
@@ -718,7 +711,6 @@ macro.weblog.searchgoogle=<em>You can al
<a href="http://google.com/search?q={0}%20site:{1}/{3}" \
class="google">try this same search</a> on \
<a href="http://google.com">Google</a>.</em>
-macro.weblog.allcategories=All
macro.weblog.notifyMeOfComments=Notify me by email of new comments
macro.weblog.noEntriesForCategory=No entries found for specified category
@@ -817,7 +809,6 @@ mediaFileEdit.tags=Tags (space separated
mediaFileEdit.copyright=Copyright statement
mediaFileEdit.directory=Folder
mediaFileEdit.save=Save
-mediaFileEdit.cancel=Cancel
mediaFileEdit.fileInfo=File info
mediaFileEdit.fileTypeSize=<b>Type</b>: {0} <b>Size</b>: {1} bytes
mediaFileEdit.fileDimensions=<b>Image</b>: {0} X {1} pixels
@@ -1235,7 +1226,6 @@ planetGroups.title=Title
planetGroups.handle=Handle
planetGroups.button.save=Save
-planetGroups.button.cancel=Cancel
planetGroups.button.delete=Delete
planetGroups.success.saved=Saved group
@@ -1532,8 +1522,6 @@ Register.error.timeZoneSize=Time Zone ca
# ---------------------------------------------------------------- User settings
userSettings.button.save=Save Profile
-userSettings.button.cancel=Cancel
-
userSettings.username=Username
userSettings.screenname=Screen Name
userSettings.fullname=Full Name
@@ -1677,9 +1665,7 @@ weblogEntriesPager.month.dateFormat=MMM
# ---------------------------------------------------------- Weblog Entry Remove
weblogEntryRemove.removeWeblogEntry=Remove Weblog Entry
-weblogEntryRemove.yes=Yes
-weblogEntryRemove.no=No
-weblogEntryRemove.areYouSure=Are you sure you want to remove this Weblog Entry?
+weblogEntryRemove.areYouSure=Are you sure you want to remove this Weblog Entry?
weblogEntryRemove.entryTitle=Entry Title
weblogEntryRemove.entryId=Entry ID
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed Jul 2 02:06:39 2014
@@ -3,6 +3,13 @@
# http://www.zaval.org/products/jrc-editor/
#
+generic.all=Alle
+generic.none=None
+application.cancel=Abbrechen
+application.done=Fertig
+application.no=Nein
+application.yes=Ja
+
#
Bookmark.error.descriptionSize=Die Beschreibung darf nicht l\u00E4nger als 255 Zeichen sein
Bookmark.error.feedUrlBad=Die eingegebene Newsfeed-URL ist ung\u00FCltig
@@ -69,12 +76,6 @@ WeblogConfig.error.descriptionSize=Die B
# errors from validation
WeblogConfig.error.nameNull=Der Name muss eingegeben werden
WeblogConfig.error.nameSize=Der Name darf nicht l\u00E4nger als 255 Zeichen sein
-application.cancel=Abbrechen
-application.done=Fertig
-application.no=Nein
-# directory of this distribution.
-application.none=None
-application.yes=Ja
bookmarkForm.add.subtitle=Lesezeichen hinzuf\u00FCgen in Ordner [{0}]
# ------------------------------------------------------------- BookmarkForm.jsp
bookmarkForm.add.title=Neues Lesezeichen hinzuf\u00FCgen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Wed Jul 2 02:06:39 2014
@@ -1,5 +1,6 @@
# Translation (c) 2005 by Patricio Mart�nez Ros <si...@wanadoo.es>
-application.none = Ninguno
+generic.none=Ninguno
+generic.all=Todos
application.cancel = Cancelar
application.done = Hecho
application.yes = S\u00ED
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed Jul 2 02:06:39 2014
@@ -14,8 +14,8 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-
-application.none=Aucune
+generic.all=Tous
+generic.none=Aucune
application.cancel=Annuler
application.done=Terminé
application.yes=Oui
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Wed Jul 2 02:06:39 2014
@@ -14,8 +14,8 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-
-application.none=\u306A\u3057
+generic.all=\u3059\u3079\u3066
+generic.none=\u306A\u3057
application.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
application.done=\u623B\u308B
application.yes=\u306F\u3044
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Wed Jul 2 02:06:39 2014
@@ -15,7 +15,8 @@
# directory of this distribution.
-application.none=\uc5c6\uc74c
+generic.all=\ubaa8\ub4e0 \uc758\uacac
+generic.none=\uc5c6\uc74c
application.cancel=\ucde8\uc18c
application.done=\ucc98\ub9ac \uc644\ub8cc
application.yes=\uc608
Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Wed Jul 2 02:06:39 2014
@@ -18,8 +18,8 @@
# Created by Jaap van der Molen (molen at mail.com)
#
-
-application.none=None
+generic.all=Allemaal
+generic.none=None
#------------------------------------------------------------ Struts Validator
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Wed Jul 2 02:06:39 2014
@@ -4,8 +4,8 @@
#Since java properties can use only ASCII, cyrillic letters are escaped by native2ascii
#You can unescape this file by "native2ascii -reverse" command
-
-application.none=\u041d\u0435\u0442
+generic.all=\u0412\u0441\u0435
+generic.none=\u041d\u0435\u0442
application.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
application.done=\u0413\u043e\u0442\u043e\u0432\u043e
application.yes=\u0414\u0430
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Wed Jul 2 02:06:39 2014
@@ -15,7 +15,8 @@
application.cancel=\u53d6\u6d88
application.done=\u6267\u884c
application.no=\u5426
-application.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
+generic.none=\u4ec0\u4e48\u4e5f\u6ca1\u6709
+generic.all=\u6240\u6709
application.yes=\u662f
bookmarkForm.add.subtitle=\u5728\u6587\u4ef6\u5939 [{0}] \u6dfb\u52a0\u65b0\u7684\u4e66\u7b7e
bookmarkForm.add.title=\u6dfb\u52a0\u65b0\u4e66\u7b7e
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Wed Jul 2 02:06:39 2014
@@ -18,8 +18,8 @@
# Created by Shawn Huang (shawnjohn at mail2000.com.tw)
#
-
-application.none=None
+generic.all=\u5168\u90e8
+generic.none=None
#------------------------------------------------------------ Struts Validator
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp Wed Jul 2 02:06:39 2014
@@ -197,19 +197,19 @@ function handleCommentResponse() {
<s:text name="commentManagement.select" /><br/>
<a href="#" onclick='setChecked(1,"bean.spamComments")'>
- <s:text name="commentManagement.all" /></a><br />
+ <s:text name="generic.all" /></a><br />
<a href="#" onclick='setChecked(0,"bean.spamComments")'>
- <s:text name="commentManagement.none" /></a>
+ <s:text name="generic.none" /></a>
</td>
<td align="center">
<s:text name="commentManagement.select" /><br/>
<a href="#" onclick='setChecked(1,"bean.deleteComments")'>
- <s:text name="commentManagement.all" /></a><br />
+ <s:text name="generic.all" /></a><br />
<a href="#" onclick='setChecked(0,"bean.deleteComments")'>
- <s:text name="commentManagement.none" /></a>
+ <s:text name="generic.none" /></a>
</td>
<td align="right">
<br />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp Wed Jul 2 02:06:39 2014
@@ -51,7 +51,7 @@
<s:submit value="%{getText('planetGroups.button.save')}" />
<input type="button"
- value='<s:text name="planetGroups.button.cancel" />'
+ value='<s:text name="application.cancel" />'
onclick="window.location='<s:url action="planetGroups"/>'"/>
<s:if test="group != null" >
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Wed Jul 2 02:06:39 2014
@@ -124,7 +124,7 @@ function handlePreview(handle) {
<br />
<s:submit value="%{getText('createWebsite.button.save')}" />
-<input type="button" value="<s:text name="createWebsite.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+<input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp Wed Jul 2 02:06:39 2014
@@ -69,4 +69,4 @@
<br />
-<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+<input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Wed Jul 2 02:06:39 2014
@@ -97,6 +97,6 @@
<br />
<s:submit value="%{getText('userSettings.button.save')}" />
- <input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
+ <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp Wed Jul 2 02:06:39 2014
@@ -149,7 +149,7 @@
<p id="readytip"><s:text name="userRegister.tip.ready" /></p>
<s:submit id="submit" key="userRegister.button.save" />
-<input type="button" value="<s:text name="userSettings.button.cancel"/>"
+<input type="button" value="<s:text name="application.cancel"/>"
onclick="window.location='<s:url value="/"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Wed Jul 2 02:06:39 2014
@@ -60,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarkAdd!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Wed Jul 2 02:06:39 2014
@@ -60,7 +60,7 @@
<p>
<s:submit value="%{getText('bookmarkForm.save')}" />
- <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarkAdd!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="bookmarkAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp Wed Jul 2 02:06:39 2014
@@ -34,5 +34,5 @@
<br />
<br />
<s:submit value="%{getText('bookmarksImport.import')}" />
- <s:submit value="%{getText('bookmarksImport.cancel')}" action="bookmarks" />
+ <s:submit value="%{getText('application.cancel')}" action="bookmarks" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Wed Jul 2 02:06:39 2014
@@ -46,7 +46,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('categoryForm.cancel')}" action="categoryAdd!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="categoryAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Wed Jul 2 02:06:39 2014
@@ -47,7 +47,7 @@
<p>
<s:submit value="%{getText('categoryForm.save')}" />
- <s:submit value="%{getText('categoryForm.cancel')}" action="categoryEdit!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="categoryEdit!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Wed Jul 2 02:06:39 2014
@@ -184,20 +184,20 @@
<td align="center">
<s:text name="commentManagement.select" /><br/>
- <span id="checkallapproved"><a href="#"><s:text name="commentManagement.all" /></a></span><br />
- <span id="clearallapproved"><a href="#"><s:text name="commentManagement.none" /></a></span>
+ <span id="checkallapproved"><a href="#"><s:text name="generic.all" /></a></span><br />
+ <span id="clearallapproved"><a href="#"><s:text name="generic.none" /></a></span>
</td>
<td align="center">
<s:text name="commentManagement.select" /><br/>
- <span id="checkallspam"><a href="#"><s:text name="commentManagement.all" /></a></span><br />
- <span id="clearallspam"><a href="#"><s:text name="commentManagement.none" /></a></span>
+ <span id="checkallspam"><a href="#"><s:text name="generic.all" /></a></span><br />
+ <span id="clearallspam"><a href="#"><s:text name="generic.none" /></a></span>
</td>
<td align="center">
<s:text name="commentManagement.select" /><br/>
- <span id="checkalldelete"><a href="#"><s:text name="commentManagement.all" /></a></span><br />
- <span id="clearalldelete"><a href="#"><s:text name="commentManagement.none" /></a></span>
+ <span id="checkalldelete"><a href="#"><s:text name="generic.all" /></a></span><br />
+ <span id="clearalldelete"><a href="#"><s:text name="generic.none" /></a></span>
</td>
<td align="right">
<br />
@@ -315,7 +315,7 @@
<a onclick='saveComment("<s:property value="#comment.id"/>")'><s:text name="commentManagement.saveComment" /></a> |
</span>
<span id="cancellink-<s:property value="#comment.id"/>" style="display: none">
- <a onclick='editCommentCancel("<s:property value="#comment.id"/>")'><s:text name="commentManagement.cancelComment" /></a>
+ <a onclick='editCommentCancel("<s:property value="#comment.id"/>")'><s:text name="application.cancel" /></a>
</span>
</div>
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Wed Jul 2 02:06:39 2014
@@ -34,14 +34,14 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
- <s:submit value="%{getText('weblogEntryRemove.yes')}" />
+ <s:submit value="%{getText('application.yes')}" />
</s:form>
</td>
<td>
<s:form action="entryEdit">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:submit value="%{getText('weblogEntryRemove.no')}" action="entryRemove!cancel" />
+ <s:submit value="%{getText('application.no')}" action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemoveViaList.jsp Wed Jul 2 02:06:39 2014
@@ -36,14 +36,14 @@
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="removeId" />
- <s:submit value="%{getText('weblogEntryRemove.yes')}" />
+ <s:submit value="%{getText('application.yes')}" />
</s:form>
</td>
<td>
<s:form action="entries">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:submit value="%{getText('weblogEntryRemove.no')}" action="entryRemove!cancel" />
+ <s:submit value="%{getText('application.no')}" action="entryRemove!cancel" />
</s:form>
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp Wed Jul 2 02:06:39 2014
@@ -36,7 +36,7 @@
</s:text>
</s:if>
<s:else>
- <span><s:text name="application.none" /></span>
+ <span><s:text name="generic.none" /></span>
</s:else>
<hr size="1" noshade="noshade" />
@@ -44,7 +44,7 @@
<s:set name="pendingEntries" value="recentPendingEntries" />
<s:if test="#pendingEntries.isEmpty">
- <span><s:text name="application.none" /></span>
+ <span><s:text name="generic.none" /></span>
</s:if>
<s:iterator id="post" value="#pendingEntries">
<span class="entryEditSidebarLink">
@@ -64,7 +64,7 @@
<s:set name="draftEntries" value="recentDraftEntries" />
<s:if test="#draftEntries.isEmpty">
- <span><s:text name="application.none" /></span>
+ <span><s:text name="generic.none" /></span>
</s:if>
<s:iterator id="post" value="#draftEntries">
<span class="entryEditSidebarLink">
@@ -86,7 +86,7 @@
<s:set name="pubEntries" value="recentPublishedEntries" />
<s:if test="#pubEntries.isEmpty">
- <span><s:text name="application.none" /></span>
+ <span><s:text name="generic.none" /></span>
</s:if>
<s:iterator id="post" value="#pubEntries">
<span class="entryEditSidebarLink">
@@ -106,7 +106,7 @@
<s:set name="schedEntries" value="recentScheduledEntries" />
<s:if test="#schedEntries.isEmpty">
- <span><s:text name="application.none" /></span>
+ <span><s:text name="generic.none" /></span>
</s:if>
<s:iterator id="post" value="#schedEntries">
<span class="entryEditSidebarLink">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Wed Jul 2 02:06:39 2014
@@ -36,7 +36,7 @@
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('folderForm.cancel')}" action="folderAdd!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="folderAdd!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Wed Jul 2 02:06:39 2014
@@ -41,7 +41,7 @@
<p>
<s:submit value="%{getText('folderForm.save')}" />
- <s:submit value="%{getText('folderForm.cancel')}" action="folderEdit!cancel" />
+ <s:submit value="%{getText('application.cancel')}" action="folderEdit!cancel" />
</p>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Wed Jul 2 02:06:39 2014
@@ -212,7 +212,7 @@ $("#d_clip_button").ready(function() {
<input type="submit" tabindex="7"
value="<s:text name="mediaFileEdit.save" />" name="submit" />
<input type="button" tabindex="8"
- value="<s:text name="mediaFileEdit.cancel" />" onClick="javascript:window.parent.onEditCancelled();" />
+ value="<s:text name="application.cancel" />" onClick="javascript:window.parent.onEditCancelled();" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1607232&r1=1607231&r2=1607232&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Wed Jul 2 02:06:39 2014
@@ -525,9 +525,9 @@ Show weblog's categories in specified pa
#macro(showWeblogCategoryLinksList)
<ul class="rCategory">
#if ($model.weblogCategory || $model.permalink)
- <li><a href="$url.home">$text.get("macro.weblog.allcategories")</a></li>
+ <li><a href="$url.home">$text.get("generic.all")</a></li>
#else
- <li class="selected"><a href="$url.home">$text.get("macro.weblog.allcategories")</a></li>
+ <li class="selected"><a href="$url.home">$text.get("generic.all")</a></li>
#end
#set($cats = $model.weblog.getWeblogCategories())
#foreach($cat in $cats)
@@ -550,11 +550,11 @@ Show weblog's categories in specified pa
<h2>Categories</h2>
<ul data-role="listview">
#if ($model.weblogCategory || $model.permalink)
- <li><a href="$url.home" data-transition="fade">$text.get("macro.weblog.allcategories")</a></li>
+ <li><a href="$url.home" data-transition="fade">$text.get("generic.all")</a></li>
#else
- <li data-icon="gear" class="ui-btn-active"><a href="$url.home" data-transition="fade">$text.get("macro.weblog.allcategories")</a></li>
+ <li data-icon="gear" class="ui-btn-active"><a href="$url.home" data-transition="fade">$text.get("generic.all")</a></li>
#end
- #set($active = $text.get("macro.weblog.allcategories"))
+ #set($active = $text.get("generic.all"))
#set($cats = $model.weblog.getWeblogCategories())
#foreach($cat in $cats)
#if ($model.weblogCategory && $model.weblogCategory.name == $cat.name || ($model.permalink && $model.weblogEntry.category.name == $cat.name))
@@ -577,7 +577,7 @@ Show weblog's categories in specified pa
*#
#macro(showAtomFeedsList $weblog)
<ul class="rFeeds">
- <li><a href="$url.feed.entries.atom">$text.get("macro.rss.all")</a></li>
+ <li><a href="$url.feed.entries.atom">$text.get("generic.all")</a></li>
#set($categories = $weblog.weblogCategories )
#foreach( $cat in $categories )
<li><a href="$url.feed.entries.atom($cat.name, false)">$cat.name</a></li>
@@ -592,7 +592,7 @@ Show weblog's categories in specified pa
*#
#macro(showRSSFeedsList $weblog)
<ul class="rFeeds">
- <li><a href="$url.feed.entries.rss">$text.get("macro.rss.all")</a></li>
+ <li><a href="$url.feed.entries.rss">$text.get("generic.all")</a></li>
#set($categories = $weblog.weblogCategories )
#foreach( $cat in $categories )
<li><a href="$url.feed.entries.rss($cat.name, false)">$cat.name</a></li>