jekyll-multiple-languages-plugin 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b82f848f59fd42778adc49bc185a780936778b0
-  data.tar.gz: 7bc74540378b2818dd3540726e9bbf149fc7f7ea
+  metadata.gz: 437382c6919e0f607b4bb0d5b98d514704b1fd17
+  data.tar.gz: 36b3c661881ae56a5d12f6d8fe3ddaa3bc835c9a
 SHA512:
-  metadata.gz: 2e6d1ebea84906ebbc8c92dd89fb414286a224a85bfab497826fc672650d09c63ac8affa47b72a20eaa9e8d00806e3d59175141df9ec8fd712cc96f8a6eed7b6
-  data.tar.gz: 5bebf75a7bf024197f0524b24ced3460a5d76087af8dd3c578c336fcf7007c2c28d19dd8afe5d6f6dfc28b561d688a8fd21ce0f0c1c7affc35810fe4108d52ca
+  metadata.gz: eb3a7852cbb502d63aedf98ca78ed2c23fd1c9979699f507f82a3b82cf22fcffc3d9f5118dbe60e3ef2f999f74a945d7f387c7c37eae8e5abf1bcf320bc5101d
+  data.tar.gz: fa407baf34ff429f22fc13830d826046abcba230995f8ba3c72981f7f5df1c5a7db1721ffc97293ab404d35c184ed2d998934d97f23f7c7cdf8ca681acfbabf8

data/README.md

@@ -1,27 +1,10 @@
 # Multiple Languages in Jekyll
 
