Link to the foundation blog from the sidebar.

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index b9c344771ba88fe36e34152f2e6b16f85004af17..7df237de87e245fa4a15ef24a8c46967fdbb7527 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -232,6 +232,12 @@ class AmfController < ApplicationController
     help = localised["help_html"]
     localised.delete("help_html")
 
+    # Populate icon names
+    POTLATCH_PRESETS[10].each { |id|
+      POTLATCH_PRESETS[11][id] = localised["preset_icon_#{id}"]
+      localised.delete("preset_icon_#{id}")
+    }
+
     return POTLATCH_PRESETS+[localised,help]
   end
 
@@ -243,7 +249,7 @@ class AmfController < ApplicationController
     en = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/locales/en.yml"))["en"]
 
     if lang == 'en'
-      return [real_lang, en]
+      return [loaded_lang, en]
     else
       # Use English as a fallback
       begin