From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Oct 2020 07:57:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2868'
X-Git-Tag: live~2977
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1affed4b2d93f4259509a5bb674f7c0b00b850f9?hp=0b5c71ad292eb8aedcc31ce3776d6e0629a4e757

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

diff --git a/.rubocop.yml b/.rubocop.yml
index ac29f4fc8..200ab8a00 100644
--- 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 eb76ffc30..79ebb3f7f 100644
--- 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 1beea2acc..742704b51 100644
--- 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
index 56a96b6c8..000000000
--- 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")