From 341275c8a319bd9143534ec4f493b6c33bd6e9f9 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Mon, 5 Oct 2020 06:58:38 +0100 Subject: [PATCH] do not show language dialog until there are some translations --- gui/griffon-app/i18n/messages_bg.properties | 1 - gui/griffon-app/lifecycle/Initialize.groovy | 2 ++ gui/src/main/java/com/muwire/gui/Translator.java | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 gui/griffon-app/i18n/messages_bg.properties diff --git a/gui/griffon-app/i18n/messages_bg.properties b/gui/griffon-app/i18n/messages_bg.properties deleted file mode 100644 index f89d1fba..00000000 --- a/gui/griffon-app/i18n/messages_bg.properties +++ /dev/null @@ -1 +0,0 @@ -EXIT=Изход diff --git a/gui/griffon-app/lifecycle/Initialize.groovy b/gui/griffon-app/lifecycle/Initialize.groovy index 673bbd94..74128050 100644 --- a/gui/griffon-app/lifecycle/Initialize.groovy +++ b/gui/griffon-app/lifecycle/Initialize.groovy @@ -205,6 +205,8 @@ class Initialize extends AbstractLifecycleHandler { } private String showLanguageDialog() { + if (Translator.SUPPORTED_LOCALES.size() == 1) + return Locale.US.toLanguageTag() def builder = new SwingBuilder() def languageComboBox def chooseButton diff --git a/gui/src/main/java/com/muwire/gui/Translator.java b/gui/src/main/java/com/muwire/gui/Translator.java index bb68a1f9..5227b799 100644 --- a/gui/src/main/java/com/muwire/gui/Translator.java +++ b/gui/src/main/java/com/muwire/gui/Translator.java @@ -1,6 +1,5 @@ package com.muwire.gui; -import java.text.ChoiceFormat; import java.text.MessageFormat; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -16,7 +15,6 @@ public class Translator { public static final Set SUPPORTED_LOCALES = new LinkedHashSet<>(); static { SUPPORTED_LOCALES.add(Locale.US); - SUPPORTED_LOCALES.add(Locale.forLanguageTag("bg")); // add more as they get translated }