Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ui/base/l10n/formatter.h

Index: ui/base/l10n/formatter.h
diff --git a/ui/base/l10n/formatter.h b/ui/base/l10n/formatter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e6308b07aaf971455e0738f0edf5f4ecf37a7f9c
--- /dev/null
+++ b/ui/base/l10n/formatter.h
@@ -0,0 +1,112 @@
+// Copyright 2014 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.
+
+#ifndef UI_BASE_L10N_FORMATTER_H_
+#define UI_BASE_L10N_FORMATTER_H_
+
+#include "base/basictypes.h"
+#include "base/lazy_instance.h"
+#include "base/memory/scoped_ptr.h"
+#include "third_party/icu/source/i18n/unicode/plurfmt.h"
+#include "third_party/icu/source/i18n/unicode/plurrule.h"
+#include "ui/base/l10n/time_format.h"
+#include "ui/base/ui_base_export.h"
+
+namespace ui {
+
+struct Pluralities;
+
+// Formatter for a (format, length) combination.  May either be instantiated
+// with four parameters for use in TimeFormat::Simple() or with ten parameters
+// for use in TimeFormat::Detailed().
+class Formatter {
+ public:
+  enum Unit {
+    UNIT_SEC,
+    UNIT_MIN,
+    UNIT_HOUR,
+    UNIT_DAY,
+    UNIT_COUNT  // Enum size counter, not a unit.  Must be last.
+  };
+  enum TwoUnits {
+    TWOUNITS_MIN_SEC,

[bartfab (slow), 2014/02/20 16:31:23]

Nit: s/TWOUNITS/TWO_UNITS/

[Thiemo Nagel, 2014/02/22 21:44:10]

Done.

+    TWOUNITS_HOUR_MIN,
+    TWOUNITS_DAY_HOUR,
+    TWOUNITS_COUNT     // Enum size counter, not a unit pair.  Must be last.

[bartfab (slow), 2014/02/20 16:31:23]

Nit: Two spaces before inline comment.

[Thiemo Nagel, 2014/02/22 21:44:10]

Done.

+  };
+
+  Formatter(const Pluralities& sec_pluralities,
+            const Pluralities& min_pluralities,
+            const Pluralities& hour_pluralities,
+            const Pluralities& day_pluralities);
+
+  Formatter(const Pluralities& sec_pluralities,
+            const Pluralities& min_pluralities,
+            const Pluralities& hour_pluralities,
+            const Pluralities& day_pluralities,
+            const Pluralities& min_sec_pluralities1,
+            const Pluralities& min_sec_pluralities2,
+            const Pluralities& hour_min_pluralities1,
+            const Pluralities& hour_min_pluralities2,
+            const Pluralities& day_hour_pluralities1,
+            const Pluralities& day_hour_pluralities2);
+
+  void Format(Unit unit, int value, icu::UnicodeString& formatted_string) const;
+
+  void Format(TwoUnits units,
+              int value1,

[bartfab (slow), 2014/02/20 16:31:23]

Nit: s/value1/value_1/

[Thiemo Nagel, 2014/02/22 21:44:10]

Done.

+              int value2,

[bartfab (slow), 2014/02/20 16:31:23]

Nit: s/value2/value_2/

[Thiemo Nagel, 2014/02/22 21:44:10]

Done.

+              icu::UnicodeString& formatted_string) const;
+
+ private:
+  friend class FormatterContainer;  // allow access to force_fallback_

[bartfab (slow), 2014/02/20 16:31:23]

Why not make |Formatter| an inner class of |FormatterContainer|? That way,
|Formatter| would automatically have access to all private members.

[Thiemo Nagel, 2014/02/22 21:44:10]

I moved force_fallback_ back to FormatterContainer -- that way, there's no need
for a friend declaration anymore.

+
+  // Create a hard-coded fallback plural format.  This will never be called
+  // unless translators make a mistake.
+  scoped_ptr<icu::PluralFormat> CreateFallbackFormat(
+      const icu::PluralRules& rules,
+      const Pluralities& pluralities) const;
+
+  scoped_ptr<icu::PluralFormat> InitFormat(const Pluralities& pluralities);
+
+  scoped_ptr<icu::PluralFormat> simple_format_[UNIT_COUNT];
+  scoped_ptr<icu::PluralFormat> detailed_format_[TWOUNITS_COUNT][2];
+
+  static bool force_fallback_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(Formatter);
+};
+
+// Class to hold all Formatters, intended to be used in a global LazyInstance.
+class UI_BASE_EXPORT FormatterContainer {
+ public:
+  FormatterContainer();
+  ~FormatterContainer();
+
+  const Formatter* Get(TimeFormat::Format format,
+                       TimeFormat::Length length) const;
+
+  void SetFallbackForTesting(bool val) {
+    Formatter::force_fallback_ = val;
+    Shutdown();
+    Initialize();
+  }
+
+ private:
+  friend struct base::DefaultLazyInstanceTraits<FormatterContainer>;
+
+  void Initialize();
+  void Shutdown();
+
+  scoped_ptr<Formatter>
+      formatter_[TimeFormat::FORMAT_COUNT][TimeFormat::LENGTH_COUNT];
+
+  DISALLOW_COPY_AND_ASSIGN(FormatterContainer);
+};
+
+extern base::LazyInstance<FormatterContainer> g_container;
+
+}  // namespace ui
+
+#endif