From 2a4fedb96791cd80bd6092a0b508f265e4d35348 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté Solà <mikisabate@gmail.com>
Date: Mon, 11 Nov 2024 14:17:54 +0100
Subject: Update rails-i18n to the proper repository
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They have finally fixed support for Rails 8, and so using a fork is no
longer needed.

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
---
 Gemfile      |  3 +--
 Gemfile.lock | 14 ++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index bbadcb1..c1dc02c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,7 @@ ruby '3.3.5'
 
 # Rails itself :)
 gem 'rails', '~> 8'
-# TODO: change to "gem 'rails-i18n'" whenever Rails 8 is supported there.
-gem 'rails-i18n', github: 'Shopify/rails-i18n', branch: 'schwad_rails_8'
+gem 'rails-i18n', '~> 8'
 
 # The original asset pipeline for Rails.
 gem 'sprockets-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2979d37..314b90e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/Shopify/rails-i18n.git
-  revision: 96778ff0651365a08db1b88aba486b844a0ac3e7
-  branch: schwad_rails_8
-  specs:
-    rails-i18n (7.0.9)
-      i18n (>= 0.7, < 2)
-      railties (>= 6.0.0)
-
 GIT
   remote: https://github.com/ruby/net-pop.git
   revision: e8d0afe2773b9eb6a23c39e9e437f6fc0fc7c733
@@ -222,6 +213,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
+    rails-i18n (8.0.1)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
     railties (8.0.0)
       actionpack (= 8.0.0)
       activesupport (= 8.0.0)
@@ -334,7 +328,7 @@ DEPENDENCIES
   net-pop!
   puma
   rails (~> 8)
-  rails-i18n!
+  rails-i18n (~> 8)
   rubocop
   rubocop-minitest
   rubocop-performance
-- 
cgit v1.2.3