Use plural formats and native digits

ash/system/chromeos/network/tray_sms.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/network/tray_sms.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_bubble.h"
@@ skipping 49 matching lines @@
       : TrayItemMore(owner, true) {
     SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         IDR_AURA_UBER_TRAY_SMS));
     Update();
   }
 
   ~SmsDefaultView() override {}
 
   void Update() {
     int message_count = static_cast<TraySms*>(owner())->messages().GetSize();
-    base::string16 label = l10n_util::GetStringFUTF16(
-        IDS_ASH_STATUS_TRAY_SMS_MESSAGES, base::IntToString16(message_count));
+    // TODO(jshin): Currently, a tabular format is used ("SMS Messages:
+    // <count>"). Check with UX if '<count> SMS messages' with a proper plural
+    // support is desired.
+    base::string16 label = l10n_util::GetStringFUTF16Int(
+        IDS_ASH_STATUS_TRAY_SMS_MESSAGES, message_count);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SmsDefaultView);
 };
 
 // An entry (row) in SmsDetailedView or NotificationView.
 class TraySms::SmsMessageView : public views::View,
                                 public views::ButtonListener {
  public:
   enum ViewType {
     VIEW_DETAILED,
     VIEW_NOTIFICATION
   };
 
   SmsMessageView(TraySms* owner,
                  ViewType view_type,
                  size_t index,
                  const std::string& number,
                  const std::string& message)
       : owner_(owner),
         index_(index) {
+    // TODO(jshin): Convert ASCII digits in |number| (phone number) to native
+    // digits if necessary. |number| can contain non-digit characters and may
+    // have to be converted one-by-one or use libphonenumber's formating API.
     number_label_ = new views::Label(
         l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_SMS_NUMBER,
                                    base::UTF8ToUTF16(number)),
         ui::ResourceBundle::GetSharedInstance().GetFontList(
             ui::ResourceBundle::BoldFont));
     number_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
     message_label_ = new views::Label(base::UTF8ToUTF16(message));
     message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_label_->SetMultiLine(true);
@@ skipping 297 matching lines @@
       std::string number, text;
       if (GetLatestMessage(&index, &number, &text))
         notification_->Update(index, number, text);
     } else if (notify) {
       ShowNotificationView();
     }
   }
 }
 
 }  // namespace ash