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

2020-10-01 08:57:36 +01:00 · 2020-10-01 08:57:36 +01:00 · c1c459734d
commit c1c459734d
parent 4b2d3973e8 865d20af80
3 changed files with 2 additions and 6 deletions
--- 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:
--- 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"))
--- a/script/locale/reload-languages
+++ b/script/locale/reload-languages
@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + "/../../config/environment"
-
-Language.load(RAILS_ROOT + "/config/languages.yml")