octopress-multilingual 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31571f420ab5d1cfc9e2ce4acf3b7f8b18edb69
-  data.tar.gz: 2c7b824b3dc4ea330d15d95a51edce0a9dd9785a
+  metadata.gz: 1ddd7536d8cb455af461184f5861d2c2384c4af6
+  data.tar.gz: f1d4232c1b20da1e832b866178e8fa245114b81d
 SHA512:
-  metadata.gz: e7de843a153b09bc68e532a9d65eb1d1f57ce13593b5050516eb289aed4a0a44d75b024f261b07990abc6e2d4801ec088728e2d30ae8440286ab2227f5c46429
-  data.tar.gz: e7a3105e08ec75ef940954a06a44f164a680bb26647d92d52ecb655d6d60011fdb8ad1d992e5c6da2880fdd33ad7244876f6428b7c19d011f795abd32cc8c7d2
+  metadata.gz: 0292321bf1138654367fb33650b8b43d0117703084d81d51b476e9686f8d88e1f7e5c8a662102a28749aeb5a8c55f0a8c811eb0cb8c05d99543fc05fac25cf25
+  data.tar.gz: 9ca4ea2e92f1351d5455c29e4e989c8afadbc571146eabd3b927ead584cdecf64272511630c662ea4012544d5a965d3aa425206b8dcc80eb2801e84a5c0c4a72

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.0.7 (2015-01-21)
+
+- Fix: If no posts had been defined with the main language, posts would disappear. Most embarrassing.
+- Change: instead of `site.main_language`, now using `site.lang`.
+
 ### 0.0.6 (2015-01-20)
 
 - Reversed post order (as it should be)

data/README.md

@@ -38,7 +38,7 @@ problem with an Octopress plugin supporting your multilingual site, please file
 
 When adding this plugin to your site, you will need to:
 
-1. Configure your site's main language, e.g. `main_language: en`.
+1. Configure your site's main language, e.g. `lang: en`.
 2. Add a language to the YAML front-matter of your posts, e.g. `lang: de`.
 3. Add new RSS feeds and post indexes for secondary languages.
 
@@ -51,7 +51,7 @@ Note: This guide will only cover the steps listed above. Your site may still hav
 First, be sure to configure your Jekyll site's main language, for example:
 
 ```yaml
-main_language: en
+lang: en
 ```
 
 Here we are setting the default language to English. Posts without a defined language will be treated as English posts.

data/lib/octopress-multilingual.rb

@@ -8,12 +8,12 @@ module Octopress
     attr_accessor :site, :posts
 
     def main_language
-      if @lang ||= site.config['main_language']
+      if @lang ||= site.config['lang']
         @lang.downcase
       else
         abort "Build canceled by Octopress Multilingual.\n".red \
              << "Your Jekyll site configuration must have a main language. For example:\n\n" \
-             << "  main_language: en\n\n"
+             << "  lang: en\n\n"
       end
     end
 
@@ -30,12 +30,13 @@ module Octopress
         posts = site.posts.reverse.select(&:lang).group_by(&:lang) \
         ## Add posts that crosspost to all languages
         .each do |lang, posts|
-          if lang == main_language
-            posts.clear.concat(main_language_posts)
-          else
+          if lang != main_language
             posts.concat(crossposts).sort_by(&:date).reverse
           end
         end
+
+        posts[main_language] = main_language_posts
+
         posts
       end
     end
@@ -69,8 +70,7 @@ module Octopress
           payload = {
             'posts'             => main_language_posts,
             'posts_by_language' => posts_by_language,
-            'languages'         => languages,
-            'lang'              => main_language
+            'languages'         => languages
           }
 
         if defined? Octopress::Linkblog

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

@@ -12,7 +12,7 @@ module Octopress
         @context     = context
         @languages   = @context['site.languages']
         @lang_posts  = @context['site.posts_by_language']
-        main_lang   = @context['site.main_language']
+        main_lang   = @context['site.lang']
 
         # Render with new posts context
         if lang

data/lib/octopress-multilingual/version.rb

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

metadata

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