Merge pull request #3474 from nextcloud/bugfix/3472/translateNoProxy

translate "no proxy" in settings
nextcloud · Nov 29, 2023 · 83a3d39 · 83a3d39
2 parents 5f53005 + f6b481c
commit 83a3d39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
@@ -587,7 +587,9 @@ class SettingsActivity : BaseActivity() {
             }
         }
 
-        if (("No proxy" == appPreferences.proxyType) || appPreferences.proxyType == null) {
+        if (((context.resources.getString(R.string.nc_no_proxy)) == appPreferences.proxyType) ||
+            appPreferences.proxyType == null
+        ) {
             hideProxySettings()
         } else {
             showProxySettings()
@@ -987,7 +989,7 @@ class SettingsActivity : BaseActivity() {
             proxyTypeFlow.collect { newString ->
                 if (newString != state) {
                     state = newString
-                    if (("No proxy" == newString) || newString.isEmpty()) {
+                    if (((context.resources.getString(R.string.nc_no_proxy)) == newString) || newString.isEmpty()) {
                         hideProxySettings()
                     } else {
                         when (newString) {

diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
@@ -41,7 +41,9 @@ import kotlinx.coroutines.runBlocking
 class AppPreferencesImpl(val context: Context) : AppPreferences {
 
     override fun getProxyType(): String {
-        return runBlocking { async { readString(PROXY_TYPE, "No proxy").first() } }.getCompleted()
+        return runBlocking {
+            async { readString(PROXY_TYPE, context.resources.getString(R.string.nc_no_proxy)).first() }
+        }.getCompleted()
     }
 
     override fun setProxyType(proxyType: String?) = runBlocking<Unit> {