Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch languageCode to content country

Browse source
This commit is contained in:
Christian Schabesberger 2018-01-09 12:25:40 +01:00
parent 28a9855fd2
commit 33d75fd2fb
7 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/values/settings_keys.xml
View file

@ -100,7 +100,9 @@
<string name="show_next_video_key" translatable="false">show_next_video</string>
<string name="show_hold_to_append_key" translatable="false">show_hold_to_append</string>
<string name="default_language_value">en</string>
<string name="default_country_value">GB</string>
<string name="search_language_key" translatable="false">search_language</string>
<string name="content_country_key" translatable="false">content_country</string>
<string name="show_age_restricted_content" translatable="false">show_age_restricted_content</string>
<string name="use_tor_key" translatable="false">use_tor</string>
<string name="enable_search_history_key" translatable="false">enable_search_history</string>
@ -518,7 +520,7 @@
<item>Sweden</item>
<item>Switzerland</item>
<item>Syrian ArabRepublic(Syria)</item>
<item>Taiwan,RepublicofChina</item>
<item>Taiwan, Republicof China</item>
<item>Tajikistan</item>
<item>Tanzania</item>
<item>Thailand</item>
@ -534,10 +536,10 @@
<item>Tuvalu</item>
<item>Uganda</item>
<item>Ukraine</item>
<item>UnitedArabEmirates</item>
<item>UnitedKingdom</item>
<item>United Arab Emirates</item>
<item>United Kingdom</item>
<item>USA</item>
<item>MinorOutlyingIslands</item>
<item>Minor Outlying Islands</item>
<item>Uruguay</item>
<item>Uzbekistan</item>
<item>Vanuatu</item>

3
app/src/main/res/values/strings.xml
View file

@ -83,7 +83,8 @@
<string name="show_hold_to_append_title">Show Hold to Append Tip</string>
<string name="show_hold_to_append_summary">Show tip when background or popup button is pressed on video details page</string>
<string name="url_not_supported_toast">URL not supported</string>
<string name="default_content_country_title">Default content country.</string>
<string name="default_content_country_title">Default content country</string>
<string name="search_language_title">Default content language</string>
<string name="settings_category_player_title">Player</string>
<string name="settings_category_player_behavior_title">Behavior</string>
<string name="settings_category_video_audio_title">Video &amp; Audio</string>

12
app/src/main/res/xml/content_settings.xml
View file

@ -3,13 +3,23 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/content">
<ListPreference
android:defaultValue="@string/default_country_value"
android:entries="@array/country_names"
android:entryValues="@array/country_codes"
android:key="@string/content_country_key"
android:summary="%s"
android:title="@string/default_content_country_title"/>
<!-- TODO: add support for this within code
<ListPreference
android:defaultValue="@string/default_language_value"
android:entries="@array/language_names"
android:entryValues="@array/language_codes"
android:key="@string/search_language_key"
android:summary="%s"
android:title="@string/default_content_country_title"/>
android:title="@string/search_language_title"/>
-->
<SwitchPreference
android:defaultValue="false"