You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/12 15:31:22 UTC
svn commit: r506461 - in /incubator/roller/branches/roller_3.1/web/WEB-INF:
classes/ApplicationResources.properties
jsps/authoring/CommentManagement.jsp velocity/weblog.vm
Author: snoopdave
Date: Mon Feb 12 06:31:22 2007
New Revision: 506461
URL: http://svn.apache.org/viewvc?view=rev&rev=506461
Log:
Merging fix for ROL-1343 from trunk
Modified:
incubator/roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/CommentManagement.jsp
incubator/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm
Modified: incubator/roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=506461&r1=506460&r2=506461
==============================================================================
--- incubator/roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties Mon Feb 12 06:31:22 2007
@@ -697,6 +697,7 @@
macro.weblog.linkbacks=Linkbacks
macro.weblog.comments=Comments
macro.weblog.comment=Comment
+macro.weblog.comment.unknown=Unknown
macro.weblog.addcomment=Add a Comment
macro.weblog.datepattern=MMMMM dd, yyyy 'at' hh:mm aa z
macro.weblog.date.timestampFormat=MMM dd yyyy, hh:mm:ss a z
Modified: incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/CommentManagement.jsp?view=diff&rev=506461&r1=506460&r2=506461
==============================================================================
--- incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/CommentManagement.jsp (original)
+++ incubator/roller/branches/roller_3.1/web/WEB-INF/jsps/authoring/CommentManagement.jsp Mon Feb 12 06:31:22 2007
@@ -370,11 +370,7 @@
<%-- comment content --%>
<br />
<span class="details">
- <pre><str:wordWrap>
- <str:truncateNicely upper="3000" appendToEnd="...">
- <c:out value="${comment.content}" escapeXml="true" />
- </str:truncateNicely>
- </str:wordWrap></pre>
+ <pre><str:wordWrap><str:truncateNicely upper="3000" appendToEnd="..."><c:out value="${comment.content}" escapeXml="true" /></str:truncateNicely></str:wordWrap></pre>
</span>
</td>
Modified: incubator/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm?view=diff&rev=506461&r1=506460&r2=506461
==============================================================================
--- incubator/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm Mon Feb 12 06:31:22 2007
@@ -180,8 +180,10 @@
<a rel="nofollow" href="$comment.url"><b>$comment.name</b></a>
#elseif (!$utils.isEmpty($comment.name))
<b>$comment.name</b>
- #else
+ #elseif ($comment.remoteHost)
<b>$comment.remoteHost</b>
+ #else
+ <b>$text.get("macro.weblog.comment.unknown")</b>
#end
$text.get("macro.weblog.on") $utils.formatDate($comment.postTime, $text.get( "macro.weblog.datepattern" ))