octopress-multilingual 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5846ed8df08ad7f6a0f3116a97eb703e90d354d7
-  data.tar.gz: 0797e18cc9f11f1f7633fd4b0ccf68a4d8acc297
+  metadata.gz: aa067e616201fbbdac411a1c687704dacd256647
+  data.tar.gz: a52f11d6b3032e0d989a7b133cbcb114f5bb505f
 SHA512:
-  metadata.gz: b3f8d265ffec1f614b736adc1b0462c9990f222132093f6c91ddabbb47e7df9333c41c854bcc377ca5471baecd6a3b194c4f07ad80cddda9bcf66df971e11d32
-  data.tar.gz: 3e81c7d2d60f172f71e281bb32923aaf267c7c67a32abef2dac659919341d4966505a2b5a1cc7a1789cd5d68b954cbd3839058864cbaf849e9a250e8461d25de
+  metadata.gz: 3564a88ef210bec33e6295d1fa3523ca7cf5e994affef73c71e9b51e6c9b38a45ef59249144227a883cf95e3b632e9577bb65f2ad789f759faf743b8cc4c87ab
+  data.tar.gz: 29ccdaf27a27ceb31dbf1b0f75564e4dd4ab97c5a035a5cdc425642dc293ec027ee3c7c3245f0c2d0a9b5fe66c9adffd9420e4d70dd64ff5d5c903476cb47319

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 (2015-02-06)
+- Added Octopress Ink integration (merges Ink payload on pages)
+- Fixed an issue where page languages weren't being added to site languages
+
 ### 0.3.0 (2015-02-03)
 - New: Language dictionaries for simplifying site templates.
 - Change: `translate` command renamed to `id` to be clearer about what it actually does.

data/lib/octopress-multilingual.rb

@@ -65,7 +65,7 @@ module Octopress
     end
 
     def languages
-      posts_by_language.keys
+      @languages ||= (site.posts.dup.concat(site.pages)).select(&:lang).group_by(&:lang).keys
     end
 
     def posts_by_language
@@ -104,8 +104,10 @@ module Octopress
         articles = {}
 
         languages.each do |lang|
-          articles[lang] = posts_by_language[lang].reject do |p|
-            p.data['linkpost']
+          if posts = posts_by_language[lang]
+            articles[lang] = posts.reject do |p|
+              p.data['linkpost']
+            end
           end
         end
 
@@ -118,8 +120,10 @@ module Octopress
         linkposts = {}
 
         languages.each do |lang|
-          linkposts[lang] = posts_by_language[lang].select do |p|
-            p.data['linkpost']
+          if posts = posts_by_language[lang]
+            linkposts[lang] = posts.select do |p|
+              p.data['linkpost']
+            end
           end
         end
 
@@ -128,7 +132,7 @@ module Octopress
     end
 
     def page_payload(lang)
-      {
+      payload = {
         'site' => { 
           'posts'     => posts_by_language[lang],
           'linkposts' => linkposts_by_language[lang],
@@ -136,10 +140,15 @@ module Octopress
         },
         'lang' => lang_dict[lang]
       }
+
+      if defined?(Octopress::Ink) && site.config['lang']
+        payload.merge!(Octopress::Ink.payload(lang))
+      end
+
+      payload
     end
 
     def site_payload
-      # Skip when when showing documentation site
       if main_language
         @payload ||= {
           'site' => {

data/lib/octopress-multilingual/hooks.rb

@@ -5,7 +5,7 @@ module Octopress
       # Generate site_payload so other plugins can access
       def post_read(site)
         Octopress::Multilingual.site = site
-        site.config['languages'] = site.languages
+        site.config['languages'] = Octopress::Multilingual.languages
       end
 
       def pre_render(site)

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.3.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-multilingual
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks