X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2a8df0bd73f1031dcf4684e084897a28b117345..b5f06e06c14f440d3c014b348149fe9ec1b67657:/app/models/language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 67e98569b..cdf85a52b 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -7,7 +7,7 @@
 #  native_name  :string
 #
 
-class Language < ActiveRecord::Base
+class Language < ApplicationRecord
   self.primary_key = "code"
 
   has_many :diary_entries, :foreign_key => "language"
@@ -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