Translation of comment author displayname is moved into JSP.

diff --git a/Workspace/Siman/WebContent/jsp/readComment.jsp b/Workspace/Siman/WebContent/jsp/readComment.jsp
index 7e518b620d03449d0b8d00edb3a011a3834c20f8..1e603c0bbfdda3045e7c0d70bb72274037df002c 100644 (file)
--- 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 2ce9a154f56ad39f620c3308d291ea8919e3959f..d597e011d32aea7734c3e9718a3802a475832abc 100644 (file)
--- 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;
        }