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

Merge branch 'master' of github.com:middleman/middleman

Browse source
This commit is contained in:
Thomas Reynolds 2014-05-26 18:00:44 -07:00
commit be5fad55ca
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/core_extensions/i18n.rb
View file

@ -183,7 +183,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
File.join(prefix, path.sub(page_id, localized_page_id)) File.join(prefix, path.sub(page_id, localized_page_id))
) )
path.gsub!(options[:templates_dir] + '/', '') path = path.sub(options[:templates_dir] + '/', '')
@_localization_data[path] = [lang, path, localized_page_id] @_localization_data[path] = [lang, path, localized_page_id]

7
middleman-core/lib/middleman-core/sitemap.rb
View file

@ -37,18 +37,13 @@ module Middleman
@locs[:current_path] @locs[:current_path]
end end
# Get the resource object for the current path
# @return [Middleman::Sitemap::Resource]
def current_page
current_resource
end
# Get the resource object for the current path # Get the resource object for the current path
# @return [Middleman::Sitemap::Resource] # @return [Middleman::Sitemap::Resource]
def current_resource def current_resource
return nil unless current_path return nil unless current_path
sitemap.find_resource_by_destination_path(current_path) sitemap.find_resource_by_destination_path(current_path)
end end
alias_method :current_page, :current_resource
end end
end end
end end