jekyll-multiple-languages-plugin 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5337525acdd06c39f7aef0e2971726c90595c5f90b115bd6dbe8279b858fa7cc
-  data.tar.gz: 4b1d6e3da5227b33aac65ed9237a9ff09e7db7f9b5e4a265e360f748bcc27005
+  metadata.gz: e0b3312ac834bde327dd7fc94194998efed8074f344607ef5e7dcad99d0ed44d
+  data.tar.gz: 45f17b6bedf4e0913a15f8a7992ebefb14a6fdc5dbfc4644c9b75205544b91ff
 SHA512:
-  metadata.gz: a1fafbdc735306738f7769c4e87c8a7c5e2c18012dd2f62bc035cc70cd59c26be7b09385c7c2f958dd99ffbb9496edd80c907d4a024b6fe0c304f6f601e9f5e2
-  data.tar.gz: 87045f0fb9883d8c0e911c8b5fb7d53dea748cc84ee087e3ee1c6d92591f30fd8430da2fd4e44b17a5febfd41ad0913011cd7637c67f533e870b3f033cee45e8
+  metadata.gz: 4a8a704e89521a3a3306e81c16cdf4b291141d75f5743303e42703a9040a9592029c8e06cb32ab72036127646bdb9d4959580c0e48360c85f4943e870e11aa31
+  data.tar.gz: 50036c5ea37b033f66e825f78e568b6fd011d2ebcb525b4c20e0f6cf092c6a2e4bce701a76cddd11f4aa4d0b89c53aefcb1749078192cb1b4739ec72a6e7039f

data/README.md

