roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r917205 - in /roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps: admin/ core/ editor/
Date Sun, 28 Feb 2010 17:07:21 GMT
Author: snoopdave
Date: Sun Feb 28 17:07:19 2010
New Revision: 917205

URL: http://svn.apache.org/viewvc?rev=917205&view=rev
Log:
Correcting use of <s:submit> tag to use the 'value' attribute rather than 'key' to convey the button's localized label text.

Modified:
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp
    roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp Sun Feb 28 17:07:19 2010
@@ -38,7 +38,7 @@
                 <td colspan="2">
                     <s:form action="cacheInfo!clear">
                         <s:hidden name="cache" value="%{#cache.key}" />
-                        <s:submit key="cacheInfo.clear" />
+                        <s:submit value="%{getText('cacheInfo.clear')}" />
                     </s:form>
                 </td>
             </tr>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp Sun Feb 28 17:07:19 2010
@@ -36,7 +36,7 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit key="pingTarget.save" />
+       <s:submit value="%{getText('pingTarget.save')}" />
     </div>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp Sun Feb 28 17:07:19 2010
@@ -34,10 +34,10 @@
 <div class="control">
     <s:form action="commonPingTargets!delete">
         <s:hidden name="pingTargetId" />
-        <s:submit key="pingTarget.removeOK" />
+        <s:submit value="%{getText('pingTarget.removeOK')}" />
     </s:form>
     &nbsp;
     <s:form action="commonPingTargets">
-        <s:submit key="pingTarget.cancel" />
+        <s:submit value="%{getText('pingTarget.cancel')}" />
     </s:form>
 </div>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp Sun Feb 28 17:07:19 2010
@@ -37,8 +37,8 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit key="pingTarget.save" />
-       <s:submit key="pingTarget.cancel" action="commonPingTargets" />
+       <s:submit value="%{getText('pingTarget.save')}" />
+       <s:submit value="%{getText('pingTarget.cancel')}" action="commonPingTargets" />
     </div>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp Sun Feb 28 17:07:19 2010
@@ -90,7 +90,7 @@
     <br />
     
     <div class="control">
-        <s:submit key="userAdmin.save" />
+        <s:submit value="%{getText('userAdmin.save')}" />
         <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagement.jsp Sun Feb 28 17:07:19 2010
@@ -327,9 +327,9 @@
 <%-- Save changes and  cancel buttons --%>
 <%-- ========================================================= --%>
             
-<s:submit key="commentManagement.update" />
+<s:submit value="%{getText('commentManagement.update')}" />
 &nbsp;
-<s:submit key="application.cancel" action="globalCommentManagement" />
+<s:submit value="%{getText('application.cancel')}" action="globalCommentManagement" />
 
 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp Sun Feb 28 17:07:19 2010
@@ -104,7 +104,7 @@
     </div>
     <br />
     
-    <s:submit key="commentManagement.query" />
+    <s:submit value="%{getText('commentManagement.query')}" />
             
 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp Sun Feb 28 17:07:19 2010
@@ -33,7 +33,7 @@
         <s:iterator id="pd" value="#dg.propertyDefs">
             
             <tr>
-                <td class="label"><s:text name="%{#pd.key}" /></td>
+                <td class="label"><s:text name="pd.key" /></td>
                 
                   <%-- special condition for comment plugins --%>
                   <s:if test="#pd.name == 'users.comments.plugins'">

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp Sun Feb 28 17:07:19 2010
@@ -144,7 +144,7 @@
     <br />
     
     <div class="control">
-        <s:submit key="userAdmin.save" />
+        <s:submit value="%{getText('userAdmin.save')}" />
         <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp Sun Feb 28 17:07:19 2010
@@ -47,7 +47,7 @@
     
     <div class="formrow">
         <label class="formrow" />&nbsp;</label>
-        <s:submit key="planetGroups.button.save" />
+        <s:submit value="%{getText('planetGroups.button.save')}" />
         &nbsp;
         <input type="button" 
                value='<s:text name="planetGroups.button.cancel" />' 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Sun Feb 28 17:07:19 2010
