Skip to content

Commit

Permalink
Revert "make timestamp abbreviations plurals (#4202)" (#4230)
Browse files Browse the repository at this point in the history 
This reverts commit 5174c00.

closes #4145
  • Loading branch information
@connyduck
connyduck authored Jan 28, 2024
1 parent 8a39fc6 commit 7fef19e
Show file tree
Hide file tree
Showing 49 changed files with 528 additions and 1,554 deletions.
37 changes: 19 additions & 18 deletions app/src/main/java/com/keylesspalace/tusky/util/TimestampUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,43 +39,44 @@ fun getRelativeTimeSpanString(context: Context, then: Long, now: Long): String {
future = true
span = -span
}
val format = if (span < MINUTE_IN_MILLIS) {
val format: Int
if (span < MINUTE_IN_MILLIS) {
span /= SECOND_IN_MILLIS
if (future) {
R.plurals.abbreviated_in_seconds
format = if (future) {
R.string.abbreviated_in_seconds
} else {
R.plurals.abbreviated_seconds_ago
R.string.abbreviated_seconds_ago
}
} else if (span < HOUR_IN_MILLIS) {
span /= MINUTE_IN_MILLIS
if (future) {
R.plurals.abbreviated_in_minutes
format = if (future) {
R.string.abbreviated_in_minutes
} else {
R.plurals.abbreviated_minutes_ago
R.string.abbreviated_minutes_ago
}
} else if (span < DAY_IN_MILLIS) {
span /= HOUR_IN_MILLIS
if (future) {
R.plurals.abbreviated_in_hours
format = if (future) {
R.string.abbreviated_in_hours
} else {
R.plurals.abbreviated_hours_ago
R.string.abbreviated_hours_ago
}
} else if (span < YEAR_IN_MILLIS) {
span /= DAY_IN_MILLIS
if (future) {
R.plurals.abbreviated_in_days
format = if (future) {
R.string.abbreviated_in_days
} else {
R.plurals.abbreviated_days_ago
R.string.abbreviated_days_ago
}
} else {
span /= YEAR_IN_MILLIS
if (future) {
R.plurals.abbreviated_in_years
format = if (future) {
R.string.abbreviated_in_years
} else {
R.plurals.abbreviated_years_ago
R.string.abbreviated_years_ago
}
}
return context.resources.getQuantityString(format, span.toInt(), span)
return context.getString(format, span)
}

fun formatPollDuration(context: Context, then: Long, now: Long): String {
Expand All @@ -97,5 +98,5 @@ fun formatPollDuration(context: Context, then: Long, now: Long): String {
span /= DAY_IN_MILLIS
format = R.plurals.poll_timespan_days
}
return context.resources.getQuantityString(format, span.toInt(), span)
return context.resources.getQuantityString(format, span.toInt(), span.toInt())
}
40 changes: 10 additions & 30 deletions app/src/main/res/values-ar/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,36 +240,16 @@
<string name="post_media_video">فيديو</string>
<string name="state_follow_requested">طلب متابعة</string>
<!--These are for timestamps on statuses. For example: "16s" or "2d"-->
<plurals name="abbreviated_in_years">
<item quantity="other">في %dy</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">في %dd</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">في %dh</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">في %dm</item>
</plurals>
<plurals name="abbreviated_in_seconds">
<item quantity="other">في %ds</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%dس</item>
</plurals>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dأيام</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dسا</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dد</item>
</plurals>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%dثا</item>
</plurals>
<string name="abbreviated_in_years">في %dy</string>
<string name="abbreviated_in_days">في %dd</string>
<string name="abbreviated_in_hours">في %dh</string>
<string name="abbreviated_in_minutes">في %dm</string>
<string name="abbreviated_in_seconds">في %ds</string>
<string name="abbreviated_years_ago">%dس</string>
<string name="abbreviated_days_ago">%dأيام</string>
<string name="abbreviated_hours_ago">%dسا</string>
<string name="abbreviated_minutes_ago">%dد</string>
<string name="abbreviated_seconds_ago">%dثا</string>
<string name="follows_you">يتبعك الآن</string>
<string name="pref_title_alway_show_sensitive_media">أظهر دائما المحتوى الحساس</string>
<string name="title_media">الوسائط</string>
Expand Down
42 changes: 11 additions & 31 deletions app/src/main/res/values-be/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,36 +323,16 @@
<string name="status_count_one_plus">1+</string>
<string name="status_created_at_now">зараз</string>
<string name="state_follow_requested">Запыт на падпіску</string>
<plurals name="abbreviated_in_years">
<item quantity="other">праз %dг</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">праз %dд</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">праз %dгад</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">праз %dхв</item>
</plurals>
<plurals name="abbreviated_in_seconds">
<item quantity="other">праз %dс</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%dг</item>
</plurals>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dд</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dгад</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dхв</item>
</plurals>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%dс</item>
</plurals>
<string name="abbreviated_in_years">праз %dг</string>
<string name="abbreviated_in_days">праз %dд</string>
<string name="abbreviated_in_hours">праз %dгад</string>
<string name="abbreviated_in_minutes">праз %dхв</string>
<string name="abbreviated_in_seconds">праз %dс</string>
<string name="abbreviated_years_ago">%dг</string>
<string name="abbreviated_days_ago">%dд</string>
<string name="abbreviated_hours_ago">%dгад</string>
<string name="abbreviated_minutes_ago">%dхв</string>
<string name="abbreviated_seconds_ago">%dс</string>
<string name="title_media">Медыя</string>
<string name="pref_title_alway_open_spoiler">Заўсёды разгортваць допіс з далікатным зместам</string>
<string name="replying_to">Адказ для @%s</string>
Expand Down Expand Up @@ -679,4 +659,4 @@
<string name="filter_keyword_display_format">%s (цэлае слова)</string>
<string name="filter_keyword_addition_title">Дадаць ключавое слова</string>
<string name="filter_edit_keyword_title">Змяніць ключавое слова</string>
</resources>
</resources>
40 changes: 10 additions & 30 deletions app/src/main/res/values-bg/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,36 +163,16 @@
<string name="pref_title_alway_open_spoiler">Винаги разгъване на публикации, маркирани с предупреждения за съдържание</string>
<string name="pref_title_alway_show_sensitive_media">Винаги показване на деликатно съдържание</string>
<string name="follows_you">Следва ви</string>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%dс</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dм</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dч</item>
</plurals>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dд</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%dг</item>
</plurals>
<plurals name="abbreviated_in_seconds">
<item quantity="other">след %dс</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">след %dм</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">след %dч</item>
</plurals>
<plurals name="abbreviated_in_years">
<item quantity="other">след %dг</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">след %dд</item>
</plurals>
<string name="abbreviated_seconds_ago">%dс</string>
<string name="abbreviated_minutes_ago">%dм</string>
<string name="abbreviated_hours_ago">%dч</string>
<string name="abbreviated_days_ago">%dд</string>
<string name="abbreviated_years_ago">%dг</string>
<string name="abbreviated_in_seconds">след %dс</string>
<string name="abbreviated_in_minutes">след %dм</string>
<string name="abbreviated_in_hours">след %dч</string>
<string name="abbreviated_in_years">след %dг</string>
<string name="abbreviated_in_days">след %dд</string>
<string name="state_follow_requested">Заявено последване</string>
<string name="post_media_attachments">Прикачени файлове</string>
<string name="post_media_audio">Аудио</string>
Expand Down
42 changes: 11 additions & 31 deletions app/src/main/res/values-bn-rBD/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="conversation_1_recipients">%1$s</string>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%dসে</item>
</plurals>
<string name="abbreviated_seconds_ago">%dসে</string>
<string name="description_poll">পছন্দগুলি সহ নর্বাচন: %1$s, %2$s, %3$s, %4$s; %5$s</string>
<string name="description_visibility_direct">সরাসরি</string>
<string name="description_visibility_private">অনুগামিবৃন্দ</string>
Expand Down Expand Up @@ -87,21 +85,11 @@
<string name="title_media">মিডিয়া</string>
<string name="pref_title_alway_show_sensitive_media">সর্বদা সংবেদনশীল কন্টেন্ট প্রদর্শন করুন</string>
<string name="follows_you">আপনাকে অনুসরন করে</string>
<plurals name="abbreviated_in_seconds">
<item quantity="other">\'%ds এ\'</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">\'%dm এ\'</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">\'%dh এ\'</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">\'%dd এ\'</item>
</plurals>
<plurals name="abbreviated_in_years">
<item quantity="other">\'%dy এ\'</item>
</plurals>
<string name="abbreviated_in_seconds">\'%ds এ\'</string>
<string name="abbreviated_in_minutes">\'%dm এ\'</string>
<string name="abbreviated_in_hours">\'%dh এ\'</string>
<string name="abbreviated_in_days">\'%dd এ\'</string>
<string name="abbreviated_in_years">\'%dy এ\'</string>
<string name="state_follow_requested">অনুরোধ অনুসরণ করুন</string>
<string name="post_media_video">ভিডিও</string>
<string name="post_media_images">চিত্রগুলি</string>
Expand Down Expand Up @@ -310,18 +298,10 @@
<string name="title_follow_requests">অনুরোধ অনুসরণ করুন</string>
<string name="title_blocks">অবরুদ্ধ ব্যবহারকারী</string>
<string name="title_mutes">শব্দ বন্ধ ব্যবহারকারী</string>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dদি</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dমা</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dঘ</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%dব</item>
</plurals>
<string name="abbreviated_days_ago">%dদি</string>
<string name="abbreviated_minutes_ago">%dমা</string>
<string name="abbreviated_hours_ago">%dঘ</string>
<string name="abbreviated_years_ago">%dব</string>
<string name="post_boosted_format">%s বুস্টকৃত</string>
<string name="post_username_format">\@%s</string>
<string name="dialog_mute_hide_notifications">বিজ্ঞপ্তি লুকাও</string>
Expand Down Expand Up @@ -523,4 +503,4 @@
<string name="notification_summary_small">%1$s আর %2$s</string>
<string name="notification_summary_medium">%1$s, %2$s, আর %3$s</string>
<string name="notification_mention_format">%s তোমাকে উল্লেখ করেছে</string>
</resources>
</resources>
42 changes: 11 additions & 31 deletions app/src/main/res/values-bn-rIN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,36 +247,16 @@
<string name="post_media_video">ভিডিও</string>
<string name="state_follow_requested">অনুরোধ অনুসরণ করুন</string>
<!--These are for timestamps on statuses. For example: "16s" or "2d"-->
<plurals name="abbreviated_in_years">
<item quantity="other">%dy এ</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">%dd এ</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">%dh এ</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">%dm এ</item>
</plurals>
<plurals name="abbreviated_in_seconds">
<item quantity="other">%ds এ</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%dy</item>
</plurals>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dd</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dh</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dm</item>
</plurals>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%ds</item>
</plurals>
<string name="abbreviated_in_years">%dy এ</string>
<string name="abbreviated_in_days">%dd এ</string>
<string name="abbreviated_in_hours">%dh এ</string>
<string name="abbreviated_in_minutes">%dm এ</string>
<string name="abbreviated_in_seconds">%ds এ</string>
<string name="abbreviated_years_ago">%dy</string>
<string name="abbreviated_days_ago">%dd</string>
<string name="abbreviated_hours_ago">%dh</string>
<string name="abbreviated_minutes_ago">%dm</string>
<string name="abbreviated_seconds_ago">%ds</string>
<string name="follows_you">আপনাকে অনুসরন করে</string>
<string name="pref_title_alway_show_sensitive_media">সর্বদা সংবেদনশীল কন্টেন্ট প্রদর্শন করুন</string>
<string name="title_media">মিডিয়া</string>
Expand Down Expand Up @@ -483,4 +463,4 @@
<string name="no_drafts">তোমার কোনো খসড়া নেই।</string>
<string name="warning_scheduling_interval">মাস্টোডনের সর্বনিম্ন ৫ মিনিটের সময়সূচীর বিরতি আছে।</string>
<string name="pref_title_hide_top_toolbar">শীর্ষস্থানীয় সরঞ্জামদণ্ডের শিরোনামটি লুকান</string>
</resources>
</resources>
42 changes: 11 additions & 31 deletions app/src/main/res/values-ca/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,36 +177,16 @@
<string name="post_media_images">Imatges</string>
<string name="post_media_video">Vídeo</string>
<!--These are for timestamps on statuses. For example: "16s" or "2d"-->
<plurals name="abbreviated_in_years">
<item quantity="other">en %d anys</item>
</plurals>
<plurals name="abbreviated_in_days">
<item quantity="other">en %dd</item>
</plurals>
<plurals name="abbreviated_in_hours">
<item quantity="other">en %dh</item>
</plurals>
<plurals name="abbreviated_in_minutes">
<item quantity="other">en %dm</item>
</plurals>
<plurals name="abbreviated_in_seconds">
<item quantity="other">en %ds</item>
</plurals>
<plurals name="abbreviated_years_ago">
<item quantity="other">%d anys</item>
</plurals>
<plurals name="abbreviated_days_ago">
<item quantity="other">%dd</item>
</plurals>
<plurals name="abbreviated_hours_ago">
<item quantity="other">%dh</item>
</plurals>
<plurals name="abbreviated_minutes_ago">
<item quantity="other">%dm</item>
</plurals>
<plurals name="abbreviated_seconds_ago">
<item quantity="other">%ds</item>
</plurals>
<string name="abbreviated_in_years">en %d anys</string>
<string name="abbreviated_in_days">en %dd</string>
<string name="abbreviated_in_hours">en %dh</string>
<string name="abbreviated_in_minutes">en %dm</string>
<string name="abbreviated_in_seconds">en %ds</string>
<string name="abbreviated_years_ago">%d anys</string>
<string name="abbreviated_days_ago">%dd</string>
<string name="abbreviated_hours_ago">%dh</string>
<string name="abbreviated_minutes_ago">%dm</string>
<string name="abbreviated_seconds_ago">%ds</string>
<string name="follows_you">Et segueix</string>
<string name="pref_title_alway_show_sensitive_media">Mostra el contingut no apte (NSFW)</string>
<string name="title_media">Multimèdia</string>
Expand Down Expand Up @@ -649,4 +629,4 @@
<string name="status_filtered_show_anyway">Mostra de totes maneres</string>
<string name="socket_timeout_exception">El contacte amb el teu servidor ha trigat massa</string>
<string name="ui_error_unknown">motiu desconegut</string>
</resources>
</resources>
Loading

0 comments on commit 7fef19e

Please sign in to comment.