Skip to content

Commit ff3526b

Browse files
TobiGrTobiGr
authored
Merge pull request #12460 from Isira-Seneviratne/Short-count-refactor
Fix short count formatting for Android versions below 7.0
2 parents 124ab56 + 9f11db8 commit ff3526b

File tree

79 files changed

+18
-238
lines changed

Some content is hidden

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

79 files changed

+18
-238
lines changed

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,20 @@ public static String shortCount(@NonNull final Context context, final long count
190190

191191
final double value = (double) count;
192192
if (count >= 1000000000) {
193-
return localizeNumber(round(value / 1000000000))
194-
+ context.getString(R.string.short_billion);
193+
final double shortenedValue = value / 1000000000;
194+
final int scale = shortenedValue >= 100 ? 0 : 1;
195+
return context.getString(R.string.short_billion,
196+
localizeNumber(round(shortenedValue, scale)));
195197
} else if (count >= 1000000) {
196-
return localizeNumber(round(value / 1000000))
197-
+ context.getString(R.string.short_million);
198+
final double shortenedValue = value / 1000000;
199+
final int scale = shortenedValue >= 100 ? 0 : 1;
200+
return context.getString(R.string.short_million,
201+
localizeNumber(round(shortenedValue, scale)));
198202
} else if (count >= 1000) {
199-
return localizeNumber(round(value / 1000))
200-
+ context.getString(R.string.short_thousand);
203+
final double shortenedValue = value / 1000;
204+
final int scale = shortenedValue >= 100 ? 0 : 1;
205+
return context.getString(R.string.short_thousand,
206+
localizeNumber(round(shortenedValue, scale)));
201207
} else {
202208
return localizeNumber(value);
203209
}
@@ -416,8 +422,8 @@ private static Locale getLocaleFromPrefs(@NonNull final Context context,
416422
}
417423
}
418424

