From 0a11b5bd4e5291b7a6c8ce3e1c0658c851285545 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 23 Sep 2016 17:50:29 +0200 Subject: de to Jekyll 3.2.x --- blog/_plugins/jekyll_assets.rb | 1 - blog/_plugins/jekyll_multiple_languages.rb | 22 ---------------------- blog/_plugins/page_title.rb | 3 +-- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 blog/_plugins/jekyll_assets.rb delete mode 100644 blog/_plugins/jekyll_multiple_languages.rb (limited to 'blog/_plugins') diff --git a/blog/_plugins/jekyll_assets.rb b/blog/_plugins/jekyll_assets.rb deleted file mode 100644 index 320122a..0000000 --- a/blog/_plugins/jekyll_assets.rb +++ /dev/null @@ -1 +0,0 @@ -require "jekyll/assets" diff --git a/blog/_plugins/jekyll_multiple_languages.rb b/blog/_plugins/jekyll_multiple_languages.rb deleted file mode 100644 index 4b1afe8..0000000 --- a/blog/_plugins/jekyll_multiple_languages.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'jekyll/multiple/languages/plugin' - -# Monkey patch a few functions in Jekyll#Post to make this work... -# Should probably try to upstream this instead. -# -module Jekyll - class Post - alias url_orig url - def url - # Drop the _i18n prefix of the generated url - url_orig.gsub("_i18n/", '') - end - - alias destination_orig destination - def destination(dest) - # Drop extra lang prefix if it occurs multiple times. - # For all but the default language it is defined both in the - # dest directory and the post url. That's one too many. - destination_orig(dest).sub(/#{site.config['lang']}\/#{site.config['lang']}/, "#{site.config['lang']}") - end - end -end diff --git a/blog/_plugins/page_title.rb b/blog/_plugins/page_title.rb index 039e859..3c835fd 100644 --- a/blog/_plugins/page_title.rb +++ b/blog/_plugins/page_title.rb @@ -1,4 +1,3 @@ -require "jekyll/multiple/languages/plugin" require "facets/kernel/silence" module Jekyll @@ -10,7 +9,7 @@ module Jekyll def render(context) text = silently do - t = Jekyll::LocalizeTag.new('t', @key, '') + t = Jekyll::LocalizeTag.parse('t', @key, '', {}) t.render(context) end text || context[@key] -- cgit v1.2.3