From: AsamK Date: Mon, 6 Jun 2022 15:14:17 +0000 (+0200) Subject: Extend logging when determining default locale X-Git-Tag: v0.10.8~16 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/51c2352d676cce004844f704b4c71c3de5bde4cc Extend logging when determining default locale --- diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java index cead93d9..cb0cf95f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java @@ -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; }