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/06/08 15:03:54 UTC
svn commit: r1601217 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/jpa/
java/org/apache/roller/weblogger/business/plugins/entry/
java/org/apache/roller/weblogger/planet/ui/
java/org/apache/roller/weblogger/ui/rendering/serv...
Author: gmazza
Date: Sun Jun 8 13:03:53 2014
New Revision: 1601217
URL: http://svn.apache.org/r1601217
Log:
ROL-1434 Added additional i18n keys where it makes sense to do so -- leaving out for unexplained system errors where one would be expected to Google the error string and hence benefit from an English message.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
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/BookmarksImport.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/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java Sun Jun 8 13:03:53 2014
@@ -313,7 +313,6 @@ public class JPAPersistenceStrategy {
InputStream in;
in = cl.getResourceAsStream(resourceName);
if (in == null) {
- //TODO: Check how i18n is done in roller
throw new WebloggerException(
"Could not locate properties to load " + resourceName);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java Sun Jun 8 13:03:53 2014
@@ -245,7 +245,6 @@ public class TopicTagPlugin implements W
*/
public String getName()
{
- // TODO: i18n
return "Topic Tags";
}
@@ -256,7 +255,6 @@ public class TopicTagPlugin implements W
*/
public String getDescription()
{
- // TODO: i18n
return "Expands topic tags for <a href=\\'http://www.technorati.com\\'>Technorati</a> and similar sites. " +
"Topic tags are of the form <code>topic:{topicbookmark}[tag]</code>, where <code>topicbookmark</code> " +
"is the name of a bookmark whose URL will be used for the site name in the topic tag. " +
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java Sun Jun 8 13:03:53 2014
@@ -117,9 +117,8 @@ public class PlanetGroups extends Planet
addMessage("planetGroups.success.saved");
} catch(Exception ex) {
- log.error("Error saving planet group - "+getBean().getId(), ex);
- // TODO: i18n
- addError("Error saving planet group");
+ log.error("Error saving planet group - " + getBean().getId(), ex);
+ addError("planetGroups.error.saved");
}
}
@@ -141,7 +140,6 @@ public class PlanetGroups extends Planet
addMessage("planetSubscription.success.deleted");
} catch(Exception ex) {
log.error("Error deleting planet group - "+getBean().getId());
- // TODO: i18n
addError("Error deleting planet group");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Sun Jun 8 13:03:53 2014
@@ -96,7 +96,6 @@ public class TrackbackServlet extends Ht
WeblogTrackbackRequest trackbackRequest = null;
if (!WebloggerRuntimeConfig.getBooleanProperty("users.trackbacks.enabled")) {
- // TODO: i18n
error = "Trackbacks are disabled for this site";
} else {
@@ -202,10 +201,8 @@ public class TrackbackServlet extends Ht
}
} else if (entry!=null) {
- // TODO: i18n
- error = "Comments and Trackbacks are disabled for the entry you specified.";
+ error = "Comments and Trackbacks are disabled for the entry specified.";
} else {
- // TODO: i18n
error = "Entry not specified.";
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Sun Jun 8 13:03:53 2014
@@ -113,16 +113,13 @@ public class CreateUser extends UIAction
mgr.addUser(newUser);
WebloggerFactory.getWeblogger().flush();
- // TODO: i18n
- addMessage("User " + getBean().getUserName() + " created. If desired, create another new user below or" +
- " select Cancel to return to User Administration.");
+ addMessage("createUser.add.success", getBean().getUserName());
setBean(new CreateUserBean());
initializeBean();
return INPUT;
} catch (WebloggerException e) {
log.error("Error adding new user", e);
- // TODO: i18n
- addError("Error creating user");
+ addError("Error creating user -- see Roller logs for more details");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Sun Jun 8 13:03:53 2014
@@ -102,7 +102,6 @@ public class GlobalConfig extends UIActi
setProperties(mgr.getProperties());
} catch (WebloggerException ex) {
log.error("Error getting runtime properties map", ex);
- // TODO: i18n
addError("Unexpected error accessing Roller properties");
}
@@ -206,7 +205,6 @@ public class GlobalConfig extends UIActi
} catch (WebloggerException ex) {
log.error("Error saving roller properties", ex);
- // TODO: i18n
addError("error.update.rollerConfig");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java Sun Jun 8 13:03:53 2014
@@ -71,8 +71,7 @@ public abstract class PingTargetAddBase
} catch (WebloggerException ex) {
getLogger().error("Error adding ping target", ex);
- // TODO: i18n
- addError("Error adding ping target.");
+ addError("pingTarget.saved.error");
}
}
@@ -98,7 +97,6 @@ public abstract class PingTargetAddBase
}
} catch (WebloggerException ex) {
getLogger().error("Error validating ping target", ex);
- // TODO: i18n
addError("Error doing ping target validation");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java Sun Jun 8 13:03:53 2014
@@ -110,8 +110,7 @@ public abstract class PingTargetEditBase
addMessage("pingTarget.saved");
} catch (WebloggerException ex) {
getLogger().error("Error saving ping target", ex);
- // TODO: i18n
- addError("Error saving ping target.");
+ addError("pingTarget.saved.error");
}
}
@@ -137,8 +136,7 @@ public abstract class PingTargetEditBase
}
} catch (WebloggerException ex) {
getLogger().error("Error validating ping target", ex);
- // TODO: i18n
- addError("Error doing ping target validation");
+ addError("pingTarget.saved.error");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Sun Jun 8 13:03:53 2014
@@ -71,8 +71,7 @@ public class CreateWeblog extends UIActi
if (permissions.size() > 0) {
// sneaky user trying to get around 1 blog limit that applies
// only when group blogging is disabled
- // TODO: i18n
- addError("Sorry, you are only allowed to have 1 weblog.");
+ addError("createWebsite.oneBlogLimit");
return "menu";
}
}
@@ -99,8 +98,7 @@ public class CreateWeblog extends UIActi
if (permissions.size() > 0) {
// sneaky user trying to get around 1 blog limit that applies
// only when group blogging is disabled
- // TODO: i18n
- addError("Sorry, you are only allowed to have 1 weblog.");
+ addError("createWebsite.oneBlogLimit");
return "menu";
}
}
@@ -176,8 +174,7 @@ public class CreateWeblog extends UIActi
}
} catch (WebloggerException ex) {
log.error("error checking for weblog", ex);
- // TODO: i18n
- addError("unexpected error");
+ addError("Unexpected error validating weblog -- check Roller logs");
}
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java Sun Jun 8 13:03:53 2014
@@ -126,16 +126,13 @@ public class Profile extends UIAction {
// save the updated profile
mgr.saveUser(existingUser);
WebloggerFactory.getWeblogger().flush();
-
- // TODO: i18n
- addMessage("profile updated.");
+ addMessage("yourProfile.saved");
return SUCCESS;
} catch (WebloggerException ex) {
log.error("ERROR in action", ex);
- // TODO: i18n
- addError("unexpected error doing profile save");
+ addError("Unexpected error doing profile save");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Sun Jun 8 13:03:53 2014
@@ -267,7 +267,6 @@ public class Register extends UIAction i
} catch (WebloggerException ex) {
log.error("Error adding new user", ex);
- // TODO: i18n
addError("Error adding new user");
}
}
@@ -388,8 +387,7 @@ public class Register extends UIAction i
}
} catch (WebloggerException ex) {
log.error("error checking for user", ex);
- // TODO: i18n
- addError("unexpected error");
+ addError("Unexpected error checking user -- check Roller logs");
}
}
}
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=1601217&r1=1601216&r2=1601217&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 Sun Jun 8 13:03:53 2014
@@ -82,7 +82,6 @@ public class BookmarkAdd extends UIActio
public String execute() {
if(getFolder() == null) {
- // TODO: i18n
addError("Cannot add bookmark to null folder");
return ERROR;
}
@@ -94,7 +93,6 @@ public class BookmarkAdd extends UIActio
public String save() {
if(getFolder() == null) {
- // TODO: i18n
addError("Cannot add bookmark to null folder");
return ERROR;
}
@@ -126,8 +124,7 @@ public class BookmarkAdd extends UIActio
} catch(Exception ex) {
log.error("Error saving new bookmark", ex);
- // TODO: i18n
- addError("Error saving new bookmark");
+ addError("bookmarkForm.error.saving");
}
}
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=1601217&r1=1601216&r2=1601217&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 Sun Jun 8 13:03:53 2014
@@ -81,7 +81,6 @@ public class BookmarkEdit extends UIActi
public String execute() {
if(getBookmark() == null) {
- // TODO: i18n
addError("Cannot edit null bookmark");
return ERROR;
}
@@ -96,7 +95,6 @@ public class BookmarkEdit extends UIActi
public String save() {
if(getBookmark() == null) {
- // TODO: i18n
addError("Cannot edit null bookmark");
return ERROR;
}
@@ -118,8 +116,7 @@ public class BookmarkEdit extends UIActi
} catch(Exception ex) {
log.error("Error saving bookmark", ex);
- // TODO: i18n
- addError("Error saving bookmark");
+ addError("bookmarkForm.error.saving");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java Sun Jun 8 13:03:53 2014
@@ -131,7 +131,6 @@ public final class BookmarksImport exten
}
} catch (Exception ex) {
log.error("ERROR: importing bookmarks", ex);
- // TODO: i18n
addError("bookmarksImport.error", ex.toString());
} finally {
if (stream != null) {
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=1601217&r1=1601216&r2=1601217&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 Sun Jun 8 13:03:53 2014
@@ -92,8 +92,7 @@ public class CategoryAdd extends UIActio
} catch(Exception ex) {
log.error("Error saving new category", ex);
- // TODO: i18n
- addError("Error saving new category");
+ addError("categoryForm.error.saving");
}
}
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=1601217&r1=1601216&r2=1601217&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 Sun Jun 8 13:03:53 2014
@@ -79,7 +79,6 @@ public class CategoryEdit extends UIActi
public String execute() {
if (getCategory() == null) {
- // TODO: i18n
addError("Cannot edit null category");
return ERROR;
}
@@ -97,7 +96,6 @@ public class CategoryEdit extends UIActi
public String save() {
if(getCategory() == null) {
- // TODO: i18n
addError("Cannot edit null category");
return ERROR;
}
@@ -122,8 +120,7 @@ public class CategoryEdit extends UIActi
} catch(Exception ex) {
log.error("Error saving category", ex);
- // TODO: i18n
- addError("Error saving category");
+ addError("categoryForm.error.saving");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Sun Jun 8 13:03:53 2014
@@ -127,7 +127,6 @@ public class CategoryRemove extends UIAc
} catch(Exception ex) {
log.error("Error removing category - "+getRemoveId(), ex);
- // TODO: i18n
addError("Error removing category");
}
}
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=1601217&r1=1601216&r2=1601217&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 Sun Jun 8 13:03:53 2014
@@ -128,7 +128,6 @@ public class Comments extends UIAction {
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
- // TODO: i18n
addError("Error looking up comments");
}
@@ -211,7 +210,6 @@ public class Comments extends UIAction {
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
- // TODO: i18n
addError("Error looking up comments");
}
@@ -270,7 +268,6 @@ public class Comments extends UIAction {
} catch (WebloggerException ex) {
log.error("Error doing bulk delete", ex);
- // TODO: i18n
addError("Bulk delete failed due to unexpected error");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Sun Jun 8 13:03:53 2014
@@ -113,7 +113,6 @@ public class Entries extends UIAction {
}
} catch (WebloggerException ex) {
log.error("Error looking up entries", ex);
- // TODO: i18n
addError("Error looking up entries");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Sun Jun 8 13:03:53 2014
@@ -217,8 +217,7 @@ public final class EntryAdd extends Entr
} catch (Exception e) {
log.error("Error saving new entry", e);
- // TODO: i18n
- addError("Error saving new entry");
+ addError("weblogEdit.error.saving");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Sun Jun 8 13:03:53 2014
@@ -247,8 +247,7 @@ public final class EntryEdit extends Ent
} catch (Exception e) {
log.error("Error saving new entry", e);
- // TODO: i18n
- addError("Error saving new entry");
+ addError("weblogEdit.error.saving");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java Sun Jun 8 13:03:53 2014
@@ -107,7 +107,6 @@ public class EntryRemove extends EntryBa
} catch (Exception e) {
log.error("Error removing entry " + getRemoveId(), e);
- // TODO: i18n
addError("Error removing entry");
}
} else {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Sun Jun 8 13:03:53 2014
@@ -82,8 +82,7 @@ public class FolderAdd extends UIAction
// notify caches
CacheManager.invalidate(newFolder);
- // TODO: i18n
- addMessage("folder added");
+ addMessage("folderForm.add.success");
// Set for next action
getBean().setId(newFolder.getId());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Sun Jun 8 13:03:53 2014
@@ -123,8 +123,7 @@ public class FolderEdit extends UIAction
// notify caches
CacheManager.invalidate(getFolder());
- // TODO: i18n
- addMessage("folder updated");
+ addMessage("folderForm.update.success");
} catch(Exception ex) {
log.error("Error saving folder", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java Sun Jun 8 13:03:53 2014
@@ -69,8 +69,7 @@ public class Maintenance extends UIActio
addMessage("maintenance.message.indexed");
} catch (Exception ex) {
log.error("Error doing index rebuild", ex);
- // TODO: i18n
- addError("Error rebuilding search index");
+ addError("maintenance.message.indexed.failure");
}
return SUCCESS;
@@ -98,7 +97,6 @@ public class Maintenance extends UIActio
} catch (Exception ex) {
log.error("Error saving weblog - "+getActionWeblog().getHandle(), ex);
- // TODO: i18n
addError("Error flushing page cache");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java Sun Jun 8 13:03:53 2014
@@ -207,7 +207,6 @@ public class MediaFileAdd extends MediaF
} catch (Exception e) {
log.error("Error uploading media file", e);
- // TODO: i18n
addError("mediaFileAdd.errorUploading", bean.getName());
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java Sun Jun 8 13:03:53 2014
@@ -141,9 +141,8 @@ public class MediaFileView extends Media
addMessage("mediaFile.directoryCreate.success");
dirCreated = true;
} catch (WebloggerException e) {
- log.error("Error creating new directory by path", e);
- // TODO: i18n
- addError("Error creating new directory by path");
+ log.error("Error creating new directory", e);
+ addError("Error creating new directory");
}
}
@@ -262,8 +261,7 @@ public class MediaFileView extends Media
} catch (Exception e) {
log.error("Error applying search criteria", e);
- // TODO: i18n
- addError("Error applying search criteria");
+ addError("Error applying search criteria - check Roller logs");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MemberResign.java Sun Jun 8 13:03:53 2014
@@ -69,8 +69,7 @@ public class MemberResign extends UIActi
addMessage("yourWebsites.resigned", getWeblog());
} catch (WebloggerException ex) {
log.error("Error doing weblog resign - " + getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Resignation failed.");
+ addError("Resignation failed - check system logs");
}
return SUCCESS;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Sun Jun 8 13:03:53 2014
@@ -66,8 +66,7 @@ public class MembersInvite extends UIAct
// if group blogging is disabled then you can't change permissions
if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
- // TODO: i18n
- addError("invitations disabled");
+ addError("inviteMember.disabled");
return SUCCESS;
}
@@ -84,8 +83,7 @@ public class MembersInvite extends UIAct
// if group blogging is disabled then you can't change permissions
if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
- // TODO: i18n
- addError("invitations disabled");
+ addError("inviteMember.disabled");
return SUCCESS;
}
@@ -102,7 +100,6 @@ public class MembersInvite extends UIAct
}
} catch(WebloggerException ex) {
log.error("Error looking up user by id - "+getUserName(), ex);
- // TODO: i18n
addError("Error looking up invitee");
}
@@ -123,7 +120,6 @@ public class MembersInvite extends UIAct
} catch (WebloggerException ex) {
log.error("Error looking up permissions for weblog - "+getActionWeblog().getHandle(), ex);
- // TODO: i18n
addError("Error checking existing permissions");
}
@@ -153,8 +149,7 @@ public class MembersInvite extends UIAct
} catch (Exception ex) {
log.error("Error creating user invitation", ex);
- // TODO: i18n
- addError("Error creating user invitation");
+ addError("Error creating user invitation - check Roller logs");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Sun Jun 8 13:03:53 2014
@@ -91,7 +91,6 @@ public class Pings extends UIAction {
setCommonPingTargets(pingTargetMgr.getCommonPingTargets());
} catch (WebloggerException ex) {
log.error("Error loading ping target lists for weblog - "+getActionWeblog().getHandle(), ex);
- // TODO: i18n
addError("Error loading ping targets");
}
}
@@ -122,7 +121,6 @@ public class Pings extends UIAction {
WebloggerFactory.getWeblogger().flush();
} catch(Exception ex) {
log.error("Error saving auto ping for target - "+getPingTargetId(), ex);
- // TODO: i18n
addError("Error enabling auto ping");
}
}
@@ -143,7 +141,6 @@ public class Pings extends UIAction {
WebloggerFactory.getWeblogger().flush();
} catch (Exception ex) {
log.error("Error removing auto ping for target - "+getPingTargetId(), ex);
- // TODO: i18n
addError("Error disabling auto ping");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Sun Jun 8 13:03:53 2014
@@ -201,8 +201,7 @@ public class StylesheetEdit extends UIAc
public String save() {
if (getTemplate() == null) {
- // TODO: i18n
- addError("Unable to locate stylesheet template");
+ addError("stylesheetEdit.error.cannotFind");
return ERROR;
}
@@ -260,8 +259,7 @@ public class StylesheetEdit extends UIAc
} catch (WebloggerException ex) {
log.error("Error updating stylesheet template for weblog - "
+ getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error saving template");
+ addError("Error saving template - check Roller logs");
}
}
@@ -274,15 +272,13 @@ public class StylesheetEdit extends UIAc
public String revert() {
if (getTemplate() == null) {
- // TODO: i18n
- addError("Unable to locate stylesheet template");
+ addError("stylesheetEdit.error.cannotFind");
return ERROR;
}
// make sure we are still using a shared theme so that reverting is
// possible
if (WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme())) {
- // TODO: i18n
addError("stylesheetEdit.error.customTheme");
}
@@ -336,8 +332,7 @@ public class StylesheetEdit extends UIAc
} catch (WebloggerException ex) {
log.error("Error updating stylesheet template for weblog - "
+ getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error saving template");
+ addError("stylesheetEdit.revert.failure");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sun Jun 8 13:03:53 2014
@@ -79,7 +79,6 @@ public class TemplateEdit extends UIActi
public String execute() {
try {
if (getTemplate() == null) {
- // TODO: i18n
addError("Unable to locate specified template");
return LIST;
}
@@ -96,8 +95,7 @@ public class TemplateEdit extends UIActi
} catch (WebloggerException ex) {
log.error("Error updating page - " + getBean().getId(), ex);
- // TODO: i18n
- addError("Error saving template");
+ addError("Error saving template - check Roller logs");
}
return INPUT;
@@ -110,7 +108,6 @@ public class TemplateEdit extends UIActi
log.debug("Entering save()");
if (getTemplate() == null) {
- // TODO: i18n
addError("Unable to locate specified template");
return LIST;
}
@@ -148,8 +145,7 @@ public class TemplateEdit extends UIActi
} catch (Exception ex) {
log.error("Error updating page - " + getBean().getId(), ex);
- // TODO: i18n
- addError("Error saving template");
+ addError("Error updating template - check Roller logs");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sun Jun 8 13:03:53 2014
@@ -123,8 +123,7 @@ public class Templates extends UIAction
} catch (WebloggerException ex) {
log.error("Error getting templates for weblog - "
+ getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error getting template list");
+ addError("Error getting template list - check Roller logs");
}
return LIST;
@@ -209,8 +208,7 @@ public class Templates extends UIAction
} catch (WebloggerException ex) {
log.error("Error adding new template for weblog - "
+ getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error adding new template");
+ addError("Error adding new template - check Roller logs");
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Sun Jun 8 13:03:53 2014
@@ -156,8 +156,7 @@ public class ThemeEdit extends UIAction
} catch (Exception re) {
log.error("Error customizing theme for weblog - "
+ getActionWeblog().getHandle(), re);
- // TODO: i18n
- addError("Error importing theme");
+ addError("Error importing theme - check Roller logs");
}
if (!hasActionErrors()) {
@@ -175,9 +174,7 @@ public class ThemeEdit extends UIAction
// change
CacheManager.invalidate(weblog);
- // TODO: i18n
- addMessage("Successfully set theme to - "
- + WeblogTheme.CUSTOM);
+ addMessage("themeEditor.setTheme.success", WeblogTheme.CUSTOM);
if (t != null) {
addMessage("Successfully copied templates from theme - "
+ t.getName());
@@ -194,8 +191,7 @@ public class ThemeEdit extends UIAction
}
}
} else {
- // TODO: i18n
- addError("Sorry, custom themes are not allowed");
+ addError("themeEditor.customTheme.disallowed");
}
// we are dealing with a shared theme scenario
@@ -204,9 +200,7 @@ public class ThemeEdit extends UIAction
// make sure theme is valid and enabled
Theme newTheme = null;
if (getThemeId() == null) {
- // TODO: i18n
addError("No theme specified");
-
} else {
try {
ThemeManager themeMgr = WebloggerFactory.getWeblogger()
@@ -214,13 +208,11 @@ public class ThemeEdit extends UIAction
newTheme = themeMgr.getTheme(getThemeId());
if (!newTheme.isEnabled()) {
- // TODO: i18n
addError("Theme not enabled");
}
} catch (Exception ex) {
log.warn(ex);
- // TODO: i18n
addError("Theme not found");
}
}
@@ -266,7 +258,7 @@ public class ThemeEdit extends UIAction
// Theme set to..
if (!originalTheme.equals(getThemeId())) {
- addMessage("themeEditor.settheme", newTheme.getName());
+ addMessage("themeEditor.setTheme.success", newTheme.getName());
}
} catch (WebloggerException re) {
@@ -279,7 +271,6 @@ public class ThemeEdit extends UIAction
// unknown theme scenario, error
} else {
// invalid theme type
- // TODO: i18n
addError("no valid theme type submitted");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Sun Jun 8 13:03:53 2014
@@ -172,7 +172,6 @@ public class WeblogConfig extends UIActi
} catch (Exception ex) {
log.error("Error updating weblog config", ex);
- // TODO: i18n
addError("Error updating configuration");
}
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1601217&r1=1601216&r2=1601217&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sun Jun 8 13:03:53 2014
@@ -59,6 +59,7 @@ Bookmark.error.priorityNotInt=Priority m
Bookmark.error.imageBad=The image URL you entered is not valid
Bookmark.error.feedUrlBad=The feed URL you entered is not valid
bookmarkForm.error.duplicateName=Bookmark with that name already exists in folder
+bookmarkForm.error.saving=Error saving new bookmark
# ----------------------------------------------------------- BookmarksForm.jsp
@@ -159,6 +160,7 @@ 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
+categoryForm.error.saving=Error saving new category
# errors from validation
Category.error.nameNull=Name is a required field
@@ -471,6 +473,8 @@ 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
CreateWeblog.error.handleNull=Handle is a required field
CreateWeblog.error.handleSize=Handle cannot be more than 255 characters
@@ -646,6 +650,9 @@ folderForm.save=Save
folderForm.cancel=Cancel
folderForm.description=Description
+folderForm.add.success=Folder added
+folderForm.update.success=Folder updated
+
folderForm.save.exception=ERROR saving folder, perhaps name is not unique? \
The error message is: {0}
@@ -763,6 +770,8 @@ inviteMember.notificationContent=You hav
Click the following link and login as user [{2}] to accept or decline this \
invitation <{3}>.
+inviteMember.disabled=invitations disabled
+
# ------------------------------------------------------------------- Installer
installer.bannerTitleLeft=Apache Roller Weblogger
@@ -972,6 +981,7 @@ maintenance.prompt.flush=Flush the page
maintenance.button.flush=Flush Cache
maintenance.message.indexed=Successfully scheduled search index rebuild for your \
Roller weblog
+maintenance.message.indexed.failure=Error rebuilding search index - check system logs
maintenance.message.flushed=Successfully flushed the page cache of your \
Roller weblog
@@ -1440,6 +1450,7 @@ pingTarget.auto=Automatic
pingTarget.manual=Manual
pingTarget.sendPingNow=Send Ping Now
pingTarget.saved=Ping target saved.
+pingTarget.saved.error=Error adding ping target.
pingTarget.nameNotUnique=The name of this target conflicts with another one in \
the same set of targets.
@@ -1587,6 +1598,7 @@ planetGroups.button.delete=Delete
planetGroups.success.deleted=Group successfully deleted
planetGroups.success.saved=Saved group
+planetGroups.error.saved=Error saving planet group - duplicate?
planetGroups.error.title=Title is required
planetGroups.error.handle=Handle is required
@@ -1623,11 +1635,13 @@ your system administrator to see about e
stylesheetEdit.create.success=Custom stylesheet created successfully.
stylesheetEdit.save.success=Stylesheet updated successfully.
stylesheetEdit.revert.success=Stylesheet reverted successfully.
+stylesheetEdit.revert.failure=Error reverting template - check Roller logs
stylesheetEdit.default.success=Stylesheet deleted successfully. Your theme is now using the Shared Theme default.
stylesheetEdit.default.noStylesheetOverride=Note: clicking the stylesheet tab will \
recreate your custom override stylesheet again from the theme default.
stylesheetEdit.error.customTheme=Cannot revert stylesheet on custom themes.
+stylesheetEdit.error.cannotFind=Unable to locate stylesheet template
stylesheetEdit.confirmDelete=Are you sure you want to delete your stylesheet?
stylesheetEdit.confirmRevert=Are you sure you want to revert your stylesheet to the theme default?
@@ -1741,7 +1755,8 @@ Please select the theme you would like t
themeEditor.save=Update Theme
-themeEditor.settheme=Successfully set theme to - {0}
+themeEditor.setTheme.success=Successfully set theme to - {0}
+themeEditor.customTheme.disallowed=Sorry, custom themes are not allowed
# ---------------------------------------------------------------------- Uploads
@@ -2098,6 +2113,8 @@ weblogEdit.mediaCastResponseError=The en
weblogEdit.mediaCastLacksContentTypeOrLength=Unable to use enclosure URL. Server provided no content type or no length.
weblogEdit.mediaCastErrorRemoving=Error removing MediaCast from weblog entry
weblogEdit.error.incompleteEntry=Entry must have a title
+weblogEdit.error.saving=Error saving new entry
+
# errors from validation
Entry.error.titleNull=Title is a required field
@@ -2456,6 +2473,9 @@ yourWebsites.todaysHits=Today''s hits:
# ---------------------------------------------------------------- Activating User Account with E-mail
+createUser.add.success=User {0} created. If desired, create another new user below or \
+select Cancel to return to User Administration
+
error.add.user.mailSendException=ERROR sending email, is your address valid?
error.add.user.mailSetupException=ERROR in email configuration, contact Roller administrator
error.add.user.activationCodeInUse=\