deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bone-headed link_to change

Browse source
This commit is contained in:
Thomas Reynolds 2015-05-15 16:20:40 -07:00
parent b20d855f2c
commit ed5236ef37
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/features/i18n_link_to.feature
View file

@ -25,7 +25,7 @@ Feature: i18n Links
Page: <%= t(:msg) %> Page: <%= t(:msg) %>
<% data.pages.each_with_index do |p, i| %> <% data.pages.each_with_index do |p, i| %>
<%= link_to "Current #{p}", "/#{p}" %> <%= link_to "Current #{p}", "/#{p}" %>
<%= link_to "Other #{p}", "/#{p}", ::I18n.locale == :en ? :es : :en %> <%= link_to "Other #{p}", "/#{p}", lang: ::I18n.locale == :en ? :es : :en %>
<% end %> <% end %>
""" """
And a file named "config.rb" with: And a file named "config.rb" with:

2
middleman-core/lib/middleman-core/version.rb
View file

@ -1,5 +1,5 @@
module Middleman module Middleman
# Current Version # Current Version
# @return [String] # @return [String]
VERSION = '3.3.13' unless const_defined?(:VERSION) VERSION = '3.3.14' unless const_defined?(:VERSION)
end end

17
middleman-core/lib/middleman-more/core_extensions/i18n.rb
View file

@ -58,9 +58,20 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
::I18n.t(*args) ::I18n.t(*args)
end end
def link_to(text, target, lang=::I18n.locale) def link_to(*args, &block)
url = extensions[:i18n].localized_path(target, lang) options = args.extract_options!
url ? super(text, url) : super(text, target) name = block_given? ? '' : args.shift
href = args.first
lang = options.delete(:lang) || ::I18n.locale
url = extensions[:i18n].localized_path(href, lang)
new_args = []
new_args << name unless block_given?
new_args << url || href
new_args << options
super(*new_args, &block)
end end
end end