1 files changed, 6 insertions, 5 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32c7373..75f92c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,7 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
 
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+  protect_from_forgery
 
   before_action :set_locale
 
@@ -14,7 +11,11 @@ class ApplicationController < ActionController::Base
     if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
       I18n.locale = params[:locale].to_sym
     else
-      params.delete(:locale)
+      I18n.locale = I18n.default_locale
     end
   end
+
+  def default_url_options
+    { locale: I18n.locale == I18n.default_locale ? nil : I18n.locale }
+  end
 end