Author: ghuber
Date: Wed Mar 26 09:58:09 2014
New Revision: 1581773
URL: http://svn.apache.org/r1581773
Log:
i18n/testing changes.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.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
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
Wed Mar 26 09:58:09 2014
@@ -117,8 +117,7 @@ public class BookmarkAdd extends UIActio
CacheManager.invalidate(newBookmark);
- // TODO: i18n
- addMessage("bookmark added");
+ addMessage("bookmarkForm.created");
// Set for next action
getBean().setId(newBookmark.getId());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Wed Mar 26 09:58:09 2014
@@ -114,8 +114,8 @@ public class BookmarkEdit extends UIActi
CacheManager.invalidate(getBookmark());
- // TODO: i18n
- addMessage("bookmark updated");
+ addMessage("bookmarkForm.changesSaved");
+
} catch(Exception ex) {
log.error("Error saving bookmark", ex);
// TODO: i18n
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
Wed Mar 26 09:58:09 2014
@@ -86,8 +86,7 @@ public class CategoryAdd extends UIActio
// notify caches
CacheManager.invalidate(newCategory);
- // TODO: i18n
- addMessage("category added");
+ addMessage("categoryForm.created");
return SUCCESS;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
Wed Mar 26 09:58:09 2014
@@ -118,8 +118,7 @@ public class CategoryEdit extends UIActi
// notify caches
CacheManager.invalidate(getCategory());
- // TODO: i18n
- addMessage("category updated");
+ addMessage("categoryForm.changesSaved");
} catch(Exception ex) {
log.error("Error saving category", ex);
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Mar
26 09:58:09 2014
@@ -45,11 +45,14 @@ bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Save
bookmarkForm.url=Bookmark URL
+bookmarkForm.created=Bookmark created
+bookmarkForm.changesSaved=Changes saved
+
# errors from validation
Bookmark.error.nameNull=Name is a required field
Bookmark.error.nameSize=Name cannot be more than 255 characters
Bookmark.error.descriptionSize=Description cannot be more than 255 characters
-Bookmark.error.urlNull=URL is a required field
+Bookmark.error.urlNull=Bookmark URL is a required field
Bookmark.error.urlBad=The URL you entered is not valid
Bookmark.error.priorityNull=Priority is a required field
Bookmark.error.priorityNotInt=Priority must be a valid integer
@@ -149,9 +152,11 @@ categoryForm.correct.subtitle=Correcting
categoryForm.name=Name
categoryForm.description=Description
-categoryForm.image=image
+categoryForm.image=Image URL
categoryForm.save=Save
categoryForm.cancel=Cancel
+categoryForm.created=Category created
+categoryForm.changesSaved=Changes saved
categoryForm.error.duplicateName=The category name ''{0}'' is already in use,
you will need to choose another
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp?rev=1581773&r1=1581772&r2=1581773&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
Wed Mar 26 09:58:09 2014
@@ -30,7 +30,6 @@
<img src='<s:url value="/images/folder_add.png"/>'
border="0"alt="icon" />
<s:url id="addCategory" action="categoryAdd">
<s:param name="weblog" value="%{actionWeblog.handle}"
/>
- <s:param name="categoryId" value="%{category.id}" />
</s:url>
<s:a href="%{addCategory}"><s:text
name="categoriesForm.addCategory" /></s:a>
</p>
@@ -40,4 +39,4 @@
</div>
</div>
-</div>
+</div>
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=1581773&r1=1581772&r2=1581773&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
Mar 26 09:58:09 2014
@@ -21,10 +21,6 @@
<s:text name="categoryForm.add.subtitle" />
</p>
-<p>
- <b><s:text name="categoriesForm.name" /></b>:<s:property
value="category.name" />
-</p>
-
<s:form action="categoryAdd!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
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=1581773&r1=1581772&r2=1581773&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
Mar 26 09:58:09 2014
@@ -21,12 +21,8 @@
<s:text name="categoryForm.edit.subtitle" />
</p>
-<p>
- <b><s:text name="categoriesForm.name" /></b>:<s:property
value="category.name" />
-</p>
-
<s:form action="categoryEdit!save">
- <s:hidden name="salt" />
+ <s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
