jekyll-multiple-languages-plugin 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d8b7b44997db4533f328c11895cc0135200cb2
-  data.tar.gz: 697d1c42e3cbf710660f76bf6082d78257751294
+  metadata.gz: 3c1762c238a15c6006f3bb808443c5c8469f4506
+  data.tar.gz: 0b977d28c6f03539781add8bced23efa44abbe2a
 SHA512:
-  metadata.gz: bba07c84820767d33bded5e4695f92064f93bff9168e7c058e5bd5cea05d18289fd63a758c233064fda25e6a5e29ca9555d9ddbda7cb2bb90f5c7f609d7b2a85
-  data.tar.gz: 502bab34718f61702de75a4b0e9e6b6d0126633918426a38b226daaa9657264d6d0821d778dd71309e634666db1d0ed2051d8e4b84f88977159197dbe8f6637e
+  metadata.gz: 32e09219e49c549b07fc4f564c17b9febb42a481b6ea675757874bf4fc9f122b40493d8d0b11dc4e649db593ef21ec06424fb135cf42ac0920371fdbb0597546
+  data.tar.gz: d84b61a05fc8073699c1a5168bba537734efde40bb4702ac918daa4552a38e4c2f6473d72660b8574d720aeadc7d6391ea6f422c0526ca504156320d4d8d4f94

data/README.md

@@ -59,37 +59,6 @@ Copy or link the file `lib/jekyll/multiple/languages/plugin.rb` into your `_plug
 * Supports translated keys in YAML format
 * Supports translated template files
 
-##Changelog
-* 1.2.9
-  * Bug fix when excluding files from translation, again thanks to [@h6](https://github.com/H6)
-* 1.2.8
-  * Support for excluding files from translation, thanks to [@h6](https://github.com/H6)
-* 1.2.7
-  * Support for Jekyll 2.5+, thanks to [@caxy4](https://github.com/caxy4)
-* 1.2.6
-  * Added fallback to default language, thanks to [@agramian](https://github.com/agramian)
-* 1.2.5
-  * Fixed a bug when global variables wasn't as global as expected
-* 1.2.4
-  * Fixed a bug when changes in .yml files got lost during live reload.
-* 1.2.3
-  * Much, much, much faster compilation when lots of translated strings.
-* 1.2.2
-  * Supports translated posts in Octopress
-* 1.2.1
-  * Supports writing translated posts in Jekyll
-  * Supports translated .yml files in Octopress
-* 1.2.0
-  * Renamed the project to jekyll-multiple-languages-plugin
-* 1.1.2
-  * Support for both variables and strings in ```translate_file```
-* 1.1.1
-  * Fixed documentation
-* 1.1.0
-  * Pull request that removed dirty forward slash from URLs
-* 1.0.0
-  * First release
-
 
 ##Usage
 ###Configuration
@@ -101,12 +70,12 @@ languages: ["sv", "en", "de", "fr"]
 
 The first language in the array will be the default language, English, German and French will be added in to separate subfolders.
 
-To avoid redundancy, it is possible to exclude files and folders from beeing copied to the localization folders. 
+To avoid redundancy, it is possible to exclude files and folders from beeing copied to the localization folders.
 
 ```yaml
 exclude_from_localizations: ["javascript", "images", "css"]
 ```
-In code these specific files shoule be referenced via `baseurl_root`. E.g.
+In code these specific files should be referenced via `baseurl_root`. E.g.
 
 ```
 <link rel="stylesheet" href="{{ "/css/bootstrap.css" | prepend: site.baseurl_root }}"/>
@@ -182,7 +151,7 @@ A perfect example is this:
 </html>
 ```
 
-So how can I add different translated titles to all pages? Don't worry, it's easy. The Multiple Languages plugin supports Liguid variables as well as strings so define a page variable in your page definition
+So how can I add different translated titles to all pages? Don't worry, it's easy. The Multiple Languages plugin supports Liquid variables as well as strings so define a page variable in your page definition
 
 ```yaml
 ---
@@ -233,6 +202,42 @@ This snippet will create a link that will toggle between Swedish and English. A
 | site.baseurl_root | Points to the root of the page without the language path | ``` http://foo.bar ``` |
 | page.url | The current page's relative URL to the baseurl | ``` /a/sub/folder/page/ ```|
 
