Fix i18n number formats in tray power displays

ash/system/chromeos/power/battery_notification.cc

 // Copyright 2015 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/battery_notification.h"
 
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/system_notifier.h"
-#include "base/strings/string_number_conversions.h"
+#include "base/i18n/message_formatter.h"
+#include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "grit/ash_resources.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/gfx/image/image.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
@@ skipping 20 matching lines @@
     resource_id = 0;
   }
 
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(resource_id);
 }
 
 std::unique_ptr<Notification> CreateNotification(
     TrayPower::NotificationState notification_state) {
   const PowerStatus& status = *PowerStatus::Get();
 
-  base::string16 message = l10n_util::GetStringFUTF16(
-      IDS_ASH_STATUS_TRAY_BATTERY_PERCENT,
-      base::IntToString16(status.GetRoundedBatteryPercent()));
+  base::string16 message = base::i18n::MessageFormatter::FormatWithNumberedArgs(
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_PERCENT),
+      static_cast<double>(status.GetRoundedBatteryPercent()) / 100.0);
 
   const base::TimeDelta time = status.IsBatteryCharging()
                                    ? status.GetBatteryTimeToFull()
                                    : status.GetBatteryTimeToEmpty();
   base::string16 time_message;
   if (status.IsUsbChargerConnected()) {
     time_message = l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE);
   } else if (PowerStatus::ShouldDisplayBatteryTime(time) &&
              !status.IsBatteryDischargingOnLinePower()) {
-    int hour = 0, min = 0;
-    PowerStatus::SplitTimeIntoHoursAndMinutes(time, &hour, &min);
     if (status.IsBatteryCharging()) {
       time_message = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL,
-          base::IntToString16(hour), base::IntToString16(min));
+          TimeDurationFormat(time, base::DURATION_WIDTH_NARROW));
     } else {
       // This is a low battery warning prompting the user in minutes.
-      time_message = ui::TimeFormat::Simple(
-          ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_LONG,
-          base::TimeDelta::FromMinutes(hour * 60 + min));
+      time_message = ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
+                                            ui::TimeFormat::LENGTH_LONG, time);
     }
   }
 
   if (!time_message.empty())
     message = message + base::ASCIIToUTF16("\n") + time_message;
 
   std::unique_ptr<Notification> notification(new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, kBatteryNotificationId,
       base::string16(), message, GetBatteryImage(notification_state),
       base::string16(), GURL(),
@@ skipping 20 matching lines @@
 
 void BatteryNotification::Update(
     TrayPower::NotificationState notification_state) {
   if (message_center_->FindVisibleNotificationById(kBatteryNotificationId)) {
     message_center_->UpdateNotification(kBatteryNotificationId,
                                         CreateNotification(notification_state));
   }
 }
 
 }  // namespace ash