Potlatch 1.1a

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index c7fa5dd80d0f667f3347602619f09fdcaaea7020..5a8ac49c36234128f0a70553805a883e68f9fd04 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -76,7 +76,7 @@ class AmfController < ApplicationController
         logger.info("Executing AMF #{message}(#{args.join(',')}):#{index}")
 
         case message
         logger.info("Executing AMF #{message}(#{args.join(',')}):#{index}")
 
         case message

-          when 'getpresets';        results[index]=AMF.putdata(index,getpresets(I18n.locale))
+          when 'getpresets';        results[index]=AMF.putdata(index,getpresets(*args))

           when 'whichways';         results[index]=AMF.putdata(index,whichways(*args))
           when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args))
           when 'getway';            results[index]=AMF.putdata(index,getway(args[0].to_i))
           when 'whichways';         results[index]=AMF.putdata(index,whichways(*args))
           when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args))
           when 'getway';            results[index]=AMF.putdata(index,getway(args[0].to_i))


@@ -213,19 +213,28 @@ class AmfController < ApplicationController
   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 
   # Return presets (default tags, localisation etc.):
   # uses POTLATCH_PRESETS global, set up in OSM::Potlatch.
 

-  def getpresets(lang) #:doc:
+  def getpresets(usertoken,lang) #:doc:

     begin
     begin

-      logger.info("Loading Potlatch/#{lang} localisation")
-      localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised/#{lang}/localised.yaml"))
+      # first, try the user setting
+      localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised/#{I18n.locale}/localised.yaml"))

     rescue
     rescue

-      logger.info("Loading Potlatch/#{lang} localisation failed, using English defaults")
-      localised = "" # guess we'll just have to use the hardcoded English text instead
+      begin
+        # if not, try the browser language
+        localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised/#{lang}/localised.yaml"))
+      rescue
+        # fall back to hardcoded English text
+        localised = ""
+      end

     end
 
     begin
     end
 
     begin

-      help = File.read("#{RAILS_ROOT}/config/potlatch/localised/#{lang}/help.html")
+      help = File.read("#{RAILS_ROOT}/config/potlatch/localised/#{I18n.locale}/help.html")

     rescue
     rescue

-      help = File.read("#{RAILS_ROOT}/config/potlatch/localised/en/help.html")
+      begin
+        help = File.read("#{RAILS_ROOT}/config/potlatch/localised/#{lang}/help.html")
+      rescue
+        help = File.read("#{RAILS_ROOT}/config/potlatch/localised/en/help.html")
+      end

     end
     return POTLATCH_PRESETS+[localised,help]
   end
     end
     return POTLATCH_PRESETS+[localised,help]
   end

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 8ee7e840a3dfdecb21833be9047b32d99832916c..8b109ec6acc5e35c7c400d2244f7118c23f7c361 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