X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/65eec829782df172eee676afe5b136fe33295a58..09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4:/app/controllers/amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index d2c0230a8..86ca3f5fb 100644
--- 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
   
   ##