Moved dataset version message text to bundle. [ref #1953]

IQSS · Jun 14, 2017 · 89bf11b · 89bf11b
1 parent e903302
commit 89bf11b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1460,6 +1460,10 @@ file.viewDiffDialog.description=Description
 file.viewDiffDialog.fileReplaced=File Replaced
 file.viewDiffDialog.filesReplaced=File(s) Replaced
 file.viewDiffDialog.files.header=Files
+file.viewDiffDialog.msg.draftFound=&#160;This is the "DRAFT" version.
+file.viewDiffDialog.msg.draftNotFound=The "DRAFT" version was not found.
+file.viewDiffDialog.msg.versionFound=&#160;This is version "{0}".
+file.viewDiffDialog.msg.versionNotFound=Version "{0}" was not found.
 file.metadataTip=Metadata Tip: After adding the dataset, click the Edit Dataset button to add more metadata.
 file.addBtn=Save Dataset
 file.dataset.allFiles=All Files from this Dataset

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java
@@ -7,6 +7,7 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.search.SolrSearchResult;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -91,27 +92,26 @@ public RetrieveDatasetVersionResponse(DatasetVersion datasetVersion, String requ
             this.checkVersion();
         }
 
-
         public String getDifferentVersionMessage(){
 
             if (this.wasSpecificVersionRequested && !this.didSpecificVersionMatch){
                 String userMsg;
                 if (DatasetVersionServiceBean.this.isVersionAskingForDraft(this.requestedVersion)){
-                    userMsg = "The \"DRAFT\" version was not found.";
+                    userMsg = BundleUtil.getStringFromBundle("file.viewDiffDialog.msg.draftNotFound");
                 }else{
-                    userMsg = "Version \"" + this.requestedVersion + "\" was not found.";
+                    userMsg = BundleUtil.getStringFromBundle("file.viewDiffDialog.msg.versionNotFound", Arrays.asList(this.requestedVersion));
                 }
 
                 if (DatasetVersionServiceBean.this.isVersionAskingForDraft(this.actualVersion)){
-                    userMsg += "  This is the \"DRAFT\" version.";
+                    userMsg += BundleUtil.getStringFromBundle("file.viewDiffDialog.msg.draftFound");
                 }else{
-                    userMsg += "  This is version \"" + this.actualVersion + "\".";                    
+                    userMsg += BundleUtil.getStringFromBundle("file.viewDiffDialog.msg.versionFound", Arrays.asList(this.actualVersion));
                 }
 
                 return userMsg;
             }
             return null;
-        }   
+        }
 
         private void checkVersion(){
             if (actualVersion==null){   // this shouldn't happen