cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rubocop fixes for ruby 2.5

Browse source
This commit is contained in:
Andy Allan 2019-03-13 10:33:33 +01:00 • committed by Tom Hughes
parent 3eb6d15db1
commit 773ef195d4
8 changed files with 41 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/language.rb
View file

@ -15,14 +15,12 @@ class Language < ActiveRecord::Base
def self.load(file)
Language.transaction do
YAML.safe_load(File.read(file)).each do |k, v|
begin
Language.update(k, :english_name => v["english"], :native_name => v["native"])
rescue ActiveRecord::RecordNotFound
Language.create do |l|
l.code = k
l.english_name = v["english"]
l.native_name = v["native"]
end
Language.update(k, :english_name => v["english"], :native_name => v["native"])
rescue ActiveRecord::RecordNotFound
Language.create do |l|
l.code = k
l.english_name = v["english"]
l.native_name = v["native"]
end
end
end