Remove locale parameter from locale nav

This commit is contained in:
Godwin 2017-05-20 08:19:05 -07:00
parent 77ef83508a
commit a02cc0d381

View File

@ -13,9 +13,12 @@ module I18nHelper
new_params = params.merge({action: (params[:_original_action] || params[:action])}) new_params = params.merge({action: (params[:_original_action] || params[:action])})
new_params.delete(:_original_action) new_params.delete(:_original_action)
if relative || Rails.env.development? || Rails.env.test? if Rails.env.development? || Rails.env.test?
return url_for(new_params.merge({lang: locale.to_s})) return url_for(new_params.merge({lang: locale.to_s}))
end end
# return now if this is a relative path, don't add the host
return url_for(new_params) if relative
subdomain = Rails.env.preview? ? "preview-#{locale.to_s}" : locale.to_s subdomain = Rails.env.preview? ? "preview-#{locale.to_s}" : locale.to_s
url_for(new_params.merge(host: "#{subdomain}.bikebike.org")) url_for(new_params.merge(host: "#{subdomain}.bikebike.org"))