diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /config/locales/en.yml | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index dabe98d..dab4595 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,6 @@ -# Don't add anything here! en: - dont_use_me: "NO ME USES!" - # Temporal, just till we create the Voice Mail stuff. - voice_mail: "Voice Mail" - fax: "Fax"
\ No newline at end of file + time: + formats: + date_only: '%m/%d/%Y' + short: ! '%m/%d/%y %H:%M' + date_only: '%m/%d/%Y' |