Fix i18n number formats in tray power displays

ash/system/chromeos/power/power_status_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/power/power_status_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/tray_power.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
-#include "base/strings/string_number_conversions.h"
+#include "base/i18n/message_formatter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
@@ skipping 59 matching lines @@
 void PowerStatusView::UpdateText() {
   const PowerStatus& status = *PowerStatus::Get();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   base::string16 battery_percentage;
   base::string16 battery_time_status;
 
   if (status.IsBatteryFull()) {
     battery_time_status =
         rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_FULL);
   } else {
-    battery_percentage = l10n_util::GetStringFUTF16(
-        IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ONLY,
-        base::IntToString16(status.GetRoundedBatteryPercent()));
+    battery_percentage = base::i18n::MessageFormatter::FormatWithNumberedArgs(
+        base::ASCIIToUTF16("{0,number,percent}"),
+        static_cast<double>(status.GetRoundedBatteryPercent()) / 100.0);
     if (status.IsUsbChargerConnected()) {
       battery_time_status = rb.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE);
     } else if (status.IsBatteryTimeBeingCalculated()) {
       battery_time_status =
           rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
     } else {
       base::TimeDelta time = status.IsBatteryCharging() ?
           status.GetBatteryTimeToFull() : status.GetBatteryTimeToEmpty();
       if (PowerStatus::ShouldDisplayBatteryTime(time) &&
           !status.IsBatteryDischargingOnLinePower()) {
         int hour = 0, min = 0;
         PowerStatus::SplitTimeIntoHoursAndMinutes(time, &hour, &min);
-        base::string16 minute = min < 10 ?
-            base::ASCIIToUTF16("0") + base::IntToString16(min) :
-            base::IntToString16(min);
+        base::string16 pattern = rb.GetLocalizedString(
+            status.IsBatteryCharging()
+                ? IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL_SHORT
+                : IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_SHORT);

[jungshik at Google, 2016/05/11 20:32:39]

Please use l10n_util::GetStringUTF16()

[Greg Levin, 2016/05/12 19:31:43]

I had already switched back to GetStringFUTF16() in PS#3.

Should I convert the above instances of rb.GetLocalizedString() to
GetStringUTF16()?  What are the guidelines for using one vs the other?

[jungshik at Google, 2016/05/13 23:00:35]

Oh. I didn't realize that there are other uses of rb.Get...() in this file. Yes,
please, switch over to l10n_util::Get...(). And, get rid of this line: 
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

l10n_util::GetStr*() takes care of it. A few cycles might be saved by getting a
reference to shared resource bundle and use it for all other
strings, but I don't think it's worth extra code lines. ;-)

[Greg Levin, 2016/05/16 17:12:56]

Done.

         battery_time_status =
-            l10n_util::GetStringFUTF16(
-                status.IsBatteryCharging() ?
-                IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL_SHORT :
-                IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_SHORT,
-                base::IntToString16(hour),
-                minute);
+            base::i18n::MessageFormatter::FormatWithNumberedArgs(pattern, hour,
+                                                                 min);
       }
     }
     battery_percentage = battery_time_status.empty() ?
         battery_percentage : battery_percentage + base::ASCIIToUTF16(" - ");
   }
   percentage_label_->SetVisible(!battery_percentage.empty());
   percentage_label_->SetText(battery_percentage);
   time_status_label_->SetVisible(!battery_time_status.empty());
   time_status_label_->SetText(battery_time_status);
 }
@@ skipping 15 matching lines @@
   views::View::Layout();
 
   // Move the time_status_label_ closer to percentage_label_.
   if (percentage_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     time_status_label_->SetX(percentage_label_->bounds().right() + 1);
   }
 }
 
 }  // namespace ash