Rename IDS ids to be more consistent in ui_strings.grd.

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 <vector>
 
 #include "base/logging.h"
 #include "grit/ui_strings.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "ui/base/l10n/l10n_util_plurals.h"
 
 namespace ui {
 
 UI_BASE_EXPORT bool formatter_force_fallback = false;
 
 static const size_t kNumberPluralities = 6;
 struct Pluralities {
   int ids[kNumberPluralities];
   const char* fallback_one;
   const char* fallback_other;
 };
 
 static const Pluralities IDS_ELAPSED_SHORT_SEC = {
-  { IDS_TIME_ELAPSED_SECS_DEFAULT, IDS_TIME_ELAPSED_SEC_SINGULAR,
+  { IDS_TIME_ELAPSED_SECS_DEFAULT, IDS_TIME_ELAPSED_SECS_SINGULAR,
     IDS_TIME_ELAPSED_SECS_ZERO, IDS_TIME_ELAPSED_SECS_TWO,
     IDS_TIME_ELAPSED_SECS_FEW, IDS_TIME_ELAPSED_SECS_MANY },
   "one{# sec ago}",
   " other{# secs ago}"
 };
 static const Pluralities IDS_ELAPSED_SHORT_MIN = {
-  { IDS_TIME_ELAPSED_MINS_DEFAULT, IDS_TIME_ELAPSED_MIN_SINGULAR,
+  { IDS_TIME_ELAPSED_MINS_DEFAULT, IDS_TIME_ELAPSED_MINS_SINGULAR,
     IDS_TIME_ELAPSED_MINS_ZERO, IDS_TIME_ELAPSED_MINS_TWO,
     IDS_TIME_ELAPSED_MINS_FEW, IDS_TIME_ELAPSED_MINS_MANY },
   "one{# min ago}",
   " other{# mins ago}"
 };
 static const Pluralities IDS_ELAPSED_HOUR = {
-  { IDS_TIME_ELAPSED_HOURS_DEFAULT, IDS_TIME_ELAPSED_HOUR_SINGULAR,
+  { IDS_TIME_ELAPSED_HOURS_DEFAULT, IDS_TIME_ELAPSED_HOURS_SINGULAR,
     IDS_TIME_ELAPSED_HOURS_ZERO, IDS_TIME_ELAPSED_HOURS_TWO,
     IDS_TIME_ELAPSED_HOURS_FEW, IDS_TIME_ELAPSED_HOURS_MANY },
   "one{# hour ago}",
   " other{# hours ago}"
 };
 static const Pluralities IDS_ELAPSED_DAY = {
-  { IDS_TIME_ELAPSED_DAYS_DEFAULT, IDS_TIME_ELAPSED_DAY_SINGULAR,
+  { IDS_TIME_ELAPSED_DAYS_DEFAULT, IDS_TIME_ELAPSED_DAYS_SINGULAR,
     IDS_TIME_ELAPSED_DAYS_ZERO, IDS_TIME_ELAPSED_DAYS_TWO,
     IDS_TIME_ELAPSED_DAYS_FEW, IDS_TIME_ELAPSED_DAYS_MANY },
   "one{# day ago}",
   " other{# days ago}"
 };
 
 static const Pluralities IDS_REMAINING_SHORT_SEC = {
-  { IDS_TIME_REMAINING_SECS_DEFAULT, IDS_TIME_REMAINING_SEC_SINGULAR,
+  { IDS_TIME_REMAINING_SECS_DEFAULT, IDS_TIME_REMAINING_SECS_SINGULAR,
     IDS_TIME_REMAINING_SECS_ZERO, IDS_TIME_REMAINING_SECS_TWO,
     IDS_TIME_REMAINING_SECS_FEW, IDS_TIME_REMAINING_SECS_MANY },
   "one{# sec left}",
   " other{# secs left}"
 };
 static const Pluralities IDS_REMAINING_SHORT_MIN = {
-  { IDS_TIME_REMAINING_MINS_DEFAULT, IDS_TIME_REMAINING_MIN_SINGULAR,
+  { IDS_TIME_REMAINING_MINS_DEFAULT, IDS_TIME_REMAINING_MINS_SINGULAR,
     IDS_TIME_REMAINING_MINS_ZERO, IDS_TIME_REMAINING_MINS_TWO,
     IDS_TIME_REMAINING_MINS_FEW, IDS_TIME_REMAINING_MINS_MANY },
   "one{# min left}",
   " other{# mins left}"
 };
 
 static const Pluralities IDS_REMAINING_LONG_SEC = {
-  { IDS_TIME_REMAINING_LONG_SECS_DEFAULT, IDS_TIME_REMAINING_LONG_SEC_SINGULAR,
+  { IDS_TIME_REMAINING_LONG_SECS_DEFAULT, IDS_TIME_REMAINING_LONG_SECS_SINGULAR,
     IDS_TIME_REMAINING_LONG_SECS_ZERO, IDS_TIME_REMAINING_LONG_SECS_TWO,
     IDS_TIME_REMAINING_LONG_SECS_FEW, IDS_TIME_REMAINING_LONG_SECS_MANY },
   "one{# second left}",
   " other{# seconds left}"
 };
 static const Pluralities IDS_REMAINING_LONG_MIN = {
-  { IDS_TIME_REMAINING_LONG_MINS_DEFAULT, IDS_TIME_REMAINING_LONG_MIN_SINGULAR,
+  { IDS_TIME_REMAINING_LONG_MINS_DEFAULT, IDS_TIME_REMAINING_LONG_MINS_SINGULAR,
     IDS_TIME_REMAINING_LONG_MINS_ZERO, IDS_TIME_REMAINING_LONG_MINS_TWO,
     IDS_TIME_REMAINING_LONG_MINS_FEW, IDS_TIME_REMAINING_LONG_MINS_MANY },
   "one{# minute left}",
   " other{# minutes left}"
 };
 static const Pluralities IDS_REMAINING_HOUR = {
-  { IDS_TIME_REMAINING_HOURS_DEFAULT, IDS_TIME_REMAINING_HOUR_SINGULAR,
+  { IDS_TIME_REMAINING_HOURS_DEFAULT, IDS_TIME_REMAINING_HOURS_SINGULAR,
     IDS_TIME_REMAINING_HOURS_ZERO, IDS_TIME_REMAINING_HOURS_TWO,
     IDS_TIME_REMAINING_HOURS_FEW, IDS_TIME_REMAINING_HOURS_MANY },
   "one{# hour left}",
   " other{# hours left}"
 };
 static const Pluralities IDS_REMAINING_DAY = {
-  { IDS_TIME_REMAINING_DAYS_DEFAULT, IDS_TIME_REMAINING_DAY_SINGULAR,
+  { IDS_TIME_REMAINING_DAYS_DEFAULT, IDS_TIME_REMAINING_DAYS_SINGULAR,
     IDS_TIME_REMAINING_DAYS_ZERO, IDS_TIME_REMAINING_DAYS_TWO,
     IDS_TIME_REMAINING_DAYS_FEW, IDS_TIME_REMAINING_DAYS_MANY },
   "one{# day left}",
   " other{# days left}"
 };
 
 static const Pluralities IDS_DURATION_SHORT_SEC = {
-  { IDS_TIME_SECS_DEFAULT, IDS_TIME_SEC_SINGULAR, IDS_TIME_SECS_ZERO,
+  { IDS_TIME_SECS_DEFAULT, IDS_TIME_SECS_SINGULAR, IDS_TIME_SECS_ZERO,
     IDS_TIME_SECS_TWO, IDS_TIME_SECS_FEW, IDS_TIME_SECS_MANY },
   "one{# sec}",
   " other{# secs}"
 };
 static const Pluralities IDS_DURATION_SHORT_MIN = {
-  { IDS_TIME_MINS_DEFAULT, IDS_TIME_MIN_SINGULAR, IDS_TIME_MINS_ZERO,
+  { IDS_TIME_MINS_DEFAULT, IDS_TIME_MINS_SINGULAR, IDS_TIME_MINS_ZERO,
     IDS_TIME_MINS_TWO, IDS_TIME_MINS_FEW, IDS_TIME_MINS_MANY },
   "one{# min}",
   " other{# mins}"
 };
 
 static const Pluralities IDS_LONG_SEC = {
-  { IDS_TIME_LONG_SECS_DEFAULT, IDS_TIME_LONG_SEC_SINGULAR,
+  { IDS_TIME_LONG_SECS_DEFAULT, IDS_TIME_LONG_SECS_SINGULAR,
     IDS_TIME_LONG_SECS_ZERO, IDS_TIME_LONG_SECS_TWO,
     IDS_TIME_LONG_SECS_FEW, IDS_TIME_LONG_SECS_MANY },
   "one{# second}",
   " other{# seconds}"
 };
 static const Pluralities IDS_LONG_MIN = {
-  { IDS_TIME_LONG_MINS_DEFAULT, IDS_TIME_LONG_MIN_SINGULAR,
+  { IDS_TIME_LONG_MINS_DEFAULT, IDS_TIME_LONG_MINS_SINGULAR,
     IDS_TIME_LONG_MINS_ZERO, IDS_TIME_LONG_MINS_TWO,
     IDS_TIME_LONG_MINS_FEW, IDS_TIME_LONG_MINS_MANY },
   "one{# minute}",
   " other{# minutes}"
 };
 static const Pluralities IDS_DURATION_HOUR = {
-  { IDS_TIME_HOURS_DEFAULT, IDS_TIME_HOUR_SINGULAR, IDS_TIME_HOURS_ZERO,
+  { IDS_TIME_HOURS_DEFAULT, IDS_TIME_HOURS_SINGULAR, IDS_TIME_HOURS_ZERO,
     IDS_TIME_HOURS_TWO, IDS_TIME_HOURS_FEW, IDS_TIME_HOURS_MANY },
   "one{# hour}",
   " other{# hours}"
 };
 static const Pluralities IDS_DURATION_DAY = {
-  { IDS_TIME_DAYS_DEFAULT, IDS_TIME_DAY_SINGULAR, IDS_TIME_DAYS_ZERO,
+  { IDS_TIME_DAYS_DEFAULT, IDS_TIME_DAYS_SINGULAR, IDS_TIME_DAYS_ZERO,
     IDS_TIME_DAYS_TWO, IDS_TIME_DAYS_FEW, IDS_TIME_DAYS_MANY },
   "one{# day}",
   " other{# days}"
 };
 
 static const Pluralities IDS_LONG_MIN_1ST = {
-  { IDS_TIME_LONG_MINS_1ST_DEFAULT, IDS_TIME_LONG_MIN_1ST_SINGULAR,
+  { IDS_TIME_LONG_MINS_1ST_DEFAULT, IDS_TIME_LONG_MINS_1ST_SINGULAR,
     IDS_TIME_LONG_MINS_1ST_ZERO, IDS_TIME_LONG_MINS_1ST_TWO,
     IDS_TIME_LONG_MINS_1ST_FEW, IDS_TIME_LONG_MINS_1ST_MANY },
   "one{# minute }",
   " other{# minutes }"
 };
 static const Pluralities IDS_LONG_SEC_2ND = {
-  { IDS_TIME_LONG_SECS_2ND_DEFAULT, IDS_TIME_LONG_SEC_2ND_SINGULAR,
+  { IDS_TIME_LONG_SECS_2ND_DEFAULT, IDS_TIME_LONG_SECS_2ND_SINGULAR,
     IDS_TIME_LONG_SECS_2ND_ZERO, IDS_TIME_LONG_SECS_2ND_TWO,
     IDS_TIME_LONG_SECS_2ND_FEW, IDS_TIME_LONG_SECS_2ND_MANY },
   "one{# second}",
   " other{# seconds}"
 };
 static const Pluralities IDS_DURATION_HOUR_1ST = {
-  { IDS_TIME_HOURS_1ST_DEFAULT, IDS_TIME_HOUR_1ST_SINGULAR,
+  { IDS_TIME_HOURS_1ST_DEFAULT, IDS_TIME_HOURS_1ST_SINGULAR,
     IDS_TIME_HOURS_1ST_ZERO, IDS_TIME_HOURS_1ST_TWO,
     IDS_TIME_HOURS_1ST_FEW, IDS_TIME_HOURS_1ST_MANY },
   "one{# hour }",
   " other{# hours }"
 };
 static const Pluralities IDS_LONG_MIN_2ND = {
-  { IDS_TIME_LONG_MINS_2ND_DEFAULT, IDS_TIME_LONG_MIN_2ND_SINGULAR,
+  { IDS_TIME_LONG_MINS_2ND_DEFAULT, IDS_TIME_LONG_MINS_2ND_SINGULAR,
     IDS_TIME_LONG_MINS_2ND_ZERO, IDS_TIME_LONG_MINS_2ND_TWO,
     IDS_TIME_LONG_MINS_2ND_FEW, IDS_TIME_LONG_MINS_2ND_MANY },
   "one{# minute}",
   " other{# minutes}"
 };
 static const Pluralities IDS_DURATION_DAY_1ST = {
-  { IDS_TIME_DAYS_1ST_DEFAULT, IDS_TIME_DAY_1ST_SINGULAR,
+  { IDS_TIME_DAYS_1ST_DEFAULT, IDS_TIME_DAYS_1ST_SINGULAR,
     IDS_TIME_DAYS_1ST_ZERO, IDS_TIME_DAYS_1ST_TWO,
     IDS_TIME_DAYS_1ST_FEW, IDS_TIME_DAYS_1ST_MANY },
   "one{# day }",
   " other{# days }"
 };
 static const Pluralities IDS_DURATION_HOUR_2ND = {
-  { IDS_TIME_HOURS_2ND_DEFAULT, IDS_TIME_HOUR_2ND_SINGULAR,
+  { IDS_TIME_HOURS_2ND_DEFAULT, IDS_TIME_HOURS_2ND_SINGULAR,
     IDS_TIME_HOURS_2ND_ZERO, IDS_TIME_HOURS_2ND_TWO,
     IDS_TIME_HOURS_2ND_FEW, IDS_TIME_HOURS_2ND_MANY },
   "one{# hour}",
   " other{# hours}"
 };
 
 Formatter::Formatter(const Pluralities& sec_pluralities,
                      const Pluralities& min_pluralities,
                      const Pluralities& hour_pluralities,
                      const Pluralities& day_pluralities) {
@@ skipping 133 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