@@ -6,47 +6,53 @@ Jekyll Multiple Languages is an internationalization plugin for [Jekyll](https:/
 
 The plugin was developed as a utility at [Daresay](https://daresay.co)
 
-### Gem [![Gem Version](https://badge.fury.io/rb/jekyll-multiple-languages-plugin.png)](http://badge.fury.io/rb/jekyll-multiple-languages-plugin)
+### Badges
+[![Build Status](https://travis-ci.com/kurtsson/jekyll-multiple-languages-plugin.svg?branch=master)](https://travis-ci.com/kurtsson/jekyll-multiple-languages-plugin)
+[![Gem Version](https://badge.fury.io/rb/jekyll-multiple-languages-plugin.png)](http://badge.fury.io/rb/jekyll-multiple-languages-plugin)
 
+## !! We are looking for more maintainers !!
+
+Are you using this plugin? Could you test and verify incoming PRs? Please give us a shout!
 
 
 Table of Contents
 -----------------
-* [1\. Current Release Notice](#1-current-release-notice)
-* [2\. Features](#2-features)
-* [3\. Installation](#3-installation)
-  * [3\.1\. Using the gem](#31-using-the-gem)
-  * [3\.2\. Manually](#32-manually)
-  * [3\.3\. As a Git Submodule](#33-as-a-git-submodule)
-* [4\. Configuration](#4-configuration)
-  * [4\.1\. \_config\.yml](#41-_configyml)
-  * [4\.2\. Folder structure](#42-folder-structure)
-* [5\. Usage](#5-usage)
-  * [5\.1\. Translating strings](#51-translating-strings)
-  * [5\.2\. Including translated files](#52-including-translated-files)
-  * [5\.3\. Permalinks and Translating Links](#53-permalinks-and-translating-links)
-  * [5\.4\. i18n in templates](#54-i18n-in-templates)
-  * [5\.5\. Link between languages](#55-link-between-languages)
-  * [5\.6\. Creating pages](#56-creating-pages)
-  * [5\.7\. Create posts](#57-creating-posts)
-* [7\. Example website](#7-example-website)
-  * [7\.1\. Adding a new language](#71-adding-a-new-language)
-  * [7\.2\. Adding new page](#72-adding-new-page)
-* [8\. Changelog](#8-changelog)
-* [9\. Contributing](#9-contributing)
-  * [Contributors](#contributors)
-  * [Created by](#created-by)
-  * [Maintained by](#maintained-by)
-* [10\. Other Language Plugins](#10-other-language-plugins)
+- [Jekyll Multiple Languages Plugin](#jekyll-multiple-languages-plugin)
+    - [Badges](#badges)
+  - [!! We are looking for more maintainers !!](#we-are-looking-for-more-maintainers)
+  - [Table of Contents](#table-of-contents)
+  - [1. Current Release Notice](#1-current-release-notice)
+  - [2. Features](#2-features)
+  - [3. Installation](#3-installation)
+    - [3.1. Using the gem](#31-using-the-gem)
+    - [3.2. Manually](#32-manually)
+    - [3.3. As a Git Submodule](#33-as-a-git-submodule)
+  - [4. Configuration](#4-configuration)
+    - [4.1. _config.yml](#41-configyml)
+    - [4.2. Folder structure](#42-folder-structure)
+  - [5. Usage](#5-usage)
+    - [5.1. Translating strings](#51-translating-strings)
+    - [5.2. Including translated files](#52-including-translated-files)
+    - [5.3. Permalinks and Translating Links](#53-permalinks-and-translating-links)
+    - [5.4. i18n in templates](#54-i18n-in-templates)
+    - [5.5. Link between languages](#55-link-between-languages)
+    - [5.6. Creating pages](#56-creating-pages)
+    - [5.7. Creating posts](#57-creating-posts)
+  - [6. License](#6-license)
+  - [7. Example website](#7-example-website)
+    - [7.1. Adding a new language](#71-adding-a-new-language)
+    - [7.2. Adding new page](#72-adding-new-page)
+  - [8. Changelog](#8-changelog)
+  - [9. Contributing](#9-contributing)
+    - [Contributors](#contributors)
+    - [Created by](#created-by)
+    - [Maintained by](#maintained-by)
+    - [Former maintainer](#former-maintainer)
+  - [10. Other Language Plugins](#10-other-language-plugins)
 
 ## 1. Current Release Notice
 
-1.5.1 is the current stable release.
-
-Users that update from older versions to 1.4.0 or newer must change their `_config.yml` for the plugin to be loaded. Please see the `Installation` section bellow for the new string used to load the plugin.
-
-The plugin now works with Jekyll 3, but it's backward compatible with Jekyll 2.
-Please note that it was only tested with Jekyll 2.5.3 and 3.1.3.
+1.6.0 is the current stable release.
 
 The support for Octopress is dropped, but the plugin should still work with it since Octopress core is Jekyll.
 Octopress 3 now has its own multi languages plugin: https://github.com/octopress/multilingual
@@ -54,7 +60,6 @@ Octopress 3 now has its own multi languages plugin: https://github.com/octopress
 
 
 ## 2. Features
-* Works with Jekyll 2.5.3 and 3.1.3
 * 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.
@@ -83,10 +88,10 @@ And then execute: `$ bundle install`
 
 Or install it yourself as: `$ gem install jekyll-multiple-languages-plugin`
 
-To activate the plugin add it to the Jekyll `_config.yml` file, under the `gems` option:
+To activate the plugin add it to the Jekyll `_config.yml` file, under the `plugins` option:
 
 ```ruby
-gems:
+plugins:
   - jekyll-multiple-languages-plugin
 ```
 See the [Jekyll configuration documentation](http://jekyllrb.com/docs/configuration) for details.
@@ -173,7 +178,7 @@ pages:
   work: Work
 ```
 
-  To access the `english` key, use one of these tag:
+  To access the `english` key, use one of these tags:
 
 ```liquid
 {% t global.english %}
@@ -181,7 +186,7 @@ or
 {% translate global.english %}
 ```
 
-You can also access translated strings by accesing the `site.translations` hash, this allows you to loop trough your translations within Liquid:
+You can also access translated strings by accessing the `site.translations` hash, this allows you to loop through your translations within Liquid:
 
 ```liquid
 {% for item in site.translations[site.lang]["my_nested_yaml_collection"] %}
@@ -326,7 +331,9 @@ Inside each of the language folders, you should create mirror pages to provide t
 ### 5.7. Creating posts
 There are no global posts. The posts are localized by language. And your posts will live in the `_i18n/[lang]/_posts` directory. So if, for example, you have English language on your website you should put your posts on `_i18n/en/_posts` directory.
 
+## 6. License
 
+This project is available under the [MIT License](LICENSE.txt).
 
 ## 7. Example website
 
@@ -361,8 +368,12 @@ permalink: /about/
 Then, create a file named `about.md` under `_i18n/en` with the English content. Repeat this for the other languages (_i18n/es/about.md ...). When running the website, visit the address `http://localhost:4000/about` to see the English version, `http://localhost:4000/es/about` for the Spanish one, etc.
 
 
-
 ## 8. Changelog
+* 1.6.1
+  * Improved testing
+  * Support for Jekyll 4
+  * Russian examples 
+  * Translations rebuilt every time page is reloaded in developer mode 
 * 1.6.0
   * fix: check if static_file_r_path is set
   * Missing slash before lang prefix in lang picker example
@@ -446,29 +457,28 @@ Then, create a file named `about.md` under `_i18n/en` with the English content.
 | [@leoditommaso](https://github.com/leoditommaso) | update the example page              |
 
 ### Created by
-[@kurtsson](https://github.com/kurtsson) from [Screen Interaction](https://github.com/screeninteraction) (http://screeninteraction.com)
-
+[@kurtsson](https://github.com/kurtsson) from [Daresay](https://github.com/daresaydigital) (https://daresay.co)
 
 ### Maintained by
-- [@kurtsson](https://github.com/kurtsson)
+- [@shushugah](https://github.com/shushugah)
+
+### Former maintainer
 - [@Anthony-Gaudino](https://github.com/Anthony-Gaudino)
 
 
 
 ## 10. Other Language Plugins
-Bellow is a list of other language plugins for Jekyll (2016/05/28):
+Below is a list of other language plugins for Jekyll (2019/06/27):
 
 **Seems to be maintained:**
-
-* [Jekyll Language Plugin](https://github.com/vwochnik/jekyll-language-plugin)
 * [Polyglot](https://github.com/untra/polyglot)
-* [Jekyll Multiple Languages](https://github.com/liaohuqiu/jekyll-multiple-languages)
-* [Octopress Multilingual](https://github.com/octopress/multilingual)
-* [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags)
+* [Jekyll Language Plugin](https://github.com/vwochnik/jekyll-language-plugin)
 * [jekyll-task-i18n](https://github.com/ruby-gettext/jekyll-task-i18n)
 
 **Seems to be unmaintained / abandoned:**
-
+* [jekyll-i18n_tags](https://github.com/KrzysiekJ/jekyll-i18n_tags)
+* [Octopress Multilingual](https://github.com/octopress/multilingual)
+* [Jekyll Multiple Languages](https://github.com/liaohuqiu/jekyll-multiple-languages)
 * [Jekyll-Multilingualism](https://github.com/aleiphoenix/jekyll-multilingualism)
 * [Jekyll::Languages](https://github.com/janlindblom/jekyll-languages)
 * [Jekyll I18n support](https://github.com/hendricius/jekyll-i18n)

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

@@ -21,10 +21,8 @@ module Jekyll
   #*****************************************************************************
   Jekyll::Hooks.register :site, :pre_render do |site, payload|
       lang = site.config['lang']
-      unless site.parsed_translations.has_key?(lang)
-        puts "Loading translation from file #{site.source}/_i18n/#{lang}.yml"
-        site.parsed_translations[lang] = YAML.load_file("#{site.source}/_i18n/#{lang}.yml")
-      end
+      puts "Loading translation from file #{site.source}/_i18n/#{lang}.yml"
+      site.parsed_translations[lang] = YAML.load_file("#{site.source}/_i18n/#{lang}.yml")
   end
   Jekyll::Hooks.register :site, :post_render do |site, payload|
     
@@ -191,11 +189,14 @@ module Jekyll
   
   
   
-  ##############################################################################
-  # class Page
-  ##############################################################################
-  class Page
-  
+  #-----------------------------------------------------------------------------
+  #
+  # Include (with priority—prepend)the translated
+  # permanent link for Page and document
+  #
+  #-----------------------------------------------------------------------------
+
+  module Permalink
     #======================================
     # permalink
     #======================================
@@ -212,6 +213,8 @@ module Jekyll
     end
   end
 
+  Page.prepend(Permalink)
+  Document.prepend(Permalink)
 
 
   ##############################################################################
@@ -445,6 +448,9 @@ module Jekyll
         baseurl = baseurl + "/" + lang
       end
       
+      collections = site.collections.values.collect{|x| x.docs}.flatten
+      pages = site.pages + collections
+      
       for p in pages
         unless             p['namespace'].nil?
           page_namespace = p['namespace']
@@ -504,4 +510,3 @@ 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/plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module MultipleLanguagesPlugin
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Martin Kurtsson
+- Yonatan Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: html-proofer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +62,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,12 +72,12 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: Plugin for Jekyll 2.x and 3.x that adds support for translated keys,
   templates and posts.
 email:
 - martin.kurtsson@daresay.co
-- anthonygaudino45@gmail.com
+- yonatan@shushugah.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -73,7 +88,7 @@ files:
 - README.md
 - lib/jekyll-multiple-languages-plugin.rb
 - lib/plugin/version.rb
-homepage: https://github.com/Anthony-Gaudino/jekyll-multiple-languages-plugin/
+homepage: https://github.com/kurtsson/jekyll-multiple-languages-plugin/
 licenses:
 - MIT
 metadata: {}
@@ -93,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: I18n plugin for Jekyll