octopress-multilingual 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddd7536d8cb455af461184f5861d2c2384c4af6
-  data.tar.gz: f1d4232c1b20da1e832b866178e8fa245114b81d
+  metadata.gz: 81d74a15580418e28ebe00dcd4f8a6cb3dcbc67a
+  data.tar.gz: aa61892cf1e4e764dc77d5eee1a6252f8419637e
 SHA512:
-  metadata.gz: 0292321bf1138654367fb33650b8b43d0117703084d81d51b476e9686f8d88e1f7e5c8a662102a28749aeb5a8c55f0a8c811eb0cb8c05d99543fc05fac25cf25
-  data.tar.gz: 9ca4ea2e92f1351d5455c29e4e989c8afadbc571146eabd3b927ead584cdecf64272511630c662ea4012544d5a965d3aa425206b8dcc80eb2801e84a5c0c4a72
+  metadata.gz: b7c725533664f672619d4ca3a3000098eebbe7a2266d53076c9e233589514cb09d7d3d8a1851b7bd62cd0958474ec74c01d31c7512ca07f6700d10fab12b673b
+  data.tar.gz: 54dd83d45d96e9b5311da61ba385a4681d939b331b79a124b5573b6084a7d6aed129c315a836bd1b684c0629804e6f93ec6172b6b35efc32cfd8e15e2e60545f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.0.8 (2015-01-21)
+- Fix: on posts, page.next and page.previous follow post language
+
 ### 0.0.7 (2015-01-21)
 
 - Fix: If no posts had been defined with the main language, posts would disappear. Most embarrassing.

data/README.md

@@ -48,13 +48,16 @@ Note: This guide will only cover the steps listed above. Your site may still hav
 
 ## Configuration
 
-First, be sure to configure your Jekyll site's main language, for example:
+You can  for standard language codes.
+
+First, be sure to configure your Jekyll site's main language. An site written primarily in English would add this to its Jekyll configuration:
 
 ```yaml
 lang: en
 ```
 
 Here we are setting the default language to English. Posts without a defined language will be treated as English posts.
+For a list of standard language codes, refer to [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
 
 ## Defining a post's language
 

data/lib/octopress-multilingual.rb

@@ -16,10 +16,6 @@ module Octopress
              << "  lang: en\n\n"
       end
     end
-
-    def site
-      @site
-    end
     
     def languages
       posts_by_language.keys
@@ -59,29 +55,29 @@ module Octopress
       @posts_without_lang ||= site.reject(&:lang)
     end
 
-    def site_payload(site)
-      @site = site
-
+    def site_payload
       if defined?(Octopress::Docs) && Octopress::Docs.enabled?
         {}
       else
         return unless main_language
 
+        @payload ||= begin
           payload = {
             'posts'             => main_language_posts,
             'posts_by_language' => posts_by_language,
             'languages'         => languages
           }
 
-        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
-          })
+          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
-        payload
       end
     end
 
@@ -113,6 +109,14 @@ module Octopress
       end
     end
 
+    class SiteHookRead < Hooks::Site
+      priority :high
+      # Generate site_payload so other plugins can access 
+      def post_read(site)
+        Octopress::Multilingual.site = site 
+      end
+    end
+
     class SiteHook < Hooks::Site
       priority :low
 
@@ -126,7 +130,7 @@ module Octopress
         #
         
         { 
-          'site' => Octopress::Multilingual.site_payload(site),
+          'site' => Octopress::Multilingual.site_payload,
         }
       end
     end
@@ -170,6 +174,29 @@ module Jekyll
         :lang => lang
       })
     end
+
+    def next
+      language = lang || site.config['lang']
+      posts = Octopress::Multilingual.posts_by_language[language] 
+      pos = posts.index {|post| post.equal?(self) }
+      if pos && pos < posts.length - 1
+        posts[pos + 1]
+      else
+        nil
+      end
+    end
+
+    def previous
+      language = lang || site.config['lang']
+      posts = Octopress::Multilingual.posts_by_language[language] 
+      pos = posts.index {|post| post.equal?(self) }
+      if pos && pos > 0
+        posts[pos - 1]
+      else
+        nil
+      end
+    end
+    
   end
 end
 

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-multilingual
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks