From 0df539f184bd152ef1877321e2867507b7b9abf2 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 24 Nov 2018 19:39:08 +0100 Subject: [PATCH] More languages for #586 --- .../mastodon/fragments/SettingsFragment.java | 24 +++++++++++++++++-- .../gouv/etalab/mastodon/helper/Helper.java | 11 ++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 0f1f69637..949a3e19e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -629,11 +629,31 @@ public class SettingsFragment extends Fragment { editor.commit(); break; case 6: - editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(Locale.CHINESE)); + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(Locale.SIMPLIFIED_CHINESE)); editor.commit(); break; case 7: - editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(Locale.CHINA)); + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(Locale.TRADITIONAL_CHINESE)); + editor.commit(); + break; + case 8: + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(new Locale("eu"))); + editor.commit(); + break; + case 9: + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(new Locale("ar"))); + editor.commit(); + break; + case 10: + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(new Locale("nl"))); + editor.commit(); + break; + case 11: + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(new Locale("gl"))); + editor.commit(); + break; + case 12: + editor.putString(Helper.SET_DEFAULT_LOCALE, Helper.localeToStringStorage(new Locale("el"))); editor.commit(); break; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 1e9799239..96f5e9ed5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -2871,15 +2871,20 @@ public class Helper { public static String[] getLocales(Context context){ - String[] locale = new String[8]; + String[] locale = new String[13]; locale[0] = context.getString(R.string.default_language); locale[1] = Locale.ENGLISH.getDisplayLanguage(); locale[2] = Locale.FRANCE.getDisplayLanguage(); locale[3] = Locale.GERMAN.getDisplayLanguage(); locale[4] = Locale.ITALIAN.getDisplayLanguage(); locale[5] = Locale.JAPAN.getDisplayLanguage(); - locale[6] = Locale.CHINESE.getDisplayLanguage(); - locale[7] = Locale.CHINA.getDisplayLanguage(); + locale[6] = Locale.SIMPLIFIED_CHINESE.getDisplayLanguage(); + locale[7] = Locale.TRADITIONAL_CHINESE.getDisplayLanguage(); + locale[8] = new Locale("eu").getDisplayLanguage(); + locale[9] = new Locale("ar").getDisplayLanguage(); + locale[10] = new Locale("nl").getDisplayLanguage(); + locale[11] = new Locale("gl").getDisplayLanguage(); + locale[12] = new Locale("el").getDisplayLanguage(); return locale; }