Added plural forms for download related strings

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -226,6 +226,16 @@ public static String shortSubscriberCount(final Context context, final long subs
                 shortCount(context, subscriberCount));
     }
 
+    public static String downloadCount(final Context context, final int downloadCount) {
+        return getQuantity(context, R.plurals.download_finished_notification, 0,
+                downloadCount, shortCount(context, downloadCount));
+    }
+
+    public static String deletedDownloadCount(final Context context, final int deletedCount) {
+        return getQuantity(context, R.plurals.deleted_downloads_toast, 0,
+                deletedCount, shortCount(context, deletedCount));
+    }
+
     private static String getQuantity(final Context context, @PluralsRes final int pluralId,
                                       @StringRes final int zeroCaseStringId, final long count,
                                       final String formattedCount) {

app/src/main/java/us/shandian/giga/service/DownloadManagerService.java

@@ -49,6 +49,8 @@
 import us.shandian.giga.get.MissionRecoveryInfo;
 import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
+import org.schabi.newpipe.util.Localization;
+
 import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManager.NetworkState;
 
@@ -467,7 +469,8 @@ public void notifyFinishedDownload(String name) {
                     .setContentIntent(makePendingIntent(ACTION_OPEN_DOWNLOADS_FINISHED));
         }
 
-        if (downloadDoneCount < 1) {
+        downloadDoneCount++;
+        if (downloadDoneCount == 1) {
             downloadDoneList.append(name);
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
@@ -476,22 +479,21 @@ public void notifyFinishedDownload(String name) {
                 downloadDoneNotification.setContentTitle(null);
             }
 
-            downloadDoneNotification.setContentText(getString(R.string.download_finished));
+            downloadDoneNotification.setContentText(Localization.downloadCount(this, downloadDoneCount));
             downloadDoneNotification.setStyle(new NotificationCompat.BigTextStyle()
-                    .setBigContentTitle(getString(R.string.download_finished))
+                    .setBigContentTitle(Localization.downloadCount(this, downloadDoneCount))
                     .bigText(name)
             );
         } else {
             downloadDoneList.append('\n');
             downloadDoneList.append(name);
 
             downloadDoneNotification.setStyle(new NotificationCompat.BigTextStyle().bigText(downloadDoneList));
-            downloadDoneNotification.setContentTitle(getString(R.string.download_finished_more, String.valueOf(downloadDoneCount + 1)));
+            downloadDoneNotification.setContentTitle(Localization.downloadCount(this, downloadDoneCount));
             downloadDoneNotification.setContentText(downloadDoneList);
         }
 
         mNotificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
-        downloadDoneCount++;
     }
 
     public void notifyFailedDownload(DownloadMission mission) {

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

@@ -43,6 +43,7 @@
 import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
@@ -596,7 +597,7 @@ public void clearFinishedDownloads(boolean delete) {
             }
             applyChanges();
 
-            String msg = String.format(mContext.getString(R.string.deleted_downloads), mHidden.size());
+            String msg = Localization.deletedDownloadCount(mContext, mHidden.size());
             mSnackbar = Snackbar.make(mView, msg, Snackbar.LENGTH_INDEFINITE);
             mSnackbar.setAction(R.string.undo, s -> {
                 Iterator<Mission> i = mHidden.iterator();

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

@@ -444,8 +444,6 @@
     <string name="enqueue">طابور</string>
     <string name="permission_denied">تم رفضها من قبل النظام</string>
     <string name="download_failed">فشل التنزيل</string>
-    <string name="download_finished">تم الانتهاء من التحميل</string>
-    <string name="download_finished_more">%s أنتهى التحميل</string>
     <string name="generate_unique_name">إنشاء اسم فريد</string>
     <string name="overwrite">الكتابة فوق</string>
     <string name="overwrite_finished_warning">يوجد ملف تحميل بهذا الاسم موجود مسبقاً</string>
@@ -540,7 +538,6 @@
     <string name="peertube_instance_url_help">ابحث عن مثيلات الخوادم التي تناسبك على %s</string>
     <string name="clear_download_history">تنظيف تاريخ التحميل</string>
     <string name="delete_downloaded_files">حذف الملفات المحملة</string>
-    <string name="deleted_downloads">تم حذف %1$d من التحميلات</string>
     <string name="permission_display_over_apps">امنح الإذن بالعرض فوق التطبيقات الأخرى</string>
     <string name="app_language_title">لغة التطبيق</string>
     <string name="systems_language">النظام الافتراضي</string>

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

@@ -286,7 +286,6 @@
     <string name="import_complete_toast">Importóse</string>
     <string name="could_not_import_all_files">Alvertencia: nun pudieron importase tolos ficheros.</string>
     <string name="settings_category_updates_title">Anovamientos</string>
-    <string name="download_finished">Finó la descarga</string>
     <string name="peertube_instance_add_fail">Nun pudo validase la instancia</string>
     <plurals name="minutes">
         <item quantity="one">%d minutu</item>
@@ -370,7 +369,6 @@
     <string name="pause_downloads_on_mobile_desc">Útil al cambiar a los datos móviles, magar que dalgunes descargues nun puedan suspendese</string>
     <string name="pause_downloads_on_mobile">Torgar nes redes midíes</string>
     <string name="stop">Parar</string>
-    <string name="deleted_downloads">Desaniciáronse %1$d descargues</string>
     <string name="delete_downloaded_files">Desaniciar lo baxao</string>
     <string name="clear_download_history">Llimpiar l\'historial de descargues</string>
     <string name="error_download_resource_gone">Esta descarga nun pue recuperase</string>
@@ -382,7 +380,6 @@
     <string name="show_error">Amosar el fallu</string>
     <string name="overwrite">Sobrescribir</string>
     <string name="generate_unique_name">Xenerar un nome únicu</string>
-    <string name="download_finished_more">Finaron %s descargues</string>
     <string name="permission_denied">El sistema negó l\'aición</string>
     <string name="enqueue">Amestar a la cola</string>
     <string name="recovering">recuperando</string>

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

@@ -479,7 +479,6 @@
     <string name="max_retry_desc">Yuklashni bekor qilishdan oldin maksimal urinishlar soni</string>
     <string name="max_retry_msg">Maksimal qayta urinishlar</string>
     <string name="stop">To\'xtatish</string>
-    <string name="deleted_downloads">%1$dta yuklash o\'chirildi</string>
     <string name="delete_downloaded_files">Yuklangan fayllarni o\'chirib tashlash</string>
     <string name="confirm_prompt">Yuklab olish tarixini tozalashni yoki barcha yuklab olingan fayllarni o\'chirishni xohlaysizmi\?</string>
     <string name="clear_download_history">Yuklab olish tarixini tozalash</string>
@@ -507,8 +506,6 @@
     <string name="overwrite_unrelated_warning">Bunday nomdagi fayl allaqachon mavjud</string>
     <string name="overwrite">Qayta yozish</string>
     <string name="generate_unique_name">Noyob nom yaratish</string>
-    <string name="download_finished_more">%s yuklash tugadi</string>
-    <string name="download_finished">Yuklab olish tugadi</string>
     <string name="download_failed">Yuklab bo‘lmadi</string>
     <string name="permission_denied">Tizim tomonidan rad etilgan harakat</string>
     <string name="enqueue">Navbat</string>

app/src/main/res/values-b+zh+HANS+CN/strings.xml

@@ -146,8 +146,6 @@
     <string name="enqueue">加入队列</string>
     <string name="permission_denied">操作已被系统拒绝</string>
     <string name="download_failed">下载失败</string>
-    <string name="download_finished">下载完成</string>
-    <string name="download_finished_more">%s 个下载已完成</string>
     <string name="no_comments">没有评论</string>
     <string name="drawer_header_description">切换服务，当前选择：</string>
     <string name="no_player_found">找不到串流播放器。是否安装 VLC？</string>
@@ -515,7 +513,6 @@
     <string name="seek_duration_title">快进 / 快退的寻址定位时间间隔</string>
     <string name="clear_download_history">清空下载记录</string>
     <string name="delete_downloaded_files">删除下载文件</string>
-    <string name="deleted_downloads">已删除 %1$d 个下载</string>
     <string name="permission_display_over_apps">授予在其他应用上层显示的权限</string>
     <string name="app_language_title">应用语言</string>
     <string name="systems_language">系统默认</string>

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

@@ -430,8 +430,6 @@
     <string name="enqueue">Чарга</string>
     <string name="permission_denied">Дзеянне забаронена сістэмай</string>
     <string name="download_failed">Памылка загрузкі</string>
-    <string name="download_finished">Загрузка завершана</string>
-    <string name="download_finished_more">%s загрузак завершана</string>
     <string name="generate_unique_name">Стварыць унікальнае імя</string>
     <string name="overwrite">Перазапісаць</string>
     <string name="download_already_running">Загрузка з такім імем ужо выконваецца</string>
@@ -503,7 +501,6 @@
     <string name="systems_language">Як у сістэме</string>
     <string name="app_language_title">Мова прылады</string>
     <string name="choose_instance_prompt">Выберыце экзэмпляр</string>
-    <string name="deleted_downloads">Выдалена %1$d загрузак</string>
     <string name="delete_downloaded_files">Выдаліць загружаныя файлы</string>
     <string name="show_original_time_ago_summary">Арыгінальныя тэксты з сэрвісаў будуць бачны ў ленце элементаў</string>
     <string name="clear_cookie_summary">Ачысціце cookie, якія NewPipe захоўвае пры рашэнні reCAPTCHA</string>

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

@@ -215,7 +215,6 @@
     <string name="error_http_not_found">পাওয়া যায় নি</string>
     <string name="error_unknown_host">সার্ভার পাওয়া যায় নি</string>
     <string name="show_error">এরর দেখান</string>
-    <string name="download_finished">ডাউন লোড শেষ হয়েছে</string>
     <string name="download_failed">ডাউন লোড হয় নি</string>
     <string name="paused">পজ হয়েছে</string>
     <string name="app_update_notification_content_text">ডাউন লোড করার জন্য চাপ দিন</string>

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

@@ -188,7 +188,6 @@
     <string name="error_http_not_found">পাওয়া যায় নি</string>
     <string name="error_unknown_host">সার্ভার পাওয়া যায় নি</string>
     <string name="label_code">কোড</string>
-    <string name="download_finished">ডাউন লোড শেষ হয়েছে</string>
     <string name="download_failed">ডাউন লোড হয় নি</string>
     <string name="paused">পজ হয়েছে</string>
     <string name="app_update_notification_content_text">ডাউন লোড করার জন্য চাপ দিন</string>

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

@@ -15,7 +15,6 @@
     <string name="error_unknown_host">সার্ভার পাওয়া যায় নি</string>
     <string name="label_code">কোড</string>
     <string name="show_error">এরর দেখান</string>
-    <string name="download_finished">ডাউন লোড শেষ হয়েছে</string>
     <string name="download_failed">ডাউন লোড হয় নি</string>
     <string name="paused">পজ হয়েছে</string>
     <string name="missions_header_finished">সম্পূর্ণ</string>
@@ -515,9 +514,7 @@
     <string name="remove_watched_popup_title">দেখা ভিডিওগুলো সরাও\?</string>
     <string name="choose_instance_prompt">একটি ইন্সট্যান্স নাও</string>
     <string name="enable_queue_limit">ডাউনলোড সারি সীমিত করো</string>
-    <string name="deleted_downloads">%1$dটি ডাউনলোড মোছা হয়েছে</string>
     <string name="generate_unique_name">অনন্য নাম বানাও</string>
-    <string name="download_finished_more">%s টি ডাউনলোড শেষ</string>
     <string name="list_view_mode">তালিকা দর্শন মোড</string>
     <string name="wifi_only">শুধুমাত্র ওয়াই-ফাই-তে</string>
     <string name="skip_silence_checkbox">নীরবতার সময় দ্রুত আগাও</string>

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

@@ -431,8 +431,6 @@
     <string name="missions_header_finished">Finalitzades</string>
     <string name="post_processing">post-processament</string>
     <string name="download_failed">Ha fallat la baixada</string>
-    <string name="download_finished">Baixada finalitzada</string>
-    <string name="download_finished_more">%s baixades finalitzades</string>
     <string name="overwrite_finished_warning">Ja existeix un fitxer baixat amb aquest nom</string>
     <string name="overwrite_unrelated_warning">Ja existeix un fitxer amb aquest nom</string>
     <string name="download_already_running">Hi ha una baixada en curs amb aquest nom</string>
@@ -597,7 +595,6 @@
     <string name="systems_language">Valors per defecte</string>
     <string name="app_language_title">Llengua de l\'aplicació</string>
     <string name="choose_instance_prompt">Escolliu una instància</string>
-    <string name="deleted_downloads">%1$d baixades suprimides</string>
     <string name="delete_downloaded_files">Esborrar els fitxers de baixades anteriors</string>
     <string name="clear_download_history">Esborra l\'historial de baixades</string>
     <string name="error_download_resource_gone">No s\'ha pogut recuperar aquesta baixada</string>

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

@@ -204,7 +204,6 @@
     <string name="list">خشته‌یی</string>
     <string name="start_downloads">دەستپێکردنەوەی دابەزاندنەکان</string>
     <string name="caption_none">ژێرنووس نییە</string>
-    <string name="download_finished_more">%s بابه‌ت دابه‌زێنراون</string>
     <string name="popup_playing_toast">لێدان لە پەنجەرە</string>
     <string name="later">دواتر</string>
     <string name="no_views">بینراو نییە</string>
@@ -266,7 +265,6 @@
     <string name="error_http_no_content">ڕاژەکە هیچ داتایەک نانێرێت</string>
     <string name="watch_history_states_deleted">شوێنی کارپێکراوەکان سڕانەوە</string>
     <string name="app_update_notification_channel_description">ئاگانامەکانی وەشانی نوێی نیوپایپ</string>
-    <string name="download_finished">دابه‌زێنرا</string>
     <string name="show_higher_resolutions_summary">تەنها چەند مۆبایلێک پشتگیری لێدانی ڤیدیۆی 2K/4K دەکەن</string>
     <string name="notification_channel_description">ئاگانامەکانی پاشبنەمای نیوپایپ و لێدانه‌كانی پەنجەرە</string>
     <string name="feed_use_dedicated_fetch_method_summary">لەهەندێ خزمەتگوزاریدا بەردەستە، بەزۆری خێراترینە بەڵام ڕەنگە هەندێک لە بابەتەکان زانیارییەکانیان ناتەواو بێت (وەک نەبوونی ماوە، جۆری بابەت ، نەبوونی پەخش)</string>
@@ -499,9 +497,6 @@
     <string name="enable_search_history_summary">مێژووی گه‌ڕانه‌كان له‌ بیرگه‌دا كۆگا ده‌كرێن</string>
     <string name="settings_category_video_audio_title">ڤیدیۆ و دەنگ</string>
     <string name="share">هاوبه‌شپێكردن</string>
-    <string name="download_choose_new_path">فۆڵده‌ری دابه‌زاندن بگۆڕە بۆ ئەنجامدانی کاریگەری</string>
-    <string name="show_hold_to_append_summary">ڕێنمایی پیشان بدرێت کاتێک لە پاشبنەما یاخوود لە پەنجەرەدا کرتە دەکرێت لەسەر \"وردەکارییەکان\"ی ڤیدیۆیەک:</string>
-    <string name="deleted_downloads">%1$d لە دابەزێنراوەکان سڕانەوە</string>
     <string name="audio_streams_empty">پەخشی هیچ دەنگێک نەدۆزرایەوە</string>
     <string name="artists">هونەرمەندەکان</string>
     <string name="no_one_watching">کەس سه‌یری ناکات</string>

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

@@ -434,8 +434,6 @@
     <string name="enqueue">Fronta</string>
     <string name="permission_denied">Akce odmítnuta systémem</string>
     <string name="download_failed">Stahování se nezdařilo</string>
-    <string name="download_finished">Stahování dokončeno</string>
-    <string name="download_finished_more">%s stahování dokončeno</string>
     <string name="generate_unique_name">Vytvořit jedinečný název</string>
     <string name="overwrite">Přepsat</string>
     <string name="overwrite_unrelated_warning">Stažený soubor s tímto názvem již existuje</string>
@@ -525,7 +523,6 @@
     <string name="choose_instance_prompt">Vyberte instanci</string>
     <string name="clear_download_history">Smazat historii stahování</string>
     <string name="delete_downloaded_files">Smazat stažené soubory</string>
-    <string name="deleted_downloads">Smazat %1$d stahování</string>
     <string name="permission_display_over_apps">Souhlasit se zobrazením přes jiné aplikace</string>
     <string name="app_language_title">Jazyk aplikace</string>
     <string name="systems_language">Jazyk systému</string>

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

@@ -355,8 +355,6 @@
     <string name="enqueue">Kø</string>
     <string name="permission_denied">Handling afvist af systemet</string>
     <string name="download_failed">Download fejlede</string>
-    <string name="download_finished">Download færdig</string>
-    <string name="download_finished_more">%s downloads færdige</string>
     <string name="generate_unique_name">Generer unikt navn</string>
     <string name="overwrite">Overskriv</string>
     <string name="overwrite_unrelated_warning">En fil med dette navn eksisterer allerede</string>

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

@@ -436,8 +436,6 @@
     <string name="enqueue">Warteschlange</string>
     <string name="permission_denied">System verweigert den Zugriff</string>
     <string name="download_failed">Herunterladen fehlgeschlagen</string>
-    <string name="download_finished">Herunterladen abgeschlossen</string>
-    <string name="download_finished_more">%s heruntergeladen</string>
     <string name="generate_unique_name">Eindeutigen Namen erzeugen</string>
     <string name="overwrite">Überschreiben</string>
     <string name="overwrite_unrelated_warning">Eine Datei mit diesem Namen existiert bereits</string>
@@ -527,7 +525,6 @@
     <string name="error_download_resource_gone">Kann diesen Download nicht wiederherstellen</string>
     <string name="clear_download_history">Downloadverlauf löschen</string>
     <string name="delete_downloaded_files">Heruntergeladene Dateien löschen</string>
-    <string name="deleted_downloads">%1$d Downloads gelöscht</string>
     <string name="permission_display_over_apps">Berechtigung zur Anzeige über andere Apps erteilen</string>
     <string name="app_language_title">Sprache der App</string>
     <string name="systems_language">Systemstandard</string>