Merge branch 'master' of git://git.openstreetmap.org/rails

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index e8de1aa8e1aeafc5ff5750ef0542936913c0ee7f..29ab4535a1f399b8c5fe7fa1325adf9c635b1b11 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -187,12 +187,11 @@ module Potlatch
       end
 
       # Read POI presets
-      icon_list=[]; icon_names={}; icon_tags={};
+      icon_list=[]; icon_tags={};
       File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file|
         file.each_line {|line|
-          (icon,name,tags)=line.chomp.split("\t")
+          (icon,tags)=line.chomp.split("\t")
           icon_list.push(icon)
-          icon_names[icon]=name
           icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
         }
       end
@@ -211,10 +210,7 @@ module Potlatch
         }
       end
 
-#        # Read internationalisation
-#        localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml"))
-
-      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,icon_names,icon_tags]
+      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,{},icon_tags]
     end
   end