android/source/res/values-tr/strings.xml                              |  230 
++++++++++
 android/source/res/values/arrays.xml                                  |    8 
 android/source/res/values/strings.xml                                 |    2 
 android/source/res/xml/libreoffice_preferences.xml                    |    9 
 android/source/src/java/org/libreoffice/LibreOfficeApplication.java   |    6 
 android/source/src/java/org/libreoffice/LocaleHelper.java             |   56 ++
 android/source/src/java/org/libreoffice/SettingsActivity.java         |    3 
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |   13 
 8 files changed, 326 insertions(+), 1 deletion(-)

New commits:
commit 1ed42082589f529278cd35a01f23cc25846f7983
Author:     Mert Tumer <merttu...@outlook.com>
AuthorDate: Mon Oct 15 15:21:02 2018 +0300
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Oct 18 12:32:49 2018 +0200

    Added Turkish Language Support on Android Viewer
    
    Change-Id: I0b2f1ca5386510e3a8217cf3bb3e08a940f438f7
    Signed-off-by: Mert Tumer <merttu...@outlook.com>
    Reviewed-on: https://gerrit.libreoffice.org/61788
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/android/source/res/values-tr/strings.xml 
b/android/source/res/values-tr/strings.xml
new file mode 100644
index 000000000000..ce22a1e3050b
--- /dev/null
+++ b/android/source/res/values-tr/strings.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">LibreOffice Görüntüleyici</string>
+    <string name="app_name_settings">LibreOffice Görüntüleyici 
Ayarları</string>
+
+    <string name="app_about_name"><b>LibreOffice Görüntüleyici 
\'Beta\'</b></string>
+    <string name="app_version">Versiyon: %1$s\nBuild ID: %2$s</string>
+    <string name="app_description">LibreOffice Görüntüleyici LibreOffice 
tabanlı bir belge görüntüleyicisidir.</string>
+    <string name="app_credits">https://www.libreoffice.org</string>
+    <string name="app_vendor">Bu sürüm $VENDOR tarafından 
derlenmiştir.</string>
+    <string name="temp_file_saving_disabled">Bu dosya salt okunabilir 
haldedir. Kaydetme devredışı.</string>
+
+    <string name="about_license">Lisansı Görüntüle</string>
+    <string name="about_notice">Bildiriyi Görüntüle</string>
+    <string name="about_moreinfo">Daha Fazla Bilgi</string>
+    <string name="back_again_to_quit">Çıkış için geri tuşuna tekrar 
basınız.</string>
+
+    <string name="new_textdocument">Yeni Kelime İşlemci</string>
+    <string name="new_presentation">Yeni Sunum</string>
+    <string name="new_spreadsheet">Yeni Hesap Tablosu</string>
+    <string name="new_drawing">Yeni Çizim</string>
+    <string name="default_document_name">başlıksız</string>
+
+    <string name="browser_app_name">LibreOffice Tarayıcı</string>
+    <string name="menu_search">Ara</string>
+    <string name="list_view">Liste</string>
+    <string name="grid_view">Grid</string>
+    <string name="filter">Şununla filtrele:</string>
+    <string name="search_not_found">Söz dizimi bulunamadı.</string>
+    <string name="sort">Şununla sırala:</string>
+    <string name="sort_smallest">Küçükten büyüğe</string>
+    <string name="sort_largest">Büyükten küçüğe</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Eskiden yeniye</string>
+    <string name="sort_newest">Yeniden eskiye</string>
+    <string name="menu_sort_size">Boyuta Göre Sırala</string>
+    <string name="menu_sort_az">Alfabetik Sırala</string>
+    <string name="menu_sort_modified">Tarihe Göre Sırala</string>
+    <string name="menu_preferences">Seçenekler</string>
+    <string name="file_icon_desc">fileicon</string>
+    <string name="title_recents">Son açılan dosyalar</string>
+    <string name="title_browser">Tüm dosyalar</string>
+    <!-- Pref keys as resources ; Not currently used -->
+    <string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
+    <string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
+    <string name="pref_category_explorer">Dosya Gezgini Ayarları</string>
+    <string name="pref_category_general">Genel</string>
+    <string name="pref_experimental_editing">Deneysel Mod</string>
+    <string name="pref_experimental_editing_summary">Deneysel editleme modunu 
etkinleştirin. Kullanım riski size aittir.</string>
+    <string name="pref_show_hidden_files">Gizli Dosyalar ve Dizinler</string>
+    <string name="pref_show_hidden_files_summary">Gizli dosyalar ve dizinleri 
göstermeyi etkinleştir.</string>
+    <string name="pref_developer_mode">Geliştirici Modu</string>
+    <string name="pref_developer_mode_summary">Geliştirici modunu 
etkinleştirerek UNO komutları gönderin. Kullanım riski size aittir.</string>
+
+    <string name="action_about">Hakkında</string>
+    <string name="action_parts">Bölümler</string>
+    <string name="action_settings">Ayarlar</string>
+    <string name="open">Aç</string>
+    <string name="share">Paylaş</string>
+    <string name="share_via">Şununla paylaş</string>
+
+    <!-- Document browser filters -->
+    <string name="filter_everything">Hepsi</string>
+    <string name="filter_documents">Kelime İşlemci</string>
+    <string name="filter_spreadsheets">Hesap Tablosu</string>
+    <string name="filter_presentations">Sunum</string>
+    <string name="filter_drawings">Çizimler</string>
+
+    <!-- Document provider names -->
+    <string name="document_locations">Belge dizinleri</string>
+    <string name="close_document_locations">Belge dizinlerini kapat</string>
+    <string name="local_documents">Belgeler</string>
+    <string name="local_file_system">Yerel dosya sistemi</string>
+    <string name="external_sd_file_system">Harici SD</string>
+    <string name="otg_file_system">OTG cihazı (deneysel)</string>
+    <string name="owncloud">Uzak sunucu</string>
+    <string name="usb_connected_configure">USB bağlantısı yapıldı, cihazınızın 
ayarlarını yapınız.</string>
+
+    <string name="owncloud_wrong_connection">ownCloud sunucusuna 
bağlanılamadı. Ayarlarınızı kontrol ediniz.</string>
+    <string name="owncloud_unauthorized">ownCloud sunucusuna giriş yapılamadı. 
Ayarlarınızı kontrol ediniz.</string>
+    <string name="owncloud_unspecified_error">ownCloud sunucusuna bağlanırken 
belirtilmemiş bir hata oluştu. Lütfen daha sonra tekrar deneyiniz veya 
ayarlarınızı kontrol ediniz.</string>
+
+    <string name="ext_document_provider_error">Geçersiz dizin. SD kart 
ayarlarınızı kontrol ediniz.</string>
+    <string name="legacy_extsd_missing_error">Geçersiz dizin. SD kartınızı 
veya SD kart ayarlarınızı kontrol ediniz.</string>
+    <string name="otg_missing_error">Geçersiz dizin. OTG cihazınızı veya OTG 
cihazı ayarlarınızı kontrol ediniz.</string>
+
+    <!-- Edit action names -->
+    <string name="action_bold">Kalın</string>
+    <string name="action_underline">Altı çizgili</string>
+    <string name="action_italic">Yana yatık</string>
+    <string name="action_strikeout">Üzeri çizgili</string>
+    <string name="action_keyboard">Klaveyi göster</string>
+    <string name="action_save">Kaydet</string>
+    <string name="action_fromat">Biçimlendirmeyi etkinleştir.</string>
+    <string name="action_search">Ara</string>
+    <string name="action_UNO_commands">UNO Komutu yolla</string>
+
+    <!-- Feedback messages -->
+    <string name="message_saved">Kaydetme tamamlandı.</string>
+    <string name="message_saving">Belge kaydediliyor…</string>
+    <string name="message_save_incomplete">Kayıt tamamlanmadı. Değişiklik 
yapıldı mı?</string>
+    <string name="create_new_file_success">"Yeni dosya yaratıldı - "</string>
+    <string name="create_new_file_error">Yeni dosya yaratma başarısız. Lütfen 
dosya ismini kontrol ediniz.</string>
+
+    <!-- Document provider settings -->
+    <string name="storage_provider_settings">Depolama sağlayıcısı 
ayarları</string>
+    <string name="owncloud_settings">ownCloud ayarları</string>
+    <string name="physical_storage_settings">Fiziksel depolama 
ayarları</string>
+    <string name="external_sd_path">Harici SD yolu</string>
+    <string name="otg_device_path">OTG cihazı yolu</string>
+    <string name="otg_warning">Deneysel özellik: OTG cihazı yazılabilir ise 
kullanın</string>
+    <string name="server_url">Sunucu URL</string>
+    <string name="server_url_and_port">ownCloud sunucusu URL ve port</string>
+    <string name="user_name">Kullanıcı Adı</string>
+    <string name="password">Parola</string>
+    <string name="action_undo">Geri Al</string>
+    <string name="action_redo">Yinele</string>
+
+    <!-- Directory browser strings -->
+    <string name="up_description">Üst dizin</string>
+    <string name="confirm_label">Onayla</string>
+    <string name="cancel_label">İptal</string>
+    <string name="search_label">Git</string>
+    <string name="directory_browser_label">Dizin Seç</string>
+    <string name="bad_directory">Geçersiz dizin</string>
+    <string name="current_dir">Şuan ki dizin: %1$s</string>
+
+    <!-- Save Alert dialog strings -->
+    <string name="save_alert_dialog_title">Değişiklikleri kaydetmek istiyor 
musunuz?</string>
+    <string name="save_document">Kaydet</string>
+    <string name="action_cancel">İptal</string>
+    <string name="no_save_document">Hayır</string>
+
+    <!-- Create New Document Dialog Strings -->
+    <string name="create_new_document_title">Dosya ismi girin</string>
+    <string name="action_create">OLUŞTUR</string>
+
+    <!-- Presentation Mode Strings -->
+    <string name="action_presentation">Slayt Gösterisi</string>
+    <string name="action_add_slide">Slayt Ekle</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard">Cihazınız uygulama 
içi slayt gösterisini desteklemiyor. Sunumu panoya kopyaladık. Lütfen ev tuşuna 
basıp modern bir tarayıcı açıp arama çubuğuna yapıştırın ve sunumu 
görüntüleyin.</string>
+    <string 
name="alert_copy_svg_slide_show_to_clipboard_dismiss">Tamam</string>
+    <string name="slideshow_action_back">Geri</string>
+
+    <!-- Calc Header Menu Strings -->
+    <string name="calc_insert_before">Ekle</string>
+    <string name="calc_delete">Sil</string>
+    <string name="calc_hide">Gizle</string>
+    <string name="calc_show">Göster</string>
+    <string name="calc_optimal_length">En iyi uzunluk</string>
+    <string name="calc_adjust_length">Uzunluğu ayarla</string>
+    <string name="calc_adjust_height">Yüksekliği ayarla</string>
+    <string name="calc_adjust_width">Genişliği ayarla</string>
+    <string name="calc_optimal_height">En iyi yükseklikt</string>
+    <string name="calc_optimal_width">En iyi genişlik</string>
+    <string name="calc_optimal_length_confirm">Tamam</string>
+    <string name="calc_optimal_length_default_text">Extra uzunluk giriniz: 
100th/mm</string>
+    <string name="calc_alert_double_click_optimal_length">İpucu: Başlığa çift 
dokunuş en iyi uzunluk ve genişliği ayarlar.</string>
+    <string name="action_add_worksheet">Hesap Tablosu Ekle</string>
+
+    <!-- Password dialog strings -->
+    <string name="action_pwd_dialog_OK">Tamam</string>
+    <string name="action_pwd_dialog_cancel">İptal</string>
+    <string name="action_pwd_dialog_title">Lütfen parola giriniz.</string>
+
+    <!-- Insert Image Strings -->
+    <string name="take_photo">Fotoğraf Çek</string>
+    <string name="select_photo">Fotoğraf Seç</string>
+    <string name="select_photo_title">Resim Seç</string>
+    <string name="no_camera_found">Kamera bulunamadı.</string>
+    <string name="compress_photo_smallest_size">Düşük Kalite</string>
+    <string name="compress_photo_medium_size">Orta Kalite</string>
+    <string name="compress_photo_max_quality">Maksimum Kalite</string>
+    <string name="compress_photo_no_compress">Sıkıştırma yapma</string>
+    <string name="compress_photo_title">Fotoğrafı sıkıştırmak ister 
misiniz?</string>
+
+    <!-- Clipboard Actions -->
+    <string name="action_copy">Kopyala</string>
+    <string name="action_paste">Yapıştır</string>
+    <string name="action_cut">Kes</string>
+    <string name="action_back">Geri</string>
+    <string name="action_text_copied">Yazı panoya kopyalandı.</string>
+    <string name="insert_table">Tablo Ekle</string>
+    <string name="select_insert_options">Ekleme seçenekleri:</string>
+    <string name="select_delete_options">Silme seçenekleri:</string>
+    <string name="action_rename_worksheet">Hesap tablosunu yeniden 
adlandır</string>
+    <string name="action_delete_worksheet">Hesap tablosunu sil</string>
+    <string name="action_delete_slide">Slayt sil</string>
+    <string name="name_already_used">Girilen isim zaten kullanılıyor.</string>
+    <string name="part_name_changed">Bölüm ismi değiştirildi.</string>
+    <string name="part_deleted">Bölüm silindi.</string>
+    <string-array name="insertrowscolumns">
+        <item>Satırları öncekine ekle</item>
+        <item>Satırları sonrakine ekle</item>
+        <item>Kolonları öncekine ekle</item>
+        <item>Kolonları sonrakine ekle</item>
+        <item>Tablo Ekle</item>
+    </string-array>
+    <string-array name="deleterowcolumns">
+        <item>Satır Sil</item>
+        <item>Kolon Sil</item>
+        <item>Tablo Sil</item>
+    </string-array>
+
+    <!-- UNO cmd controller Strings -->
+    <string name="UNO_commands_string_hint">UNO Komutu</string>
+    <string name="UNO_commands_string_type_hint">Tip</string>
+    <string name="UNO_commands_string_value_hint">Değer</string>
+    <string name="UNO_commands_string_parent_value_hint">Ebeveyn 
Değeri</string>
+    <string name="action_exportToPDF">PDF olarak aktar</string>
+    <string name="action_print">Yazdır</string>
+    <string name="tabhost_character">Karakter</string>
+    <string name="tabhost_paragraph">Paragraf</string>
+    <string name="tabhost_insert">Ekle</string>
+    <string name="tabhost_style">Stil</string>
+    <string name="alert_ok">Tamam</string>
+    <string name="alert_cancel">İptal</string>
+    <string name="unable_to_go_further">Daha fazla ilerlenemiyor.</string>
+    <string name="current_uno_command">Şuan ki UNO komutu</string>
+    <string name="pref_sort_summary">Dosyaların nasıl sıralanacağını seçiniz. 
A-Z, Z-A yada boyutsal.</string>
+    <string name="pref_viewmode_summary">Dosyaları grid veya liste şeklinde 
görüntüle.</string>
+    <string name="pref_file_explorer_title">Dosya Gezgini</string>
+    <string name="pref_sort_title">Dosya Sıralaması</string>
+    <string name="pref_filter_title">Varsayılan Dosya Filtrelemesi</string>
+    <string name="pref_filter_summary">Varsayılan dosya filtrelemesini 
seç</string>
+    <string name="display_language">Uygulama Dili</string>
+    <string name="display_language_summary">Varsayılan dili değiştir</string>
+</resources>
diff --git a/android/source/res/values/arrays.xml 
b/android/source/res/values/arrays.xml
index f331e672c35e..5912f08900b9 100644
--- a/android/source/res/values/arrays.xml
+++ b/android/source/res/values/arrays.xml
@@ -14,6 +14,7 @@
     </string-array>
     <string-array name="SupportedLanguagesValues">
         <item >en</item>
