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

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

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/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")