Use plural formats and native digits

ui/base/l10n/l10n_util.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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/message_formatter.h"
+#include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/string_compare.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 795 matching lines @@
                                const base::string16& a,
                                const base::string16& b,
                                std::vector<size_t>* offsets) {
   std::vector<base::string16> replacements;
   replacements.push_back(a);
   replacements.push_back(b);
   return GetStringFUTF16(message_id, replacements, offsets);
 }
 
 base::string16 GetStringFUTF16Int(int message_id, int a) {
-  return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::IntToString(a)));
+  return GetStringFUTF16(message_id, base::FormatNumber(a));
 }
 
 base::string16 GetStringFUTF16Int(int message_id, int64_t a) {
-  return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::Int64ToString(a)));
+  return GetStringFUTF16(message_id, base::FormatNumber(a));
 }
 
 base::string16 GetPluralStringFUTF16(int message_id, int number) {
   return base::i18n::MessageFormatter::FormatWithNumberedArgs(
       GetStringUTF16(message_id), number);
 }
 
 std::string GetPluralStringFUTF8(int message_id, int number) {
   return base::UTF16ToUTF8(GetPluralStringFUTF16(message_id, number));
 }
@@ skipping 34 matching lines @@
 
 const char* const* GetAcceptLanguageListForTesting() {
   return kAcceptLanguageList;
 }
 
 size_t GetAcceptLanguageListSizeForTesting() {
   return arraysize(kAcceptLanguageList);
 }
 
 }  // namespace l10n_util