zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-02 07:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-765

Browse source 
# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-03-10 13:22:34 +02:00
commit 1b87c0bbc6
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/locales/en.yml
View file

@ -19,7 +19,6 @@ en:
time:
formats:
default: "%Y-%m-%d %H:%M"
longer: "%a, %e. %b %Y, %H:%M"
long: "%A, %e. %B %Y, %H:%M"
short: "%d.%m.%y, %H:%M"
date: "%Y-%m-%d"
@ -28,7 +27,6 @@ en:
date:
formats:
default: "%Y-%m-%d"
year_and_month: "%Y %B"
activerecord:
errors:
@ -388,7 +386,6 @@ en:
choose: 'Choose...'
created_before: 'Created before'
created_after: 'Created after'
billing_address: 'Billing address'
billing_email: 'Billing e-mail'
contact_phone: 'Contact phone'
contact_email: 'Contact e-mail'