RubyGems - jekyll-multiple-languages-plugin - Versions diffs - 1.4.2 → 1.7.0 - Mend

jekyll-multiple-languages-plugin 1.4.2 → 1.7.0

Files changed (6) hide show

checksums.yaml +5 -5
data/LICENSE.txt +5 -349
data/README.md +115 -53
data/lib/jekyll-multiple-languages-plugin.rb +157 -37
data/lib/plugin/version.rb +1 -1
metadata +29 -15

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a24d785fff6763046ceeea5785d3ad0000496f16
-  data.tar.gz: 6a5db73c7439aee25ceb892d34ebf8d6466c0d6f
+SHA256:
+  metadata.gz: 9f3a2a500acf67ad5bea871232433bab2c4fee41366f0d59864e09256121eecf
+  data.tar.gz: 2c9a1a596557ecd8aea38c07e0607d5e104e4c755b1f41c01fd14b9355d75f30
 SHA512:
-  metadata.gz: 540e03c839745d68f91383dcbee1026dedf31e6f7c6e5c02962dea1db63a71f34fd4647ab20db081e1f33f1148cd588c812ecb825ccb2d9d8b2fcc4861577b10
-  data.tar.gz: 9b5ae238698d5412448618779a616522c1e065912ee114ac5e36950b107d8a0cf97a5e4a6d8c0948502e5648f07ddaafdd51aaf5d360940471e733667dcda724
+  metadata.gz: f94a3062d46cbcfe28d878073e539ebf675494021e16d0bb96297878720a9c8b449f7d4a12b1d04bfc8a717178eb828bf7a15428842e5772412643099d5dbdfd
+  data.tar.gz: 9e11ecf14870bbf6655d0ed407d83409ce87c57880e5ceac803d0236bc56c222b7d1af9cba901861edf23303b3db8a92dcdcc3ef50e3260dfde766a757f71c39

data/LICENSE.txt CHANGED

