From 98cc4f1302f9eb438abd1be650999012f06a51ad Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 5 Nov 2021 14:37:20 -0400
Subject: [PATCH] Some updates for better localization

Test: manual
Fixes: 190021494
Fixes: 185203196
Fixes: 190088372
Change-Id: Ia2871814870a1f0e5c5f2deed06dcbef7b2bd967
---
 res/values/strings.xml                                    | 8 ++++++--
 .../ShowOnLockScreenNotificationPreferenceController.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index aa484835065..949b6758d94 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9073,6 +9073,10 @@
     <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->
     <string name="lock_screen_notifs_title">Notifications on lock screen</string>
 
+    <!-- Configure notifications: summary for lockscreen notifications: all notifications shown
+    regardless of noisiness [CHAR LIMIT=60] -->
+    <string name="lock_screen_notifs_show_all_summary">Show conversations, default, and silent</string>
+
     <!-- Configure notifications: Value for lockscreen notifications: all notifications shown
     regardless of noisiness [CHAR LIMIT=60] -->
     <string name="lock_screen_notifs_show_all">Show conversations, default, and silent</string>
@@ -9324,11 +9328,11 @@
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <plurals name="notifications_sent_daily">
         <item quantity="one">~<xliff:g id="number">%d</xliff:g> notification per day</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> notifications per day</item>
+        <item quantity="other">~<xliff:g id="number">%,d</xliff:g> notifications per day</item>
     </plurals>
     <plurals name="notifications_sent_weekly">
         <item quantity="one">~<xliff:g id="number">%d</xliff:g> notification per week</item>
-        <item quantity="other">~<xliff:g id="number">%d</xliff:g> notifications per week</item>
+        <item quantity="other">~<xliff:g id="number">%,d</xliff:g> notifications per week</item>
     </plurals>
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <string name="notifications_sent_never">Never</string>
diff --git a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
index f8f76caecbd..f7dc3913775 100644
--- a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
@@ -116,7 +116,7 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr
         } else if (!getLockscreenSilentNotificationsEnabled()) {
             return mContext.getString(R.string.lock_screen_notifs_show_alerting);
         } else {
-            return mContext.getString(R.string.lock_screen_notifs_show_all);
+            return mContext.getString(R.string.lock_screen_notifs_show_all_summary);
         }
     }