-Jekyll Multiple Languages is an internationalization plugin for [Jekyll](https://github.com/mojombo/jekyll). It compiles your Jekyll site for one or more languages with a similar approach as Rails does. The different sites will be stored in sub folders with the same name as the language it contains.
+Jekyll Multiple Languages is an internationalization plugin for [Jekyll](https://github.com/mojombo/jekyll). It compiles your Jekyll site for one or more languages with a similar approach as Rails does. The different sites will be stored in sub folders with the same name as the language it contains. Version 1.2.1 and later also supports Octopress.
 
 The plugin is developed as an utility at [Screen Interaction](http://www.screeninteraction.com)
 
 ##Installation
-### Submodule
-If your Jekyll project is in a git repository, you can easily
-manage your plugins by utilizing git submodules.
-
-To install this plugin as a git submodule:
-
-    git submodule add git://github.com/screeninteraction/jekyll-multiple-languages-plugin.git _plugins/multiple-languages
-
-To update:
-
-    cd _plugins/multiple-languages
-    git pull origin master
-
-
-### Copy file
-Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plugins` folder for your Jekyll project.
-
 
 ### Gem [![Gem Version](https://badge.fury.io/rb/jekyll-multiple-languages-plugin.png)](http://badge.fury.io/rb/jekyll-multiple-languages-plugin)
 
@@ -43,8 +26,26 @@ To activate the plugin add this line in to a *.rb file in the _plugins directory
     
     require 'jekyll/multiple/languages/plugin'
 
+
+### Submodule
+If your Jekyll project is in a git repository, you can easily
+manage your plugins by utilizing git submodules.
+
+To install this plugin as a git submodule:
+
+    git submodule add git://github.com/screeninteraction/jekyll-multiple-languages-plugin.git _plugins/multiple-languages
+
+To update:
+
+    cd _plugins/multiple-languages
+    git pull origin master
+
+
+### Copy file
+Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plugins` folder for your Jekyll project.
+
     
-###Features
+##Features
 * Supports multiple languages with the same code base.
 * Supports all template languages that your Liquid pipeline supports.
 * Uses [Liquid tags](https://github.com/Shopify/liquid) in your HTML for including translated strings.
@@ -53,7 +54,8 @@ To activate the plugin add this line in to a *.rb file in the _plugins directory
 * Contains an example web site thanks to [@davrandom](https://github.com/davrandom/)
 * Supports translated keys in YAML format
 * Supports translated template files
-* _NEW!_ Supports writing translated posts
+* *NEW!* Supports writing translated posts
+* *NEW!* Supports Octopress
 
 ##Usage
 ###Configuration

data/example/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-gem 'github-pages'
-#gem 'multiple-languages-plugin'
 gem "jekyll"
+gem 'jekyll-multiple-languages-plugin'
 

data/jekyll-multiple-languages-plugin.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Jekyll::Multiple::Languages::Plugin::VERSION
   spec.authors       = ["Martin Kurtsson"]
   spec.email         = ["martin.kurtsson@screeninteraction.com"]
-  spec.description   = %q{I18n plugin for Jekyll}
-  spec.summary       = %q{I18n plugin for Jekyll}
+  spec.description   = %q{Plugin for Jekyll and Octopress that adds support for translated keys, templates and posts.}
+  spec.summary       = %q{I18n plugin for Jekyll and Octopress}
   spec.homepage      = "https://github.com/screeninteraction/jekyll-multiple-languages-plugin/"
   spec.license       = "MPL2"
 

data/lib/jekyll/multiple/languages/plugin.rb

@@ -4,11 +4,14 @@ module Jekyll
   class Site
     alias :process_org :process
     def process
+      if !self.config['baseurl']
+        self.config['baseurl'] = ""
+      end
       #Variables
-      self.config['baseurl_root'] = self.config['baseurl']
-      dest_org = self.dest
-      baseurl_org = self.baseurl
+      config['baseurl_root'] = self.config['baseurl']
+      baseurl_org = self.config['baseurl']
       languages = self.config['languages']
+      dest_org = self.dest
 
       #Loop
       self.config['lang'] = languages.first
@@ -19,15 +22,13 @@ module Jekyll
 
         # Build site for language lang
         self.dest = self.dest + "/" + lang
-        self.baseurl = self.baseurl + "/" + lang
-        self.config['baseurl'] = self.baseurl
+        self.config['baseurl'] = self.config['baseurl'] + "/" + lang
         self.config['lang'] = lang
         puts "Building site for language: \"#{self.config['lang']}\" to: " + self.dest
         process_org
 
         #Reset variables for next language
         self.dest = dest_org
-        self.baseurl = baseurl_org
         self.config['baseurl'] = baseurl_org
       end
       puts 'Build complete'
@@ -51,47 +52,6 @@ module Jekyll
     end
   end
 
-  class LocalizeInclude < Jekyll::Tags::IncludeTag
-    def render(context)
-      if "#{context[@file]}" != "" #Check for page variable
-        file = "#{context[@file]}"
-      else
-        file = @file
-      end
-
-      includes_dir = File.join(context.registers[:site].source, '_i18n/' + context.registers[:site].config['lang'])
-
-      if File.symlink?(includes_dir)
-        return "Includes directory '#{includes_dir}' cannot be a symlink"
-      end
-      if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./
-        return "Include file '#{file}' contains invalid characters or sequences"
-      end
-
-      Dir.chdir(includes_dir) do
-        choices = Dir['**/*'].reject { |x| File.symlink?(x) }
-        if choices.include?(file)
-          source = File.read(file)
-          partial = Liquid::Template.parse(source)
-
-          context.stack do
-            context['include'] = parse_params(context) if @params
-            contents = partial.render(context)
-            site = context.registers[:site]
-            ext = File.extname(file)
-
-            converter = site.converters.find { |c| c.matches(ext) }
-            contents = converter.convert(contents) unless converter.nil?
-
-            contents
-          end
-        else
-          "Included file '#{file}' not found in #{includes_dir} directory"
-        end
-      end
-    end
-  end
-
   class LocalizeTag < Liquid::Tag
 
     def initialize(tag_name, key, tokens)
@@ -124,9 +84,52 @@ module Jekyll
       end
     end
   end
+
+  module Tags
+    class LocalizeInclude < IncludeTag
+      def render(context)
+        if "#{context[@file]}" != "" #Check for page variable
+          file = "#{context[@file]}"
+        else
+          file = @file
+        end
+
+        includes_dir = File.join(context.registers[:site].source, '_i18n/' + context.registers[:site].config['lang'])
+
+        if File.symlink?(includes_dir)
+          return "Includes directory '#{includes_dir}' cannot be a symlink"
+        end
+        if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./
+          return "Include file '#{file}' contains invalid characters or sequences"
+        end
+
+        Dir.chdir(includes_dir) do
+          choices = Dir['**/*'].reject { |x| File.symlink?(x) }
+          if choices.include?(file)
+            source = File.read(file)
+            partial = Liquid::Template.parse(source)
+
+            context.stack do
+              context['include'] = parse_params(context) if @params
+              contents = partial.render(context)
+              site = context.registers[:site]
+              ext = File.extname(file)
+
+              converter = site.converters.find { |c| c.matches(ext) }
+              contents = converter.convert(contents) unless converter.nil?
+
+              contents
+            end
+          else
+            "Included file '#{file}' not found in #{includes_dir} directory"
+          end
+        end
+      end
+    end
+  end
 end
 
 Liquid::Template.register_tag('t', Jekyll::LocalizeTag)
-Liquid::Template.register_tag('tf', Jekyll::LocalizeInclude)
 Liquid::Template.register_tag('translate', Jekyll::LocalizeTag)
-Liquid::Template.register_tag('translate_file', Jekyll::LocalizeInclude)
+Liquid::Template.register_tag('tf', Jekyll::Tags::LocalizeInclude)
+Liquid::Template.register_tag('translate_file', Jekyll::Tags::LocalizeInclude)

data/lib/jekyll/multiple/languages/plugin/version.rb

@@ -2,7 +2,7 @@ module Jekyll
   module Multiple
     module Languages
       module Plugin
-        VERSION = "1.2.0"
+        VERSION = "1.2.1"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Martin Kurtsson
@@ -38,7 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: I18n plugin for Jekyll
+description: Plugin for Jekyll and Octopress that adds support for translated keys,
+  templates and posts.
 email:
 - martin.kurtsson@screeninteraction.com
 executables: []
@@ -96,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: I18n plugin for Jekyll
+summary: I18n plugin for Jekyll and Octopress
 test_files: []