i18n of several browser messages

chrome/browser/ui/views/critical_notification_bubble_view.cc

Index: chrome/browser/ui/views/critical_notification_bubble_view.cc
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc
index ded52e7bc5d936e5251b4921819a180f8901aa7b..98e77edd49af2417e10dc0b48f3398891d40120b 100644
--- a/chrome/browser/ui/views/critical_notification_bubble_view.cc
+++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 
-#include "base/strings/string_number_conversions.h"
+#include "base/i18n/number_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ -86,7 +86,7 @@ base::string16 CriticalNotificationBubbleView::GetWindowTitle() const {
   return seconds > 0 ? l10n_util::GetStringFUTF16(
                            IDS_CRITICAL_NOTIFICATION_HEADLINE,
                            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-                           base::IntToString16(seconds))
+                           base::FormatNumber(seconds))

[jungshik at Google, 2016/05/20 23:58:03]

This one is also caught in my search for <ex>[0-9]+</ex> and I was getting there
(but not yet). Why don't you just go ahead with the following?


This also needs to use plural format or a measure format (with seconds). 

<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will restart in <ph
name="SECONDS">$2<ex>10</ex></ph> seconds.

In grd, the message spec has to be :

{1, plural, 
  =1{<ph name="PRODUCT_NAME">{0}<ex>Google Chrome</ex></ph> will restart in a
second.}
  other{<ph name="PRO...</ph> will restart in # seconds.}
}

Note that there are two input values to pass (one is string and the other is
integer). So, GetPluralStringFUTF16 helper cannot be used. You have to use

MessageFormatter::FormatWithNumberedArgs(GetStringUTF16(<msg id>), 
GetStringUTF16(IDS_PRODUCT_NAME), seconds); 

[Greg Levin, 2016/05/26 14:03:14]

Done.

                      : l10n_util::GetStringFUTF16(
                            IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE,
                            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));