Implement (FORMAT_ELAPSED, LENGTH_LONG) in time_format

ui/base/l10n/formatter.cc

 // 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.
 
 #include "ui/base/l10n/formatter.h"
 
 #include <limits.h>
 
 #include <memory>
 #include <vector>
@@ skipping 12 matching lines @@
   int id;
   const char* const fallback_one;
   const char* const fallback_other;
 };
 
 static const Pluralities IDS_ELAPSED_SHORT_SEC = {
   IDS_TIME_ELAPSED_SECS,
   "one{# sec ago}",
   " other{# secs ago}"
 };
+
+static const Pluralities IDS_ELAPSED_LONG_SEC = {
+    IDS_TIME_ELAPSED_LONG_SECS, "one{# second ago}", " other{# seconds ago}"};
+
 static const Pluralities IDS_ELAPSED_SHORT_MIN = {
   IDS_TIME_ELAPSED_MINS,
   "one{# min ago}",
   " other{# mins ago}"
 };
+
+static const Pluralities IDS_ELAPSED_LONG_MIN = {
+    IDS_TIME_ELAPSED_LONG_MINS, "one{# minute ago}", " other{# minutes ago}"};
+
 static const Pluralities IDS_ELAPSED_HOUR = {
   IDS_TIME_ELAPSED_HOURS,
   "one{# hour ago}",
   " other{# hours ago}"
 };
 static const Pluralities IDS_ELAPSED_DAY = {
   IDS_TIME_ELAPSED_DAYS,
   "one{# day ago}",
   " other{# days ago}"
 };
@@ skipping 210 matching lines @@
     if (format.get())
       return format;
   }
 
   std::unique_ptr<icu::PluralRules> rules(BuildPluralRules());
   return CreateFallbackFormat(*rules, pluralities);
 }
 
 const Formatter* FormatterContainer::Get(TimeFormat::Format format,
                                          TimeFormat::Length length) const {
-  DCHECK(formatter_[format][length])
-      << "Combination of FORMAT_ELAPSED and LENGTH_LONG is not implemented!";
   return formatter_[format][length].get();
 }
 
 FormatterContainer::FormatterContainer() {
   Initialize();
 }
 
 FormatterContainer::~FormatterContainer() {
 }
 
 void FormatterContainer::Initialize() {
   formatter_[TimeFormat::FORMAT_ELAPSED][TimeFormat::LENGTH_SHORT].reset(
       new Formatter(IDS_ELAPSED_SHORT_SEC,
                     IDS_ELAPSED_SHORT_MIN,
                     IDS_ELAPSED_HOUR,
                     IDS_ELAPSED_DAY));
-  formatter_[TimeFormat::FORMAT_ELAPSED][TimeFormat::LENGTH_LONG].reset();
+  formatter_[TimeFormat::FORMAT_ELAPSED][TimeFormat::LENGTH_LONG].reset(
+      new Formatter(IDS_ELAPSED_LONG_SEC, IDS_ELAPSED_LONG_MIN,
+                    IDS_ELAPSED_HOUR, IDS_ELAPSED_DAY));
   formatter_[TimeFormat::FORMAT_REMAINING][TimeFormat::LENGTH_SHORT].reset(
       new Formatter(IDS_REMAINING_SHORT_SEC,
                     IDS_REMAINING_SHORT_MIN,
                     IDS_REMAINING_HOUR,
                     IDS_REMAINING_DAY));
   formatter_[TimeFormat::FORMAT_REMAINING][TimeFormat::LENGTH_LONG].reset(
       new Formatter(IDS_REMAINING_LONG_SEC,
                     IDS_REMAINING_LONG_MIN,
                     IDS_REMAINING_HOUR,
                     IDS_REMAINING_DAY));
@@ skipping 17 matching lines @@
 
 void FormatterContainer::Shutdown() {
   for (int format = 0; format < TimeFormat::FORMAT_COUNT; ++format) {
     for (int length = 0; length < TimeFormat::LENGTH_COUNT; ++length) {
       formatter_[format][length].reset();
     }
   }
 }
 
 }  // namespace ui