From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Fri, 29 May 2009 14:11:12 +0000 (+0000)
Subject: Might be useful to set the locale everywhere we need the web, rather than just the... 
X-Git-Tag: live~7335^2~60
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/035254c5fbcf7c4a892532baefc79f5e9e4e7aa7?hp=d640ae3b9309e4f3e90a8a6c5bf56e3ae185dc44

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index e9081f026..c8242a29e 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,6 +1,7 @@
 class BrowseController < ApplicationController
   layout 'site'
 
+  before_filter :set_locale
   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 778bb73ae..72b966689 100644
--- 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]
+  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]
diff --git a/app/controllers/changeset_tag_controller.rb b/app/controllers/changeset_tag_controller.rb
index 3e8db3fc2..527149f77 100644
--- a/app/controllers/changeset_tag_controller.rb
+++ b/app/controllers/changeset_tag_controller.rb
@@ -1,6 +1,8 @@
 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
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index ab25fcbc6..c84075d37 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,4 +1,7 @@
 class ExportController < ApplicationController
+
+  before_filter :set_locale
+
   def start
   end
 
diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 2f71107f4..e01c34aca 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -1,6 +1,7 @@
 class MessageController < ApplicationController
   layout 'site'
 
+  before_filter :set_locale
   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 4b22e46fd..9bee03209 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,4 +1,5 @@
 class SiteController < ApplicationController
+  before_filter :set_locale
   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 47bc62be8..33f6d0df7 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,6 +1,7 @@
 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]
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index eb1471b00..36516f60f 100644
--- 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]
+  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]