now you will actually save the changeset on updating ways. Showing the changeset...
[rails.git] / lib / potlatch.rb
index 4dfba12efb23cf37e9dd16f5b44e531a5b54fa83..cf8f5903dde5fe72aae759155e5ef89b5273e6d6 100644 (file)
@@ -83,7 +83,7 @@ module Potlatch
       when 'Hash'
         a=3.chr
         n.each do |k,v|
       when 'Hash'
         a=3.chr
         n.each do |k,v|
-          a+=encodestring(k)+encodevalue(v)
+          a+=encodestring(k.to_s)+encodevalue(v)
         end
         a+0.chr+0.chr+9.chr
       when 'String'
         end
         a+0.chr+0.chr+9.chr
       when 'String'
@@ -195,7 +195,10 @@ module Potlatch
         }
       end
 
         }
       end
 
-      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths]
+         # Read internationalisation
+         localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml"))
+
+      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,localised]
     end
   end
 
     end
   end