+
+##Changelog
+* 1.3.0
+  * Support for localized links and custom permalinks, thanks to [@jasonlemay](https://github.com/screeninteraction/jekyll-multiple-languages-plugin/pull/53)
+  * Support for excluding posts from translation, thanks to [ctruelson](https://github.com/screeninteraction/jekyll-multiple-languages-plugin/pull/51)
+* 1.2.9
+  * Bug fix when excluding files from translation, again thanks to [@h6](https://github.com/H6)
+* 1.2.8
+  * Support for excluding files from translation, thanks to [@h6](https://github.com/H6)
+* 1.2.7
+  * Support for Jekyll 2.5+, thanks to [@caxy4](https://github.com/caxy4)
+* 1.2.6
+  * Added fallback to default language, thanks to [@agramian](https://github.com/agramian)
+* 1.2.5
+  * Fixed a bug when global variables wasn't as global as expected
+* 1.2.4
+  * Fixed a bug when changes in .yml files got lost during live reload.
+* 1.2.3
+  * Much, much, much faster compilation when lots of translated strings.
+* 1.2.2
+  * Supports translated posts in Octopress
+* 1.2.1
+  * Supports writing translated posts in Jekyll
+  * Supports translated .yml files in Octopress
+* 1.2.0
+  * Renamed the project to jekyll-multiple-languages-plugin
+* 1.1.2
+  * Support for both variables and strings in ```translate_file```
+* 1.1.1
+  * Fixed documentation
+* 1.1.0
+  * Pull request that removed dirty forward slash from URLs
+* 1.0.0
+  * First release
+
+
 ## Contributing
 
 1. Fork it
@@ -246,4 +251,4 @@ This snippet will create a link that will toggle between Swedish and English. A
 - [@Davrandom](https://github.com/davrandom), plugin usage example
 - [@agramian](https://github.com/agramian), fallback to default language
 - [@h6](https://github.com/H6), exclude files from translation
-- [@leoditommaso)(https://github.com/leoditommaso), update the example page
+- [@leoditommaso](https://github.com/leoditommaso), update the example page

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

@@ -32,8 +32,8 @@ module Jekyll
         @dest = @dest + "/" + lang
         self.config['baseurl'] = self.config['baseurl'] + "/" + lang
         self.config['lang'] = lang
-        
-        # exclude folders or files from beeing copied to all the language folders
+
+        # exclude folders or files from being copied to all the language folders
         exclude_from_localizations = self.config['exclude_from_localizations'] || []
         @exclude = @exclude + exclude_from_localizations
 
@@ -52,7 +52,8 @@ module Jekyll
 
     alias :read_posts_org :read_posts
     def read_posts(dir)
-      if dir == ''
+      translate_posts = !self.config['exclude_from_localizations'].include?("_posts")
+      if dir == '' && translate_posts
         read_posts("_i18n/#{self.config['lang']}/")
       else
         read_posts_org(dir)
@@ -60,6 +61,18 @@ module Jekyll
     end
   end
 
+  class Page
+    def permalink
+      return nil if data.nil? || data['permalink'].nil?
+      if site.config['relative_permalinks']
+        File.join(@dir, data['permalink'])
+      else
+        # Look if there's a permalink overwrite specified for this lang
+        data['permalink_'+site.config['lang']] || data['permalink']
+      end
+    end
+  end
+
   class LocalizeTag < Liquid::Tag
 
     def initialize(tag_name, key, tokens)
@@ -130,6 +143,44 @@ module Jekyll
       end
     end
   end
+
+  class LocalizeLink < Liquid::Tag
+
+    def initialize(tag_name, key, tokens)
+      super
+      @key = key
+    end
+
+    def render(context)
+      if "#{context[@key]}" != "" #Check for page variable
+        key = "#{context[@key]}"
+      else
+        key = @key
+      end
+      key = key.split
+      namespace = key[0]
+      lang = key[1] || context.registers[:site].config['lang']
+      default_lang = context.registers[:site].config['default_lang']
+      baseurl = context.registers[:site].baseurl
+      pages = context.registers[:site].pages
+      url = "";
+
+      if default_lang != lang
+        baseurl = baseurl + "/" + lang
+      end
+
+      for p in pages
+        unless p['namespace'].nil?
+          page_namespace = p['namespace']
+          if namespace == page_namespace
+            permalink = p['permalink_'+lang] || p['permalink']
+            url = baseurl + permalink
+          end
+        end
+      end
+      url
+    end
+  end
 end
 
 unless Hash.method_defined? :access
@@ -153,3 +204,5 @@ Liquid::Template.register_tag('t', Jekyll::LocalizeTag)
 Liquid::Template.register_tag('translate', Jekyll::LocalizeTag)
 Liquid::Template.register_tag('tf', Jekyll::Tags::LocalizeInclude)
 Liquid::Template.register_tag('translate_file', Jekyll::Tags::LocalizeInclude)
+Liquid::Template.register_tag('tl', Jekyll::LocalizeLink)
+Liquid::Template.register_tag('translate_link', Jekyll::LocalizeLink)

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

@@ -2,7 +2,7 @@ module Jekyll
   module Multiple
     module Languages
       module Plugin
-        VERSION = "1.2.9"
+        VERSION = "1.3.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Martin Kurtsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: I18n plugin for Jekyll and Octopress