+        <item >tr</item>
     </string-array>
     <string-array name="SortModeStringValues">
         <item >0</item>
@@ -41,6 +42,7 @@
     </string-array>
     <string-array name="SupportedLanguages">
         <item>English</item>
+        <item>Turkçe</item>
     </string-array>
     <string-array name="SortModeNames">
         <item >@string/sort_az</item>
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index 457d10b40af8..99a6d809f042 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -225,4 +225,6 @@
     <string name="pref_sort_title">File Order</string>
     <string name="pref_filter_title">Default File Filter</string>
     <string name="pref_filter_summary">Set which file filter should be used by 
default.</string>
+    <string name="display_language">Display Language</string>
+    <string name="display_language_summary">Set the default display 
language</string>
 </resources>
diff --git a/android/source/res/xml/libreoffice_preferences.xml 
b/android/source/res/xml/libreoffice_preferences.xml
index 86ad3af81971..5541c29ff3d4 100644
--- a/android/source/res/xml/libreoffice_preferences.xml
+++ b/android/source/res/xml/libreoffice_preferences.xml
@@ -24,8 +24,8 @@
             android:summary="@string/pref_viewmode_summary" />
 
         <ListPreference
-            android:title="Display Language"
-            android:summary="Set the default display language"
+            android:title="@string/display_language"
+            android:summary="@string/display_language_summary"
             android:entries="@array/SupportedLanguages"
             android:entryValues="@array/SupportedLanguagesValues"
             android:key="DISPLAY_LANGUAGE"
