Skip to content

Commit 94c1438

Browse files
committed
Use "done" button to close license dialogs.
Rename string res "recaptcha_done_button" to "done".
1 parent e206a26 commit 94c1438

75 files changed

Lines changed: 79 additions & 82 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,12 @@ class LicenseFragment : Fragment() {
106106
.setView(webView)
107107
.setOnCancelListener { activeSoftwareComponent = null }
108108
.setOnDismissListener { activeSoftwareComponent = null }
109-
if (softwareComponent == NEWPIPE_SOFTWARE_COMPONENT) {
110-
builder.setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
111-
} else {
112-
builder.setPositiveButton(R.string.dismiss) { dialog, _ ->
113-
dialog.dismiss()
109+
.setPositiveButton(R.string.done) { dialog, _ -> dialog.dismiss() }
110+
111+
if (softwareComponent != NEWPIPE_SOFTWARE_COMPONENT) {
112+
builder.setNeutralButton(R.string.open_website_license) { _, _ ->
113+
ShareUtils.openUrlInApp(requireContext(), softwareComponent.link)
114114
}
115-
.setNeutralButton(R.string.open_website_license) { _, _ ->
116-
ShareUtils.openUrlInApp(requireContext(), softwareComponent.link)
117-
}
118115
}
119116

120117
builder.show()

app/src/main/res/menu/menu_recaptcha.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<item
66
android:id="@+id/menu_item_done"
77
android:icon="@drawable/ic_done"
8-
android:title="@string/recaptcha_done_button"
8+
android:title="@string/done"
99
app:showAsAction="always" />
1010
</menu>

app/src/main/res/values-ar/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
<string name="app_language_title">لغة التطبيق</string>
467467
<string name="systems_language">النظام الافتراضي</string>
468468
<string name="subtitle_activity_recaptcha">اضغط على \"تم\" عند حلها</string>
469-
<string name="recaptcha_done_button">منجز</string>
469+
<string name="done">منجز</string>
470470
<string name="videos_string">الفيديوهات</string>
471471
<plurals name="seconds">
472472
<item quantity="zero">%d ثانية</item>

app/src/main/res/values-az/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
<string name="no_dir_yet">Hələ endirmə qovluğu təyin edilməyib, indi standart endirmə qovluğu seç</string>
328328
<string name="title_activity_recaptcha">reCAPTCHA çağırışı</string>
329329
<string name="recaptcha_request_toast">reCAPTCHA sorğusu göndərildi</string>
330-
<string name="recaptcha_done_button">Bitdi</string>
330+
<string name="done">Bitdi</string>
331331
<string name="settings_file_replacement_character_summary">Etibarsız simvollar bu dəyərlə əvəz olunur</string>
332332
<string name="settings_file_replacement_character_title">Əvəzedici xarakter</string>
333333
<string name="charset_most_special_characters">Ən xüsusi simvollar</string>

app/src/main/res/values-b+ast/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
<string name="app_description">Un aplicación llibre pa ver/sentir plataformes de tresmisión n\'Android.</string>
421421
<string name="settings_file_replacement_character_title">Caráuteres de troquéu</string>
422422
<string name="settings_file_replacement_character_summary">Los caráuteres que nun son válidos van trocase por esti valor</string>
423-
<string name="recaptcha_done_button">Fecho</string>
423+
<string name="done">Fecho</string>
424424
<string name="subtitle_activity_recaptcha">Primi «Fecho» al resolvelu</string>
425425
<string name="one_item_deleted">Desanicióse 1 elementu.</string>
426426
<string name="no_available_dir">Defini una capeta de descargues dempués, nos axustes de l\'aplicación</string>

app/src/main/res/values-b+uz+Latn/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<string name="settings_file_replacement_character_summary">Noto\'g\'ri belgilar ushbu qiymat bilan almashtiriladi</string>
215215
<string name="settings_file_charset_title">Fayl nomidagi ruxsat berilgan belgilar</string>
216216
<string name="settings_category_downloads_title">Yuklab olish</string>
217-
<string name="recaptcha_done_button">Bajarildi</string>
217+
<string name="done">Bajarildi</string>
218218
<string name="recaptcha_request_toast">reCAPTCHA muammosi so\'raldi</string>
219219
<string name="subtitle_activity_recaptcha">Hal etilganda \"Bajarildi\" tugmasini bosing</string>
220220
<string name="title_activity_recaptcha">reCAPTCHA muammosi</string>

app/src/main/res/values-be/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
<string name="no_playlist_bookmarked_yet">Няма закладак у плейлісце</string>
454454
<string name="select_a_playlist">Выберыце плэйліст</string>
455455
<string name="default_kiosk_page_summary">Кіёск па змаўчанні</string>
456-
<string name="recaptcha_done_button">Так</string>
456+
<string name="done">Так</string>
457457
<string name="subtitle_activity_recaptcha">Націсніце \"Так\" калі вырашана</string>
458458
<string name="infinite_videos">∞ відэа</string>
459459
<string name="more_than_100_videos">100+ відэа</string>

app/src/main/res/values-bg/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
<string name="detail_heart_img_view_description">Отбелязан със сърце от автора</string>
446446
<string name="conferences">Конференции</string>
447447
<string name="most_liked">Най-харесвани</string>
448-
<string name="recaptcha_done_button">Готово</string>
448+
<string name="done">Готово</string>
449449
<string name="comments_tab_description">Коментари</string>
450450
<string name="localization_changes_requires_app_restart">Езикът ще се смени след рестартиране на приложението</string>
451451
<string name="metadata_privacy_unlisted">Скрит</string>

app/src/main/res/values-bn-rBD/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<string name="peertube_instance_url_title">পিয়ার টিউব এর ইন্সটান্স সমূহ</string>
258258
<string name="grid">ছক</string>
259259
<string name="local">স্থানীয়</string>
260-
<string name="recaptcha_done_button">হয়েছে</string>
260+
<string name="done">হয়েছে</string>
261261
<string name="events">ইভেন্টগুলো</string>
262262
<string name="settings_category_updates_title">আপডেট</string>
263263
<string name="minimize_on_exit_none_description">কোনোটি না</string>

app/src/main/res/values-bn-rIN/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<string name="contribution_title">যোগদান</string>
240240
<string name="title_activity_about">নিউ পাইপ এর সম্বন্ধে</string>
241241
<string name="charset_letters_and_digits">শব্দ ও নম্বর</string>
242-
<string name="recaptcha_done_button">হয়েছে</string>
242+
<string name="done">হয়েছে</string>
243243
<string name="no_comments">কোন মন্তব্য নেই</string>
244244
<string name="no_subscribers">কোন সাবস্ক্রাইবার নেই</string>
245245
<string name="no_streams_available_download">ডাউন লোড এর জন্য কোন স্ট্রিম নেই</string>

0 commit comments

Comments
 (0)