diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index 760fb1168..1d2f22da7 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -1,39 +1,53 @@ package org.cryptomator.launcher; import org.cryptomator.common.settings.Settings; -import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; +import java.text.Collator; +import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.stream.Collectors; @Singleton public class SupportedLanguages { private static final Logger LOG = LoggerFactory.getLogger(SupportedLanguages.class); - // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_": - public static final List LANGUAGAE_TAGS = List.of("en", "ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // + // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_". + // "en" is not part of this list - it is always inserted at the top. + public static final List LANGUAGE_TAGS = List.of("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // "hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "si", "sk", "sr", "sr-Latn", "sv", "sw", // "ta", "te", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW"); + public static final String ENGLISH = "en"; - @Nullable - private final String preferredLanguage; + private final List sortedLanguageTags; + + private final Locale preferredLocale; @Inject public SupportedLanguages(Settings settings) { - this.preferredLanguage = settings.languageProperty().get(); + var preferredLanguage = settings.languageProperty().get(); + preferredLocale = preferredLanguage == null ? Locale.getDefault() : Locale.forLanguageTag(preferredLanguage); + var collator = Collator.getInstance(preferredLocale); + collator.setStrength(Collator.PRIMARY); + var sorted = LANGUAGE_TAGS.stream() // + .sorted((a, b) -> collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName())) // + .collect(Collectors.toList()); + sorted.add(0, Settings.DEFAULT_LANGUAGE); + sorted.add(1, ENGLISH); + sortedLanguageTags = Collections.unmodifiableList(sorted); } public void applyPreferred() { - if (preferredLanguage == null) { - LOG.debug("Using system locale"); - return; - } - var preferredLocale = Locale.forLanguageTag(preferredLanguage); - LOG.debug("Applying preferred locale {}", preferredLocale.getDisplayName(Locale.ENGLISH)); + LOG.debug("Using locale {}", preferredLocale); Locale.setDefault(preferredLocale); } + + public List getLanguageTags() { + return sortedLanguageTags; + } + } diff --git a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java index dd463b9e3..05b733f86 100644 --- a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.preferences; -import com.google.common.base.Strings; import org.cryptomator.common.LicenseHolder; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.UiTheme; @@ -35,6 +34,7 @@ public class InterfacePreferencesController implements FxController { private final ObjectProperty selectedTabProperty; private final LicenseHolder licenseHolder; private final ResourceBundle resourceBundle; + private final SupportedLanguages supportedLanguages; public ChoiceBox themeChoiceBox; public CheckBox showMinimizeButtonCheckbox; public CheckBox showTrayIconCheckbox; @@ -44,13 +44,14 @@ public class InterfacePreferencesController implements FxController { public RadioButton nodeOrientationRtl; @Inject - InterfacePreferencesController(Settings settings, TrayMenuComponent trayMenu, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ResourceBundle resourceBundle) { + InterfacePreferencesController(Settings settings, SupportedLanguages supportedLanguages, TrayMenuComponent trayMenu, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ResourceBundle resourceBundle) { this.settings = settings; this.trayMenuInitialized = trayMenu.isInitialized(); this.trayMenuSupported = trayMenu.isSupported(); this.selectedTabProperty = selectedTabProperty; this.licenseHolder = licenseHolder; this.resourceBundle = resourceBundle; + this.supportedLanguages = supportedLanguages; } @FXML @@ -66,8 +67,7 @@ public class InterfacePreferencesController implements FxController { showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon()); - preferredLanguageChoiceBox.getItems().add(null); - preferredLanguageChoiceBox.getItems().addAll(SupportedLanguages.LANGUAGAE_TAGS); + preferredLanguageChoiceBox.getItems().addAll(supportedLanguages.getLanguageTags()); preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.languageProperty()); preferredLanguageChoiceBox.setConverter(new LanguageTagConverter(resourceBundle)); @@ -141,9 +141,7 @@ public class InterfacePreferencesController implements FxController { return resourceBundle.getString("preferences.interface.language.auto"); } else { var locale = Locale.forLanguageTag(tag); - var lang = locale.getDisplayLanguage(locale); - var region = locale.getDisplayCountry(locale); - return lang + (Strings.isNullOrEmpty(region) ? "" : " (" + region + ")"); + return locale.getDisplayName(); } } diff --git a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java index 7d76409e8..8ea48465b 100644 --- a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java +++ b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java @@ -25,7 +25,7 @@ public class SupportedLanguagesTest { } public static Stream languageTags() { - return SupportedLanguages.LANGUAGAE_TAGS.stream() // + return SupportedLanguages.LANGUAGE_TAGS.stream() // .filter(tag -> !"en".equals(tag)); // english uses the default bundle } } \ No newline at end of file