commit f2e35a695671028b32139df1824ff536e7610d35
Author:     Mert Tumer <merttu...@outlook.com>
AuthorDate: Tue Sep 18 23:29:57 2018 +0300
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Oct 18 12:32:15 2018 +0200

    Added language support on Android Viewer
    
    Change-Id: I05a189dcee9cf4415ce59771da03c08cf0fef6c4
    Signed-off-by: Mert Tumer <merttu...@outlook.com>
    Reviewed-on: https://gerrit.libreoffice.org/60727
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/android/source/res/values/arrays.xml 
b/android/source/res/values/arrays.xml
index f2326764aa76..f331e672c35e 100644
--- a/android/source/res/values/arrays.xml
+++ b/android/source/res/values/arrays.xml
@@ -12,6 +12,9 @@
         <item >1</item>
         <item >2</item>
     </string-array>
+    <string-array name="SupportedLanguagesValues">
+        <item >en</item>
+    </string-array>
     <string-array name="SortModeStringValues">
         <item >0</item>
         <item >1</item>
@@ -36,6 +39,9 @@
         <item>@string/filter_presentations</item>
         <item>@string/filter_drawings</item>
     </string-array>
+    <string-array name="SupportedLanguages">
+        <item>English</item>
+    </string-array>
     <string-array name="SortModeNames">
         <item >@string/sort_az</item>
         <item >@string/sort_za</item>
