i18n.rb in review-5.4.0

- old
+ new

@@ -73,15 +73,15 @@
     def load_default
       load_file(File.expand_path('i18n.yml', File.dirname(__FILE__)))
     end
 
     def load_file(path)
-      @store = YAML.load_file(path)
+      @store = YAMLLoader.safe_load_file(path)
     end
 
     def update_localefile(path)
-      user_i18n = YAML.load_file(path)
+      user_i18n = YAMLLoader.safe_load_file(path)
       locale = user_i18n['locale']
       if locale
         user_i18n.delete('locale')
         if @store[locale]
           @store[locale].merge!(user_i18n)
@@ -169,10 +169,10 @@
         args.delete_at(idx)
       end
       args_matched = (frmt.count('%') <= args.size)
       frmt.gsub!('##', '%%')
       args_matched ? (frmt % args) : frmt
-    rescue
+    rescue StandardError
       str
     end
   end
 end