@@ -1,353 +1,9 @@
-Mozilla Public License Version 2.0
-==================================
+MIT License
-1. Definitions
---------------
+Copyright (c) 2014 Martin Kurtsson
-1.1. "Contributor"
-    means  each  individual  or  legal  entity  that creates, contributes to the
-    creation of, or owns Covered Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-1.2. "Contributor Version"
-    means  the  combination  of  the  Contributions of others (if any) used by a
-    Contributor and that particular Contributor's Contribution.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-1.4. "Covered Software"
-    means  Source  Code  Form  to which the initial Contributor has attached the
-    notice  in  Exhibit  A,  the  Executable  Form of such Source Code Form, and
-    Modifications  of  such  Source  Code  Form, in each case including portions
-    thereof.
-1.5. "Incompatible With Secondary Licenses"
-    means
-    (a) that  the  initial  Contributor  has  attached  the  notice described in
-        Exhibit B to the Covered Software; or
-    (b) that  the Covered Software was made available under the terms of version
-        1.1  or  earlier  of  the  License,  but  not  also under the terms of a
-        Secondary License.
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-1.7. "Larger Work"
-    means  a  work  that  combines  Covered  Software  with other material, in a
-    separate file or files, that is not Covered Software.
-1.8. "License"
-    means this document.
-1.9. "Licensable"
-    means  having the right to grant, to the maximum extent possible, whether at
-    the  time  of  the  initial grant or subsequently, any and all of the rights
-    conveyed by this License.
-1.10. "Modifications"
-    means any of the following:
-    (a) any  file in Source Code Form that results from an addition to, deletion
-        from, or modification of the contents of Covered Software; or
-    (b) any new file in Source Code Form that contains any Covered Software.
-1.11. "Patent Claims" of a Contributor
-    means  any  patent  claim(s), including without limitation, method, process,
-    and  apparatus  claims,  in  any  patent Licensable by such Contributor that
-    would  be infringed, but for the grant of the License, by the making, using,
-    selling,  offering  for sale, having made, import, or transfer of either its
-    Contributions or its Contributor Version.
-1.12. "Secondary License"
-    means  either  the  GNU  General Public License, Version 2.0, the GNU Lesser
-    General  Public License, Version 2.1, the GNU Affero General Public License,
-    Version 3.0, or any later versions of those licenses.
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this License.
-    For  legal  entities, "You" includes any entity that controls, is controlled
-    by,  or  is  under common control with You. For purposes of this definition,
-    "control" means (a) the power, direct or indirect, to cause the direction or
-    management  of  such  entity,  whether  by  contract  or  otherwise,  or (b)
-    ownership  of  more  than  fifty  percent (50%) of the outstanding shares or
-    beneficial ownership of such entity.
-2. License Grants and Conditions
---------------------------------
-2.1. Grants
-Each  Contributor  hereby  grants  You a world-wide, royalty-free, non-exclusive
-license:
-(a) under   intellectual  property  rights  (other  than  patent  or  trademark)
-    Licensable  by  such  Contributor to use, reproduce, make available, modify,
-    display,  perform,  distribute,  and  otherwise  exploit  its Contributions,
-    either  on  an  unmodified basis, with Modifications, or as part of a Larger
-    Work; and
-(b) under  Patent Claims of such Contributor to make, use, sell, offer for sale,
-    have  made,  import,  and otherwise transfer either its Contributions or its
-    Contributor Version.
-2.2. Effective Date
-The  licenses  granted  in  Section  2.1 with respect to any Contribution become
-effective  for  each  Contribution on the date the Contributor first distributes
-such Contribution.
-2.3. Limitations on Grant Scope
-The  licenses  granted  in this Section 2 are the only rights granted under this
-License.  No additional rights or licenses will be implied from the distribution
-or  licensing  of  Covered  Software under this License. Notwithstanding Section
-2.1(b) above, no patent license is granted by a Contributor:
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-(b) for   infringements  caused  by:  (i)  Your  and  any  other  third  party's
-    modifications   of   Covered  Software,  or  (ii)  the  combination  of  its
-    Contributions  with  other  software  (except  as  part  of  its Contributor
-    Version); or
-(c) under  Patent  Claims  infringed  by  Covered Software in the absence of its
-    Contributions.
-This  License  does  not  grant  any rights in the trademarks, service marks, or
-logos  of  any Contributor (except as may be necessary to comply with the notice
-requirements in Section 3.4).
-2.4. Subsequent Licenses
-No  Contributor makes additional grants as a result of Your choice to distribute
-the  Covered  Software  under  a subsequent version of this License (see Section
-10.2) or under the terms of a Secondary License (if permitted under the terms of
-Section 3.3).
-2.5. Representation
-Each  Contributor represents that the Contributor believes its Contributions are
-its  original creation(s) or it has sufficient rights to grant the rights to its
-Contributions conveyed by this License.
-2.6. Fair Use
-This  License  is  not  intended  to  limit any rights You have under applicable
-copyright doctrines of fair use, fair dealing, or other equivalents.
-2.7. Conditions
-Sections  3.1,  3.2,  3.3,  and  3.4  are  conditions of the licenses granted in
-Section 2.1.
-3. Responsibilities
--------------------
-3.1. Distribution of Source Form
-All  distribution  of  Covered  Software  in  Source  Code  Form,  including any
-Modifications  that  You  create  or  to which You contribute, must be under the
-terms  of  this License. You must inform recipients that the Source Code Form of
-the  Covered Software is governed by the terms of this License, and how they can
-obtain  a  copy  of  this  License. You may not attempt to alter or restrict the
-recipients' rights in the Source Code Form.
-3.2. Distribution of Executable Form
-If You distribute Covered Software in Executable Form then:
-(a) such  Covered  Software  must also be made available in Source Code Form, as
-    described  in  Section 3.1, and You must inform recipients of the Executable
-    Form how they can obtain a copy of such Source Code Form by reasonable means
-    in a timely manner, at a charge no more than the cost of distribution to the
-    recipient; and
-(b) You  may distribute such Executable Form under the terms of this License, or
-    sublicense  it  under  different  terms,  provided  that the license for the
-    Executable Form does not attempt to limit or alter the recipients' rights in
-    the Source Code Form under this License.
-3.3. Distribution of a Larger Work
-You may create and distribute a Larger Work under terms of Your choice, provided
-that  You  also  comply  with  the  requirements of this License for the Covered
-Software.  If  the  Larger Work is a combination of Covered Software with a work
-governed  by  one  or  more  Secondary Licenses, and the Covered Software is not
-Incompatible  With  Secondary Licenses, this License permits You to additionally
-distribute  such  Covered Software under the terms of such Secondary License(s),
-so  that  the  recipient  of  the  Larger  Work  may,  at  their option, further
-distribute  the  Covered Software under the terms of either this License or such
-Secondary License(s).
-3.4. Notices
-You  may  not  remove  or  alter the substance of any license notices (including
-copyright  notices,  patent  notices, disclaimers of warranty, or limitations of
-liability) contained within the Source Code Form of the Covered Software, except
-that  You  may  alter any license notices to the extent required to remedy known
-factual inaccuracies.
-3.5. Application of Additional Terms
-You  may  choose to offer, and to charge a fee for, warranty, support, indemnity
-or liability obligations to one or more recipients of Covered Software. However,
-You may do so only on Your own behalf, and not on behalf of any Contributor. You
-must  make  it  absolutely  clear that any such warranty, support, indemnity, or
-liability  obligation is offered by You alone, and You hereby agree to indemnify
-every  Contributor for any liability incurred by such Contributor as a result of
-warranty,  support,  indemnity  or  liability  terms  You offer. You may include
-additional  disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-If it is impossible for You to comply with any of the terms of this License with
-respect  to  some or all of the Covered Software due to statute, judicial order,
-or  regulation  then  You must: (a) comply with the terms of this License to the
-maximum  extent  possible;  and  (b)  describe the limitations and the code they
-affect.  Such  description  must  be  placed  in  a  text file included with all
-distributions  of  the Covered Software under this License. Except to the extent
-prohibited  by  statute  or  regulation,  such  description must be sufficiently
-detailed for a recipient of ordinary skill to be able to understand it.
-5. Termination
---------------
-5.1. The  rights  granted under this License will terminate automatically if You
-fail to comply with any of its terms. However, if You become compliant, then the
-rights  granted  under this License from a particular Contributor are reinstated
-(a)  provisionally,  unless  and  until  such Contributor explicitly and finally
-terminates  Your  grants, and (b) on an ongoing basis, if such Contributor fails
-to  notify  You  of the non-compliance by some reasonable means prior to 60 days
-after  You  have  come  back  into  compliance.  Moreover,  Your  grants  from a
-particular  Contributor  are  reinstated on an ongoing basis if such Contributor
-notifies  You  of the non-compliance by some reasonable means, this is the first
-time  You  have  received  notice  of non-compliance with this License from such
-Contributor, and You become compliant prior to 30 days after Your receipt of the
-notice.
-5.2. If  You  initiate  litigation  against  any  entity  by  asserting a patent
-infringement  claim (excluding declaratory judgment actions, counter-claims, and
-cross-claims)  alleging  that  a  Contributor  Version  directly  or  indirectly
-infringes any patent, then the rights granted to You by any and all Contributors
-for the Covered Software under Section 2.1 of this License shall terminate.
-5.3. In  the  event of termination under Sections 5.1 or 5.2 above, all end user
-license  agreements  (excluding  distributors  and  resellers)  which  have been
-validly  granted  by  You  or  Your  distributors  under  this  License prior to
-termination shall survive termination.
-********************************************************************************
-*                                                                              *
-*  6. Disclaimer of Warranty                                                   *
-*  -------------------------                                                   *
-*                                                                              *
-*  Covered  Software  is  provided  under  this  License on an "as is" basis,  *
-*  without  warranty  of  any  kind, either expressed, implied, or statutory,  *
-*  including,  without  limitation,  warranties  that the Covered Software is  *
-*  free   of   defects,   merchantable,   fit  for  a particular  purpose  or  *
-*  non-infringing.  The entire  risk as to the quality and performance of the  *
-*  Covered  Software is with You. Should any Covered Software prove defective  *
-*  in any respect, You (not any Contributor) assume the cost of any necessary  *
-*  servicing,  repair, or correction. This disclaimer of warranty constitutes  *
-*  an  essential  part  of  this  License.  No use of any Covered Software is  *
-*  authorized under this License except under this disclaimer.                 *
-*                                                                              *
-********************************************************************************
-********************************************************************************
-*                                                                              *
-*  7. Limitation of Liability                                                  *
-*  --------------------------                                                  *
-*                                                                              *
-*  Under  no circumstances and under no legal theory, whether tort (including  *
-*  negligence),  contract, or otherwise, shall any Contributor, or anyone who  *
-*  distributes  Covered Software as permitted above, be liable to You for any  *
-*  direct,  indirect,  special,  incidental,  or consequential damages of any  *
-*  character including, without limitation, damages for lost profits, loss of  *
-*  goodwill,  work  stoppage, computer failure or malfunction, or any and all  *
-*  other  commercial  damages  or  losses, even if such party shall have been  *
-*  informed  of the possibility of such damages. This limitation of liability  *
-*  shall  not  apply to liability for death or personal injury resulting from  *
-*  such  party's  negligence  to  the  extent  applicable  law prohibits such  *
-*  limitation. Some jurisdictions do not allow the exclusion or limitation of  *
-*  incidental  or consequential damages, so this exclusion and limitation may  *
-*  not apply to You.                                                           *
-*                                                                              *
-********************************************************************************
-8. Litigation
--------------
-Any  litigation  relating to this License may be brought only in the courts of a
-jurisdiction  where  the defendant maintains its principal place of business and
-such  litigation  shall  be  governed  by  laws  of  that  jurisdiction, without
-reference  to  its  conflict-of-law  provisions.  Nothing  in this Section shall
-prevent a party's ability to bring cross-claims or counter-claims.
-9. Miscellaneous
-----------------
-This  License  represents  the  complete agreement concerning the subject matter
-hereof.  If  any  provision  of  this  License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it enforceable.
-Any  law  or  regulation which provides that the language of a contract shall be
-construed against the drafter shall not be used to construe this License against
-a Contributor.
-10. Versions of the License
----------------------------
-10.1. New Versions
-Mozilla  Foundation  is the license steward. Except as provided in Section 10.3,
-no  one  other  than  the license steward has the right to modify or publish new
-versions  of  this  License. Each version will be given a distinguishing version
-number.
-10.2. Effect of New Versions
-You  may  distribute  the Covered Software under the terms of the version of the
-License  under  which You originally received the Covered Software, or under the
-terms of any subsequent version published by the license steward.
-10.3. Modified Versions
-If  you  create  software not governed by this License, and you want to create a
-new license for such software, you may create and use a modified version of this
-License  if  you rename the license and remove any references to the name of the
-license  steward  (except  to  note that such modified license differs from this
-License).
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-If You choose to distribute Source Code Form that is Incompatible With Secondary
-Licenses under the terms of this version of the License, the notice described in
-Exhibit B of this License must be attached.
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-  This  Source  Code Form is subject to the terms of the Mozilla Public License,
-  v. 2.0.  If  a  copy  of  the  MPL was not distributed with this file, You can
-  obtain one at http://mozilla.org/MPL/2.0/.
-If  it is not possible or desirable to put the notice in a particular file, then
-You  may  include the notice in a location (such as a LICENSE file in a relevant
-directory) where a recipient would be likely to look for such a notice.
-You may add additional accurate notices of copyright ownership.
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-  This Source Code Form is "Incompatible With Secondary Licenses", as defined by
-  the Mozilla Public License, v. 2.0.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md CHANGED

