summaryrefslogtreecommitdiffstats
path: root/core/res/res/values-en-rIE
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-06-10 12:10:22 -0700
committerEric Fischer <enf@google.com>2009-06-10 12:46:13 -0700
commit84c863d9af1270a2ccd2ccd2b8c1a753826dfe6d (patch)
treea5c0d1062e8ae70c031b4a34d572ff12f346f46b /core/res/res/values-en-rIE
parent295e7248b11557cf80ee9b7a12009d9cec5bd8b0 (diff)
downloadframeworks_base-84c863d9af1270a2ccd2ccd2b8c1a753826dfe6d.zip
frameworks_base-84c863d9af1270a2ccd2ccd2b8c1a753826dfe6d.tar.gz
frameworks_base-84c863d9af1270a2ccd2ccd2b8c1a753826dfe6d.tar.bz2
Fix some 12- vs 24-hour problems in the FormatDateRange strings.
Use a resource instead of a hardcoded string for the 24-hour format since it is not exactly the same in every locale. Make sure the 12-hour format is actually for a 12-hour clock, even in locales where this is not a normal thing to do. In the cap_ampm version, do not have it try to capitalize "am" and "pm" if these are non-ASCII strings, since strftime() doesn't know about Unicode and will mess it up. Add a comment so that people don't think the YEAR_IN_MILLIS constant is actually the length of any real year.
Diffstat (limited to 'core/res/res/values-en-rIE')
-rw-r--r--core/res/res/values-en-rIE/donottranslate-cldr.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/res/res/values-en-rIE/donottranslate-cldr.xml b/core/res/res/values-en-rIE/donottranslate-cldr.xml
index 2809bc0..dd8e730 100644
--- a/core/res/res/values-en-rIE/donottranslate-cldr.xml
+++ b/core/res/res/values-en-rIE/donottranslate-cldr.xml
@@ -91,8 +91,9 @@
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>
- <string name="hour_minute_ampm">%H:%M</string>
- <string name="hour_minute_cap_ampm">%H:%M</string>
+ <string name="hour_minute_24">%H:%M</string>
+ <string name="hour_minute_ampm">%-l:%M%p</string>
+ <string name="hour_minute_cap_ampm">%-l:%M%^p</string>
<string name="numeric_date">%d/%m/%Y</string>
<string name="numeric_date_format">dd/MM/yyyy</string>
<string name="month_day_year">%-e %B %Y</string>