Fix short count formatting for Android versions below 7.0

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

@@ -191,14 +191,20 @@ public static String shortCount(@NonNull final Context context, final long count
 
         final double value = (double) count;
         if (count >= 1000000000) {
-            return localizeNumber(round(value / 1000000000))
-                    + context.getString(R.string.short_billion);
+            final double shortenedValue = value / 1000000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
+            return context.getString(R.string.short_billion,
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000000) {
-            return localizeNumber(round(value / 1000000))
-                    + context.getString(R.string.short_million);
+            final double shortenedValue = value / 1000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
+            return context.getString(R.string.short_million,
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000) {
-            return localizeNumber(round(value / 1000))
-                    + context.getString(R.string.short_thousand);
+            final double shortenedValue = value / 1000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
+            return context.getString(R.string.short_thousand,
+                    localizeNumber(round(shortenedValue, scale)));
         } else {
             return localizeNumber(value);
         }
@@ -416,8 +422,8 @@ private static Locale getLocaleFromPrefs(@NonNull final Context context,
         }
     }
 
-    private static double round(final double value) {
-        return new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue();
+    private static double round(final double value, final int scale) {
+        return new BigDecimal(value).setScale(scale, RoundingMode.HALF_UP).doubleValue();
     }
 
     private static String getQuantity(@NonNull final Context context,

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

@@ -75,13 +75,11 @@
     <string name="downloads_title">الملفات المحملة</string>
     <string name="invalid_source">لا يوجد مثل هذا الملف/مصدر المحتوى</string>
     <string name="most_liked">الأكثر إعجابًا</string>
-    <string name="short_billion">بليون</string>
     <string name="feed_load_error_account_info">تعذر تحميل موجز \'%s\'.</string>
     <string name="question_mark">؟</string>
     <string name="check_for_updates">التحقق من وجود تحديثات</string>
     <string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
     <string name="more_than_100_videos">+100 فيديو</string>
-    <string name="short_thousand">ألف</string>
     <string name="peertube_instance_add_exists">مثيل الخادم موجود بالفعل</string>
     <string name="clear_queue_confirmation_title">طلب تأكيد قبل مسح قائمة الانتظار</string>
     <string name="metadata_subscribers">المشتركون</string>
@@ -649,7 +647,6 @@
     <string name="seek_duration_title">تسريع إلى الأمام/-ترجيع وقت البحث</string>
     <string name="permission_denied">تم رفضها من قبل النظام</string>
     <string name="no_comments">ليس هناك تعليقات</string>
-    <string name="short_million">مليون</string>
     <string name="checking_updates_toast">جاري التحقق من وجود تحديثات…</string>
     <string name="content">المحتوى</string>
     <string name="downloads_storage_ask_title">اسأل عن مكان التنزيل</string>

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

@@ -116,9 +116,6 @@
     <string name="empty_list_subtitle">لا شيء هنا سوى الصراصير</string>
     <string name="audio">الصوت</string>
     <string name="retry">إعادة المحاولة</string>
-    <string name="short_thousand">ألف</string>
-    <string name="short_million">مليون</string>
-    <string name="short_billion">بليون</string>
     <string name="no_subscribers">ليس هناك مشترِكون</string>
     <plurals name="subscribers">
         <item quantity="zero">%s مشارك</item>

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

@@ -297,9 +297,6 @@
     <string name="detail_likes_img_view_description">Bəyən</string>
     <string name="detail_dislikes_img_view_description">Bəyənmə</string>
     <string name="detail_drag_description">Yenidən sıralamaq üçün sürüklə</string>
-    <string name="short_thousand">min</string>
-    <string name="short_million">Mln</string>
-    <string name="short_billion">Mlrd</string>
     <string name="drawer_header_description">Xidməti dəyiş, hazırda seçilmiş:</string>
     <string name="no_subscribers">Abunəçi yoxdur</string>
     <string name="no_views">Baxış yoxdur</string>

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

@@ -43,9 +43,6 @@
     <string name="detail_dislikes_img_view_description">Tarrezmes</string>
     <string name="default_video_format_title">Formatu de videu predetermináu</string>
     <string name="black_theme_title">Prietu</string>
-    <string name="short_thousand">mil</string>
-    <string name="short_million">mill.</string>
-    <string name="short_billion">mil mill.</string>
     <string name="msg_popup_permission">Precísase esti permisu p\'abrir
 \nnel mou ventanu</string>
     <string name="title_activity_recaptcha">Retu de reCAPTCHA</string>

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

@@ -267,9 +267,6 @@
     </plurals>
     <string name="no_subscribers">Obunachilar yo\'q</string>
     <string name="drawer_header_description">Hozirda tanlangan xizmatni yoqish:</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">k</string>
     <string name="retry">Qayta</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>

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

@@ -159,9 +159,6 @@
     <string name="video">Відэа</string>
     <string name="audio">Аўдыя</string>
     <string name="retry">Паспрабаваць зноў</string>
-    <string name="short_thousand">тыс.</string>
-    <string name="short_million">млн</string>
-    <string name="short_billion">млрд</string>
     <string name="no_subscribers">Няма падпісчыкаў</string>
     <plurals name="subscribers">
         <item quantity="one">%s падпісчык</item>

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

@@ -45,9 +45,6 @@
     </plurals>
     <string name="infinite_videos">∞ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
     <string name="more_than_100_videos">100+ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
-    <string name="short_billion">ⴱ</string>
-    <string name="short_million">ⵎ</string>
-    <string name="short_thousand">ⴽ</string>
     <string name="audio">ⴰⵎⵙⵍⴰⵢ</string>
     <string name="video">ⴰⴼⵉⴷⵢⵓ</string>
     <string name="detail_likes_img_view_description">ⵉⵔⵉⵜⵏ</string>

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

@@ -183,9 +183,6 @@
     <string name="file_name_empty_error">Името на файла не може да бъде празно</string>
     <string name="error_occurred_detail">Възникна грешка: %1$s</string>
     <string name="no_streams_available_download">Не са налични източници за изтегляне</string>
-    <string name="short_thousand">хил.</string>
-    <string name="short_million">млн.</string>
-    <string name="short_billion">млрд.</string>
     <string name="no_subscribers">Няма абонати</string>
     <string name="create">Създай</string>
     <string name="dismiss">Откажи</string>

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

@@ -82,9 +82,6 @@
     <string name="video">ভিডিও</string>
     <string name="audio">অডিও</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
-    <string name="short_thousand">হা</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">বি</string>
     <!-- Missions -->
     <string name="start">শুরু</string>
     <string name="pause">বিরতি</string>

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

@@ -104,9 +104,6 @@
     <string name="no_videos">কোন ভিডিও নেই</string>
     <string name="no_views">কোন ভিউ নেই</string>
     <string name="no_subscribers">কোন সাবস্ক্রাইবার নেই</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">K</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
     <string name="audio">অডিও</string>
     <string name="video">ভিডিও</string>

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

@@ -231,9 +231,6 @@
     <string name="player_recoverable_failure">S\'està recuperant el reproductor després de l\'error</string>
     <string name="sorry_string">Bé, és lamentable.</string>
     <string name="detail_drag_description">Arrossegueu per reordenar la llista</string>
-    <string name="short_thousand">mil</string>
-    <string name="short_million">milions</string>
-    <string name="short_billion">mil milions</string>
     <string name="start">Inicia</string>
     <string name="msg_running_detail">Feu un toc aquí per a més detalls</string>
     <string name="no_available_dir">Defineix una carpeta de baixades més endavant als paràmetres</string>

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

@@ -25,7 +25,6 @@
     <string name="subscribers_count_not_available">ژمارەی بەژداری نادیارە</string>
     <string name="overwrite_failed">ناتوانرێت لەسەر ئەو فایله‌وه‌ جێگیر بکرێت</string>
     <string name="tab_choose">په‌ڕه‌ هەڵبژێرە</string>
-    <string name="short_million">ملیۆن</string>
     <string name="more_than_100_videos">+١٠٠ ڤیدیۆیان</string>
     <string name="settings_category_player_title">لێده‌ر</string>
     <string name="import_title">هاوردە</string>
@@ -46,7 +45,6 @@
     <string name="override_current_data">ئەمە لەسەر ڕێکخستنەکانی ئێستات جێگیر دەبێت.</string>
     <string name="notification_channel_name">پەیامەکانی نیوپایپ</string>
     <string name="donation_encouragement">نیوپایپ لەلایەن چەند خۆبەخشێکەوە دروستکراوە کە کاته‌كانی خۆیان پێ بەخشیووە تاکو باشترین خزمەتگوزاریت پێشکەش بکەن. هیچ نەبێت بە کڕینی کوپێک قاوە یارمەتی گەشەپێدەرەکانمان بدە بۆ ئەوەی کاتی زیاتر تەرخان بکەین بۆ بەرەوپێشبردنی نیوپایپ.</string>
-    <string name="short_billion">ملیار</string>
     <string name="show_search_suggestions_title">گەڕانی پێشنیارکراوەکان</string>
     <string name="playback_tempo">خێرا</string>
     <string name="file_deleted">فایل سڕایەوە</string>
@@ -373,7 +371,6 @@
     <string name="download_failed">ناتوانرێت داببه‌زێنرێت</string>
     <string name="error_connect_host">ناتوانرێت بە ڕاژەكه‌وە پەیوەست ببیت</string>
     <string name="detail_thumbnail_view_description">لێدانی ڤیدیۆ، مه‌ودا:</string>
-    <string name="short_thousand">هەزار</string>
     <string name="most_liked">زۆرترین بەدڵ</string>
     <string name="delete">سڕینەوە</string>
     <string name="default_video_format_title">جۆری بنەڕەتی ڤیدیۆ</string>

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

@@ -83,9 +83,7 @@
     <string name="no_available_dir">Určete prosím složku pro stahování později v nastavení</string>
     <string name="info_labels">Co:\\nŽádost:\\nJazyk obsahu:\\nZemě obsahu:\\nJazyk aplikace:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS:</string>
     <string name="all">Vše</string>
-    <string name="short_thousand">tis.</string>
     <string name="open_in_popup_mode">Otevřít ve vyskakovacím okně</string>
-    <string name="short_million">mil.</string>
     <string name="msg_popup_permission">Toto oprávnění je vyžadováno
 \npro otevření ve vyskakovacím okně</string>
     <string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
@@ -124,7 +122,6 @@
     <string name="notification_channel_description">Oznámení pro NewPipe přehrávač</string>
     <string name="search_no_results">Žádné výsledky</string>
     <string name="empty_list_subtitle">Je tu sranda jak v márnici</string>
-    <string name="short_billion">mld.</string>
     <string name="no_subscribers">Žádní odběratelé</string>
     <plurals name="subscribers">
         <item quantity="one">%s odběratel</item>

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

@@ -305,9 +305,6 @@
     <string name="stop">Stop</string>
     <string name="events">Hændelser</string>
     <string name="empty_list_subtitle">Ikke andet end fårekyllinger her</string>
-    <string name="short_thousand">t</string>
-    <string name="short_million">mio.</string>
-    <string name="short_billion">mia.</string>
     <plurals name="subscribers">
         <item quantity="one">%s abonnent</item>
         <item quantity="other">%s abonnenter</item>

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

@@ -69,9 +69,6 @@
     <string name="error_report_title">Fehlerbericht</string>
     <string name="delete">Löschen</string>
     <string name="checksum">Prüfsumme</string>
-    <string name="short_thousand">Tsd.</string>
-    <string name="short_million">Mio.</string>
-    <string name="short_billion">Mrd.</string>
     <string name="msg_name">Dateiname</string>
     <string name="msg_error">Fehler</string>
     <string name="msg_wait">Bitte warten …</string>

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

@@ -41,7 +41,6 @@
     <string name="detail_uploader_thumbnail_view_description">Μικρογραφία εικόνας προφίλ του χρήστη</string>
     <string name="detail_likes_img_view_description">Like</string>
     <string name="detail_dislikes_img_view_description">Dislike</string>
-    <string name="short_billion">δισ/ρια</string>
     <string name="open_in_popup_mode">Άνοιγμα σε αναδυόμενο παράθυρο</string>
     <string name="subscribe_button_title">Εγγραφή</string>
     <string name="subscribed_button_title">Εγγεγραμμένος</string>
@@ -169,8 +168,6 @@
     <string name="empty_list_subtitle">Δεν υπάρχει τίποτα εδώ</string>
     <string name="detail_drag_description">Σύρετε για ταξινόμηση</string>
     <string name="retry">Προσπάθεια εκ νέου</string>
-    <string name="short_thousand">χιλ.</string>
-    <string name="short_million">εκ/ρια</string>
     <string name="no_subscribers">Κανένας συνδρομητής</string>
     <plurals name="subscribers">
         <item quantity="one">%s συνδρομητής</item>

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

@@ -261,9 +261,6 @@
         <item quantity="one">%s spekto</item>
         <item quantity="other">%s spektoj</item>
     </plurals>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">Mrd</string>
     <string name="title_activity_about">Pri NewPipe</string>
     <string name="title_licenses">Eksteraj permesiloj</string>
     <string name="copyright" formatted="true">© %1$s de %2$s sub %3$s</string>

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

@@ -81,9 +81,6 @@
     <string name="info_labels">Qué:\\nSolicitud:\\nIdioma del contenido:\\nPaís del contenido:\\nIdioma de la aplicación:\\nServicio:\\nMarca de tiempo:\\nPaquete:\\nVersión:\\nVersión del SO:</string>
     <string name="black_theme_title">Negro</string>
     <string name="all">Todo</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">MM</string>
     <string name="open_in_popup_mode">Abrir en modo emergente</string>
     <string name="msg_popup_permission">Se necesita este permiso
 \npara abrir en modo emergente</string>

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

@@ -154,9 +154,6 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Proovi uuesti</string>
-    <string name="short_thousand">tuh</string>
-    <string name="short_million">mln</string>
-    <string name="short_billion">mld</string>
     <string name="no_subscribers">Tellijaid pole</string>
     <plurals name="subscribers">
         <item quantity="one">%s tellija</item>

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

@@ -84,9 +84,6 @@
     <string name="video">Bideoa</string>
     <string name="audio">Audioa</string>
     <string name="retry">Saiatu berriro</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">MM</string>
     <string name="start">Hasi</string>
     <string name="pause">Pausatu</string>
     <string name="delete">Ezabatu</string>

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

@@ -148,9 +148,6 @@
     <string name="error_occurred_detail">خطایی رخ داد: %1$s</string>
     <string name="no_streams_available_download">جریانی برای بارگیری در دسترس نیست</string>
     <string name="search_no_results">بدون نتیجه</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <plurals name="subscribers">
         <item quantity="one">%s مشترک</item>
         <item quantity="other">%s مشترک</item>

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

@@ -102,9 +102,6 @@
     <string name="video">Video</string>
     <string name="audio">Ääni</string>
     <string name="retry">Toista uudelleen</string>
-    <string name="short_thousand">t.</string>
-    <string name="short_million">milj.</string>
-    <string name="short_billion">bilj.</string>
     <string name="no_subscribers">Ei tilaajia</string>
     <plurals name="subscribers">
         <item quantity="one">%s tilaaja</item>

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

@@ -87,8 +87,6 @@
     <string name="popup_playing_toast">Lecture en mode flottant</string>
     <string name="disabled">Désactivés</string>
     <string name="info_labels">Quoi :\\nRequest :\\nContent Language :\\nContent Country :\\nApp Language :\\nService :\\nGMT Time :\\nPackage :\\nVersion :\\nOS version :</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
     <string name="msg_popup_permission">Cette autorisation est nécessaire pour
 \nutiliser le mode flottant</string>
     <string name="controls_background_title">Arrière-plan</string>
@@ -100,7 +98,6 @@
     <string name="popup_remember_size_pos_title">Mémoriser les propriétés de la fenêtre flottante</string>
     <string name="popup_remember_size_pos_summary">Mémoriser les dernières taille et position de la fenêtre flottante</string>
     <string name="clear">Effacer</string>
-    <string name="short_billion">G</string>
     <string name="use_external_video_player_summary">Le son peut être absent à certaines définitions</string>
     <string name="show_search_suggestions_title">Suggestions de recherche</string>
     <string name="show_search_suggestions_summary">Sélectionner les suggestions à afficher lors d’une recherche</string>

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

@@ -158,9 +158,6 @@
     <string name="video">Vídeo</string>
     <string name="audio">Audio</string>
     <string name="retry">Tentar de novo</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <string name="no_subscribers">Ningún subscrito</string>
     <plurals name="subscribers">
         <item quantity="one">%s subscrito</item>

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

@@ -112,9 +112,6 @@
     <string name="video">סרטון</string>
     <string name="audio">שמע</string>
     <string name="retry">ניסיון חוזר</string>
-    <string name="short_thousand">אלפ.</string>
-    <string name="short_million">מיל.</string>
-    <string name="short_billion">מיליארד</string>
     <string name="no_subscribers">אין מנויים</string>
     <plurals name="subscribers">
         <item quantity="one">מנוי אחד</item>

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

@@ -126,9 +126,6 @@
     <string name="video">वीडियो</string>
     <string name="audio">ऑडियो</string>
     <string name="retry">फिर से कोशिश करें</string>
-    <string name="short_thousand">हज़ार</string>
-    <string name="short_million">मिलियन</string>
-    <string name="short_billion">अरब</string>
     <string name="no_subscribers">कोई सब्सक्राइबर नहीं</string>
     <plurals name="subscribers">
         <item quantity="one">%s सब्सक्राइबर</item>