diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f16166a9..ee47d21e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.0' - - '3.1' - '3.2' - '3.3' rubyopt: [""] diff --git a/CHANGELOG.md b/CHANGELOG.md index b1ad93d3..ccb4985e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## unreleased -- Update dependencies to allow Rails 8+. + +## 8.0.0 (2024-11-09) + +- Update to Rails 8.0.x ## 7.0.10 (2024-10-28) diff --git a/Gemfile.lock b/Gemfile.lock index 51f3ceda..54070157 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,52 @@ PATH remote: . specs: - rails-i18n (7.0.10) + rails-i18n (8.0.0) i18n (>= 0.7, < 2) - railties (>= 6.0.0) + railties (>= 8.0.0, < 9) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.7) - actionview (= 7.0.7) - activesupport (= 7.0.7) - rack (~> 2.0, >= 2.2.4) + actionpack (8.0.0) + actionview (= 8.0.0) + activesupport (= 8.0.0) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7) - activesupport (= 7.0.7) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actionview (8.0.0) + activesupport (= 8.0.0) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.7) - concurrent-ruby (~> 1.0, >= 1.0.2) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (8.0.0) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) ast (2.4.2) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.8) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) crass (1.0.6) diff-lcs (1.5.0) + drb (2.2.1) erubi (1.12.0) highline (2.1.0) i18n (1.14.1) @@ -47,12 +63,16 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) iso (0.4.0) i18n + logger (1.6.1) loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) mini_portile2 (2.8.4) minitest (5.19.0) nokogiri (1.15.4) @@ -61,10 +81,17 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc + psych (5.2.0) + stringio racc (1.7.1) rack (2.2.8) + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) + rackup (1.0.1) + rack (< 3) + webrick rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -72,15 +99,20 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7) - actionpack (= 7.0.7) - activesupport (= 7.0.7) - method_source + railties (8.0.0) + actionpack (= 8.0.0) + activesupport (= 8.0.0) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.0.6) + rdoc (6.7.0) + psych (>= 4.0.0) + reline (0.5.11) + io-console (~> 0.5) rspec-core (3.9.3) rspec-support (~> 3.9.3) rspec-expectations (3.9.4) @@ -98,12 +130,17 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) + securerandom (0.3.1) + stringio (3.1.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) + uri (1.0.1) + useragent (0.16.10) + webrick (1.9.0) zeitwerk (2.6.11) PLATFORMS @@ -116,4 +153,4 @@ DEPENDENCIES rspec-rails (~> 3.7) BUNDLED WITH - 2.4.18 + 2.5.23 diff --git a/rails-i18n.gemspec b/rails-i18n.gemspec index 70ef61c5..78ec0819 100644 --- a/rails-i18n.gemspec +++ b/rails-i18n.gemspec @@ -1,24 +1,24 @@ Gem::Specification.new do |s| + s.platform = Gem::Platform::RUBY s.name = "rails-i18n" - s.version = '7.0.10' + s.version = "8.0.0" s.authors = ["Rails I18n Group"] s.email = "rails-i18n@googlegroups.com" s.homepage = "https://github.com/svenfuchs/rails-i18n" s.summary = "Common locale data and translations for Rails i18n." s.description = "A set of common locale data and translations to internationalize and/or localize your Rails applications." - s.license = 'MIT' + s.license = "MIT" s.files = Dir.glob("lib/**/*") + Dir.glob("rails/locale/*") + Dir.glob("rails/ordinals/*") + Dir.glob("rails/pluralization/*") + Dir.glob("rails/transliteration/*") + %w(README.md CHANGELOG.md MIT-LICENSE.txt) - s.platform = Gem::Platform::RUBY - s.require_path = 'lib' - s.required_rubygems_version = '>= 1.8.11' - - s.add_dependency('i18n', '>= 0.7', '< 2') - s.add_dependency('railties', '>= 6.0.0') + s.require_path = "lib" + s.required_rubygems_version = ">= 1.8.11" + s.required_ruby_version = ">= 3.2.0" + s.add_dependency("i18n", ">= 0.7", "< 2") + s.add_dependency("railties", ">= 8.0.0", "< 9") s.add_development_dependency "rspec-rails", "~> 3.7" s.add_development_dependency "i18n-spec", "~> 0.6.0" - s.add_development_dependency 'i18n-tasks', '~> 0.9.37' + s.add_development_dependency "i18n-tasks", "~> 0.9.37" end diff --git a/rails/locale/en.yml b/rails/locale/en.yml index 20c73e69..4d3e9c7c 100644 --- a/rails/locale/en.yml +++ b/rails/locale/en.yml @@ -17,7 +17,7 @@ en: - Fri - Sat abbr_month_names: - - + - - Jan - Feb - Mar @@ -43,7 +43,7 @@ en: long: "%B %d, %Y" short: "%b %d" month_names: - - + - - January - February - March @@ -57,9 +57,9 @@ en: - November - December order: - - :year - - :month - - :day + - year + - month + - day datetime: distance_in_words: about_x_hours: @@ -100,7 +100,7 @@ en: one: "%{count} year" other: "%{count} years" prompts: - second: Second + second: Seconds minute: Minute hour: Hour day: Day @@ -157,6 +157,7 @@ en: format: delimiter: "," format: "%u%n" + negative_format: "-%u%n" precision: 2 separator: "." significant: false @@ -196,6 +197,7 @@ en: mb: MB pb: PB tb: TB + zb: ZB percentage: format: delimiter: ''