webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extend logging when determining default locale

Browse source
This commit is contained in:
AsamK 2022-06-06 17:14:17 +02:00
parent 3ad87e1362
commit 51c2352d67
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/src/main/java/org/asamk/signal/manager/util/Utils.java
View file

@ -107,15 +107,18 @@ public class Utils {
public static Locale getDefaultLocale(Locale fallback) {
final var locale = Locale.getDefault();
if (locale == null) {
logger.debug("No default locale found, using fallback: {}", fallback);
return fallback;
}
final var localeString = locale.getLanguage() + "-" + locale.getCountry();
try {
Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry());
Locale.LanguageRange.parse(localeString);
} catch (IllegalArgumentException e) {
logger.debug("Invalid locale, ignoring: {}", locale);
logger.debug("Invalid locale '{}', using fallback: {}", locale, fallback);
return fallback;
}
logger.debug("Using default locale: {} ({})", locale, localeString);
return locale;
}