@@ -46,7 +46,7 @@
     <div class="formrow">
         <label for="feedURL" class="formrow" /><s:text name="planetSubscription.feedUrl" /></label>
         <s:textfield name="subUrl" size="40" maxlength="255" />
-        &nbsp;<s:submit key="planetSubscriptions.button.save" />
+        &nbsp;<s:submit value="%{getText('planetSubscriptions.button.save')}" />
     </div>
 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp Sun Feb 28 17:07:19 2010
@@ -54,7 +54,7 @@
     <p><s:text name="installer.createTables" /></p>
 
     <s:form action="install!create">
-        <s:submit key="installer.yesCreateTables" />
+        <s:submit value="%{getText('installer.yesCreateTables')}" />
     </s:form>
     
 </s:else>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Sun Feb 28 17:07:19 2010
@@ -112,7 +112,7 @@
 
 <br />
    
-<s:submit key="createWebsite.button.save" />
+<s:submit value="%{getText('createWebsite.button.save')}" />
 <input type="button" value="<s:text name="createWebsite.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Sun Feb 28 17:07:19 2010
@@ -99,7 +99,7 @@
     
     <br />
     
-    <s:submit key="userSettings.button.save" />
+    <s:submit value="%{getText('userSettings.button.save')}" />
     <input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
-    
+
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Setup.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Setup.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/Setup.jsp Sun Feb 28 17:07:19 2010
@@ -90,7 +90,7 @@
                     <tr>
                         <td colspan="2" class="label">
                             <div class="control">
-                                <s:submit key="frontpageConfig.save" />
+                                <s:submit value="%{getText('frontpageConfig.save')}" />
                             </div>
                         </td>
                     </tr>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp Sun Feb 28 17:07:19 2010
@@ -39,7 +39,7 @@
     <p><s:text name="installer.upgradeTables" /></p>
 
     <s:form action="install!upgrade">
-        <s:submit key="installer.yesUpgradeTables" />
+        <s:submit value="%{getText('installer.yesUpgradeTables')}" />
     </s:form>
 
 </s:elseif>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Sun Feb 28 17:07:19 2010
@@ -67,8 +67,8 @@
     </table>
     
     <p>
-        <s:submit key="bookmarkForm.save" />
-        <s:submit key="bookmarkForm.cancel" action="bookmarks" />
+        <s:submit value="%{getText('bookmarkForm.save')}" />
+        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Sun Feb 28 17:07:19 2010
@@ -70,8 +70,8 @@
     </table>
     
     <p>
-        <s:submit key="bookmarkForm.save" />
-        <s:submit key="bookmarkForm.cancel" action="bookmarks" />
+        <s:submit value="%{getText('bookmarkForm.save')}" />
+        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp Sun Feb 28 17:07:19 2010
@@ -32,5 +32,5 @@
     <s:file name="opmlFile" />
     <br />
     <br />
-    <s:submit key="bookmarksImport.import" />
+    <s:submit value="%{getText('bookmarksImport.import')}" />
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Sun Feb 28 17:07:19 2010
@@ -80,7 +80,7 @@
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     
     <%-- Move-selected button --%>
-    <s:submit key="categoriesForm.move" onclick="onMove()" />
+    <s:submit value="%{getText('categoriesForm.move')}" onclick="onMove()" />
     
     <%-- Move-to combo-box --%>
     <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="path" />

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Sun Feb 28 17:07:19 2010
@@ -49,8 +49,8 @@
     </table>
     
     <p>
-        <s:submit key="categoryForm.save" />
-        <s:submit key="categoryForm.cancel" action="categories" />
+        <s:submit value="%{getText('categoryForm.save')}" />
+        <s:submit value="%{getText('categoryForm.cancel')}" action="categories" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Sun Feb 28 17:07:19 2010
@@ -52,8 +52,8 @@
     </table>
     
     <p>
