gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-24 22:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Translation string fixes
This commit is contained in:
Andy Scherzinger 2023-07-14 18:02:32 +02:00 committed by GitHub
commit b899433180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
View File

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

1
app/src/main/res/layout/activity_settings.xml
View File

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

7
app/src/main/res/values/strings.xml
View File

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