From 18c41951155ddf5fa54bfbeb4e755266a0dd9b96 Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Thu, 7 Jun 2018 11:42:31 +0200
Subject: [PATCH] fix region and title
---
.../briar/android/settings/SettingsFragment.java | 2 +-
briar-android/src/main/res/values/strings.xml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
index e975690e9b..083d624bb7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -202,7 +202,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
Locale locale = Localizer.getLocaleFromTag(tag);
if (locale == null)
throw new IllegalStateException();
- String nativeName = locale.getDisplayLanguage(locale);
+ String nativeName = locale.getDisplayName(locale);
// Fallback to English if the name is unknown in both native and
// current locale.
if (nativeName.equals(tag)) {
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index a0087bedd7..877c40e1f0 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -323,6 +323,12 @@
<string name="blogs_rss_feeds_manage_empty_state">No RSS feeds to show\n\nTap the + icon to import a feed</string>
<string name="blogs_rss_feeds_manage_error">There was a problem loading your feeds. Please try again later.</string>
+ <!-- Settings Display -->
+ <string name="pref_language_title">Language & region</string>
+ <string name="pref_language_changed">This setting will take effect when you restart Briar. Please sign out and restart Briar.</string>
+ <string name="pref_language_default">System default</string>
+ <string name="display_settings_title">Display</string>
+
<!-- Settings Network -->
<string name="network_settings_title">Networks</string>
<string name="bluetooth_setting">Connect via Bluetooth</string>
@@ -421,10 +427,4 @@
<string name="permission_camera_denied_toast">Camera permission was not granted</string>
<string name="qr_code">QR code</string>
<string name="show_qr_code_fullscreen">Show QR code fullscreen</string>
-
- <!-- Languages -->
- <string name="pref_language_title">Language</string>
- <string name="pref_language_changed">This setting will take effect when you restart Briar. Please sign out and restart Briar.</string>
- <string name="pref_language_default">System default</string>
- <string name="display_settings_title">Display</string>
</resources>
--
GitLab