diff --git a/android/source/res/xml/libreoffice_preferences.xml 
b/android/source/res/xml/libreoffice_preferences.xml
index 3bc04d769278..86ad3af81971 100644
--- a/android/source/res/xml/libreoffice_preferences.xml
+++ b/android/source/res/xml/libreoffice_preferences.xml
@@ -22,6 +22,15 @@
             android:title="@string/pref_file_explorer_title"
             android:key="EXPLORER_VIEW_TYPE"
             android:summary="@string/pref_viewmode_summary" />
+
+        <ListPreference
+            android:title="Display Language"
+            android:summary="Set the default display language"
+            android:entries="@array/SupportedLanguages"
+            android:entryValues="@array/SupportedLanguagesValues"
+            android:key="DISPLAY_LANGUAGE"
+            />
+
         <CheckBoxPreference
             android:title="@string/pref_show_hidden_files"
             android:key="ENABLE_SHOW_HIDDEN_FILES"
diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeApplication.java 
b/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
index 67655c7689cd..07c14663860e 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeApplication.java
@@ -11,6 +11,7 @@
 package org.libreoffice;
 
 import android.app.Application;
+import android.content.Context;
 import android.os.Handler;
 
 public class LibreOfficeApplication extends Application {
@@ -24,4 +25,9 @@ public class LibreOfficeApplication extends Application {
     public static Handler getMainHandler() {
         return mainHandler;
     }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base, "en"));
