Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove code for Rails 2 from locales.thor

Each task doesn't check the formality for Rails 2.

Following tasks were removed:
 - not_ready_for
 - copy_rails3_ready_to

`ready` task was renamed to `complete`
  • Loading branch information...
commit 11894b53afae71da983c2048eac89138eed5a922 1 parent 42981d0
@kuroda kuroda authored
View
82 locales.thor
@@ -7,12 +7,10 @@ class Locales < Thor
if md = filename.match(/([\w\-]+)\.(rb|yml)$/)
locale = md[1]
broken_keys = []
- [2, 3].each do |version|
- missing_keys, keys = KeyStructure.check(locale, version)
- broken_keys += keys
- unless missing_keys.empty?
- puts "[#{locale}] Some keys are missing for Rails #{version}."
- end
+ missing_keys, keys = KeyStructure.check(locale)
+ broken_keys += keys
+ unless missing_keys.empty?
+ puts "[#{locale}] Some keys are missing."
end
unless broken_keys.empty?
puts "[#{locale}] Some keys have broken data."
@@ -26,16 +24,14 @@ class Locales < Thor
good = true
broken_keys = []
- [2, 3].each do |version|
- missing_keys, keys = KeyStructure.check(locale, version)
- broken_keys += keys
- unless missing_keys.empty?
- puts "The following keys are missing for Rails #{version}."
- missing_keys.each do |key|
- puts " " + key
- end
- good = false
+ missing_keys, keys = KeyStructure.check(locale)
+ broken_keys += keys
+ unless missing_keys.empty?
+ puts "The following keys are missing."
+ missing_keys.each do |key|
+ puts " " + key
end
+ good = false
end
unless broken_keys.empty?
@@ -46,7 +42,7 @@ class Locales < Thor
good = false
end
- puts "The structure is good for Rails 2 and 3." if good
+ puts "The structure is good." if good
end
desc 'list', 'List locale names.'
@@ -60,65 +56,19 @@ class Locales < Thor
puts locales.sort.join(', ')
end
- desc 'ready', 'List locales ready for Rails 2 and 3.'
- def ready
+ desc 'complete', 'List complete locales'
+ def complete
locales = []
Dir.glob(File.dirname(__FILE__) + '/rails/locale/*.{rb,yml}') do |filename|
if md = filename.match(/([\w\-]+)\.(rb|yml)$/)
locale = md[1]
- if [2, 3].all? { |version|
- missing_keys, broken_keys = KeyStructure.check(locale, version)
- missing_keys.empty? && broken_keys.empty? }
- locales << locale
- end
- end
- end
- puts locales.sort.join(', ')
- end
-
- desc 'ready_for VERSION', 'List locales ready for a VERSION of Rails.'
- def ready_for(version)
- locales = []
- Dir.glob(File.dirname(__FILE__) + '/rails/locale/*.{rb,yml}') do |filename|
- if md = filename.match(/([\w\-]+)\.(rb|yml)$/)
- locale = md[1]
- missing_keys, broken_keys = KeyStructure.check(locale, version)
+
+ missing_keys, broken_keys = KeyStructure.check(locale)
if missing_keys.empty? && broken_keys.empty?
locales << locale
end
end
end
puts locales.sort.join(', ')
- locales.sort
- end
-
- desc 'not_ready_for VERSION', 'List locales not ready for a VERSION of Rails.'
- def not_ready_for(version)
- locales = []
- Dir.glob(File.dirname(__FILE__) + '/rails/locale/*.{rb,yml}') do |filename|
- if md = filename.match(/([\w\-]+)\.(rb|yml)$/)
- locale = md[1]
- missing_keys, broken_keys = KeyStructure.check(locale, version)
- if not missing_keys.empty? or not broken_keys.empty?
- locales << locale
- end
- end
- end
- puts locales.sort.join(', ')
- locales.sort
- end
-
- desc 'copy_rails3_ready_to FOLDER','Copy rails 3 ready locales to a folder'
- def copy_rails3_ready_to(folder)
- puts "Folder #{folder}"
- ready_for(3).each do |locale|
- if locale=="th"
- cmd = "cp #{File.dirname(__FILE__) + '/rails/locale/' + locale + '.rb'} #{folder}"
- else
- cmd = "cp #{File.dirname(__FILE__) + '/rails/locale/' + locale + '.yml'} #{folder}"
- end
- puts cmd
- system cmd
- end
end
end
View
117 rails/rails/action_view.yml
@@ -1,117 +0,0 @@
-"en":
- number:
- # Used in number_with_delimiter()
- # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
- format:
- # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
- separator: "."
- # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
- delimiter: ","
- # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
- precision: 3
-
- # Used in number_to_currency()
- currency:
- format:
- # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
- format: "%u%n"
- unit: "$"
- # These three are to override number.format and are optional
- separator: "."
- delimiter: ","
- precision: 2
-
- # Used in number_to_percentage()
- percentage:
- format:
- # These three are to override number.format and are optional
- # separator:
- delimiter: ""
- # precision:
-
- # Used in number_to_precision()
- precision:
- format:
- # These three are to override number.format and are optional
- # separator:
- delimiter: ""
- # precision:
-
- # Used in number_to_human_size()
- human:
- format:
- # These three are to override number.format and are optional
- # separator:
- delimiter: ""
- precision: 1
- storage_units:
- # Storage units output formatting.
- # %u is the storage unit, %n is the number (default: 2 MB)
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Bytes"
- kb: "KB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
- # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
- datetime:
- distance_in_words:
- half_a_minute: "half a minute"
- less_than_x_seconds:
- one: "less than 1 second"
- other: "less than %{count} seconds"
- x_seconds:
- one: "1 second"
- other: "%{count} seconds"
- less_than_x_minutes:
- one: "less than a minute"
- other: "less than %{count} minutes"
- x_minutes:
- one: "1 minute"
- other: "%{count} minutes"
- about_x_hours:
- one: "about 1 hour"
- other: "about %{count} hours"
- x_days:
- one: "1 day"
- other: "%{count} days"
- about_x_months:
- one: "about 1 month"
- other: "about %{count} months"
- x_months:
- one: "1 month"
- other: "%{count} months"
- about_x_years:
- one: "about 1 year"
- other: "about %{count} years"
- over_x_years:
- one: "over 1 year"
- other: "over %{count} years"
- almost_x_years:
- one: "almost 1 year"
- other: "almost %{count} years"
- prompts:
- year: "Year"
- month: "Month"
- day: "Day"
- hour: "Hour"
- minute: "Minute"
- second: "Seconds"
-
- activerecord:
- errors:
- template:
- header:
- one: "1 error prohibited this %{model} from being saved"
- other: "%{count} errors prohibited this %{model} from being saved"
- # The variable :count is also available
- body: "There were problems with the following fields:"
-
- support:
- select:
- # default value for :prompt => true in FormOptionsHelper
- prompt: "Please select"
View
58 rails/rails/active_record.yml
@@ -1,58 +0,0 @@
-en:
- activerecord:
- errors:
- # The values :model, :attribute and :value are always available for interpolation
- # The value :count is available when applicable. Can be used for pluralization.
- messages:
- inclusion: "is not included in the list"
- exclusion: "is reserved"
- invalid: "is invalid"
- confirmation: "doesn't match confirmation"
- accepted: "must be accepted"
- empty: "can't be empty"
- blank: "can't be blank"
- too_long: "is too long (maximum is %{count} characters)"
- too_short: "is too short (minimum is %{count} characters)"
- wrong_length: "is the wrong length (should be %{count} characters)"
- taken: "has already been taken"
- not_a_number: "is not a number"
- greater_than: "must be greater than %{count}"
- greater_than_or_equal_to: "must be greater than or equal to %{count}"
- equal_to: "must be equal to %{count}"
- less_than: "must be less than %{count}"
- less_than_or_equal_to: "must be less than or equal to %{count}"
- odd: "must be odd"
- even: "must be even"
- record_invalid: "Validation failed: %{errors}"
- # Append your own errors here or at the model/attributes scope.
-
- full_messages:
- format: "%{attribute} %{message}"
-
- # You can define own errors for models or model attributes.
- # The values :model, :attribute and :value are always available for interpolation.
- #
- # For example,
- # models:
- # user:
- # blank: "This is a custom blank message for %{model}: %{attribute}"
- # attributes:
- # login:
- # blank: "This is a custom blank message for User login"
- # Will define custom blank validation message for User model and
- # custom blank validation message for login attribute of User model.
- #models:
-
- # Translate model names. Used in Model.human_name().
- #models:
- # For example,
- # user: "Dude"
- # will translate User model name to "Dude"
-
- # Translate model attribute names. Used in Model.human_attribute_name(attribute).
- #attributes:
- # For example,
- # user:
- # login: "Handle"
- # will translate User attribute "login" as "Handle"
-
View
76 rails/rails/active_support.yml
@@ -1,76 +0,0 @@
-en:
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%Y-%m-%d"
- short: "%b %d"
- long: "%B %d, %Y"
-
- day_names:
- - Sunday
- - Monday
- - Tuesday
- - Wednesday
- - Thursday
- - Friday
- - Saturday
- abbr_day_names:
- - Sun
- - Mon
- - Tue
- - Wed
- - Thu
- - Fri
- - Sat
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names:
- - ~
- - January
- - February
- - March
- - April
- - May
- - June
- - July
- - August
- - September
- - October
- - November
- - December
- abbr_month_names:
- - ~
- - Jan
- - Feb
- - Mar
- - Apr
- - May
- - Jun
- - Jul
- - Aug
- - Sep
- - Oct
- - Nov
- - Dec
- # Used in date_select and datime_select.
- order:
- - :year
- - :month
- - :day
-
- time:
- formats:
- default: "%a, %d %b %Y %H:%M:%S %z"
- short: "%d %b %H:%M"
- long: "%B %d, %Y %H:%M"
- am: "am"
- pm: "pm"
-
-# Used in array.to_sentence.
- support:
- array:
- words_connector: ", "
- two_words_connector: " and "
- last_word_connector: ", and "
View
13 rails/test/lib/key_structure.rb
@@ -13,11 +13,11 @@ class KeyStructure
PLURALIZATION_KEYS = ['zero', 'one', 'two', 'few', 'many', 'other']
class << self
- def check(locale, version)
+ def check(locale)
missing_keys = []
broken_keys = []
- init_backend(locale, version)
+ init_backend(locale)
I18n.locale = locale.to_sym
translations = flatten_hash(I18n.backend.translations[:'en'])
@@ -61,16 +61,11 @@ def pluralization_data?(data)
keys.all? {|k| PLURALIZATION_KEYS.include?(k) }
end
- def init_backend(locale, version)
+ def init_backend(locale)
I18n.load_path = []
I18n.reload!
- case version.to_i
- when 2
- I18n.load_path += Dir[File.dirname(__FILE__) + "/../../rails/*.yml"]
- when 3
- I18n.load_path += Dir[File.dirname(__FILE__) + "/../../rails3/*.yml"]
- end
+ I18n.load_path += Dir[File.dirname(__FILE__) + "/../../rails3/*.yml"]
path = File.dirname(__FILE__) + "/../../locale/#{locale}.rb"
Please sign in to comment.
Something went wrong with that request. Please try again.