litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use same fallback locale used by RDFFilesLoader when setting locale on request. Resolves https://jira.lyrasis.org/browse/VIVO-1959 (#212)

Browse source
This commit is contained in:
Brian Lowe 2021-02-18 16:50:32 +02:00 • committed by GitHub
parent eb949919b5
commit 6b612316ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java
View file

@ -91,7 +91,9 @@ public abstract class SelectedLocale {
} }
} }
return null; Locale fallbackLocale = getFallbackLocale();
log.debug("Using fallback locale as default: " + fallbackLocale);
return fallbackLocale;
} }
/** /**
@ -134,7 +136,17 @@ public abstract class SelectedLocale {
return preferredLocal; return preferredLocal;
} }
return null; Locale fallbackLocale = getFallbackLocale();
log.debug("Using fallback locale as default: " + fallbackLocale);
return fallbackLocale;
}
/**
* @return a default locale to use if no other criteria for selecting a
* different one exist.
*/
public static Locale getFallbackLocale() {
return new Locale("en", "US");
} }
/** /**

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java
View file

@ -132,9 +132,9 @@ public class RDFFilesLoader {
enabledLocales.add(locale.toLanguageTag().replace('-', '_')); enabledLocales.add(locale.toLanguageTag().replace('-', '_'));
} }
// If no languages were enabled in runtime.properties, add 'en_US' as the default // If no languages were enabled in runtime.properties, add a fallback as the default
if (enabledLocales.isEmpty()) { if (enabledLocales.isEmpty()) {
enabledLocales.add("en_US"); enabledLocales.add(SelectedLocale.getFallbackLocale().toString());
} }
return enabledLocales; return enabledLocales;