Merge remote-tracking branch 'upstream/pull/2868'

diff --git a/.rubocop.yml b/.rubocop.yml
index ac29f4fc8769d9aec2d1142f33eef65bf698383e..200ab8a00816b92077b78ea72c7908636d9a989e 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,7 +37,6 @@ Metrics/ModuleLength:
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
-    - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
 Naming/MethodParameterName:

diff --git a/Gemfile.lock b/Gemfile.lock
index eb76ffc305deb19bea4b7101862d8fcbda819f9d..79ebb3f7f74863fa1b8a5dfa89709fdf6c7a1b05 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,17 +74,17 @@ GEM
     autoprefixer-rails (10.0.1.0)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.376.0)
-    aws-sdk-core (3.108.0)
+    aws-partitions (1.378.0)
+    aws-sdk-core (3.109.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.38.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.81.1)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.82.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)

diff --git a/db/seeds.rb b/db/seeds.rb
index 1beea2accd7ed91d080b323eef17dba95e95e27f..742704b51ccfecd78b92153154ea7804d1f99b20 100644 (file)
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,5 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
+
+Language.load(Rails.root.join("config/languages.yml"))

diff --git a/script/locale/reload-languages b/script/locale/reload-languages
deleted file mode 100755 (executable)
index 56a96b6..0000000
--- a/script/locale/reload-languages
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + "/../../config/environment"
-
-Language.load(RAILS_ROOT + "/config/languages.yml")