diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-12-20 10:40:34 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-01-22 08:47:02 +0100 |
| commit | 5bf2ec9ed8728a2042e110122ea2b0e4ff55104a (patch) | |
| tree | d1eee48c253ed81eba7f21b2d4b9a9a188dcdf29 /android/source/res | |
| parent | 9ee61e01ad47e99bf6c443efb98dd1e0e4d1ae83 (diff) | |
android: Use system locale by default
Instead of hard-coding the use of English as default
locale and allowing manually selecting another language,
this now makes the system's default locale to be used
by default in the Android Viewer. It's still possible to
explicitly select another language to override that.
In case there is no localization for the system locale,
an automatic fallback to English happens anyway, so there
should be no need to explicitly set the locale to English
in that case either.
Change-Id: I0b8cfafea6a4659c3657522cfd5895c00f25f054
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85583
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android/source/res')
| -rw-r--r-- | android/source/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | android/source/res/xml/libreoffice_preferences.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/android/source/res/values/arrays.xml b/android/source/res/values/arrays.xml index b1b61ef89b2f..edea6443b419 100644 --- a/android/source/res/values/arrays.xml +++ b/android/source/res/values/arrays.xml @@ -14,6 +14,7 @@ <item >3</item> </string-array> <string-array name="SupportedLanguagesValues"> + <item>SYSTEM_DEFAULT_LANGUAGE</item> <item >de</item> <item >en</item> <item >tr</item> @@ -43,6 +44,7 @@ <item>@string/filter_drawings</item> </string-array> <string-array name="SupportedLanguages"> + <item>(System Default)</item> <item>Deutsch</item> <item>English</item> <item>Turkçe</item> diff --git a/android/source/res/xml/libreoffice_preferences.xml b/android/source/res/xml/libreoffice_preferences.xml index cf1d306866cf..d02c9d5cccbc 100644 --- a/android/source/res/xml/libreoffice_preferences.xml +++ b/android/source/res/xml/libreoffice_preferences.xml @@ -30,7 +30,7 @@ android:summary="@string/display_language_summary" android:entries="@array/SupportedLanguages" android:entryValues="@array/SupportedLanguagesValues" - android:defaultValue="en" + android:defaultValue="SYSTEM_DEFAULT_LANGUAGE" android:key="DISPLAY_LANGUAGE" /> |