From 5b389c73acb77cc0d209ac9e86f28ad4474d2f6e Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Mon, 11 Mar 2013 13:07:46 +0000
Subject: [PATCH] Translation of comment author displayname is moved into JSP.

---
 Workspace/Siman/WebContent/jsp/readComment.jsp           | 2 +-
 .../Siman/src/org/splat/simer/EditStepCommentAction.java | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Workspace/Siman/WebContent/jsp/readComment.jsp b/Workspace/Siman/WebContent/jsp/readComment.jsp
index 7e518b6..1e603c0 100644
--- a/Workspace/Siman/WebContent/jsp/readComment.jsp
+++ b/Workspace/Siman/WebContent/jsp/readComment.jsp
@@ -36,7 +36,7 @@
                     <s:property value="%{text}" escapeHtml="false"/>
               </div>
               <br/>
-	          <s:property value="%{user.displayName}"/>
+	          <s:text name="%{user.displayName}"/>
 	        </td>   
 	    </tr>
 	    <tr height="1" bgcolor="#AAAAAA"><td colspan="2"></td></tr>
diff --git a/Workspace/Siman/src/org/splat/simer/EditStepCommentAction.java b/Workspace/Siman/src/org/splat/simer/EditStepCommentAction.java
index 2ce9a15..d597e01 100644
--- a/Workspace/Siman/src/org/splat/simer/EditStepCommentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditStepCommentAction.java
@@ -11,7 +11,6 @@ package org.splat.simer;
 
 import java.util.Date;
 import java.util.List;
-import java.util.ResourceBundle;
 
 import org.splat.exception.InvalidParameterException;
 import org.splat.service.StepService;
@@ -76,12 +75,9 @@ public class EditStepCommentAction extends DisplayStudyStepAction {
 			_comments = getStepService().getStepComments(getOpenStudy().getSelectedStep());
 			_commentPopup = getApplicationSettings().getPopupMenu("comment");
 			
-			//necessary for sysadmin user (with label.sysadmin displayName)
-			ResourceBundle label = ResourceBundle.getBundle("labels",
-					getApplicationSettings().getCurrentLocale());
 			for(StepCommentDTO comment : _comments) {
-				comment.getUser().setDisplayName(label.getString(
-						comment.getUser().getDisplayName()));
+				comment.getUser().setDisplayName(
+						comment.getUser().getDisplayName());
 			}
 		} catch(InvalidParameterException exception) {
 			_comments = null;
@@ -219,6 +215,7 @@ public class EditStepCommentAction extends DisplayStudyStepAction {
 	 * Get the commentPopup. Should have this exact name since it is used in menupopup.jsp.
 	 * @return the commentPopup
 	 */
+	@Override
 	public PopupMenu getPopup() {
 		return _commentPopup;
 	}
-- 
2.39.2