octopress-multilingual 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e686430fdd82cfe9d2a087a3e2ca8ddb46cbf00
-  data.tar.gz: 310ab73b3121f5bb638208cd62ef8245ec0b9d6f
+  metadata.gz: 5bd5e6f51c804733c55246e3b4b1be02892600e0
+  data.tar.gz: db7d5e207295198819c8423849970173afde3cf7
 SHA512:
-  metadata.gz: 1f40e26fe6d5f38ba627486aeaf644d5adb2e106b0dc33457eb07ab089b9e5d594f5c1e521ab9b2b189774ac963e1fb970afca6090d918d7b188fea05169d476
-  data.tar.gz: 000fe172c2185a760a440acdc2166c4970374c6edb6a3455b83823cadc88058d3feb78d5f797e03184116e1afab9d8f8a5edf5d9232077046b9cef16fce4503b
+  metadata.gz: 40e189148351826d42e4ae0fa4ea6cbd1f100cf22f1a33928590fbd29398d71ca52c40be1c6f482ee9fb59565c48c7ee5a35f5a4ad2fabe39e76e9ea00b74a7f
+  data.tar.gz: e041121a1cdf86dd36532750da14ecdb34ff54cef95c51b2cdf524c50d26d6cb1220b5b8d35c4ec16772b8685a035de3075320c0a590d33a3303a9c6bdfde6ec

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.1.2 (2015-02-26)
+- Fix: Pages with `:lang` in permalink structure are given proper URLs if language is not defined for them.
+
 ### 1.1.1 (2015-02-18)
 - Minor: Now site languages array always lists primary language first.
 

data/lib/octopress-multilingual/jekyll.rb

@@ -59,12 +59,17 @@ module Jekyll
     end
 
     def permalink
-      if lang && permalink = permalink_orig
-        data['permalink'].sub!(/:lang/, lang)
-        permalink.sub(/:lang/, lang)
-      else
-        permalink_orig
+      if permalink = permalink_orig
+        if lang
+          data['permalink'].sub!(':lang', lang)
+          permalink.sub!(':lang', lang)
+        else
+          data['permalink'].sub!('/:lang', '')
+          permalink.sub!('/:lang', '')
+        end
       end
+
+      permalink
     end
   end
 

data/lib/octopress-multilingual/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Multilingual
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

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