octopress-feeds 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0763f000cc10d04b861503e9e83950663abafb8
-  data.tar.gz: 9dfd1534121c6aa203c27b2b7b4289affce50f5e
+  metadata.gz: b04ed329d37a75cec4ac021450cc76c9abe7362b
+  data.tar.gz: 820b7d2fdf05b91463e72a2bcb96de6e43494afa
 SHA512:
-  metadata.gz: 9a034ddda257dba71c7b7f5edff3e9f6257cb622ac4792d7bdb2debdee79cc664ca2df92bf83a35a9715e6078c27d7c7d623dd60e2d4261f8f8eafa4a2dddca4
-  data.tar.gz: ebaed813e2b84404bdd944dbcc271699daf8f820bf701381655ecdb874403aa9de2cba5fe5c341bf8ddd16935692f5f9211c609a804ee3092f78f11f4007d97b
+  metadata.gz: 14e16ef273416146553716e841f2f62eb90d54d09320f2cd9cb39a1afca4ef5d3be80d9db45ef24a8c9e4c9a2476a88eda4c1a9ea454b899c911d9d0b5e68979
+  data.tar.gz: 420c6c0ee381e9805f59b2a6fdd80903afa65ca6e74ca463e597729c5398b2fbd703833ae6aa4556ec06e15b70d5b725730faec372138f0d35ab35930b10266b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.3.1 (2015-02-03)
+
+- Now feed titles include the full language name.
+
 ### 1.3.0 (2015-02-01)
 
 - Now all language feeds are automatically generated.

data/lib/octopress-feeds/config-asset.rb

@@ -10,12 +10,15 @@ module Octopress
       end
 
       def multilingual_permalinks
-        lang = Octopress.site.config['lang']
-        { "permalinks" => {
-          "main"    => "/#{lang}/feed/",
-          "links"    => "/#{lang}/feed/links/",
-          "articles" => "/#{lang}/feed/articles/"
-        }}
+        if lang = Octopress.site.config['lang']
+          { "permalinks" => {
+            "main"    => "/#{lang}/feed/",
+            "links"    => "/#{lang}/feed/links/",
+            "articles" => "/#{lang}/feed/articles/"
+          }}
+        else
+          {}
+        end
       end
     end
   end

data/lib/octopress-feeds/tags.rb

@@ -19,8 +19,8 @@ module Octopress
         title << ': ' unless title.empty?
         title << page.data['title']
 
-        if defined? Octopress::Multilingual
-          title << " (#{page.lang})"
+        if defined?(Octopress::Multilingual) && page.lang
+          title << " (#{Octopress::Multilingual.language_name(page.lang)})"
         end
 
         title

data/lib/octopress-feeds/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Feeds
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/octopress-feeds.rb

@@ -56,7 +56,7 @@ module Octopress
           # New name for permalink settings in plugin config.yml
           permalink_name = "#{page.permalink_name}-#{lang}"
 
-          # Set the permalink defaul to /en/feed/[type]
+          # Set the permalink defaul to /[lang]/feed/[type]
           permalink = File.join("/#{lang}", "feed", feed_type(page), '/')
 
           # Create a copy of the page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink