From b48a7675956fe2b1495f0a4ee5ed5ed5816a0a65 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Sat, 26 Apr 2014 12:56:50 -0700 Subject: [PATCH 1/2] Use alias_method instead of defining an alias method for current_page --- middleman-core/lib/middleman-core/sitemap.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/middleman-core/lib/middleman-core/sitemap.rb b/middleman-core/lib/middleman-core/sitemap.rb index 3a66cebb..c320369c 100644 --- a/middleman-core/lib/middleman-core/sitemap.rb +++ b/middleman-core/lib/middleman-core/sitemap.rb @@ -37,18 +37,13 @@ module Middleman @locs[:current_path] 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 # @return [Middleman::Sitemap::Resource] def current_resource return nil unless current_path sitemap.find_resource_by_destination_path(current_path) end + alias_method :current_page, :current_resource end end end From 7a5865a4073bde576355d76c86f4227db17e97d4 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Sun, 27 Apr 2014 23:05:18 -0700 Subject: [PATCH 2/2] gsub to sub --- middleman-core/lib/middleman-core/core_extensions/i18n.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb index bf7033b3..e83f7cfc 100644 --- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb +++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb @@ -183,7 +183,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension 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]