Localize strings, speeds.

base/i18n/number_formatting.cc

 // Copyright (c) 2011 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 "base/i18n/number_formatting.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "unicode/numfmt.h"
 #include "unicode/ustring.h"
 
 namespace base {
 
 namespace {
 
 struct NumberFormatWrapper {
   NumberFormatWrapper() {
+    Reset();
+  }
+
+  void Reset() {
     // There's no ICU call to destroy a NumberFormat object other than
     // operator delete, so use the default Delete, which calls operator delete.
     // This can cause problems if a different allocator is used by this file
     // than by ICU.
     UErrorCode status = U_ZERO_ERROR;
     number_format.reset(icu::NumberFormat::createInstance(status));
     DCHECK(U_SUCCESS(status));
   }
 
   scoped_ptr<icu::NumberFormat> number_format;
 };
 
 }  // namespace
 
-static LazyInstance<NumberFormatWrapper> g_number_format(LINKER_INITIALIZED);
+static

[Mark Mentovai, 2011/06/22 20:24:11]

Rather than staticating these, just move them up a couple lines to put them into
the anonymous namespace.

[Avi (use Gerrit), 2011/06/22 20:27:37]

Done.

+LazyInstance<NumberFormatWrapper> g_number_format_int(LINKER_INITIALIZED);
+
+static
+LazyInstance<NumberFormatWrapper> g_number_format_float(LINKER_INITIALIZED);
 
 string16 FormatNumber(int64 number) {
-  icu::NumberFormat* number_format = g_number_format.Get().number_format.get();
+  icu::NumberFormat* number_format =
+      g_number_format_int.Get().number_format.get();
 
   if (!number_format) {
     // As a fallback, just return the raw number in a string.
     return UTF8ToUTF16(StringPrintf("%" PRId64, number));
   }
   icu::UnicodeString ustr;
   number_format->format(number, ustr);
 
   return string16(ustr.getBuffer(), static_cast<size_t>(ustr.length()));
 }
 
+string16 FormatDouble(double number, int fractional_digits) {
+  icu::NumberFormat* number_format =
+      g_number_format_float.Get().number_format.get();
+
+  if (!number_format) {
+    // As a fallback, just return the raw number in a string.
+    return UTF8ToUTF16(StringPrintf("%f", number));
+  }
+  number_format->setMaximumFractionDigits(fractional_digits);
+  number_format->setMinimumFractionDigits(fractional_digits);
+  icu::UnicodeString ustr;
+  number_format->format(number, ustr);
+
+  return string16(ustr.getBuffer(), static_cast<size_t>(ustr.length()));
+}
+
+namespace testing {
+
+void ResetFormatters() {
+  g_number_format_int.Get().Reset();
+  g_number_format_float.Get().Reset();
+}
+
+}  // namespace testing
+
 }  // namespace base