octopress-multilingual 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cdb85708c9c83a005a9264293caa1191f194d9d
-  data.tar.gz: a43cbabca0b124c02d65b4e821ee8e28b50a6138
+  metadata.gz: ae2a7d77082269627ef469a575b895949ae49989
+  data.tar.gz: 472a8cfecf409781c79272d665abc7df984c6236
 SHA512:
-  metadata.gz: ca0756bc4340d208e966a4bc2f2826d1a28bcae42d57d589d0699d6f4b9a33a17533eef2ef12b3ac504918913a95a1ecbfd48ca9f9a0c1bb24245a62594c2b9c
-  data.tar.gz: e70ab74c2c0ba7529c57288fade6d27eaa2655873ab4315d4e16229591c96c8c6322062df7c3794eb6ea42b451c570496d76b2bce5db95528edad356eab906e6
+  metadata.gz: 43a2416772b2c9af04bdc6913e3b8cd36232a39eb2c60fd0ce00ce01cf6671faf6a3c01caeac2410575e87babe11768020614bc31f55d239e4fb1858198383c5
+  data.tar.gz: 4cbbda31c6c4e7f00d1205fcb71f5bae2979901b59c4a7cda16e1e667de77d619eea38c4369218361255ce66c6e0f10173f9f1dbfc0fbd752f277097f21ab118

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.2.0 (2015-02-02)
+- No longer necessary to abort if site language is not defined.
+
 ### 0.2.0 (2015-02-02)
 - Added a `language_name` method for retrieving a match from the language_names hash.
 

data/lib/octopress-multilingual.rb

@@ -15,12 +15,10 @@ module Octopress
     attr_accessor :site
 
     def 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" \
-             << "  lang: en\n\n"
+      @lang ||= begin
+        if lang = site.config['lang']
+          lang.downcase
+        end
       end
     end
 
@@ -29,11 +27,7 @@ module Octopress
     end
 
     def language_name(name=nil)
-      if language = language_names[name]
-        language
-      else
-        name
-      end
+      language_names[name] || name
     end
 
     def language_names
@@ -133,17 +127,15 @@ module Octopress
 
     def site_payload
       # Skip when when showing documentation site
-      if defined?(Octopress::Docs) && Octopress::Docs.enabled?
-        {}
-      else
-        return unless main_language
-
+      if main_language
         @payload ||= {
           'posts_by_language'     => posts_by_language,
           'linkposts_by_language' => linkposts_by_language,
           'articles_by_language'  => articles_by_language,
           'languages'             => languages
         }
+      else
+        {}
       end
     end
   end

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

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