Merging 17824:17845 from trunk to blocking branch.

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index d2c0230a81af9643b6e6e3e4fcb557fb50d06b64..86ca3f5fbe193250a301cbb810d68b6b9d5d7862 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -226,7 +226,6 @@ class AmfController < ApplicationController
     # Get help from i18n but delete it so we won't pass it around
     # twice for nothing
     help = localised["help_html"]
-    help = 'foo'
     localised.delete("help_html")
 
     return POTLATCH_PRESETS+[localised,help]
@@ -884,7 +883,7 @@ class AmfController < ApplicationController
   end
 
   def getlocales
-    Dir.glob("#{RAILS_ROOT}/config/potlatch/localised/*").collect { |f| File.basename(f) }
+    Dir.glob("#{RAILS_ROOT}/config/potlatch/locales/*").collect { |f| File.basename(f, ".yml") }
   end
   
   ##