diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 0d30d5d..630356e 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -95,6 +95,7 @@ class HomeController < ApplicationController
     end
   end
   def language
+    redirect_to  request.referer || root_path
   end
   def choose_contact_topics
     authorize! :doadmin, User
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9bcb565..bf8855d 100755
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -39,8 +39,8 @@ m.save
 
 
   def switch_locale_url(target_locale)
-    current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
-   
+#    current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
+    language_path(locale: target_locale)
   end
   def ffi1_icon (name)
     content_tag("i","", class: "ffi1-"+name )