419-
private static double round(final double value) {
420-
return new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue();
425+
private static double round(final double value, final int scale) {
426+
return new BigDecimal(value).setScale(scale, RoundingMode.HALF_UP).doubleValue();
421427
}
422428

423429
private static String getQuantity(@NonNull final Context context,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,11 @@
7575
<string name="downloads_title">الملفات المحملة</string>
7676
<string name="invalid_source">لا يوجد مثل هذا الملف/مصدر المحتوى</string>
7777
<string name="most_liked">الأكثر إعجابًا</string>
78-
<string name="short_billion">بليون</string>
7978
<string name="feed_load_error_account_info">تعذر تحميل موجز \'%s\'.</string>
8079
<string name="question_mark">؟</string>
8180
<string name="check_for_updates">التحقق من وجود تحديثات</string>
8281
<string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
8382
<string name="more_than_100_videos">+100 فيديو</string>
84-
<string name="short_thousand">ألف</string>
8583
<string name="peertube_instance_add_exists">مثيل الخادم موجود بالفعل</string>
8684
<string name="clear_queue_confirmation_title">طلب تأكيد قبل مسح قائمة الانتظار</string>
8785
<string name="metadata_subscribers">المشتركون</string>
@@ -649,7 +647,6 @@
649647
<string name="seek_duration_title">تسريع إلى الأمام/-ترجيع وقت البحث</string>
650648
<string name="permission_denied">تم رفضها من قبل النظام</string>
651649
<string name="no_comments">ليس هناك تعليقات</string>
652-
<string name="short_million">مليون</string>
653650
<string name="checking_updates_toast">جاري التحقق من وجود تحديثات…</string>
654651
<string name="content">المحتوى</string>
655652
<string name="downloads_storage_ask_title">اسأل عن مكان التنزيل</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@
116116
<string name="empty_list_subtitle">لا شيء هنا سوى الصراصير</string>
117117
<string name="audio">الصوت</string>
118118
<string name="retry">إعادة المحاولة</string>
119-
<string name="short_thousand">ألف</string>
120-
<string name="short_million">مليون</string>
121-
<string name="short_billion">بليون</string>
122119
<string name="no_subscribers">ليس هناك مشترِكون</string>
123120
<plurals name="subscribers">
124121
<item quantity="zero">%s مشارك</item>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,6 @@
297297
<string name="detail_likes_img_view_description">Bəyən</string>
298298
<string name="detail_dislikes_img_view_description">Bəyənmə</string>
299299
<string name="detail_drag_description">Yenidən sıralamaq üçün sürüklə</string>
300-
<string name="short_thousand">min</string>
301-
<string name="short_million">Mln</string>
302-
<string name="short_billion">Mlrd</string>
303300
<string name="drawer_header_description">Xidməti dəyiş, hazırda seçilmiş:</string>
304301
<string name="no_subscribers">Abunəçi yoxdur</string>
305302
<string name="no_views">Baxış yoxdur</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<string name="detail_dislikes_img_view_description">Tarrezmes</string>
4444
<string name="default_video_format_title">Formatu de videu predetermináu</string>
4545
<string name="black_theme_title">Prietu</string>
46-
<string name="short_thousand">mil</string>
47-
<string name="short_million">mill.</string>
48-
<string name="short_billion">mil mill.</string>
4946
<string name="msg_popup_permission">Precísase esti permisu p\'abrir
5047
\nnel mou ventanu</string>
5148
<string name="title_activity_recaptcha">Retu de reCAPTCHA</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@
267267
</plurals>
268268
<string name="no_subscribers">Obunachilar yo\'q</string>
269269
<string name="drawer_header_description">Hozirda tanlangan xizmatni yoqish:</string>
270-
<string name="short_billion">B</string>
271-
<string name="short_million">M</string>
272-
<string name="short_thousand">k</string>
273270
<string name="retry">Qayta</string>
274271
<string name="audio">Audio</string>
275272
<string name="video">Video</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@
159159
<string name="video">Відэа</string>
160160
<string name="audio">Аўдыя</string>
161161
<string name="retry">Паспрабаваць зноў</string>
162-
<string name="short_thousand">тыс.</string>
163-
<string name="short_million">млн</string>
164-
<string name="short_billion">млрд</string>
165162
<string name="no_subscribers">Няма падпісчыкаў</string>
166163
<plurals name="subscribers">
167164
<item quantity="one">%s падпісчык</item>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
</plurals>
4646
<string name="infinite_videos">∞ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
4747
<string name="more_than_100_videos">100+ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
48-
<string name="short_billion">ⴱ</string>
49-
<string name="short_million">ⵎ</string>
50-
<string name="short_thousand">ⴽ</string>
5148
<string name="audio">ⴰⵎⵙⵍⴰⵢ</string>
5249
<string name="video">ⴰⴼⵉⴷⵢⵓ</string>
5350
<string name="detail_likes_img_view_description">ⵉⵔⵉⵜⵏ</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@
183183
<string name="file_name_empty_error">Името на файла не може да бъде празно</string>
184184
<string name="error_occurred_detail">Възникна грешка: %1$s</string>
185185
<string name="no_streams_available_download">Не са налични източници за изтегляне</string>
186-
<string name="short_thousand">хил.</string>
187-
<string name="short_million">млн.</string>
188-
<string name="short_billion">млрд.</string>
189186
<string name="no_subscribers">Няма абонати</string>
190187
<string name="create">Създай</string>
191188
<string name="dismiss">Откажи</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
<string name="video">ভিডিও</string>
8383
<string name="audio">অডিও</string>
8484
<string name="retry">পুনরায় চেষ্টা করো</string>
85-
<string name="short_thousand">হা</string>
86-
<string name="short_million">M</string>
87-
<string name="short_billion">বি</string>
8885
<!-- Missions -->
8986
<string name="start">শুরু</string>
9087
<string name="pause">বিরতি</string>

0 commit comments

Comments
 (0)