octopress-multilingual 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53be2ced0c8a63eb3b700693e9c7970d3f8d9fee
-  data.tar.gz: 63c5a43ee90647ca20155753f6cfbe540a4c48aa
+  metadata.gz: ce87f2f55eaed0f5b3a9fe806e1dab7d4a07c870
+  data.tar.gz: 6387312bed51e706a7d9fd1fce1bdf25438874bb
 SHA512:
-  metadata.gz: 5559796598c95835c13af44f6ecc402926572629f3ba6499f5511fed54e2063eb6d932dbfe125715647c6ef96057c23e90a1801879ac82a4ce0097e16d659a2f
-  data.tar.gz: fdd40263d7ab8776f082297d817e2a7936be4e7137a3af86f82f5557c708d3972cf7f8b5fbc28f802a2e7198bf051fbc6780aade8585fb02efd5ae34df7049d1
+  metadata.gz: 7c026837759184448beff5307f3d3b69bca69ea6487d38b5d567267de55794aa2aa454e39e308b415e3341cdfa4eaccb1e1149fd5f960920ff73a029a479336c
+  data.tar.gz: 33eea004f47c2a1012921e4fd3ed002f5412344cbadee9b7173fa651916760ad0caa143e54d1582451c764dcec9308698c2faeeee8f58fc4bc2d4e7da622d794

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-### 0.0.2 (2015-01-18)
+### 0.0.4 (2015-01-18)
+
+- Added support for scoping octopress-linkblog `articles` and `linkposts` loops.
+
+### 0.0.3 (2015-01-18)
 
 - Renamed tag to `{% set_lang %}`.
 

data/README.md

@@ -71,6 +71,8 @@ If you are using Octopress, you can easily create a new post with the language a
 $ octopress new post "Some title" --lang en
 ```
 
+This command will set the post language (in the YAML front-matter) and add it to the `_posts/en` directory.
+
 ### Cross-posting languages
 
 Occasionally you may wish to write a post in a single language and have it show up in other languages indexes and feeds. This can be done in your post's YAML front-matter:
@@ -132,6 +134,9 @@ Using the `set_lang` liquid block, you can temporarily switch languages while re
 {{ site.posts }}   # => English posts 
 ```
 
+If you have the [octopress-linkblog](https://github.com/octopress/linkblog) plugin installed, this will also change scope for your
+`site.articles` and `site.linkposts` loops.
+
 ## Post Indexes and RSS Feeds
 
 To add multilingual post indexes you can use the `set_lang` tag like this:
@@ -151,7 +156,7 @@ example, `_includes/post-index.html`. It might look this:
 ```
 {% set_lang page.lang %}
 {% for post in site.posts %}...{% endfor %}
-{% endpost_lang %}
+{% endset_lang %}
 ```
 
 Set the page language to German and include the same partial.

data/lib/octopress-multilingual.rb

@@ -61,16 +61,54 @@ module Octopress
     def site_payload(site)
       @site = site
 
-      if main_language
-        {
-          'posts'             => main_language_posts,
-          'posts_by_language' => posts_by_language,
-          'languages'         => languages,
-          'lang'              => main_language
-        }
+      return unless main_language
+
+      payload = {
+        'posts'             => main_language_posts,
+        'posts_by_language' => posts_by_language,
+        'languages'         => languages,
+        'lang'              => main_language
+      }
+
+      if defined? Octopress::Linkblog
+        payload.merge!({
+          'linkposts' => linkposts_by_language[main_language],
+          'articles'  => articles_by_language[main_language],
+          'linkposts_by_language' => linkposts_by_language,
+          'articles_by_language' => articles_by_language
+        })
       end
+
+      payload
     end
 
+    def articles_by_language
+      @articles_by_language ||= begin 
+        articles = {}
+
+        languages.each do |lang|
+          articles[lang] = posts_by_language[lang].reject do |p|
+            p.data['linkpost']
+          end
+        end
+
+        articles
+      end
+    end
+
+    def linkposts_by_language
+      @linkposts_by_language ||= begin 
+        linkposts = {}
+
+        languages.each do |lang|
+          linkposts[lang] = posts_by_language[lang].select do |p|
+            p.data['linkpost']
+          end
+        end
+
+        linkposts
+      end
+    end
 
     class SiteHook < Hooks::Site
       priority :low

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

@@ -36,7 +36,13 @@ module Octopress
       end
 
       def set_post_lang(lang)
-        @context.environments.first['site']['posts'] = @lang_posts[lang]
+        site = @context.environments.first['site']
+        site['posts'] = @lang_posts[lang]
+
+        if defined? Octopress::Linkblog
+          site['linkposts'] = site['linkposts_by_language'][lang]
+          site['articles']  = site['articles_by_language'][lang] 
+        end
       end
 
       def set_current_lang(lang)

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-multilingual
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: clash
+  name: octopress-linkblog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: clash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: octopress-debugger
   requirement: !ruby/object:Gem::Requirement