octopress-feeds 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71bee0e15a5b3f5e34b414c4c2c6d89e8c06bb89
-  data.tar.gz: 34990d035956040f710ecbd122834cf9d6677fb1
+  metadata.gz: 7d307a33c33e838bbe81f6193b41804f7308e912
+  data.tar.gz: dd85e6ed168dd55d82f2a60747656d1970fde500
 SHA512:
-  metadata.gz: 4f20f380fc274eef3c11dca8dfbaefba9b96830a0b03eb3af0613f4b552b467ccda5f264733cd279d566d22c3ffe05706eeecc151ac906cd6d8d54fd9aa434b6
-  data.tar.gz: d5e973edb2bfa19ac32f6b6061d38e128196556e862f7d626bfb4d84d40460b7db8568d8c3571e9c59db78b9bf9933524b73383380b134085de76089f5c272ac
+  metadata.gz: 1ab992ed2c4439b5dcba3e4726465bcb6145bb04b183abe41dee41f91c7a66d1520e3e2367d915131f8ef24562e3c0b6808bbdc26f88b52c3c6b91c8f0a72fcf
+  data.tar.gz: cf1df6581d4bb85c229a2475ab3373e66ee78f852c0081fb0987851283e0f1026f030982da1772e3d3790c08e96ab2a14d9e8ab6f17f73730e8f24934e97f3d7

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+### 1.2.7 (2015-01-31)
+
+- Added support for new octopress-multilingual page.lang feature.
+
 ### 1.2.6 (2015-01-27)
 
-- On multilanguage sites, the main language feed URL will default to `/[lang]/feed/index.xml`
+- On multilingual sites, the main language feed URL will default to `/[lang]/feed/index.xml`
 
 ### 1.2.5 (2015-01-26)
 

data/README.md

@@ -86,8 +86,9 @@ First, create a page at `/de/feed/index.xml` (or whatever path suits your site's
 ---
 feed: true
 title: Deutsch feed
+lang: de
 ---
-{% include feeds:main-feed.xml lang='de' %}
+{% include feeds:main-feed.xml %}
 ```
 
 The page config, `feed: true` ensures that it will be added to your site's feed listing with `{% feed_tag %}`. The title, as you'd
@@ -101,8 +102,9 @@ To create an articles feed, add a file to `/de/feed/articles/index.xml` (or wher
 ---
 feed:true
 title: Deutsch Artikel Feed
+lang: de
 ---
-{% include feeds:article-feed.xml lang='de' %}
+{% include feeds:article-feed.xml %}
 ```
 
 To add a link-posts feed, add a file to `/de/feed/links/index.xml` containing the following:
@@ -111,8 +113,9 @@ To add a link-posts feed, add a file to `/de/feed/links/index.xml` containing th
 ---
 feed:true
 title: Deutsch Link Feed
+lang: de
 ---
-{% include feeds:article-feed.xml lang='de' %}
+{% include feeds:article-feed.xml %}
 ```
 
 That's it. When you generate your site. These feeds should contain only German posts. If you have more than one language, you can just repeat the steps above for each.

data/assets/includes/article-feed.xml

@@ -1,7 +1,7 @@
-{% assign feed_type = 'articles' %}{% set_lang include.lang %}{% include feeds:head.xml %}
+{% assign feed_type = 'articles' %}{% include feeds:head.xml %}
 {% for post in site.articles limit:plugins.feeds.count %}
   <entry>
     {% include feeds:entry.xml %}
   </entry>
 {% endfor %}
-</feed>{% endset_lang %}
+</feed>

data/assets/includes/entry.xml

@@ -12,7 +12,7 @@
       <name>{% return post.author || site.author %}</name>
       <uri>{% if post.author_site %}{{ post.author_site }}{% else %}{{ site.url | join_url: site.baseurl }}{% endif %}</uri>
     </author>
-    <content type="html" xml:base="{{ site.url | join_url: site.baseurl }}" xml:lang="{% return site.lang || 'en' %}">
+    <content type="html" xml:base="{{ site.url | join_url: site.baseurl }}" {% if page.lang %}xml:lang="{{ page.lang }}"{% endif %}>
 <![CDATA[
 {% if plugins.feeds.excerpts == false or post.linkpost %}
 {{ post.content | full_urls }}

data/assets/includes/head.xml

@@ -6,5 +6,5 @@
   <id>{{ site.url | join_url: site.baseurl }}</id>
   <updated>{% feed_updated_date %}</updated>
   <generator uri="http://octopress.org/">Octopress</generator>
-  <language>{% return site.lang || 'en' %}</language>
+  {% if page.lang %}<language>{{ page.lang }}</language>{% endif %}
   <rights>Copyright © {{ site.time | date: '%Y' }}, {{ site.author | strip_html }}</rights>

data/assets/includes/link-feed.xml

@@ -1,7 +1,7 @@
-{% assign feed_type = 'linkposts' %}{% set_lang include.lang %}{% include feeds:head.xml %}
+{% assign feed_type = 'linkposts' %}{% include feeds:head.xml %}
 {% for post in site.linkposts limit:plugins.feeds.count %}
   <entry>
     {% include feeds:entry.xml %}
   </entry>
 {% endfor %}
-</feed>{% endset_lang %}
+</feed>

data/assets/includes/main-feed.xml

@@ -1,7 +1,7 @@
-{% assign feed_type = 'posts' %}{% set_lang include.lang %}{% include feeds:head.xml %}
+{% assign feed_type = 'posts' %}{% include feeds:head.xml %}
 {% for post in site.posts limit:plugins.feeds.count %}
   <entry>
     {% include feeds:entry.xml %}
   </entry>
 {% endfor %}
-</feed>{% endset_lang %}
+</feed>

data/assets/pages/article-feed.xml

@@ -2,5 +2,6 @@
 permalink: /feed/articles/
 title: Articles Feed
 feed: true
+lang: en
 ---
 {% include feeds:article-feed.xml %}

data/assets/pages/link-feed.xml

@@ -2,5 +2,6 @@
 permalink: /feed/links/
 title: Links Feed
 feed: true
+lang: en
 ---
 {% include feeds:link-feed.xml %}

data/assets/pages/main-feed.xml

@@ -2,5 +2,6 @@
 permalink: /feed/
 title: Main Feed
 feed: true
+lang: en
 ---
 {% include feeds:main-feed.xml %}

data/lib/octopress-feeds/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Feeds
-    VERSION = "1.2.6"
+    VERSION = "1.2.7"
   end
 end

metadata

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