@@ -4,48 +4,55 @@
 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 subfolders with the same name as the language it contains.
-The plugin was developed as a utility at [Screen Interaction](http://www.screeninteraction.com)
+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)
-* [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.4.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
@@ -53,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.
@@ -82,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.
@@ -135,6 +141,12 @@ In code, these specific files should be referenced via `baseurl_root`. E.g.
 <link rel="stylesheet" href="{{ "/css/bootstrap.css" | prepend: site.baseurl_root }}"/>
 ```
+If you wish to avoid having the default_lang built into the root of your website, use:
+```yaml
+default_locale_in_subfolder: true
+```
 ### 4.2. Folder structure
 Create a folder called `_i18n` and add sub-folders for each language, using the same names used on the `languages` setting on the `_config.yml`:
@@ -172,7 +184,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 %}
@@ -180,14 +192,36 @@ 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 using the translated string's index:
 ```liquid
-{% for item in site.translations[site.lang]["my_nested_yaml_collection"] %}
+{% for item in site.translations[site.lang].my_nested_yaml_collection %}
     <p>{{ item[0] }} -> {{ item[1] }}</p>
 {% endfor %}
 ```
+or the translated string's assignment:
+```yaml
+my_nested_yaml_collection:
+  -
+    title: First
+    message: Message
+  -
+    title: Second
+    message: Message
+```
+```liquid
+{% for item in site.translations[site.lang].my_nested_yaml_collection %}
+   <li>
+      <h2>{{ item["title"] }}</h2>
+      <p>{{ item["message"] }}</p>
+   </li>
+{% endfor %}
+```
 ### 5.2. Including translated files
 The plugin also supports using different markdown files for different languages using the liquid tag:
@@ -272,7 +306,7 @@ titles:
 This plugin gives you the variables
 ```liquid
-{{ page.lang }}
+{{ site.lang }}
 and
@@ -286,7 +320,7 @@ This allows you to create solutions like this:
 ``` liquid
 {% if site.lang == "sv" %}
-  {% capture link1 %}{{ site.baseurl_root }}en{{ page.url}}{% endcapture %}
+  {% capture link1 %}{{ site.baseurl_root }}/en{{ page.url}}{% endcapture %}
   <a href="{{ link1 }}" >{% t global.english %}</a>
 {% elsif site.lang == "en" %}
   {% capture link2 %}{{ site.baseurl_root }}{{ page.url  }}{% endcapture %}
@@ -322,10 +356,17 @@ 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
 This repository has an example website where you can test the plugin.
-After downloading the repository, get into the `example` directory and run: `bundle install` to install the newest version of Jekyll (change the Gemfile to install another version), the plugin, and all other dependencies.
+After downloading the repository, get into the `example` directory and run: `bundle install` to install the newest version of Jekyll (edit the Gemfile to install another version) and all other dependencies.
 Then run `bundle exec jekyll serve` to start the Jekyll server. Using your web browser, access the address `http://localhost:4000`.
@@ -355,8 +396,30 @@ 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.7.0
+  * Option to build the default language into a subfolder
+  * Configurable verbosity
+  * Improved documentation
+  * Removed deprecation warning
+* 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
+  * Updated README.md with _posts directory
+  * Build translations in pre_render hook
+  * If include not found, fall back to default language
+* 1.5.1
+  * Fix a bug (#70) where `site.static_files` would be empty on subsites if `exclude_from_localizations` is used.
+  * Some overall project enhancements and minor fixes.
+  * A simple Rake task is available to test the plugin, CI services now have something to run.
+* 1.5.0
+  * Enables Liquid expansions within Liquid Tags.
+  * The example website post language switchers were rewritten in an algorithmic way.
 * 1.4.2
   * Exposes the `site.translations` hash containing the translated strings to Liquid.
 * 1.4.1
@@ -427,29 +490,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 CHANGED

@@ -16,6 +16,92 @@ require_relative "plugin/version"
 module Jekyll
+  #*****************************************************************************
+  # :site, :post_render hook
+  #*****************************************************************************
+  Jekyll::Hooks.register :site, :pre_render do |site, payload|
+      lang = site.config['lang']
+      puts "Loading translation from file #{site.source}/_i18n/#{lang}.yml"
+      site.parsed_translations[lang] = YAML.load_file("#{site.source}/_i18n/#{lang}.yml")
+  end
+  #*****************************************************************************
+  # :site, :post_write hook
+  #*****************************************************************************
+  Jekyll::Hooks.register :site, :post_write do |site|
+    # Moves excluded paths from the default lang subfolder to the root folder
+    #===========================================================================
+    default_lang = site.config["default_lang"]
+    current_lang = site.config["lang"]
+    exclude_paths = site.config["exclude_from_localizations"]
+    if (default_lang == current_lang && site.config["default_locale_in_subfolder"])
+      files = Dir.glob(File.join("_site/" + current_lang + "/", "*"))
+      files.each do |file_path|
+        parts = file_path.split('/')
+        f_path = parts[2..-1].join('/')
+        if (f_path == 'base.html')
+          new_path = parts[0] + "/index.html"
+          puts "Moving '" + file_path + "' to '" + new_path + "'"
+          File.rename file_path, new_path
+        else
+          exclude_paths.each do |exclude_path|
+            if (exclude_path == f_path)
+              new_path = parts[0] + "/" + f_path
+              puts "Moving '" + file_path + "' to '" + new_path + "'"
+              if (Dir.exists?(new_path))
+                FileUtils.rm_r new_path
+              end
+              File.rename file_path, new_path
+            end
+          end
+        end
+      end
+    end
+    #===========================================================================
+  end
+  Jekyll::Hooks.register :site, :post_render do |site, payload|
+    # Removes all static files that should not be copied to translated sites.
+    #===========================================================================
+    default_lang  = payload["site"]["default_lang"]
+    current_lang  = payload["site"][        "lang"]
+    static_files  = payload["site"]["static_files"]
+    exclude_paths = payload["site"]["exclude_from_localizations"]
+    default_locale_in_subfolder = site.config["default_locale_in_subfolder"]
+    if default_lang != current_lang
+      static_files.delete_if do |static_file|
+        next true if (static_file.name == 'base.html' && default_locale_in_subfolder)
+        # Remove "/" from beginning of static file relative path
+        if static_file.instance_variable_get(:@relative_path) != nil
+          static_file_r_path = static_file.instance_variable_get(:@relative_path).dup
+          if static_file_r_path
+            static_file_r_path[0] = ''
+            exclude_paths.any? do |exclude_path|
+              Pathname.new(static_file_r_path).descend do |static_file_path|
+                break(true) if (Pathname.new(exclude_path) <=> static_file_path) == 0
+              end
+            end
+          end
+        end
+      end
+    end
+    #===========================================================================
+  end
   ##############################################################################
   # class Site
   ##############################################################################
@@ -37,6 +123,8 @@ module Jekyll
       self.parsed_translations ||= {}
       self.config['exclude_from_localizations'] ||= []
+      self.config['default_locale_in_subfolder'] ||= false
       if ( !self.config['languages']         or
             self.config['languages'].empty?  or
@@ -52,9 +140,8 @@ module Jekyll
       #-------------------------------------------------------------------------
       # Original Jekyll configurations
-      baseurl_org                 = self.config[ 'baseurl' ] # Baseurl set on _config.yml
-      exclude_org                 = self.exclude             # List of excluded paths
-      dest_org                    = self.dest                # Destination folder where the website is generated
+      baseurl_org                 = self.config[ 'baseurl' ].to_s # Baseurl set on _config.yml
+      dest_org                    = self.dest                     # Destination folder where the website is generated
       # Site building only variables
       languages                   = self.config['languages'] # List of languages set on _config.yml
@@ -65,30 +152,20 @@ module Jekyll
       self.config['baseurl_root'] = baseurl_org              # Baseurl of website root (without the appended language code)
       self.config['translations'] = self.parsed_translations # Hash that stores parsed translations read from YAML files. Exposes this hash to Liquid.
-      # Build the website for default language
-      #-------------------------------------------------------------------------
-      puts "Building site for default language: \"#{self.config['lang']}\" to: #{self.dest}"
-      process_org
-      # Build the website for the other languages
+      # Build the website for all languages
       #-------------------------------------------------------------------------
       # Remove .htaccess file from included files, so it wont show up on translations folders.
       self.include -= [".htaccess"]
-      languages.drop(1).each do |lang|
+      languages.each do |lang|
         # Language specific config/variables
-        @dest                  = dest_org    + "/" + lang
-        self.config['baseurl'] = baseurl_org + "/" + lang
-        self.config['lang']    =                     lang
-        # exclude folders or files from being copied to all the language folders
-        exclude_from_localizations =  self.config['exclude_from_localizations']
-        self.exclude               = exclude_org + exclude_from_localizations
+        if lang != self.config['default_lang'] || self.config['default_locale_in_subfolder']
+          @dest                  = dest_org    + "/" + lang
+          self.config['baseurl'] = baseurl_org + "/" + lang
+          self.config['lang']    =                     lang
+        end
         puts "Building site for language: \"#{self.config['lang']}\" to: #{self.dest}"
@@ -97,7 +174,6 @@ module Jekyll
       # Revert to initial Jekyll configurations (necessary for regeneration)
       self.config[ 'baseurl' ] = baseurl_org  # Baseurl set on _config.yml
-      self.exclude             = exclude_org  # List of excluded paths
       @dest                    = dest_org     # Destination folder where the website is generated
       puts 'Build complete'
@@ -151,11 +227,14 @@ module Jekyll
-  ##############################################################################
-  # class Page
-  ##############################################################################
-  class Page
+  #-----------------------------------------------------------------------------
+  #
+  # Include (with priority—prepend)the translated
+  # permanent link for Page and document
+  #
+  #-----------------------------------------------------------------------------
+  module Permalink
     #======================================
     # permalink
     #======================================
@@ -172,6 +251,8 @@ module Jekyll
     end
   end
+  Page.prepend(Permalink)
+  Document.prepend(Permalink)
   ##############################################################################
@@ -270,22 +351,21 @@ module Jekyll
         key =            @key
       end
+      key = Liquid::Template.parse(key).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
       site = context.registers[:site] # Jekyll site object
       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
       translation = site.parsed_translations[lang].access(key) if key.is_a?(String)
       if translation.nil? or translation.empty?
          translation = site.parsed_translations[site.config['default_lang']].access(key)
-        puts "Missing i18n key: #{lang}:#{key}"
-        puts "Using translation '%s' from default language: %s" %[translation, site.config['default_lang']]
+        if site.config["verbose"]
+          puts "Missing i18n key: #{lang}:#{key}"
+          puts "Using translation '%s' from default language: %s" %[translation, site.config['default_lang']]
+        end
       end
       translation
@@ -313,11 +393,28 @@ module Jekyll
           file =            @file
         end
-        site = context.registers[:site] # Jekyll site object
+        file = Liquid::Template.parse(file).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
-        includes_dir = File.join(site.source, '_i18n/' + site.config['lang'])
+        site = context.registers[:site] # Jekyll site object
+        default_lang = site.config['default_lang']
         validate_file_name(file)
+        includes_dir = File.join(site.source, '_i18n/' + site.config['lang'])
+        # If directory doesn't exist, go to default lang
+        if !Dir.exist?(includes_dir)
+          includes_dir = File.join(site.source, '_i18n/' + default_lang)
+        elsif
+          # If file doesn't exist, go to default lang
+          Dir.chdir(includes_dir) do
+            choices = Dir['**/*'].reject { |x| File.symlink?(x) }
+            if !choices.include?(  file)
+              includes_dir = File.join(site.source, '_i18n/' + default_lang)
+            end
+          end
+        end
         Dir.chdir(includes_dir) do
           choices = Dir['**/*'].reject { |x| File.symlink?(x) }
@@ -343,6 +440,25 @@ module Jekyll
         end
       end
     end
+    # Override of core Jekyll functionality, to get rid of deprecation
+    # warning. See https://github.com/jekyll/jekyll/pull/7117 for more
+    # details.
+    class PostComparer
+      def initialize(name)
+        @name = name
+        all, @path, @date, @slug = *name.sub(%r!^/!, "").match(MATCHER)
+        unless all
+          raise Jekyll::Errors::InvalidPostNameError,
+                "'#{name}' does not contain valid date and/or title."
+        end
+        escaped_slug = Regexp.escape(slug)
+        @name_regex = %r!_posts/#{path}#{date}-#{escaped_slug}\.[^.]+|
+          ^#{path}_posts/?#{date}-#{escaped_slug}\.[^.]+!x
+      end
+    end
   end
@@ -375,6 +491,8 @@ module Jekyll
         key = @key
       end
+      key = Liquid::Template.parse(key).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
       site = context.registers[:site] # Jekyll site object
       key          = key.split
@@ -385,10 +503,13 @@ module Jekyll
       pages        =           site.pages
       url          = "";
-      if default_lang != lang
+      if default_lang != lang || site.config['default_locale_in_subfolder']
         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']
@@ -448,4 +569,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 CHANGED

@@ -1,6 +1,6 @@
 module Jekyll
   module MultipleLanguagesPlugin
-    VERSION = "1.4.2"
+    VERSION = "1.7.0"
   end
 end

metadata CHANGED

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Martin Kurtsson
+- Yonatan Miller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +17,42 @@ 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: rake
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: jekyll
   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@screeninteraction.com
-- anthonygaudino45@gmail.com
+- martin.kurtsson@daresay.co
+- yonatan@shushugah.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -73,9 +88,9 @@ files:
 - README.md
 - lib/jekyll-multiple-languages-plugin.rb
 - lib/plugin/version.rb
-homepage: https://github.com/screeninteraction/jekyll-multiple-languages-plugin/
+homepage: https://github.com/kurtsson/jekyll-multiple-languages-plugin/
 licenses:
-- MPL2
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options:
@@ -93,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: I18n plugin for Jekyll