瀏覽代碼

Merge pull request #3188 from nextcloud/chore/noid/translationStringFixes

Translation string fixes
Andy Scherzinger 2 年之前
父節點
當前提交
b899433180

+ 3 - 3
app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -942,16 +942,16 @@ class SettingsActivity : BaseActivity() {
                 when (newValue) {
                     "HTTP" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_http_value))
-                        appPreferences.proxyPort = "3128"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_http_value)
                     }
 
                     "DIRECT" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_direct_value))
-                        appPreferences.proxyPort = "8080"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_direct_value)
                     }
                     "SOCKS" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_socks_value))
-                        appPreferences.proxyPort = "1080"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_socks_value)
                     }
                     else -> {
                     }

+ 0 - 1
app/src/main/res/layout/activity_settings.xml

@@ -751,7 +751,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/standard_margin"
-                            android:hint="@string/v0_1"
                             android:textSize="@dimen/supporting_text_text_size"/>
 
                     </LinearLayout>

+ 3 - 4
app/src/main/res/values/strings.xml

@@ -687,10 +687,9 @@ How to translate with transifex:
     <string name="nc_filter">Filter Conversations</string>
     <string name="mentioned">Mentioned</string>
     <string name="unread">Unread</string>
-    <string name="nc_settings_http_value">3128</string>
-    <string name="nc_settings_direct_value">8080</string>
-    <string name="nc_settings_socks_value">1080</string>
+    <string name="nc_settings_http_value" translatable="false">3128</string>
+    <string name="nc_settings_direct_value" translatable="false">8080</string>
+    <string name="nc_settings_socks_value" translatable="false">1080</string>
     <string name="this_is_a_test_message">This is a test message</string>
-    <string name="v0_1">v0.1</string>
 
 </resources>