Browse files

Merge pull request #6886 from fabi1cazenave/short-prettyDates-followup

Bug 814355 - l10n_date.js / pretty dates: support compact formats
  • Loading branch information...
2 parents 70b4b01 + 406579f commit 8036ba14843198e98dd3f90017d5df1e60115f53 Josh Carpenter committed Dec 7, 2012
Showing with 5 additions and 2 deletions.
  1. +5 −2 shared/locales/date/date.en-US.properties
View
7 shared/locales/date/date.en-US.properties
@@ -97,10 +97,13 @@ inDays-long[other] = in {{d}} days
# Relative time ("pretty dates"), short variant
# LOCALIZATION NOTE: the time unit should be as short as possible,
# and the whole string should not exceed a length of ~10 latin characters.
+# LOCALIZATION NOTE: the prime (’) can be used to represent minutes for most
+# locales, but we use “m” instead for the English locale to prevent a possible
+# confusion (35’ ago ≠ 35 feet ago).
minutesAgo-short={[ plural(m) ]}
minutesAgo-short[zero] = just now
-minutesAgo-short[other] = {{m}} ago
+minutesAgo-short[other] = {{m}}m ago
hoursAgo-short={[ plural(h) ]}
hoursAgo-short[zero] = just now
@@ -112,7 +115,7 @@ daysAgo-short[other] = {{d}}d ago
inMinutes-short={[ plural(m) ]}
inMinutes-short[zero] = now
-inMinutes-short[other] = in {{m}}
+inMinutes-short[other] = in {{m}}m
inHours-short={[ plural(h) ]}
inHours-short[zero] = now

0 comments on commit 8036ba1

Please sign in to comment.