-        <s:submit key="categoryForm.save" />
-        <s:submit key="categoryForm.cancel" action="categories" />
+        <s:submit value="%{getText('categoryForm.save')}" />
+        <s:submit value="%{getText('categoryForm.cancel')}" action="categories" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp Sun Feb 28 17:07:19 2010
@@ -47,7 +47,7 @@
         <strong><s:text name="categoryDeleteOK.areYouSure" /></strong>
     </p>
     
-    <s:submit key="application.yes" />&nbsp;
-    <s:submit key="application.no" action="categories" />
+    <s:submit value="%{getText('application.yes')}" />&nbsp;
+    <s:submit value="%{getText('application.no')}" action="categories" />
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Sun Feb 28 17:07:19 2010
@@ -355,7 +355,7 @@
 <%-- Save changes and  cancel buttons --%>
 <%-- ========================================================= --%>
 
-        <s:submit key="commentManagement.update" />
+        <s:submit value="%{getText('commentManagement.update')}" />
 
     </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp Sun Feb 28 17:07:19 2010
@@ -105,7 +105,7 @@
     </div>
     <br />
     
-    <s:submit key="commentManagement.query" />
+    <s:submit value="%{getText('commentManagement.query')}" />
             
 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp Sun Feb 28 17:07:19 2010
@@ -39,7 +39,7 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit key="pingTarget.save" />
+       <s:submit value="%{getText('pingTarget.save')}" />
     </div>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp Sun Feb 28 17:07:19 2010
@@ -35,11 +35,11 @@
     <s:form action="customPingTargets!delete">
         <s:hidden name="pingTargetId" />
         <s:hidden name="weblog" value="%{actionWeblog.handle}" />
-        <s:submit key="pingTarget.removeOK" />
+        <s:submit value="%{getText('pingTarget.removeOK')}" />
     </s:form>
     &nbsp;
     <s:form action="customPingTargets">
         <s:hidden name="weblog" value="%{actionWeblog.handle}" />
-        <s:submit key="pingTarget.cancel" />
+        <s:submit value="%{getText('pingTarget.cancel')}" />
     </s:form>
 </div>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp Sun Feb 28 17:07:19 2010
@@ -40,8 +40,8 @@
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit key="pingTarget.save" />
-       <s:submit key="pingTarget.cancel" action="customPingTargets" />
+       <s:submit value="%{getText('pingTarget.save')}" />
+       <s:submit value="%{getText('pingTarget.cancel')}" action="customPingTargets" />
     </div>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp Sun Feb 28 17:07:19 2010
@@ -144,7 +144,7 @@
 
                     <br />
 
-                    <s:submit key="weblogEntryQuery.button.query" />
+                    <s:submit value="%{getText('weblogEntryQuery.button.query')}" />
 
                 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Sun Feb 28 17:07:19 2010
@@ -198,12 +198,12 @@
 
     <br>
     <div class="control">
-        <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+        <s:submit value="%{getText('weblogEdit.save')}" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
         <s:if test="userAnAuthor">
-            <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+            <s:submit value="%{getText('weblogEdit.post')}" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
         </s:if>
         <s:else>
-            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+            <s:submit value="%{getText('weblogEdit.submitForReview')}" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
         </s:else>
     </div>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Sun Feb 28 17:07:19 2010
@@ -252,13 +252,13 @@
     
     <br>
     <div class="control">
-        <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+        <s:submit value="%{getText('weblogEdit.save')}" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
 
         <s:if test="userAnAuthor">
-            <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+            <s:submit value="%{getText('weblogEdit.post')}" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
         </s:if>
         <s:else>
-            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+            <s:submit value="%{getText('weblogEdit.submitForReview')}" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
         </s:else>        
         
         <s:url id="removeUrl" action="entryRemove">
@@ -282,7 +282,7 @@
         <br />
         <s:textfield name="trackbackUrl" size="80" maxlength="255" />
 
-        <s:submit key="weblogEdit.sendTrackback" action="entryEdit!trackback" />
+        <s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback" />
     </s:if>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Sun Feb 28 17:07:19 2010
@@ -33,14 +33,14 @@
     <s:form action="entryRemove!remove">
         <s:hidden name="weblog" />
         <s:hidden name="removeId" />
