Fix rubocop warnings

[rails.git] / app / controllers / api / amf_controller.rb

diff --git a/app/controllers/api/amf_controller.rb b/app/controllers/api/amf_controller.rb
index e5648989b97a9a02fa8573e7c5ba64f55c0ca153..4dbc16fd287dd7a88f2f90703ecbdb19e4d7e53a 100644 (file)
--- a/app/controllers/api/amf_controller.rb
+++ b/app/controllers/api/amf_controller.rb
@@ -226,14 +226,14 @@ module Api
       loaded_lang = "en"
 
       # Load English defaults
       loaded_lang = "en"
 
       # Load English defaults

-      en = YAML.safe_load(File.open(Rails.root.join("config", "potlatch", "locales", "en.yml")))["en"]
+      en = YAML.safe_load(File.open(Rails.root.join("config/potlatch/locales/en.yml")))["en"]

 
       if lang == "en"
 
       if lang == "en"

-        return [loaded_lang, en]
+        [loaded_lang, en]

       else
         # Use English as a fallback
         begin
       else
         # Use English as a fallback
         begin

-          other = YAML.safe_load(File.open(Rails.root.join("config", "potlatch", "locales", "#{lang}.yml")))[lang]
+          other = YAML.safe_load(File.open(Rails.root.join("config/potlatch/locales/#{lang}.yml")))[lang]

           loaded_lang = lang
         rescue StandardError
           other = en
           loaded_lang = lang
         rescue StandardError
           other = en


@@ -241,7 +241,7 @@ module Api
 
         # We have to return a flat list and some of the keys won't be
         # translated (probably)
 
         # We have to return a flat list and some of the keys won't be
         # translated (probably)

-        return [loaded_lang, en.merge(other)]
+        [loaded_lang, en.merge(other)]

       end
     end
 
       end
     end
 


@@ -876,7 +876,7 @@ module Api
     end
 
     def getlocales
     end
 
     def getlocales

-      @getlocales ||= Locale.list(Dir.glob(Rails.root.join("config", "potlatch", "locales", "*")).collect { |f| File.basename(f, ".yml") })
+      @getlocales ||= Locale.list(Dir.glob(Rails.root.join("config/potlatch/locales/*")).collect { |f| File.basename(f, ".yml") })

     end
 
     ##
     end
 
     ##