Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JN-1586] fix i18n call #1414

Merged
merged 4 commits into from
Jan 22, 2025
Merged

[JN-1586] fix i18n call #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52cce07
fix b2c i18n call
connorlbark Jan 22, 2025
28b56e5
fix tests
connorlbark Jan 22, 2025
cd88f39
fix i18n controller
connorlbark Jan 22, 2025
a2c8146
spotless
connorlbark Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api-admin/src/main/java/bio/terra/pearl/api/admin/controller/i18n/I18nController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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))
Expand Down
5 changes: 5 additions & 0 deletions ...icipant/src/main/java/bio/terra/pearl/api/participant/controller/i18n/I18nController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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))
Expand Down
Loading