+    }
 }
diff --git a/android/source/src/java/org/libreoffice/LocaleHelper.java 
b/android/source/src/java/org/libreoffice/LocaleHelper.java
new file mode 100644
index 000000000000..26a31e431397
--- /dev/null
+++ b/android/source/src/java/org/libreoffice/LocaleHelper.java
@@ -0,0 +1,56 @@
+package org.libreoffice;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import java.util.Locale;
+
+public class LocaleHelper {
+
+    private static final String SELECTED_LANG = 
"org.libreoffice.selected.lang";
+
+    public static Context onAttach(Context context){
+        String lang = getPersistedData(context, 
Locale.getDefault().getLanguage());
+        return setLocale(context, lang);
+    }
+
+    public static Context onAttach(Context context, String defLang){
+        String lang = getPersistedData(context, defLang);
+        return setLocale(context, lang);
+    }
+
+    public static Context setLocale(Context context, String lang) {
+        persist(context, lang);
+        return updateResources(context, lang);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Context updateResources(Context context, String lang) {
+        Locale locale = new Locale(lang);
+        Locale.setDefault(locale);
+
+        Resources res = context.getResources();
+        Configuration cfg = res.getConfiguration();
+        cfg.locale = locale;
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+            cfg.setLayoutDirection(locale);
+
+        res.updateConfiguration(cfg, res.getDisplayMetrics());
+        return context;
+    }
+
+    private static void persist(Context context, String lang) {
+        SharedPreferences preferences = 
PreferenceManager.getDefaultSharedPreferences(context);
+        preferences.edit().putString(SELECTED_LANG, lang);
+        preferences.edit().apply();
+    }
+
+    private static String getPersistedData(Context context, String lang) {
+        SharedPreferences preferences = 
PreferenceManager.getDefaultSharedPreferences(context);
+        return preferences.getString(SELECTED_LANG, lang);
+    }
+}
diff --git a/android/source/src/java/org/libreoffice/SettingsActivity.java 
b/android/source/src/java/org/libreoffice/SettingsActivity.java
index 4ef7277d7d53..de5f388c7c25 100644
--- a/android/source/src/java/org/libreoffice/SettingsActivity.java
+++ b/android/source/src/java/org/libreoffice/SettingsActivity.java
@@ -48,6 +48,9 @@ public class SettingsActivity extends Activity {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences 
sharedPreferences, String key) {
             
SettingsListenerModel.getInstance().changePreferenceState(sharedPreferences, 
key);
+            if(key.equals("DISPLAY_LANGUAGE")){
+                getActivity().recreate();
+            }
         }
     }
 }
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index fd1e2a217b14..d6501f08bd85 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -67,6 +67,7 @@ import android.widget.Toast;
 import org.libreoffice.AboutDialogFragment;
 import org.libreoffice.LOKitShell;
 import org.libreoffice.LibreOfficeMainActivity;
