zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-359

Browse source
This commit is contained in:
Artur Beljajev 2017-02-28 06:08:11 +02:00
commit 2b101776e5
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/locales/en.yml
View file

@ -18,7 +18,7 @@ en:
time: time:
formats: formats:
default: "%d. %B %Y, %H:%M" default: "%Y-%m-%d %H:%M"
longer: "%a, %e. %b %Y, %H:%M" longer: "%a, %e. %b %Y, %H:%M"
long: "%A, %e. %B %Y, %H:%M" long: "%A, %e. %B %Y, %H:%M"
short: "%d.%m.%y, %H:%M" short: "%d.%m.%y, %H:%M"
@ -28,6 +28,7 @@ en:
ydate: "%Y.%m.%d" ydate: "%Y.%m.%d"
date: date:
formats: formats:
default: "%Y-%m-%d"
year_and_month: "%Y %B" year_and_month: "%Y %B"
activerecord: activerecord: