From 940785ceec0a9edd01ebaf52f6d10fc03f3e725d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 21 Feb 2020 10:42:04 -0600 Subject: [PATCH] Remove RTL override --- .../main/java/org/tasks/locale/Locale.java | 41 ++++--------------- .../preferences/fragments/LookAndFeel.kt | 14 +------ app/src/main/res/values-af-rZA/strings.xml | 3 -- app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-bg-rBG/strings.xml | 3 -- app/src/main/res/values-ca/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 3 -- app/src/main/res/values-de/strings.xml | 3 -- app/src/main/res/values-es/strings.xml | 3 -- app/src/main/res/values-et/strings.xml | 2 - app/src/main/res/values-eu/strings.xml | 3 -- app/src/main/res/values-fa/strings.xml | 3 -- app/src/main/res/values-fi/strings.xml | 3 -- app/src/main/res/values-fr/strings.xml | 3 -- app/src/main/res/values-gl/strings.xml | 3 -- app/src/main/res/values-hu/strings.xml | 3 -- app/src/main/res/values-id/strings.xml | 3 -- app/src/main/res/values-it/strings.xml | 3 -- app/src/main/res/values-iw/strings.xml | 3 -- app/src/main/res/values-ja/strings.xml | 3 -- app/src/main/res/values-ko/strings.xml | 3 -- app/src/main/res/values-lt/strings.xml | 3 -- app/src/main/res/values-nb/strings.xml | 3 -- app/src/main/res/values-nl/strings.xml | 3 -- app/src/main/res/values-pl/strings.xml | 3 -- app/src/main/res/values-pt-rBR/strings.xml | 3 -- app/src/main/res/values-pt/strings.xml | 3 -- app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 3 -- app/src/main/res/values-sk/strings.xml | 3 -- app/src/main/res/values-sr/strings.xml | 3 -- app/src/main/res/values-sv/strings.xml | 3 -- app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 3 -- app/src/main/res/values-uk/strings.xml | 3 -- app/src/main/res/values-zh-rCN/strings.xml | 3 -- app/src/main/res/values-zh-rTW/strings.xml | 3 -- app/src/main/res/values/arrays.xml | 12 ------ app/src/main/res/values/keys.xml | 1 - app/src/main/res/values/strings.xml | 3 -- .../res/xml/preferences_look_and_feel.xml | 7 ---- 41 files changed, 9 insertions(+), 168 deletions(-) diff --git a/app/src/main/java/org/tasks/locale/Locale.java b/app/src/main/java/org/tasks/locale/Locale.java index 08debb0d1..294786028 100644 --- a/app/src/main/java/org/tasks/locale/Locale.java +++ b/app/src/main/java/org/tasks/locale/Locale.java @@ -23,7 +23,7 @@ import org.tasks.R; public class Locale implements Serializable { - private static final Locale DEFAULT = new Locale(java.util.Locale.getDefault(), null, -1); + private static final Locale DEFAULT = new Locale(java.util.Locale.getDefault(), null); private static final int[] sDialogButtons = new int[] {android.R.id.button1, android.R.id.button2, android.R.id.button3}; private static final char LEFT_TO_RIGHT_MARK = '\u200e'; @@ -34,13 +34,11 @@ public class Locale implements Serializable { private final int appDirectionality; private final char appDirectionalityMark; private final String languageOverride; - private final int directionOverride; private final boolean hasUserOverrides; - public Locale(java.util.Locale deviceLocale, String languageOverride, int directionOverride) { + public Locale(java.util.Locale deviceLocale, String languageOverride) { this.deviceLocale = deviceLocale; this.languageOverride = languageOverride; - this.directionOverride = directionOverride; java.util.Locale override = localeFromString(languageOverride); if (override != null) { @@ -49,12 +47,7 @@ public class Locale implements Serializable { appLocale = deviceLocale; } - if (directionOverride == View.LAYOUT_DIRECTION_LTR - || directionOverride == View.LAYOUT_DIRECTION_RTL) { - appDirectionality = directionOverride; - } else { - appDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(appLocale); - } + appDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(appLocale); appDirectionalityMark = appDirectionality == View.LAYOUT_DIRECTION_RTL ? RIGHT_TO_LEFT_MARK : LEFT_TO_RIGHT_MARK; int deviceDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(deviceLocale); @@ -72,10 +65,7 @@ public class Locale implements Serializable { PreferenceManager.getDefaultSharedPreferences(applicationContext); String language = prefs.getString(applicationContext.getString(R.string.p_language), null); - int directionOverride = - Integer.parseInt( - prefs.getString(applicationContext.getString(R.string.p_layout_direction), "-1")); - setDefault(DEFAULT.getLocale(), language, directionOverride); + setDefault(DEFAULT.getLocale(), language); } } } @@ -84,12 +74,11 @@ public class Locale implements Serializable { } public static void setDefault(java.util.Locale locale) { - setDefault(locale, null, -1); + setDefault(locale, null); } - private static void setDefault( - java.util.Locale locale, String languageOverride, int directionOverride) { - INSTANCE = new Locale(locale, languageOverride, directionOverride); + private static void setDefault(java.util.Locale locale, String languageOverride) { + INSTANCE = new Locale(locale, languageOverride); java.util.Locale.setDefault(locale); } @@ -157,11 +146,7 @@ public class Locale implements Serializable { } public Locale withLanguage(String language) { - return new Locale(deviceLocale, language, directionOverride); - } - - public Locale withDirectionality(int directionality) { - return new Locale(deviceLocale, languageOverride, directionality); + return new Locale(deviceLocale, language); } public String getDisplayName() { @@ -185,10 +170,6 @@ public class Locale implements Serializable { } } - public String formatPercentage(int percentage) { - return NumberFormat.getPercentInstance(appLocale).format(percentage / 100.0); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -222,8 +203,6 @@ public class Locale implements Serializable { + ", languageOverride='" + languageOverride + '\'' - + ", directionOverride=" - + directionOverride + ", hasUserOverrides=" + hasUserOverrides + '}'; @@ -247,8 +226,4 @@ public class Locale implements Serializable { public String getCountry() { return appLocale.getCountry(); } - - public boolean isRtl() { - return appDirectionality == View.LAYOUT_DIRECTION_RTL; - } } diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt index d25798672..4a823c626 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt @@ -101,15 +101,6 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange dialog.show(fragmentManager!!, FRAG_TAG_LOCALE_PICKER) false } - findPreference(R.string.p_layout_direction) - .setOnPreferenceChangeListener { _: Preference?, o: Any -> - val newValue: Int = o as Int - if (locale.directionality - != locale.withDirectionality(newValue).directionality) { - showRestartDialog() - } - true - } val startOfWeekPreference: ListPreference = getStartOfWeekPreference() startOfWeekPreference.entries = getWeekdayEntries() @@ -124,10 +115,7 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange requires(R.string.task_list_options, atLeastLollipop(), R.string.p_show_subtasks) - requires(R.string.settings_localization, - atLeastJellybeanMR1(), - R.string.p_language, - R.string.p_layout_direction) + requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language) @Suppress("ConstantConditionIf") if (BuildConfig.FLAVOR != "googleplay") { diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 167fbd1dd..86b6c286e 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -22,9 +22,6 @@ Geen herinneringe gedurende stil ure nie Wys onsigbare Wys voltooide - Uitleg rigting - Links na regs - Regs na links Spesifiseer battery optimalisasies Batteryoptimalisering kan kennisgewings vertraag \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 41be33570..ce4e52825 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -147,7 +147,5 @@ التعتيم أبيض تخصيص اللغة و الجهة - إتجاه التنسيق - من اليمين إلى اليسار تصدير المهام diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index fc84853ba..bd7780e3b 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -403,9 +403,6 @@ Рестартирай сега По-късно Локализация - Направление на изгледа - Отляво надясно - Отдясно наляво LED нотификация Изисква се хардуерна поддръжка Не са намерени календари diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c34050baf..93466d715 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -105,8 +105,6 @@ Blanc Idioma Localització - D\'esquerra a dreta - De dreta a esquerra Led de notificació Introdueixi el nom del filtre Recolzades %1$s de %2$s. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a9768cba9..d9379f1fe 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -259,9 +259,6 @@ Restartovat nyní Později Překlad - Orientace - Zleva do prava - Zprava do leva Nenalezeny žádné kalendáře Nastavení widgetu Zadejte název filtru diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 510c39018..e61eb58dd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -391,9 +391,6 @@ Jetzt neustarten Später Übersetzung - Schreibrichtung - Links nach rechts - Rechts nach links Benachrichtigungs-LED Hardware-Unterstützung benötigt Es wurden keine Kalender gefunden diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b5b1dd9a5..ecc7391f1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -402,9 +402,6 @@ Reiniciar ahora Más tarde Configuración regional - Sentido de la escritura - De izquierda a derecha - De derecha a izquierda Notificación de la LED Apoyo de hardware requerido No se han encontrado calendarios diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 84320c067..158ef8f14 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -258,8 +258,6 @@ Keel Taaskäivita kohe Hiljem - Vasakult paremale - Paremalt vasakule LED-i teavitused Riistvara tugi on nõutud Ühtegi kalendrit ei leitud diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 52cdeb136..3c368e8a3 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -408,9 +408,6 @@ Berrabiarazi orain Geroago Lokalizazioa - Disenuaren norabidea - Ezkerretik eskuinera - Eskuinetik ezkerrera LED jakinarazpena Hardwareak onartzea ezinbestekoa Ez da egutegitik aurkitu diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 209229bb3..eb6390024 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -247,9 +247,6 @@ اکنون ریست کن بعدا محلی‌سازی - چینش صفحه - چپ به راست - راست به چپ مدیریت اعلانات مدیریت بهینه سازی باتری مدیریت بهینه سازی باتری ممکن است اعلانات را به تاخیر بیاندازد diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index aa730096f..727c8e7cf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -378,9 +378,6 @@ Käynnistä uudelleen nyt Myöhemmin Paikallistaminen - Asettelun suunta - Vasemmalta oikealle - Oikealta vasemmalle LED muistutus Laitetuki vaaditaan Kalenteria ei löydy diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a39d279c3..c1057a66a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -381,9 +381,6 @@ Redémarrer maintenant Plus tard Localisation - Sens de lecture - Gauche à droite - Droite à gauche Notification de la LED Support matériel requis Pas de calendrier trouvé diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8dfbce448..69f1254c1 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -299,9 +299,6 @@ Reiniciar ahora Más tarde Localización - Sentido da escritura - De esquerda a dereita - De derecha a izquierda Notificación de la LED Apoyo de hardware requerido No se han encontrado calendarios diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9bffbe159..762d2d64f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -402,9 +402,6 @@ Újraindítás most Később Lokalizáció - Szövegirány - Balról jobbra - Jobbról balra LED értesítés Hardveres támogatás szükséges Naptár nem található diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 03f8c6c5f..5a719352e 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -314,9 +314,6 @@ Mulai ulang sekarang Nanti Pelokalan - Arah tata letak - Kiri ke kanan - Kanan ke kiri Notifikasi LED Membutuhkan dukungan perangkat keras Tidak ada kalender yang ditemukan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 97aece16f..32372a942 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -399,9 +399,6 @@ Riavvia ora Dopo Localizzazione - Direzione Layout - Da sinistra a destra - Da destra a sinistra LED di notifica E\' richiesto il supporto Hardware Nessun calendario diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index ff1ae5365..be360b152 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -438,9 +438,6 @@ אתחל כעת מאוחר יותר לוקאליזציה - כיוון הפריסה - משמאל לימין - מימין לשמאל תאורת התראות נדרשת חומרה תואמת לא נמצאו לוחות שנה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index de6985e6b..3be176eb2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -400,9 +400,6 @@ 今すぐ再起動 後で ローカライズ - レイアウトの向き - 左から右 - 右から左 LED 通知 ハードウェア サポートが必要です カレンダーが見つかりません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 174aba4b5..32f6bf877 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -403,9 +403,6 @@ 지금 재시작하기 나중에 현지화 - 레이아웃 정렬 방향 - 왼쪽 정렬 - 오른쪽 정렬 LED 알림 하드웨어 지원을 필요로 합니다 달력 없음 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4a5352bdb..ede4376cc 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -398,9 +398,6 @@ Perkrauti dabar Vėliau Lokalizacija - Išdėstymo kryptis - Iš kairės į dešinę - Iš dešinės į kairę LED pranešimai Reikalingas techninės įrangos palaikymas Kalendorių nerasta diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 738b6b123..67ac2170d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -145,8 +145,6 @@ Restart nå Senere Lokalisering - Venstre til høyre - Høyre til venstre LED-varsel Tilpass varsler Tilpass batterioptimaliseringer @@ -431,7 +429,6 @@ Mørk Bakgrunnsbilde Dag/natt - Sideretning Maskinvarestøtte kreves Fant ingen kalendre Miniprogramsinnstillinger diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 27c732522..c62ddb411 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -392,9 +392,6 @@ Tasks moet opnieuw gestart worden om de nieuwe wijzingen te activeren Herstart nu Vertalingen - Layout richting - Links naar rechts - Rechts naar links LED notificatie Hardware ondersteuning vereist Geen kalenders gevonden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 90d8c0db1..45556f36b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -414,9 +414,6 @@ Zrestartuj teraz Póżniej Ustawienia regionalne - Kierunek tekstów - Lewy do prawego - Prawy do lewego Powiadomienie LED Wymagane wsparcie sprzętowe Nie znaleziono kalendzarzy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 359bba68d..5c5bbb60a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -400,9 +400,6 @@ Reiniciar agora Depois Localização - Direção do Layout - Esquerda para direita - Direita para esquerda LED de notificações Suporte de hardware necessário Não foi encontrado nenhum calendário diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6438eba31..77af401e9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -364,9 +364,6 @@ Reiniciar agora Mais tarde Tradução - Orientação do layout - Da esquerda para a direita - Da direita para a esquerda Notificação LED Calendário não encontrado Definições do widget diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 0d289b768..396ca8f19 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -9,6 +9,4 @@ Fara categorie Filtre Alb - Stanga la dreapta - Dreapta la stânga \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7af5f12ac..0bf28cd86 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -421,9 +421,6 @@ Перезапустить сейчас Позже Локализация - Ориентация интерфейса - Слева направо - Справа налево LED уведомления Необходима аппаратная поддержка Календарей не найдено diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2bccb0fdb..f5c9dd7eb 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -399,9 +399,6 @@ Reštartovať teraz Neskôr Určovanie polohy - Rozloženie - Z ľava do prava - Z prava do ľava LED oznámenia Vyžaduje sa podpora zariadenia Kalendár nenájdený diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 50ebb0381..9811014a6 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -26,7 +26,4 @@ Bez podsetnika u mirnim satima Filter podešavanja Prikaži skrivene - Raspored komandi - Sleva nadesno - Zdesna nalevo \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 90ab5d8b8..8afe17a75 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -292,8 +292,6 @@ Starta om nu Senare Språk - Vänster till höger - Höger till vänster LED Notifiering Hårdvarustöd krävs Inga kalendrar hittades @@ -409,7 +407,6 @@ Cyan Lime Orange - Layoutriktning Överskriftsinställningar Radinställmingar Tasks kräver tillstånd diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index cd43b1f7d..ed52d3b6c 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -58,7 +58,6 @@ URL kailangan Pangalan ng host kailangan Kailangan magsimula na may http(s):// - Kaliwa sa kanan Magdagdag ng account Gumagamit Mamahala ng baterya mga optimization diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3f6f072a8..5e03a35d2 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -405,9 +405,6 @@ Şimdi yeniden başlat Sonra Yerelleştirme - Yerleşim yönü - Soldan sağa - Sağdan sola LED bildirimi Donanım desteği gerekiyor Takvim bulunamadı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0cdfd81de..bbd931fca 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -403,9 +403,6 @@ Перезапустити зараз Пізніше Локалізація - Напрям письма - Зліва направо - Зправа наліво LED-сповіщення Потрібна підтримка апартних засобів Календарів не знайдено diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 56ff74792..a0058e24d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -384,9 +384,6 @@ 马上重启 稍后 本地化 - 布局方向 - 从左到右 - 从右到左 LED提醒 需要硬件支持 没有找到日历 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8c68f17c5..1146c032d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -209,9 +209,6 @@ Tasks 必須重新啟動以使變更生效 馬上重新啟動 稍後 - 排版方向 - 由左至右 - 由右至左 找不到日曆 管理通知 重複 %s diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 2d1409add..588ecd633 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -125,18 +125,6 @@ zh-tw - - @string/use_locale_default - @string/layout_direction_left_to_right - @string/layout_direction_right_to_left - - - - -1 - 0 - 1 - - @string/no_deadline @string/today diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 73dd05597..d7ed580b1 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -234,7 +234,6 @@ theme_accent theme_launcher language - layout_direction led_notificatiWCAon widget-id- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d49833c36..1e997e23e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -423,9 +423,6 @@ File %1$s contained %2$s.\n\n Restart now Later Localization - Layout direction - Left to right - Right to left LED notification Hardware support required No calendars found diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml index 18b1a5a0d..409659998 100644 --- a/app/src/main/res/xml/preferences_look_and_feel.xml +++ b/app/src/main/res/xml/preferences_look_and_feel.xml @@ -181,13 +181,6 @@ android:key="@string/p_language" android:title="@string/language" /> - -