-        <s:submit key="weblogEntryRemove.yes" />
+        <s:submit value="%{getText('weblogEntryRemove.yes')}" />
     </s:form>
 </td>
 <td>
     <s:form action="entryEdit">
         <s:hidden name="weblog" />
         <s:hidden name="bean.id" value="%{removeId}" />
-        <s:submit key="weblogEntryRemove.no" />
+        <s:submit value="%{getText('weblogEntryRemove.no')}" />
     </s:form>
 </td>
 </tr>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Sun Feb 28 17:07:19 2010
@@ -40,8 +40,8 @@
     </table>
     
     <p>
-        <s:submit key="folderForm.save" />
-        <s:submit key="folderForm.cancel" action="bookmarks" />
+        <s:submit value="%{getText('folderForm.save')}" />
+        <s:submit value="%{getText('folderForm.cancel')}" action="bookmarks" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Sun Feb 28 17:07:19 2010
@@ -43,8 +43,8 @@
     </table>
     
     <p>
-        <s:submit key="folderForm.save" />
-        <s:submit key="folderForm.cancel" action="bookmarks" />
+        <s:submit value="%{getText('folderForm.save')}" />
+        <s:submit value="%{getText('folderForm.cancel')}" action="bookmarks" />
     </p>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp Sun Feb 28 17:07:19 2010
@@ -23,12 +23,12 @@
     <s:hidden name="weblog" value="%{actionWeblog.handle}" />
 
     <s:text name="maintenance.prompt.flush" /><br /><br />
-    <s:submit key="maintenance.button.flush" action="maintenance!flushCache" />
+    <s:submit value="%{getText('maintenance.button.flush')}" action="maintenance!flushCache" />
 
     <s:if test="getProp('search.enabled')">
         <br /><br />
         <s:text name="maintenance.prompt.index" /><br /><br />
-        <s:submit key="maintenance.button.index" action="maintenance!index" />	
+        <s:submit value="%{getText('maintenance.button.index')}" action="maintenance!index" />	
     </s:if>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Members.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Members.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Members.jsp Sun Feb 28 17:07:19 2010
@@ -107,7 +107,7 @@
     <br />
      
     <div class="control">
-       <s:submit key="memberPermissions.button.save" />
+       <s:submit value="%{getText('memberPermissions.button.save')}" />
     </div>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp Sun Feb 28 17:07:19 2010
@@ -57,8 +57,8 @@
     </div>  
          
     <br />      
-    <s:submit key="inviteMember.button.save" />
-    <s:submit key="application.cancel" action="members" />
+    <s:submit value="%{getText('inviteMember.button.save')}" />
+    <s:submit value="%{getText('application.cancel')}" action="members" />
 
 </s:form>
 

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp Sun Feb 28 17:07:19 2010
@@ -53,7 +53,7 @@
     </table>
     
     <br />
-    <s:submit key="referers.deleteSelected" />
+    <s:submit value="%{getText('referers.deleteSelected')}" />
     
 </s:form>
 
@@ -64,5 +64,5 @@
 <p><s:text name="referers.hits" />: <s:property value="dayHits"/></p>
 <s:form action="referrers!reset">
     <s:hidden name="weblog" />
-    <s:submit key="referers.reset" />
+    <s:submit value="%{getText('referers.reset')}" />
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Sun Feb 28 17:07:19 2010
@@ -55,9 +55,9 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit key="stylesheetEdit.save" />&nbsp;&nbsp;
+                <s:submit value="%{getText('stylesheetEdit.save')}" />&nbsp;&nbsp;
                 <s:if test="!customTheme">
-                    <s:submit key="stylesheetEdit.revert" action="stylesheetEdit!revert" />
+                    <s:submit value="%{getText('stylesheetEdit.revert')}" action="stylesheetEdit!revert" />
                 </s:if>
             </td>
             <td align="right">

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Sun Feb 28 17:07:19 2010
@@ -135,7 +135,7 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit key="pageForm.save" />
+                <s:submit value="%{getText('pageForm.save')}" />
                 <input type="button" value="<s:text name="application.done"/>" onclick="window.location='<s:url action="templates"><s:param name="weblog" value="%{weblog}"/></s:url>'" />
             </td>
             <td align="right">

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp Sun Feb 28 17:07:19 2010
@@ -40,8 +40,8 @@
                 <s:hidden name="removeId" />
                 <s:hidden name="weblog" value="%{actionWeblog.handle}" />
                 
