Skip to content

Commit

Permalink
Merge pull request #1091 from jlduran/fix-rails-script-update-branch
Browse files Browse the repository at this point in the history
Fix Rails' update script branch
  • Loading branch information
pama authored Jun 23, 2023
2 parents 6eea72c + d6a2a88 commit b3fad86
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
7 changes: 3 additions & 4 deletions rails/rails/active_model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ en:
inclusion: "is not included in the list"
exclusion: "is reserved"
invalid: "is invalid"
confirmation: "doesnt match %{attribute}"
confirmation: "doesn't match %{attribute}"
accepted: "must be accepted"
empty: "cant be empty"
blank: "cant be blank"
empty: "can't be empty"
blank: "can't be blank"
present: "must be blank"
too_long:
one: "is too long (maximum is 1 character)"
other: "is too long (maximum is %{count} characters)"
password_too_long: "is too long"
too_short:
one: "is too short (minimum is 1 character)"
other: "is too short (minimum is %{count} characters)"
Expand Down
2 changes: 0 additions & 2 deletions rails/rails/active_support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ en:
format:
# Where is the currency sign? %u is the currency unit, %n is the number (default: $5.00)
format: "%u%n"
negative_format: "-%u%n"
unit: "$"
# These six are to override number.format and are optional
separator: "."
Expand Down Expand Up @@ -113,7 +112,6 @@ en:
tb: "TB"
pb: "PB"
eb: "EB"
zb: "ZB"
# Used in NumberHelper.number_to_human()
decimal_units:
format: "%n %u"
Expand Down
8 changes: 4 additions & 4 deletions rails/script/update.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
puts "Fetching latest Rails locale files to #{rails_locale_dir}"

exec %(
curl -Lo '#{rails_locale_dir}/action_view.yml' https://raw.github.com/rails/rails/main/actionview/lib/action_view/locale/en.yml
curl -Lo '#{rails_locale_dir}/action_view.yml' https://raw.githubusercontent.com/rails/rails/7-0-stable/actionview/lib/action_view/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_model.yml' https://raw.github.com/rails/rails/main/activemodel/lib/active_model/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_model.yml' https://raw.githubusercontent.com/rails/rails/7-0-stable/activemodel/lib/active_model/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_record.yml' https://raw.github.com/rails/rails/main/activerecord/lib/active_record/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_record.yml' https://raw.githubusercontent.com/rails/rails/7-0-stable/activerecord/lib/active_record/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_support.yml' https://raw.github.com/rails/rails/main/activesupport/lib/active_support/locale/en.yml
curl -Lo '#{rails_locale_dir}/active_support.yml' https://raw.githubusercontent.com/rails/rails/7-0-stable/activesupport/lib/active_support/locale/en.yml
)

0 comments on commit b3fad86

Please sign in to comment.