From a4972b450b7bb3ad40d289e2dc49c67e629c2bd3 Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <bordjukov@gmail.com>
Date: Mon, 1 Sep 2014 12:56:33 +0300
Subject: [PATCH] Do not add a locale parameter when not needed

---
 app/controllers/application_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6cb183d..ce2859d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,7 +6,11 @@ class ApplicationController < ActionController::Base
   before_action :set_locale
 
   def default_url_options(options={})
-    {locale: I18n.locale}
+    if params[:locale]
+      {locale: I18n.locale}
+    else
+      {}
+    end
   end
 
   private