Change orbit-bar for language but bug when user name is too long

app/helpers/application_helper.rb

@@ -21,26 +21,38 @@ module ApplicationHelper
   end
   
   # Clean the link back
-  # Remove the locale but keep all the other params
   def get_go_back
     begin
       if request.url.include?('locale=')
         session[:last_page]
       else
-        target = request.referer.split('?')
-        vars = target[1].split('&') rescue []
-        vars.delete_if {|var| var.include? 'locale=' }
-        session[:last_page] = if vars.size > 0
-         target[0].to_s + '?' + vars.join('&')
-        else
-          target[0].to_s
-        end
+        session[:last_page] = remove_locale(request.referer)
       end
     rescue
       eval(params[:controller].split('/').join('_') << '_url')
     end
   end
 
+  # Remove the locale but keep all the other params
+  def remove_locale(url)
+    target = url.split('?')
+    vars = target[1].split('&') rescue []
+    vars.delete_if {|var| var.include? 'locale=' }
+    if vars.size > 0
+      target[0].to_s + '?' + vars.join('&')
+    else
+      target[0].to_s
+    end
+  end
+
+  def add_locale(url, locale)
+    if url.include?('?')
+      url + "&locale=#{locale}"
+    else
+      url + "?locale=#{locale}"
+    end
+  end
+
   def message_for_item(message, item = nil)
     if item.is_a?(Array)
       message % link_to(*item)