Might be useful to set the locale everywhere we need the web, rather than just the...

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index e9081f02698911a8e01e5a2bd516d6ae9135cda9..c8242a29e6fe7a6f5da52b9083cc1e3e9216ceff 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,6 +1,7 @@
 class BrowseController < ApplicationController
   layout 'site'
 
 class BrowseController < ApplicationController
   layout 'site'
 

+  before_filter :set_locale

   before_filter :authorize_web  
   before_filter { |c| c.check_database_readable(true) }
 
   before_filter :authorize_web  
   before_filter { |c| c.check_database_readable(true) }
 

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 778bb73aed716c071c277752b74ee256465fcd52..72b966689c1b6fc65fa768c84c16fcbfce272dd2 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -5,6 +5,7 @@ class ChangesetController < ApplicationController
   require 'xml/libxml'
 
   session :off, :except => [:list, :list_user, :list_bbox]
   require 'xml/libxml'
 
   session :off, :except => [:list, :list_user, :list_bbox]

+  before_filter :set_locale, :only => [:list, :list_user, :list_bbox]

   before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close]

diff --git a/app/controllers/changeset_tag_controller.rb b/app/controllers/changeset_tag_controller.rb
index 3e8db3fc24539839e7f915dcf922c4caf9407b2e..527149f77e66ce22872b2d2c5a4f1964ac9641b8 100644 (file)
--- a/app/controllers/changeset_tag_controller.rb
+++ b/app/controllers/changeset_tag_controller.rb
@@ -1,6 +1,8 @@
 class ChangesetTagController < ApplicationController
   layout 'site'
 
 class ChangesetTagController < ApplicationController
   layout 'site'
 

+  before_filter :set_locale
+

   def search
     @tags = ChangesetTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
   end
   def search
     @tags = ChangesetTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
   end

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index ab25fcbc67a2ed407955953287d3550c99c46812..c84075d37ed7b822f3d2cdb2dd934f174557d953 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,4 +1,7 @@
 class ExportController < ApplicationController
 class ExportController < ApplicationController

+
+  before_filter :set_locale
+

   def start
   end
 
   def start
   end
 

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 2f71107f4b39e35720b78193d549a6f716d74e83..e01c34aca54bd169ef04b2fdaf28206c3ee887ff 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,6 +1,7 @@
 class MessageController < ApplicationController
   layout 'site'
 
 class MessageController < ApplicationController
   layout 'site'
 

+  before_filter :set_locale

   before_filter :authorize_web
   before_filter :require_user
   before_filter :check_database_readable
   before_filter :authorize_web
   before_filter :require_user
   before_filter :check_database_readable

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 4b22e46fd4d0ac39c7c28e5a6e38003cd79b343a..9bee03209f204ee08c24e4133c19bd5610d4e9a2 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,4 +1,5 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

+  before_filter :set_locale

   before_filter :authorize_web
   before_filter :require_user, :only => [:edit]
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:edit]
 

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 47bc62be882021bfd8f4e305306774f9e9c9761b..33f6d0df72fcf1777e7f89f1fe966ac95c45e217 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,6 +1,7 @@
 class TraceController < ApplicationController
   layout 'site'
 
 class TraceController < ApplicationController
   layout 'site'
 

+  before_filter :set_locale

   before_filter :authorize_web
   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]
   before_filter :authorize_web
   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index eb1471b00f005769359f03afd1eb87ab04335ffc..36516f60f05698c93bb32d00a374cc3440ab3f5b 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,6 +2,7 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]

+  before_filter :set_locale, :except => [:api_details, :api_gpx_files]

   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]