FIX: Remove duplicate keys from locale files

This commit is contained in:
Gerhard Schlager 2015-09-18 22:29:01 +02:00
parent 49dc470a28
commit ade31c4468
2 changed files with 12 additions and 12 deletions

View file

@ -153,7 +153,6 @@ en:
sign_up: "Sign Up" sign_up: "Sign Up"
log_in: "Log In" log_in: "Log In"
age: "Age" age: "Age"
last_post: "Last Post"
joined: "Joined" joined: "Joined"
admin_title: "Admin" admin_title: "Admin"
flags_title: "Flags" flags_title: "Flags"

View file

@ -20,17 +20,21 @@ en:
short_date: "D MMM, YYYY" short_date: "D MMM, YYYY"
long_date: "MMMM D, YYYY h:mma" long_date: "MMMM D, YYYY h:mma"
datetime: &datetime datetime_formats: &datetime_formats
month_names:
[~, January, February, March, April, May, June, July, August, September, October, November, December]
formats: formats:
# Format directives: http://ruby-doc.org/core-2.2.0/Time.html#method-i-strftime
short: "%m-%d-%Y" short: "%m-%d-%Y"
# Format directives: http://ruby-doc.org/core-2.2.0/Time.html#method-i-strftime
short_no_year: "%B %-d" short_no_year: "%B %-d"
# Format directives: http://ruby-doc.org/core-2.2.0/Time.html#method-i-strftime
date_only: "%B %-d, %Y" date_only: "%B %-d, %Y"
date: date:
<<: *datetime # Do not remove the brackets and commas and do not translate the first month name. It should be "null".
month_names:
[~, January, February, March, April, May, June, July, August, September, October, November, December]
<<: *datetime_formats
time: time:
<<: *datetime <<: *datetime_formats
title: "Discourse" title: "Discourse"
topics: "Topics" topics: "Topics"
@ -62,8 +66,10 @@ en:
exclusion: is reserved exclusion: is reserved
greater_than: must be greater than %{count} greater_than: must be greater than %{count}
greater_than_or_equal_to: must be greater than or equal to %{count} greater_than_or_equal_to: must be greater than or equal to %{count}
has_already_been_used: "has already been used"
inclusion: is not included in the list inclusion: is not included in the list
invalid: is invalid invalid: is invalid
is_invalid: "is invalid; try to be a little more descriptive"
less_than: must be less than %{count} less_than: must be less than %{count}
less_than_or_equal_to: must be less than or equal to %{count} less_than_or_equal_to: must be less than or equal to %{count}
not_a_number: is not a number not_a_number: is not a number
@ -101,9 +107,6 @@ en:
activemodel: activemodel:
errors: errors:
<<: *errors <<: *errors
activerecord:
errors:
<<: *errors
bulk_invite: bulk_invite:
file_should_be_csv: "The uploaded file should be of csv or txt format." file_should_be_csv: "The uploaded file should be of csv or txt format."
@ -280,9 +283,7 @@ en:
user: user:
ip_address: "" ip_address: ""
errors: errors:
messages: <<: *errors
is_invalid: "is invalid; try to be a little more descriptive"
has_already_been_used: "has already been used"
models: models:
topic: topic:
attributes: attributes: