From fa2ffbd70f75554ac84c1082a333201b85a72f55 Mon Sep 17 00:00:00 2001 From: "Dr. Tobias Quathamer" Date: Thu, 9 Feb 2017 10:03:45 +0100 Subject: [PATCH] Rewrite more plural handling of 'Days' --- MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java | 2 +- .../main/java/com/b44t/ui/ProfileNotificationsActivity.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java index 8287ddda9..d997bf5fa 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java @@ -678,7 +678,7 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter } else if (UserConfig.autoLockIn < 60 * 60 * 24) { val = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.Hours, (int) Math.ceil(UserConfig.autoLockIn / 60.0f / 60), (int) Math.ceil(UserConfig.autoLockIn / 60.0f / 60)); } else { - val = LocaleController.formatString("AutoLockInTime", R.string.AutoLockInTime, LocaleController.formatPluralString("Days", (int) Math.ceil(UserConfig.autoLockIn / 60.0f / 60 / 24))); + val = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.Days, (int) Math.ceil(UserConfig.autoLockIn / 60.0f / 60 / 24), (int) Math.ceil(UserConfig.autoLockIn / 60.0f / 60 / 24)); } textCell.setTextAndValue(LocaleController.getString("AutoLock", R.string.AutoLock), val, true); textCell.setTextColor(0xff000000); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index 3eb57a5b0..7d85c75c3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -589,7 +589,8 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi // @TODO: Maybe this should be reworded a bit. val = mContext.getResources().getQuantityString(R.plurals.Hours, (int) Math.ceil(delta / 60.0f / 60), (int) Math.ceil(delta / 60.0f / 60)); } else if (delta < 60 * 60 * 24 * 365) { - val = LocaleController.formatString("WillUnmuteIn", R.string.WillUnmuteIn, LocaleController.formatPluralString("Days", (int) Math.ceil(delta / 60.0f / 60 / 24))); + // @TODO: Maybe this should be reworded a bit. + val = mContext.getResources().getQuantityString(R.plurals.Days, (int) Math.ceil(delta / 60.0f / 60 / 24), (int) Math.ceil(delta / 60.0f / 60 / 24)); } else { val = null; }