Author: snoopdave
Date: Sat Oct 12 19:45:19 2013
New Revision: 1531586
URL: http://svn.apache.org/r1531586
Log:
Merging in rev 1523445 from Roller trunk (used a set of patch files, applied
each separately)
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
Sat Oct 12 19:45:19 2013
@@ -65,8 +65,7 @@ public class CommonPingTargets extends P
setPingTargets(pingTargetMgr.getCommonPingTargets());
} catch (WebloggerException ex) {
log.error("Error loading common ping targets", ex);
- // TODO: i18n
- addError("Error loading common ping targets");
+ addError("commonPingTargets.error.loading");
}
}
@@ -85,12 +84,10 @@ public class CommonPingTargets extends P
WebloggerFactory.getWeblogger().flush();
} catch (Exception ex) {
getLogger().error("Error saving ping target", ex);
- // TODO: i18n
- addError("Error saving ping target.");
+ addError("commonPingTargets.error.saving");
}
} else {
- // TODO: i18n
- addError("Cannot enable ping target - "+getPingTargetId());
+ addError("commonPingTargets.error.enabling");
}
return LIST;
@@ -111,12 +108,10 @@ public class CommonPingTargets extends P
WebloggerFactory.getWeblogger().flush();
} catch (Exception ex) {
getLogger().error("Error saving ping target", ex);
- // TODO: i18n
- addError("Error saving ping target.");
+ addError("commonPingTargets.error.saving");
}
} else {
- // TODO: i18n
- addError("Cannot disable ping target - "+getPingTargetId());
+ addError("commonPingTargets.error.disabling");
}
return LIST;
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
Sat Oct 12 19:45:19 2013
@@ -122,8 +122,7 @@ public class GlobalCommentManagement ext
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
- // TODO: i18n
- addError("Error looking up comments");
+ addError("commentManagement.lookupError");
}
// build comments pager
@@ -201,8 +200,7 @@ public class GlobalCommentManagement ext
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
- // TODO: i18n
- addError("Error looking up comments");
+ addError("commentManagement.lookupError");
}
return LIST;
@@ -224,8 +222,7 @@ public class GlobalCommentManagement ext
getBean().getEndDate(),
getBean().getStatus());
- // TODO: i18n
- addMessage("Successfully deleted "+deleted+" comments");
+
addMessage("commentManagement.deleteSuccess",Integer.toString(deleted));
// reset form and load fresh comments list
setBean(new GlobalCommentManagementBean());
@@ -234,8 +231,7 @@ public class GlobalCommentManagement ext
} catch (WebloggerException ex) {
log.error("Error doing bulk delete", ex);
- // TODO: i18n
- addError("Bulk delete failed due to unexpected error");
+ addError("commentManagement.deleteError");
}
return LIST;
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
Sat Oct 12 19:45:19 2013
@@ -58,13 +58,11 @@ public abstract class PingTargetEditBase
}
if(getPingTarget() == null) {
- // TODO: i18n
- addError("No such ping target id: " + getBean().getId());
+ addError("pingTarget.notFound", getBean().getId());
}
} else {
- // TODO: i18n
- addError("Missing ping target id: " + getBean().getId());
+ addError("pingTarget.unspecified");
}
}
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
Sat Oct 12 19:45:19 2013
@@ -88,8 +88,7 @@ public abstract class PingTargetsBase ex
return "confirm";
} else {
- // TODO: i18n
- addError("Cannot delete ping target: " + getPingTargetId());
+ addError("pingTarget.notFound",getPingTargetId());
}
return LIST;
@@ -111,17 +110,14 @@ public abstract class PingTargetsBase ex
// remove deleted target from list
getPingTargets().remove(getPingTarget());
- // TODO: i18n
- addMessage("Successfully deleted ping target:
"+getPingTarget().getName());
+ addMessage("pingTarget.successfullyDeleted",
getPingTarget().getName());
} catch (WebloggerException ex) {
getLogger().error("Error deleting ping target -
"+getPingTargetId(), ex);
- // TODO: i18n
- addError("Error deleting ping target - "+getPingTargetId());
+ addError("pingTarget.errorDeleting", getPingTargetId());
}
} else {
- // TODO: i18n
- addError("Cannot delete ping target: " + getPingTargetId());
+ addError("pingTarget.notFound", getPingTargetId());
}
return LIST;
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
Sat Oct 12 19:45:19 2013
@@ -186,9 +186,9 @@ public class MediaFileAdd extends MediaF
uploaded.add(mediaFile);
} catch (Exception e) {
- log.error("Error saving new entry", e);
+ log.error("Error uploading media file", e);
// TODO: i18n
- addError("Error reading uploaded file - " +
bean.getName());
+ addError("mediaFileAdd.errorUploading",
bean.getName());
}
}
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
Sat Oct 12 19:45:19 2013
@@ -62,8 +62,7 @@ public class MediaFileBase extends UIAct
addMessage("mediaFile.delete.success");
} catch (WebloggerException e) {
log.error("Error deleting media file", e);
- // TODO: i18n
- addError("Error deleting media file - " + this.mediaFileId);
+ addError("mediaFile.delete.error",this.mediaFileId);
}
}
@@ -83,8 +82,7 @@ public class MediaFileBase extends UIAct
addMessage("mediaFile.includeInGallery.success");
} catch (WebloggerException e) {
log.error("Error including media file in gallery", e);
- // TODO: i18n
- addError("Error including media file in gallery - " +
this.mediaFileId);
+ addError("mediaFile.includeInGallery.error",this.mediaFileId);
}
}
@@ -123,8 +121,7 @@ public class MediaFileBase extends UIAct
} catch (WebloggerException e) {
log.error("Error deleting selected media files", e);
- // TODO: i18n
- addError("Error deleting selected media files");
+ addError("mediaFile.delete.error");
}
}
@@ -165,8 +162,7 @@ public class MediaFileBase extends UIAct
} catch (WebloggerException e) {
log.error("Error moving selected media files", e);
- // TODO: i18n
- addError("Error moving selected media files");
+ addError("mediaFile.move.errors");
}
}
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
Sat Oct 12 19:45:19 2013
@@ -98,9 +98,8 @@ public class MediaFileEdit extends Media
addError("uploadFiles.error.upload", bean.getName());
} catch (Exception e) {
- log.error("Error saving new entry", e);
- // TODO: i18n
- addError("Error reading uploaded file - " + bean.getName());
+ log.error("Error uploading file " + bean.getName(), e);
+ addError("uploadFiles.error.upload", bean.getName());
}
return INPUT;
@@ -137,9 +136,8 @@ public class MediaFileEdit extends Media
addError("uploadFiles.error.upload", bean.getName());
} catch (Exception e) {
- log.error("Error saving new entry", e);
- // TODO: i18n
- addError("Error reading uploaded file - " + bean.getName());
+ log.error("Error uploading file " + bean.getName(), e);
+ addError("uploadFiles.error.upload", bean.getName());
}
}
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
Sat Oct 12 19:45:19 2013
@@ -130,15 +130,14 @@ public class Members extends UIAction im
} catch (Exception ex) {
log.error("Error saving permissions on weblog -
"+getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error saving permissions");
+ addError("memberPermissions.saveError");
}
if (removed > 0) {
- addMessage("memberPermissions.membersRemoved", ""+removed);
+ addMessage("memberPermissions.membersRemoved",
Integer.toString(removed));
}
if (changed > 0) {
- addMessage("memberPermissions.membersChanged", ""+changed);
+ addMessage("memberPermissions.membersChanged",
Integer.toString(changed));
}
return LIST;
Modified:
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java?rev=1531586&r1=1531585&r2=1531586&view=diff
==============================================================================
---
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
(original)
+++
roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
Sat Oct 12 19:45:19 2013
@@ -66,14 +66,12 @@ public class WeblogRemove extends UIActi
CacheManager.invalidate(getActionWeblog());
- // TODO: i18n
- addMessage("Successfully removed weblog - " +
getActionWeblog().getName());
+ addMessage("websiteRemove.success", getActionWeblog().getName());
return SUCCESS;
} catch (Exception ex) {
log.error("Error removing weblog - " +
getActionWeblog().getHandle(), ex);
- // TODO: i18n
- addError("Error removing weblog");
+ addError("websiteRemove.error", getActionWeblog().getName());
}
return "confirm";
