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

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 67e98569bbf14315099efb4b79d40dc7ef32e2ad..bb1aa4bd26016758ad3d8b66d09a7527a72b8ad8 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -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