From 39913ff7d0376484f6cd3ebcfe787528f7749706 Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Mon, 7 Mar 2022 15:18:41 -0500
Subject: [PATCH 1/6] Internationalization of curation labels

---
 .../java/edu/harvard/iq/dataverse/DatasetPage.java  | 13 ++++++++++++-
 .../edu/harvard/iq/dataverse/DatasetVersion.java    |  9 +++++++++
 .../edu/harvard/iq/dataverse/DataversePage.java     |  9 ++++++++-
 src/main/webapp/dataset.xhtml                       |  4 ++--
 src/main/webapp/search-include-fragment.xhtml       |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 61720efafb2..061b9de88af 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -5640,7 +5640,10 @@ public void setExternalStatus(String status) {
             if (status == null || status.isEmpty()) {
                 JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("dataset.externalstatus.removed"));
             } else {
-                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.externalstatus.header"), BundleUtil.getStringFromBundle("dataset.externalstatus.info", Arrays.asList(status)));
+                JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.externalstatus.header"),
+                        BundleUtil.getStringFromBundle("dataset.externalstatus.info",
+                                Arrays.asList(getLocaleExternalStatus(status))
+                        ));
             }
 
         } catch (CommandException ex) {
@@ -5649,6 +5652,14 @@ public void setExternalStatus(String status) {
             JsfHelper.addErrorMessage(msg);
         }
     }
+
+    public String getLocaleExternalStatus(String status) {
+        String localizedName = BundleUtil.getStringFromBundle(status.toLowerCase().replace(" ", "_"));
+        if (localizedName == null) {
+            localizedName = status ;
+        }
+        return localizedName;
+    }
     
     public List<String> getAllowedExternalStatuses() {
         return settingsWrapper.getAllowedExternalStatuses(dataset);
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index b766e5d7b58..da9c04ef6c1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.util.MarkupChecker;
+import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.DatasetFieldType.FieldType;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
@@ -1953,6 +1954,14 @@ public String getExternalStatusLabel() {
         return externalStatusLabel;
     }
 
+    public String getLocaleExternalStatusLabel() {
+        String localizedName = BundleUtil.getStringFromBundle(externalStatusLabel.toLowerCase().replace(" ", "_"));
+        if (localizedName == null) {
+            localizedName = externalStatusLabel ;
+        }
+        return localizedName;
+    }
+
     public void setExternalStatusLabel(String externalStatusLabel) {
         this.externalStatusLabel = externalStatusLabel;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 664658818e3..2525adf231e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -1249,8 +1249,15 @@ public Set<Entry<String, String>> getCurationLabelSetOptions() {
                 }
                 // Add an entry for disabled
                 setNames.put(BundleUtil.getStringFromBundle("dataverse.curationLabels.disabled"), SystemConfig.CURATIONLABELSDISABLED);
+
                 allowedSetNames.forEach(name -> {
-                    setNames.put(name, name);
+                    String localizedName = BundleUtil.getStringFromBundle( name.toLowerCase().replace(" ","_")) ;
+                    if (localizedName != null) {
+                        setNames.put(localizedName,name);
+                    }
+                    else {
+                        setNames.put(name, name);
+                    }
                 });
             }
             curationLabelSetOptions = setNames.entrySet();
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index e42b61ef88f..06dac5a42df 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -125,7 +125,7 @@
                                             <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
                                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
                                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
-                                            <h:outputText value="#{DatasetPage.workingVersion.externalStatusLabel}" styleClass="label label-info" rendered="#{DatasetPage.workingVersion.externalStatusLabel!=null and DatasetPage.canPublishDataset()}"/>
+                                            <h:outputText value="#{DatasetPage.workingVersion.localeExternalStatusLabel}" styleClass="label label-info" rendered="#{DatasetPage.workingVersion.externalStatusLabel!=null and DatasetPage.canPublishDataset()}"/>
                                             <!-- DATASET VERSION NUMBER -->
                                             <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
                                                           value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}"/>
@@ -341,7 +341,7 @@
                                                                     <ui:repeat value="#{DatasetPage.allowedExternalStatuses}" var="status">
                                                                         <li>
                                                                             <p:commandLink action="#{DatasetPage.setExternalStatus(status)}" update=":datasetForm:topDatasetBlockFragment,:messagePanel">
