From 9695f59152be45182d3156f1aca76f57424a2536 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 18 Mar 2018 20:29:47 +0100 Subject: [PATCH] TransBundle: can now get the locale in use --- changelog.md | 4 + .../nikiroo/utils/resources/TransBundle.java | 108 +++++++++++++----- 2 files changed, 85 insertions(+), 27 deletions(-) diff --git a/changelog.md b/changelog.md index c25ddf90..830f5c29 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # nikiroo-utils +## Version WIP + +- New getLanguage in TransBundle + ## Version 4.1.0 - New TempFiles (Image.java now uses it instead of memory) diff --git a/src/be/nikiroo/utils/resources/TransBundle.java b/src/be/nikiroo/utils/resources/TransBundle.java index ec5b2d0a..fb9f2906 100644 --- a/src/be/nikiroo/utils/resources/TransBundle.java +++ b/src/be/nikiroo/utils/resources/TransBundle.java @@ -36,8 +36,7 @@ public class TransBundle> extends Bundle { * the name of the {@link Bundles} */ public TransBundle(Class type, Enum name) { - super(type, name, null); - setLanguage(null); + this(type, name, (Locale) null); } /** @@ -49,11 +48,27 @@ public class TransBundle> extends Bundle { * @param name * the name of the {@link Bundles} * @param language - * the language to use + * the language to use, can be NULL for default */ public TransBundle(Class type, Enum name, String language) { super(type, name, null); - setLanguage(language); + setLocale(language); + } + + /** + * Create a translation service for the given language (will fall back to + * the default one i not found). + * + * @param type + * a runtime instance of the class of E + * @param name + * the name of the {@link Bundles} + * @param language + * the language to use, can be NULL for default + */ + public TransBundle(Class type, Enum name, Locale language) { + super(type, name, null); + setLocale(language); } /** @@ -163,6 +178,30 @@ public class TransBundle> extends Bundle { return getKnownLanguages(keyType); } + /** + * The current language (which can be the default one, but NOT NULL). + * + * @return the language, not NULL + */ + public Locale getLocale() { + return locale; + } + + /** + * The current language (which can be the default one, but NOT NULL). + * + * @return the language, not NULL, in a display format (fr-BE, en-GB, es, + * de...) + */ + public String getLocaleString() { + String lang = locale.getLanguage(); + String country = locale.getCountry(); + if (country != null && !country.isEmpty()) { + return lang + "-" + country; + } + return lang; + } + /** * Initialise the translation mappings for the given language. * @@ -170,9 +209,25 @@ public class TransBundle> extends Bundle { * the language to initialise, in the form "en-GB" or "fr" for * instance */ - private void setLanguage(String language) { - defaultLocale = (language == null || language.length() == 0); - locale = getLocaleFor(language); + private void setLocale(String language) { + setLocale(getLocaleFor(language)); + } + + /** + * Initialise the translation mappings for the given language. + * + * @param language + * the language to initialise, or NULL for default + */ + private void setLocale(Locale language) { + if (language != null) { + defaultLocale = false; + locale = language; + } else { + defaultLocale = true; + locale = Locale.getDefault(); + } + setBundle(keyType, locale, false); } @@ -204,22 +259,22 @@ public class TransBundle> extends Bundle { Object status = takeSnapshot(); // default locale - setLanguage(null); - if (prev.equals(getLocaleFor(null).getLanguage())) { + setLocale((Locale) null); + if (prev.equals(Locale.getDefault().getLanguage())) { // restore snapshot if default locale = current locale restoreSnapshot(status); } super.updateFile(path); for (String lang : getKnownLanguages()) { - setLanguage(lang); + setLocale(lang); if (lang.equals(prev)) { restoreSnapshot(status); } super.updateFile(path); } - setLanguage(prev); + setLocale(prev); restoreSnapshot(status); } @@ -283,29 +338,28 @@ public class TransBundle> extends Bundle { * the language to initialise, in the form "en-GB" or "fr" for * instance * - * @return the corresponding {@link Locale} or the default {@link Locale} if - * it is not known + * @return the corresponding {@link Locale} or NULL if it is not known */ static private Locale getLocaleFor(String language) { Locale locale; - if (language == null) { - locale = Locale.getDefault(); - } else { - language = language.replaceAll("_", "-"); - String lang = language; - String country = null; - if (language.contains("-")) { - lang = language.split("-")[0]; - country = language.split("-")[1]; - } + if (language == null || language.trim().isEmpty()) { + return null; + } - if (country != null) - locale = new Locale(lang, country); - else - locale = new Locale(lang); + language = language.replaceAll("_", "-"); + String lang = language; + String country = null; + if (language.contains("-")) { + lang = language.split("-")[0]; + country = language.split("-")[1]; } + if (country != null) + locale = new Locale(lang, country); + else + locale = new Locale(lang); + return locale; } -- 2.27.0