[JN-1586] fix i18n call (#1414)

broadinstitute · Jan 22, 2025 · 57d2336 · 57d2336
1 parent aebdeb1
commit 57d2336
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/api-admin/src/main/java/bio/terra/pearl/api/admin/controller/i18n/I18nController.java b/api-admin/src/main/java/bio/terra/pearl/api/admin/controller/i18n/I18nController.java
@@ -8,6 +8,7 @@
 import bio.terra.pearl.core.service.portal.PortalEnvironmentService;
 import bio.terra.pearl.core.service.portal.PortalService;
 import java.util.HashMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 
@@ -29,6 +30,10 @@ public I18nController(
   @Override
   public ResponseEntity<Object> listLanguageTexts(
       String language, String portalShortcode, String environmentName) {
+    if (StringUtils.isEmpty(environmentName)) {
+      environmentName = "live";
+    }
+
     PortalEnvironment portalEnv =
         portalEnvironmentService
             .findOne(portalShortcode, EnvironmentName.valueOfCaseInsensitive(environmentName))

diff --git a/...icipant/src/main/java/bio/terra/pearl/api/participant/controller/i18n/I18nController.java b/...icipant/src/main/java/bio/terra/pearl/api/participant/controller/i18n/I18nController.java
@@ -8,6 +8,7 @@
 import bio.terra.pearl.core.service.portal.PortalEnvironmentService;
 import bio.terra.pearl.core.service.portal.PortalService;
 import java.util.HashMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 
@@ -29,6 +30,10 @@ public I18nController(
   @Override
   public ResponseEntity<Object> listLanguageTexts(
       String language, String portalShortcode, String environmentName) {
+    if (StringUtils.isEmpty(environmentName)) {
+      environmentName = "live";
+    }
+
     PortalEnvironment portalEnv =
         portalEnvironmentService
             .findOne(portalShortcode, EnvironmentName.valueOfCaseInsensitive(environmentName))