-                                                                              #{status}
+                                                                                #{DatasetPage.getLocaleExternalStatus(status)}
                                                                             </p:commandLink>
                                                                         </li>
                                                                     </ui:repeat>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 2d03349acf1..3b1526cba0c 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -548,7 +548,7 @@
                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
                             <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{SearchIncludeFragment.isActivelyEmbargoed(result)}"/>
-                            <h:outputText value="#{result.externalStatus}" styleClass="label label-info" rendered="#{!empty result.externalStatus and SearchIncludeFragment.canPublishDataset(result.entityId)}"/>
+                            <h:outputText value="#{DatasetPage.getLocaleExternalStatus(result.externalStatus)}" styleClass="label label-info" rendered="#{!empty result.externalStatus and SearchIncludeFragment.canPublishDataset(result.entityId)}"/>
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
                         </div>
                         <div class="card-preview-icon-block text-center">

From 546f93e8b95f2d55a30b3395bc1a17305021d34d Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Mon, 7 Mar 2022 15:59:19 -0500
Subject: [PATCH 2/6] Curation label doc

---
 doc/sphinx-guides/source/installation/config.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 36fb7d018ac..d549227847f 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -2517,6 +2517,12 @@ Each set of labels is identified by a curationLabelSet name and a JSON Array of
 
 ``curl -X PUT -d '{"Standard Process":["Author contacted", "Privacy Review", "Awaiting paper publication", "Final Approval"], "Alternate Process":["State 1","State 2","State 3"]}' http://localhost:8080/api/admin/settings/:AllowedCurationLabels``
 
+If the Dataverse Installation supports multiple languages, the curation label translations should be added to the Bundle property files.
+
+Example:
+standard_process=Standard Process
+author_contacted=Author contacted
+
 .. _:AllowCustomTermsOfUse:
 
 :AllowCustomTermsOfUse

From 4e14e61c345111a63ca8bd3fa1f9db36bf4a92e3 Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Wed, 9 Mar 2022 11:27:24 -0500
Subject: [PATCH 3/6] moved function to DatasetUtil.java

---
 doc/sphinx-guides/source/installation/config.rst       |  1 +
 .../java/edu/harvard/iq/dataverse/DatasetPage.java     | 10 +---------
 .../java/edu/harvard/iq/dataverse/DatasetVersion.java  |  8 --------
 .../java/edu/harvard/iq/dataverse/DataversePage.java   | 10 +++-------
 .../edu/harvard/iq/dataverse/dataset/DatasetUtil.java  |  8 ++++++++
 src/main/webapp/dataset.xhtml                          |  6 ++++--
 src/main/webapp/search-include-fragment.xhtml          |  3 ++-
 7 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index d549227847f..0a49d7a5980 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -2518,6 +2518,7 @@ Each set of labels is identified by a curationLabelSet name and a JSON Array of
 ``curl -X PUT -d '{"Standard Process":["Author contacted", "Privacy Review", "Awaiting paper publication", "Final Approval"], "Alternate Process":["State 1","State 2","State 3"]}' http://localhost:8080/api/admin/settings/:AllowedCurationLabels``
 
 If the Dataverse Installation supports multiple languages, the curation label translations should be added to the Bundle property files.
+Since the Curation labels are free text, while creating the key, it has to be converted to lowercase, replace space with underscore.
 
 Example:
 standard_process=Standard Process
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index c8fb77d1776..2499642e5b4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -5649,7 +5649,7 @@ public void setExternalStatus(String status) {
             } else {
                 JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.externalstatus.header"),
                         BundleUtil.getStringFromBundle("dataset.externalstatus.info",
-                                Arrays.asList(getLocaleExternalStatus(status))
+                                Arrays.asList(DatasetUtil.getLocaleExternalStatus(status))
                         ));
             }
 
@@ -5660,14 +5660,6 @@ public void setExternalStatus(String status) {
         }
     }
 
