lib/padrino-localization.rb in padrino-localization-0.1.0 vs lib/padrino-localization.rb in padrino-localization-0.1.1
- old
+ new
@@ -25,16 +25,17 @@
# url_for_with_locale('/') # /ru/
#
# url_for_with_locale(:posts, :new, :locale => 'se') # /se/posts/new
#
def url_with_locale *args
- locale_scope = (::I18n.locale == ::I18n.default_locale) ? {} : {locale: ::I18n.locale}
+ locale_scope = (::I18n.locale == ::I18n.default_locale) ? {} : {:locale => ::I18n.locale}
if args.last.kind_of? Hash
# should not overwrite provided locale
args.last.merge!(locale_scope)
url_without_locale *args
else
- url_without_locale *args, locale_scope
+ args << locale_scope
+ url_without_locale *args
end.gsub('//','/')
end
###
# Returns a link, unless application locale is equivalent to those from URL.
\ No newline at end of file