+import org.libreoffice.LocaleHelper;
 import org.libreoffice.R;
 import org.libreoffice.SettingsActivity;
 import org.libreoffice.SettingsListenerModel;
@@ -95,6 +96,8 @@ public class LibreOfficeUIActivity extends AppCompatActivity 
implements Settings
     private int viewMode;
     private int sortMode;
     private boolean showHiddenFiles;
+    private String displayLanguage;
+
     // dynamic permissions IDs
     private static final int PERMISSION_READ_EXTERNAL_STORAGE = 0;
 
@@ -115,6 +118,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
     public static final String SORT_MODE_KEY = "SORT_MODE";
     private static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS";
     private static final String ENABLE_SHOW_HIDDEN_FILES_KEY = 
"ENABLE_SHOW_HIDDEN_FILES";
+    private static final String DISPLAY_LANGUAGE = "DISPLAY_LANGUAGE";
 
     public static final String NEW_FILE_PATH_KEY = "NEW_FILE_PATH_KEY";
     public static final String NEW_DOC_TYPE_KEY = "NEW_DOC_TYPE_KEY";
@@ -148,7 +152,6 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
     private LinearLayout impressLayout;
     private LinearLayout calcLayout;
 
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -173,6 +176,11 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
         fabCloseAnimation = AnimationUtils.loadAnimation(this, 
R.anim.fab_close);
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(LocaleHelper.onAttach(newBase,"en"));
+    }
+
     public void createUI() {
 
         setContentView(R.layout.activity_document_browser);
@@ -834,6 +842,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
         viewMode = 
Integer.valueOf(defaultPrefs.getString(EXPLORER_VIEW_TYPE_KEY, ""+ GRID_VIEW));
         filterMode = Integer.valueOf(defaultPrefs.getString(FILTER_MODE_KEY , 
"-1"));
         showHiddenFiles = 
defaultPrefs.getBoolean(ENABLE_SHOW_HIDDEN_FILES_KEY, false);
+        displayLanguage = defaultPrefs.getString(DISPLAY_LANGUAGE, "en");
 
         Intent i = this.getIntent();
         if (i.hasExtra(CURRENT_DIRECTORY_KEY)) {
@@ -855,6 +864,8 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
             viewMode = i.getIntExtra( EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
             Log.d(LOGTAG, EXPLORER_VIEW_TYPE_KEY);
         }
+
+        LocaleHelper.setLocale(this, displayLanguage);
     }
 
     @Override
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to