-    public String getLocaleExternalStatus(String status) {
-        String localizedName = BundleUtil.getStringFromBundle(status.toLowerCase().replace(" ", "_"));
-        if (localizedName == null) {
-            localizedName = status ;
-        }
-        return localizedName;
-    }
-    
     public List<String> getAllowedExternalStatuses() {
         return settingsWrapper.getAllowedExternalStatuses(dataset);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index da9c04ef6c1..f211ccd0410 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -1954,14 +1954,6 @@ public String getExternalStatusLabel() {
         return externalStatusLabel;
     }
 
-    public String getLocaleExternalStatusLabel() {
-        String localizedName = BundleUtil.getStringFromBundle(externalStatusLabel.toLowerCase().replace(" ", "_"));
-        if (localizedName == null) {
-            localizedName = externalStatusLabel ;
-        }
-        return localizedName;
-    }
-
     public void setExternalStatusLabel(String externalStatusLabel) {
         this.externalStatusLabel = externalStatusLabel;
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 2525adf231e..b48ff725e1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.dataaccess.DataAccess;
+import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
@@ -1251,13 +1252,8 @@ public Set<Entry<String, String>> getCurationLabelSetOptions() {
                 setNames.put(BundleUtil.getStringFromBundle("dataverse.curationLabels.disabled"), SystemConfig.CURATIONLABELSDISABLED);
 
                 allowedSetNames.forEach(name -> {
-                    String localizedName = BundleUtil.getStringFromBundle( name.toLowerCase().replace(" ","_")) ;
-                    if (localizedName != null) {
-                        setNames.put(localizedName,name);
-                    }
-                    else {
-                        setNames.put(name, name);
-                    }
+                    String localizedName = DatasetUtil.getLocaleExternalStatus(name) ;
+                    setNames.put(localizedName,name);
                 });
             }
             curationLabelSetOptions = setNames.entrySet();
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
index a33caa9f890..a4617c24b86 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -568,4 +568,12 @@ public static String getLicenseDescription(DatasetVersion dsv) {
         License license = dsv.getTermsOfUseAndAccess().getLicense();
         return license != null ? license.getShortDescription() : BundleUtil.getStringFromBundle("license.custom.description");
     }
+
+    public static String getLocaleExternalStatus(String status) {
+        String localizedName = BundleUtil.getStringFromBundle(status.toLowerCase().replace(" ", "_"));
+        if (localizedName == null) {
+            localizedName = status ;
+        }
+        return localizedName;
+    }
 }
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 6a0b1033958..3a56b254c41 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -125,7 +125,8 @@
                                             <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
                                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
                                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
-                                            <h:outputText value="#{DatasetPage.workingVersion.localeExternalStatusLabel}" styleClass="label label-info" rendered="#{DatasetPage.workingVersion.externalStatusLabel!=null and DatasetPage.canPublishDataset()}"/>
+                                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
+                                            <h:outputText value="#{DatasetUtil:getLocaleExternalStatus(DatasetPage.workingVersion.externalStatusLabel)}" styleClass="label label-info" rendered="#{DatasetPage.workingVersion.externalStatusLabel!=null and DatasetPage.canPublishDataset()}"/>
                                             <!-- DATASET VERSION NUMBER -->
                                             <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
                                                           value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}"/>
@@ -340,8 +341,9 @@
                                                                 <ul class="dropdown-menu">
                                                                     <ui:repeat value="#{DatasetPage.allowedExternalStatuses}" var="status">
                                                                         <li>
+                                                                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
                                                                             <p:commandLink action="#{DatasetPage.setExternalStatus(status)}" update=":datasetForm:topDatasetBlockFragment,:messagePanel">
-                                                                                #{DatasetPage.getLocaleExternalStatus(status)}
+                                                                                #{DatasetUtil:getLocaleExternalStatus(status)}
                                                                             </p:commandLink>
                                                                         </li>
                                                                     </ui:repeat>
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 3b1526cba0c..61dd58842ad 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -535,6 +535,7 @@
                     <!--DATASET CARDS-->
                     <div class="datasetResult clearfix" jsf:rendered="#{result.type == 'datasets'}">
                         <div class="card-title-icon-block">
+                            <o:importFunctions type="edu.harvard.iq.dataverse.dataset.DatasetUtil" />
                             <span class="glyphicon glyphicon-link text-info pull-right" title="#{bundle.linked}" jsf:rendered="#{!SearchIncludeFragment.rootDv and !result.isInTree}"/>
                             <span class="glyphicon glyphicon-new-window text-info pull-right" title="#{bundle.harvested}" jsf:rendered="#{result.harvested}"/>
                             <span class="icon-dataset text-info pull-right" title="#{bundle.dataset}"/>
@@ -548,7 +549,7 @@
                             <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
                             <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
                             <h:outputText value="#{bundle['embargoed']}" styleClass="label label-primary" rendered="#{SearchIncludeFragment.isActivelyEmbargoed(result)}"/>
