MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-29 12:05:53 +01:00
Code Releases Wiki Activity

Group language settings.

Browse Source
This commit is contained in:
Pavel Elagin 2018-09-06 16:45:31 +03:00
parent 7b709dd975
commit 04789f841b
3 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/values-ru/strings.xml
View File

@ -628,4 +628,5 @@
<string name="preferences_fm_frequency">Частота УКВ</string> <string name="preferences_fm_frequency">Частота УКВ</string>
<string name="pref_invalid_frequency_title">Недопустимая частота</string> <string name="pref_invalid_frequency_title">Недопустимая частота</string>
<string name="pref_invalid_frequency_message">Выберите, пожалуйста, частоту в интервале 87.5—108</string> <string name="pref_invalid_frequency_message">Выберите, пожалуйста, частоту в интервале 87.5—108</string>
<string name="language_and_region_prefs">Язык и региональные настройки</string>
</resources> </resources>

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

@ -660,4 +660,5 @@
<string name="preferences_fm_frequency">FM Frequency</string> <string name="preferences_fm_frequency">FM Frequency</string>
<string name="pref_invalid_frequency_title">Invalid frequency</string> <string name="pref_invalid_frequency_title">Invalid frequency</string>
<string name="pref_invalid_frequency_message">Please enter a frequency between 87.5 and 108.0</string> <string name="pref_invalid_frequency_message">Please enter a frequency between 87.5 and 108.0</string>
<string name="language_and_region_prefs">Language and region settings</string>
</resources> </resources>

88
app/src/main/res/xml/preferences.xml
View File

@ -30,6 +30,10 @@
android:entryValues="@array/pref_theme_values" android:entryValues="@array/pref_theme_values"
android:defaultValue="@string/pref_theme_value_light" android:defaultValue="@string/pref_theme_value_light"
android:summary="%s" /> android:summary="%s" />
<PreferenceScreen
android:key="language_category"
android:title="@string/language_and_region_prefs">
<ListPreference <ListPreference
android:defaultValue="default" android:defaultValue="default"
android:entries="@array/pref_language_options" android:entries="@array/pref_language_options"
@ -44,6 +48,37 @@
android:key="measurement_system" android:key="measurement_system"
android:summary="%s" android:summary="%s"
android:title="@string/pref_title_unit_system" /> android:title="@string/pref_title_unit_system" />
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="transliteration"
android:summary="@string/pref_summary_transliteration"
android:title="@string/pref_title_transliteration" />
<PreferenceScreen
android:title="@string/preferences_rtl_settings">
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="rtl"
android:summary="@string/pref_summary_rtl"
android:title="@string/pref_title_rtl" />
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="contextualArabic"
android:summary="@string/pref_summary_contextual_arabic"
android:title="@string/pref_title_contextual_arabic" />
<EditTextPreference
android:inputType="number"
android:key="rtl_max_line_length"
android:defaultValue="20"
android:maxLength="159"
android:title="@string/pref_rtl_max_line_length"
android:summary="@string/pref_rtl_max_line_length_summary"/>
</PreferenceScreen>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_title_weather"> <PreferenceScreen android:title="@string/pref_title_weather">
<EditTextPreference <EditTextPreference
android:key="weather_city" android:key="weather_city"
@ -181,39 +216,6 @@
android:title="@string/pref_title_notifications_timeout" android:title="@string/pref_title_notifications_timeout"
android:summary="%s" /> android:summary="%s" />
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="transliteration"
android:summary="@string/pref_summary_transliteration"
android:title="@string/pref_title_transliteration"
/>
<PreferenceScreen
android:title="@string/preferences_rtl_settings">
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="rtl"
android:summary="@string/pref_summary_rtl"
android:title="@string/pref_title_rtl"
/>
<CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false"
android:key="contextualArabic"
android:summary="@string/pref_summary_contextual_arabic"
android:title="@string/pref_title_contextual_arabic"
/>
<EditTextPreference
android:inputType="number"
android:key="rtl_max_line_length"
android:defaultValue="20"
android:maxLength="159"
android:title="@string/pref_rtl_max_line_length"
android:summary="@string/pref_rtl_max_line_length_summary"/>
</PreferenceScreen>
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox" android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
@ -577,21 +579,21 @@
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_header_development"> android:title="@string/pref_header_development">
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_force_protocol" android:key="pebble_force_protocol"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_forceprotocol" android:summary="@string/pref_summary_pebble_forceprotocol"
android:title="@string/pref_title_pebble_forceprotocol" /> android:title="@string/pref_title_pebble_forceprotocol" />
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_force_untested" android:key="pebble_force_untested"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_forceuntested" android:summary="@string/pref_summary_pebble_forceuntested"
android:title="@string/pref_title_pebble_forceuntested" /> android:title="@string/pref_title_pebble_forceuntested" />
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_force_le" android:key="pebble_force_le"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_forcele" android:summary="@string/pref_summary_pebble_forcele"
android:title="@string/pref_title_pebble_forcele" /> android:title="@string/pref_title_pebble_forcele" />
<EditTextPreference <EditTextPreference
@ -602,28 +604,28 @@
android:title="@string/pref_title_pebble_mtu_limit" android:title="@string/pref_title_pebble_mtu_limit"
android:summary="@string/pref_summary_pebble_mtu_limit" /> android:summary="@string/pref_summary_pebble_mtu_limit" />
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_gatt_clientonly" android:key="pebble_gatt_clientonly"
android:title="@string/pref_title_pebble_gatt_clientonly"
android:summary="@string/pref_summary_pebble_gatt_clientonly" />
<CheckBoxPreference
android:layout="@layout/preference_checkbox" android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_gatt_clientonly"
android:title="@string/pref_title_pebble_gatt_clientonly" />
<CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_enable_applogs" android:key="pebble_enable_applogs"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_enable_applogs" android:summary="@string/pref_summary_pebble_enable_applogs"
android:title="@string/pref_title_pebble_enable_applogs" /> android:title="@string/pref_title_pebble_enable_applogs" />
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_always_ack_pebblekit" android:key="pebble_always_ack_pebblekit"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_always_ack_pebblekit" android:summary="@string/pref_summary_pebble_always_ack_pebblekit"
android:title="@string/pref_title_pebble_always_ack_pebblekit" /> android:title="@string/pref_title_pebble_always_ack_pebblekit" />
<CheckBoxPreference <CheckBoxPreference
android:layout="@layout/preference_checkbox"
android:defaultValue="false" android:defaultValue="false"
android:key="pebble_enable_background_javascript"
android:dependency="pebble_force_untested" android:dependency="pebble_force_untested"
android:key="pebble_enable_background_javascript"
android:layout="@layout/preference_checkbox"
android:summary="@string/pref_summary_pebble_enable_bgjs" android:summary="@string/pref_summary_pebble_enable_bgjs"
android:title="@string/pref_title_pebble_enable_bgjs" /> android:title="@string/pref_title_pebble_enable_bgjs" />
<EditTextPreference <EditTextPreference