Skip to content
Snippets Groups Projects
Commit 797d67a4 authored by Anton Danilov's avatar Anton Danilov
Browse files

#627 Removed "System language" from menu

parent eacc00dc
Branches
Tags
No related merge requests found
......@@ -433,10 +433,10 @@ public class TablexiaSettings {
}
public enum LocaleDefinition {
SYSTEM (null, null, "system", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_SYSTEM, true, null),
cs_CZ (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.cs_CZ, new Locale("cs", "CZ"), "cs_CZ", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_CZECH, true, "čeština"),
sk_SK (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.sk_SK, new Locale("sk", "SK"), "sk_SK", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_SLOVAK, true, "slovenčina"),
de_DE (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.de_DE, new Locale("de", "DE"), "de_DE", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_GERMAN, true, "deutsch");
SYSTEM (null, null, "system", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_SYSTEM, true, null, false),
cs_CZ (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.cs_CZ, new Locale("cs", "CZ"), "cs_CZ", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_CZECH, true, "čeština", true),
sk_SK (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.sk_SK, new Locale("sk", "SK"), "sk_SK", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_SLOVAK, true, "slovenčina", true),
de_DE (cz.nic.tablexia.shared.model.definitions.LocaleDefinition.de_DE, new Locale("de", "DE"), "de_DE", ApplicationTextManager.ApplicationTextsAssets.LANGUAGE_GERMAN, true, "deutsch", true);
public final static LocaleDefinition DEFAULT_LOCALE = LocaleDefinition.cs_CZ;
private final static LocaleDefinition FALLBACK_VARIANT = LocaleDefinition.SYSTEM;
......@@ -447,16 +447,18 @@ public class TablexiaSettings {
private final String descriptionKey;
private final boolean enabled;
private final String nativeLocaleName;
private final boolean selectable;
private static List<LocaleDefinition> enabledLocaleDefinitions;
LocaleDefinition(cz.nic.tablexia.shared.model.definitions.LocaleDefinition modelLocaleDefinition, Locale locale, String localeKey, String descriptionKey, boolean enabled, String nativeLocaleName) {
LocaleDefinition(cz.nic.tablexia.shared.model.definitions.LocaleDefinition modelLocaleDefinition, Locale locale, String localeKey, String descriptionKey, boolean enabled, String nativeLocaleName, boolean selectable) {
this.modelLocaleDefinition = modelLocaleDefinition;
this.locale = locale;
this.localeKey = localeKey;
this.descriptionKey = descriptionKey;
this.enabled = enabled;
this.nativeLocaleName = nativeLocaleName;
this.selectable = selectable;
}
public String getLocaleKey() {
......@@ -475,6 +477,10 @@ public class TablexiaSettings {
return nativeLocaleName;
}
public boolean isSelectable() {
return selectable;
}
public Locale getLocale() {
return locale != null ? locale : instance.systemLocale.locale;
}
......
......@@ -98,6 +98,7 @@ public class LocaleSelectBox extends AbstractTablexiaSelectBox<LocaleSelectBox.L
List<LocaleItem> localeItems = new ArrayList<LocaleItem>();
for (TablexiaSettings.LocaleDefinition localeDefinition: TablexiaSettings.LocaleDefinition.getEnabledLocaleDefinitions()) {
if(!localeDefinition.isSelectable()) continue;
LocaleItem localeItem = new LocaleItem(localeDefinition);
if (localeDefinition.equals(TablexiaSettings.getInstance().getLocaleDefinition())) {
selectedLocaleItem = localeItem;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment