Skip to content

Commit dcc8549

Browse files
Merge pull request #1064 from HL7/do-20250324--fix-locale-constructor-use
Don't use Locale(String) for full BCP 47 codes
2 parents 54d3d95 + 7511e03 commit dcc8549

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,14 +2378,14 @@ private Locale inferDefaultNarrativeLang(final boolean logDecision) {
23782378
if (logDecision) {
23792379
logMessage("Using " + defaultTranslationLang + " as the default narrative language. (i18n-default-lang has been set in Implementation Guide ini)");
23802380
}
2381-
return new Locale(defaultTranslationLang);
2381+
return Locale.forLanguageTag(defaultTranslationLang);
23822382
}
23832383
if (sourceIg != null) {
23842384
if (sourceIg.hasLanguage()) {
23852385
if (logDecision) {
23862386
logMessage("Using " + sourceIg.getLanguage() + " as the default narrative language. (ImplementationGuide.language has been set)");
23872387
}
2388-
return new Locale(sourceIg.getLanguage());
2388+
return Locale.forLanguageTag(sourceIg.getLanguage());
23892389
}
23902390
if (sourceIg.hasJurisdiction()) {
23912391
final String jurisdiction = sourceIg.getJurisdictionFirstRep().getCodingFirstRep().getCode();
@@ -2415,7 +2415,7 @@ private List<Locale> translationLocales() {
24152415
res.add(inferDefaultNarrativeLang());
24162416

24172417
for (String translationLang : translationLangs) {
2418-
Locale locale = new Locale(translationLang);
2418+
Locale locale = Locale.forLanguageTag(translationLang);
24192419
if (!res.contains(locale)) {
24202420
res.add(locale);
24212421
}
@@ -5045,7 +5045,7 @@ private void load() throws Exception {
50455045
rcLangs = new RenderingContextLangs(rc);
50465046
for (String l : allLangs()) {
50475047
RenderingContext lrc = rc.copy(false);
5048-
lrc.setLocale(new Locale(l));
5048+
lrc.setLocale(Locale.forLanguageTag(l));
50495049
rcLangs.seeLang(l, lrc);
50505050
}
50515051
realmRules = makeRealmBusinessRules();
@@ -15256,7 +15256,7 @@ public static void main(String[] args) throws Exception {
1525615256
}
1525715257

1525815258
private void setForcedLanguage(String language) {
15259-
this.forcedLanguage = new Locale(language);
15259+
this.forcedLanguage = Locale.forLanguageTag(language);
1526015260
}
1526115261

1526215262
public static String getAbsoluteConfigFilePath(String configFilePath) throws IOException {

0 commit comments

Comments
 (0)