octopress-multilingual 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3417d3f633e1f848fa11d4c11bd5f6d034d7ada0
-  data.tar.gz: 0e3a0f92834a9e1b416dd732912c3759a592ce87
+  metadata.gz: b3ae15ba4e42285ca409a3e01dad012bbb35df62
+  data.tar.gz: 6bbbd3561ad7f931c11ab9d7020af47e33ac4329
 SHA512:
-  metadata.gz: 7c7f1293cb33d3e9fb1b4cc9f9cf6e7614fc9c2d7d3941375b77e529703d7370f50511bd8ad697e8e31f9ae471b73bcc09fefecba0112d9b9bd3be4af5de3f63
-  data.tar.gz: f93757aee7c7053017d60979024ea141f9d69ec9ed058206857015d80e5534e958ae08649d1845c5a59de5ca0e1d71fe67863445e65888185279895625639034
+  metadata.gz: ee9d5706021be85b0cb543dec60807388759ffb7394b74884d73c8e4065f139faff613f0f1d4cca24cc824b2980ecaf6e5b1b7f8856da440abf924f50b8bef40
+  data.tar.gz: 21863f42abef3df62dfd7992f9cefb46734cc294e425b92c98004a80a5e076280748a45bae2f93ec354957d5ac3348b05e0cebf75c5f47da086ce005f4af3858

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-### 0.1.2 (2015-01-31)
+### 0.1.4 (2015-02-01)
+- Cross-post languages with `lang_crosspost: true` in a post's YAML front-matter.
+
+### 0.1.3 (2015-01-31)
 - Fix: 'default' language maps to site.lang.
 - Fix: Issue with access to site instance.
 

data/README.md

@@ -127,16 +127,16 @@ If you have [octopress-linkblog](https://github.com/octopress/linkblog) installe
 
 ### Cross-posting languages
 
-If you would like to write a post which shows up in indexes and feeds for every language, set `lang: all` in your post's YAML
-front-matter.
+If you would like to write a post which shows up in indexes and feeds for every language, set `lang_crosspost: true` in your post's YAML front-matter.
 
 ```
 title: "Ein nachdenklicher Beitrag"
-lang: all
+lang: de
+lang_crosspost: true
 ```
 
-This post will show up with every language. However, it will be treated exactly like a post written in your
-site's default language and will have one canonical URL. Even `{{ post.lang }}` will return your default language instead of `all`.
+This post will show up with every language. However, it will be treated exactly like a post written in German
+and will have one canonical URL.
 
 ### Language in permalinks
 

data/lib/octopress-multilingual.rb

@@ -46,7 +46,7 @@ module Octopress
     end
 
     def crossposts
-      site.posts.select(&:language_crosspost)
+      site.posts.select(&:crosspost_languages)
     end
 
     def main_language_posts
@@ -88,16 +88,11 @@ module Octopress
     end
 
     def page_payload(lang)
-      payload = { 'posts' => posts_by_language[lang] }
-
-      # If the octopress-linkblog plugin is installed swap out articles and linkposts
-      #
-      if defined? Octopress::Linkblog
-        payload['linkposts'] = linkposts_by_language[lang]
-        payload['articles']  = articles_by_language[lang]
-      end
-
-      payload
+      { 
+        'posts'     => posts_by_language[lang],
+        'linkposts' => linkposts_by_language[lang],
+        'articles'  => articles_by_language[lang]
+      }
     end
 
     def site_payload

data/lib/octopress-multilingual/jekyll.rb

@@ -72,16 +72,12 @@ module Jekyll
 
     def lang
       if data['lang']
-        if data['lang'].downcase == 'all'
-          @language_crosspost = true
-          data['lang'] = site.config['lang']
-        end
         data['lang'].downcase
       end
     end
 
-    def language_crosspost
-      @language_crosspost if lang
+    def crosspost_languages
+      data['lang_crosspost']
     end
 
     def url_placeholders

data/lib/octopress-multilingual/set_lang-tag.rb

@@ -34,34 +34,19 @@ module Octopress
       #
       def set_lang(lang)
         @context.environments.first['page']['lang'] = lang
-        site = @context.environments.first['site']
-        site['posts'] = site['posts_by_language'][lang]
-
-        if defined? Octopress::Linkblog
-          site['linkposts'] = site['linkposts_by_language'][lang]
-          site['articles']  = site['articles_by_language'][lang] 
+        Multilingual.page_payload(lang).each do |key,value| 
+          @context.environments.first['site'][key] = value
         end
       end
 
       def store_state
         @current_lang       = @context['page.lang']
-        @posts              = @context['site.posts']
-
-        if defined? Octopress::Linkblog
-          @articles         = @context['site.articles']
-          @links            = @context['site.linkposts']
-        end
+        @site               = @context['site'].clone
       end
 
       def restore_state
         @context.environments.first['page']['lang'] = @current_lang
-        site = @context.environments.first['site']
-        site['posts'] = @posts
-
-        if defined? Octopress::Linkblog
-          site['linkposts'] = @links
-          site['articles']  = @articles
-        end
+        @context.environments.first['site'] = @site
       end
 
       def lang

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-multilingual
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Brandon Mathis