Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fix #249

Merged
merged 9 commits into from
Oct 23, 2023
Merged

Some fix #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
caf1549
Russian language
Oct 20, 2023
e2dcbed
Fix preferences.xml
Oct 20, 2023
ff60b66
Fix space symbol
Oct 20, 2023
52226e5
Merge branch 'wuan:main' into main
karevivan Oct 20, 2023
9ae9fc9
Merge branch 'wuan:main' into main
karevivan Oct 20, 2023
2ef27fd
More Russian translation
Oct 21, 2023
68d67a8
Merge branch 'wuan:main' into main
karevivan Oct 22, 2023
716fc65
Add translation for "ms" strings.
Oct 23, 2023
360749e
Merge branch 'wuan:main' into main
karevivan Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/blitzortung/android/preferences/SlidePreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SlidePreferences(context: Context, attrs: AttributeSet) : DialogPreference

init {
data = SliderData(
suffix = attrs.getAttributeValue(ATTRIBUTE_NAMESPACE, "text"),
suffix = context.getString(attrs.getAttributeResourceValue(ATTRIBUTE_NAMESPACE, "text", -1)),
default = attrs.getAttributeIntValue(ATTRIBUTE_NAMESPACE, "defaultValue", 30),
minimum = attrs.getAttributeIntValue(ATTRIBUTE_NAMESPACE, "min", 0),
maximum = attrs.getAttributeIntValue(ATTRIBUTE_NAMESPACE, "max", 80),
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,19 @@ Russian by Ivan Karev (karev.ivan@gmail.com)\n
<string name="animation_interval_duration_summary">Временной отрезок анимации, час</string>
<string name="ok">Ок</string>
<string name="cancel">Отмена</string>
<string name="ms">мс</string>
<string-array name="animation_interval_durations">
<item>2 часа</item>
<item>4 часа</item>
<item>6 часов</item>
<item>12 часов</item>
<item>24 часа</item>
</string-array>
<string-array name="animation_interval_duration_values">
<item>2</item>
<item>4</item>
<item>6</item>
<item>12</item>
<item>24</item>
</string-array>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@ Russian by Ivan Karev (karev.ivan@gmail.com)\n
<string name="animation_cycle_sleep_duration_summary">Sleep time after animation cycle has finished (in milliseconds)</string>
<string name="animation_interval_duration">Animation interval</string>
<string name="animation_interval_duration_summary">Size of the interval of the animation cycle in hours</string>
<string name="ms">ms</string>
<string name="percent" translatable="false">%</string>
<string-array name="animation_interval_durations">
<item>2 h</item>
<item>4 h</item>
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
android:persistent="true"
android:selectable="true"
android:summary="@string/map_scale_summary"
android:text="%"
android:text="@string/percent"
android:title="@string/map_scale" />
<org.blitzortung.android.preferences.SlidePreferences
android:defaultValue="55"
Expand All @@ -73,7 +73,7 @@
android:persistent="true"
android:selectable="true"
android:summary="@string/map_fade_summary"
android:text="%"
android:text="@string/percent"
android:title="@string/map_fade" />
<ListPreference
android:defaultValue="BLITZORTUNG"
Expand Down Expand Up @@ -105,7 +105,7 @@
android:max="400"
android:selectable="true"
android:persistent="true"
android:text="%"
android:text="@string/percent"
min="50"
/>
</PreferenceScreen>
Expand Down Expand Up @@ -140,7 +140,7 @@
android:max="500"
android:selectable="true"
android:persistent="true"
android:text="ms"
android:text="@string/ms"
android:min="100"
step="50"
/>
Expand All @@ -152,7 +152,7 @@
android:max="5000"
android:selectable="true"
android:persistent="true"
android:text="ms"
android:text="@string/ms"
android:min="0"
step="500"
/>
Expand Down Expand Up @@ -298,7 +298,7 @@
android:persistent="true"
android:selectable="true"
android:summary="@string/alarm_vibration_signal_summary"
android:text=""
android:text="@string/ms"
android:title="@string/alarm_vibration_signal" />
</PreferenceScreen>
<ListPreference
Expand Down