-                <s:submit key="application.yes" />&nbsp;
-                <s:submit key="application.no" action="templates" />
+                <s:submit value="%{getText('application.yes')}" />&nbsp;
+                <s:submit value="%{getText('application.no')}" action="templates" />
             </s:form>
         </td>
     </tr>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/TemplatesSidebar.jsp Sun Feb 28 17:07:19 2010
@@ -45,7 +45,7 @@
                         
                         <tr>
                             <td></td>
-                            <td><s:submit key="pagesForm.add" /></td>
+                            <td><s:submit value="%{getText('pagesForm.add')}" /></td>
                         </tr>
                     </table>
                     

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Sun Feb 28 17:07:19 2010
@@ -127,7 +127,7 @@
                 <s:text name="themeEditor.customStylesheetDescription" />
             </p>
         </s:if>
-        <p><s:submit key="themeEditor.save" /></p>
+        <p><s:submit value="%{getText('themeEditor.save')}" /></p>
     </div>
 
     <div id="customOptioner" class="optioner" style="display:none;">
@@ -186,7 +186,7 @@
             </p>
         </div>
 
-        <p><s:submit key="themeEditor.save" /></p>
+        <p><s:submit value="%{getText('themeEditor.save')}" /></p>
     </div>
 
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp Sun Feb 28 17:07:19 2010
@@ -67,7 +67,7 @@
             </p>
         </s:if>
         
-        <p><s:submit key="themeEditor.save" /></p>
+        <p><s:submit value="%{getText('themeEditor.save')}" /></p>
     </div>
     
 </s:form>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Sun Feb 28 17:07:19 2010
@@ -255,7 +255,7 @@
 
 <br />
 <div class="control">
-    <s:submit key="websiteSettings.button.update" />
+    <s:submit value="%{getText('websiteSettings.button.update')}" />
 </div>
         
 <br />
@@ -278,7 +278,7 @@
     
     <br />
     
-    <s:submit key="websiteSettings.button.remove" />
+    <s:submit value="%{getText('websiteSettings.button.remove')}" />
     
     <br />
     <br />    

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogExport.jsp Sun Feb 28 17:07:19 2010
@@ -35,7 +35,7 @@
         <s:textfield name="baseUrl" size="30" />
     </p>
     <p>
-        <s:submit key="weblogExport.exportEntries" />
+        <s:submit value="%{getText('weblogExport.exportEntries')}" />
         <s:hidden name="weblog" />
     </p>
 </s:form>
@@ -44,7 +44,7 @@
 <p class="pagetip" style="width:50%"><s:text name="weblogExport.resources.tip" /></p>
 <p>
     <s:form name="resourcesExport" action="weblogExport!exportResources" method="POST">
-        <s:submit key="weblogExport.exportResources" />
+        <s:submit value="%{getText('weblogExport.exportResources')}" />
         <s:hidden name="weblog" />
     </s:form>
 </p>

Modified: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp?rev=917205&r1=917204&r2=917205&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp (original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp Sun Feb 28 17:07:19 2010
@@ -43,13 +43,13 @@
         <td>
             <s:form action="weblogRemove!remove">
                 <s:hidden name="weblog" value="%{actionWeblog.handle}" />
-                <s:submit key="application.yes" />
+                <s:submit value="%{getText('application.yes')}" />
             </s:form>
         </td>
         <td>
             <s:form action="weblogConfig" method="post">
                 <s:hidden name="weblog" value="%{actionWeblog.handle}" />
-                <s:submit key="application.no" />
+                <s:submit value="%{getText('application.no')}" />
             </s:form>
         </td>
     </tr>



Mime
View raw message