-                            <h:outputText value="#{DatasetPage.getLocaleExternalStatus(result.externalStatus)}" styleClass="label label-info" rendered="#{!empty result.externalStatus and SearchIncludeFragment.canPublishDataset(result.entityId)}"/>
+                            <h:outputText value="#{DatasetUtil:getLocaleExternalStatus(result.externalStatus)}" styleClass="label label-info" rendered="#{!empty result.externalStatus and SearchIncludeFragment.canPublishDataset(result.entityId)}"/>
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
                         </div>
                         <div class="card-preview-icon-block text-center">

From 6dc4fe398d06927ddd5894f0a6bb22240f961f00 Mon Sep 17 00:00:00 2001
From: JayanthyChengan <JayanthyChengan@users.noreply.github.com>
Date: Tue, 15 Mar 2022 09:18:32 -0400
Subject: [PATCH 4/6] Update doc/sphinx-guides/source/installation/config.rst

Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
---
 doc/sphinx-guides/source/installation/config.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 0a49d7a5980..b7b113dbcd2 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -2520,9 +2520,10 @@ Each set of labels is identified by a curationLabelSet name and a JSON Array of
 If the Dataverse Installation supports multiple languages, the curation label translations should be added to the Bundle property files.
 Since the Curation labels are free text, while creating the key, it has to be converted to lowercase, replace space with underscore.
 
-Example:
-standard_process=Standard Process
-author_contacted=Author contacted
+Example::
+
+  standard_process=Standard Process
+  author_contacted=Author contacted
 
 .. _:AllowCustomTermsOfUse:
 

From 7ff7c5f1302c752cd82068de28f83a6278e95479 Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Wed, 16 Mar 2022 09:38:50 -0400
Subject: [PATCH 5/6] added new property file: CurationLabels.properties

---
 doc/sphinx-guides/source/installation/config.rst         | 2 +-
 .../edu/harvard/iq/dataverse/dataset/DatasetUtil.java    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index b7b113dbcd2..21b983dffd7 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -2517,7 +2517,7 @@ Each set of labels is identified by a curationLabelSet name and a JSON Array of
 
 ``curl -X PUT -d '{"Standard Process":["Author contacted", "Privacy Review", "Awaiting paper publication", "Final Approval"], "Alternate Process":["State 1","State 2","State 3"]}' http://localhost:8080/api/admin/settings/:AllowedCurationLabels``
 
-If the Dataverse Installation supports multiple languages, the curation label translations should be added to the Bundle property files.
+If the Dataverse Installation supports multiple languages, the curation label translations should be added to the CurationLables property files.
 Since the Curation labels are free text, while creating the key, it has to be converted to lowercase, replace space with underscore.
 
 Example::
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
index a4617c24b86..d4b9802f47c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -570,7 +570,14 @@ public static String getLicenseDescription(DatasetVersion dsv) {
     }
 
     public static String getLocaleExternalStatus(String status) {
-        String localizedName = BundleUtil.getStringFromBundle(status.toLowerCase().replace(" ", "_"));
+        String localizedName =  "" ;
+        try {
+            localizedName = BundleUtil.getStringFromPropertyFile(status.toLowerCase().replace(" ", "_"), "CurationLabels");
+        }
+        catch (Exception e) {
+            localizedName = status;
+        }
+
         if (localizedName == null) {
             localizedName = status ;
         }

From c511e95c4becd8c834f2453219e8db865519e661 Mon Sep 17 00:00:00 2001
From: chenganj <jayanthy.chengan@utoronto.ca>
Date: Wed, 16 Mar 2022 15:27:20 -0400
Subject: [PATCH 6/6] fixed typo

---
 doc/sphinx-guides/source/installation/config.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 0dce1da2ee4..55643a3d152 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -2506,7 +2506,7 @@ Each set of labels is identified by a curationLabelSet name and a JSON Array of
 
 ``curl -X PUT -d '{"Standard Process":["Author contacted", "Privacy Review", "Awaiting paper publication", "Final Approval"], "Alternate Process":["State 1","State 2","State 3"]}' http://localhost:8080/api/admin/settings/:AllowedCurationLabels``
 
-If the Dataverse Installation supports multiple languages, the curation label translations should be added to the CurationLables property files.
+If the Dataverse Installation supports multiple languages, the curation label translations should be added to the ``CurationLabels`` properties files. (See :ref:`i18n` for more on properties files and internationalization in general.)
 Since the Curation labels are free text, while creating the key, it has to be converted to lowercase, replace space with underscore.
 
 Example::