diff options
| author | tnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 15:32:23 +0000 |
|---|---|---|
| committer | tnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 15:32:23 +0000 |
| commit | b6cc963b3efa562cfe51b44a733471d0369b52ed (patch) | |
| tree | da0f4d214f172625620975a29b3ec665dc92b72b /build | |
| parent | 817fed527b0862a1154d876e15ccafab7f23f389 (diff) | |
| download | chromium_src-b6cc963b3efa562cfe51b44a733471d0369b52ed.zip chromium_src-b6cc963b3efa562cfe51b44a733471d0369b52ed.tar.gz chromium_src-b6cc963b3efa562cfe51b44a733471d0369b52ed.tar.bz2 | |
Add support for localized time strings with two units, eg. "2 hours 17 minutes"
At that occasion, replace five existing formatting functions for one-unit time strings by a single consistent interface with the aim to make time formatting functions easier to use by highlighting the availability of different formatting options.
Also at that occasion, rename IDS_TIME_DURATION_LONG* to IDS_TIME_LONG* to be more consistent with other IDS_TIME* ids.
BUG=339835
TEST=full unit test coverage
TBR=oshima@chromium.org (for resolution_notification_controller.cc)
TBR=jennyz@chromium.org (for ash/system)
TBR=asanka@chromium.org (for download_item_model.cc)
TBR=tim@chromium.org (for profile_sync_service.cc)
TBR=xiyuan@chromium.org (for imageburner_ui.cc)
TBR=estade@chromium.org (for foreign_session_handler.cc, policy_ui.cc)
Review URL: https://codereview.chromium.org/147443007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 60 |
1 files changed, 48 insertions, 12 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 0f0949f..f3a0f70 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -884,24 +884,18 @@ IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL IDS_SYNC_UPGRADE_CLIENT IDS_SYNC_ZERO_DATA_TYPES_ERROR IDS_SYSTEM_FLAGS_OWNER_ONLY +IDS_TIME_DAYS_1ST_DEFAULT +IDS_TIME_DAYS_1ST_FEW +IDS_TIME_DAYS_1ST_MANY +IDS_TIME_DAYS_1ST_TWO +IDS_TIME_DAYS_1ST_ZERO IDS_TIME_DAYS_DEFAULT IDS_TIME_DAYS_FEW IDS_TIME_DAYS_MANY IDS_TIME_DAYS_TWO IDS_TIME_DAYS_ZERO +IDS_TIME_DAY_1ST_SINGULAR IDS_TIME_DAY_SINGULAR -IDS_TIME_DURATION_LONG_MINS_DEFAULT -IDS_TIME_DURATION_LONG_MINS_FEW -IDS_TIME_DURATION_LONG_MINS_MANY -IDS_TIME_DURATION_LONG_MINS_TWO -IDS_TIME_DURATION_LONG_MINS_ZERO -IDS_TIME_DURATION_LONG_MIN_SINGULAR -IDS_TIME_DURATION_LONG_SECS_DEFAULT -IDS_TIME_DURATION_LONG_SECS_FEW -IDS_TIME_DURATION_LONG_SECS_MANY -IDS_TIME_DURATION_LONG_SECS_TWO -IDS_TIME_DURATION_LONG_SECS_ZERO -IDS_TIME_DURATION_LONG_SEC_SINGULAR IDS_TIME_ELAPSED_DAYS_DEFAULT IDS_TIME_ELAPSED_DAYS_FEW IDS_TIME_ELAPSED_DAYS_MANY @@ -926,12 +920,54 @@ IDS_TIME_ELAPSED_SECS_MANY IDS_TIME_ELAPSED_SECS_TWO IDS_TIME_ELAPSED_SECS_ZERO IDS_TIME_ELAPSED_SEC_SINGULAR +IDS_TIME_HOURS_1ST_DEFAULT +IDS_TIME_HOURS_1ST_FEW +IDS_TIME_HOURS_1ST_MANY +IDS_TIME_HOURS_1ST_TWO +IDS_TIME_HOURS_1ST_ZERO +IDS_TIME_HOURS_2ND_DEFAULT +IDS_TIME_HOURS_2ND_FEW +IDS_TIME_HOURS_2ND_MANY +IDS_TIME_HOURS_2ND_TWO +IDS_TIME_HOURS_2ND_ZERO IDS_TIME_HOURS_DEFAULT IDS_TIME_HOURS_FEW IDS_TIME_HOURS_MANY IDS_TIME_HOURS_TWO IDS_TIME_HOURS_ZERO +IDS_TIME_HOUR_1ST_SINGULAR +IDS_TIME_HOUR_2ND_SINGULAR IDS_TIME_HOUR_SINGULAR +IDS_TIME_LONG_MINS_1ST_DEFAULT +IDS_TIME_LONG_MINS_1ST_FEW +IDS_TIME_LONG_MINS_1ST_MANY +IDS_TIME_LONG_MINS_1ST_TWO +IDS_TIME_LONG_MINS_1ST_ZERO +IDS_TIME_LONG_MINS_2ND_DEFAULT +IDS_TIME_LONG_MINS_2ND_FEW +IDS_TIME_LONG_MINS_2ND_MANY +IDS_TIME_LONG_MINS_2ND_TWO +IDS_TIME_LONG_MINS_2ND_ZERO +IDS_TIME_LONG_MINS_DEFAULT +IDS_TIME_LONG_MINS_FEW +IDS_TIME_LONG_MINS_MANY +IDS_TIME_LONG_MINS_TWO +IDS_TIME_LONG_MINS_ZERO +IDS_TIME_LONG_MIN_1ST_SINGULAR +IDS_TIME_LONG_MIN_2ND_SINGULAR +IDS_TIME_LONG_MIN_SINGULAR +IDS_TIME_LONG_SECS_2ND_DEFAULT +IDS_TIME_LONG_SECS_2ND_FEW +IDS_TIME_LONG_SECS_2ND_MANY +IDS_TIME_LONG_SECS_2ND_TWO +IDS_TIME_LONG_SECS_2ND_ZERO +IDS_TIME_LONG_SECS_DEFAULT +IDS_TIME_LONG_SECS_FEW +IDS_TIME_LONG_SECS_MANY +IDS_TIME_LONG_SECS_TWO +IDS_TIME_LONG_SECS_ZERO +IDS_TIME_LONG_SEC_2ND_SINGULAR +IDS_TIME_LONG_SEC_SINGULAR IDS_TIME_MINS_DEFAULT IDS_TIME_MINS_FEW IDS_TIME_MINS_MANY |