jekyll-contentful 0.1.4 → 0.1.5.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637ee259884f12976d992cafd510bc4f1afb0a86
-  data.tar.gz: a979832be89ce18ad4d143e838fb080d118b25ec
+  metadata.gz: 1da7a9d5781e7e2b4e4e3df79d1dc3cbd64c24aa
+  data.tar.gz: 3481be3efe344fe79dcec661c54a551c7e6c5ff2
 SHA512:
-  metadata.gz: a917a98be702cd8099132fba82fab900b2767c7e8fb9e57ec7d46f0eca6bc1aafa1d2459e6cb5578294b18c53970afb939ccede3262db57e15bc5aabd71fc0cb
-  data.tar.gz: f2aaa90fc7e0024c3c1082c0042ee60820bfda7fc02fa201580930ba6fb635b1bd07443d742ec24fdffbedeb938e46e2ab9d6a8e43de70811bebaae55f9f6de5
+  metadata.gz: 048abc0e3b9a9ef9a00bcf73104cae4cec0f555f826f47b640dcc17853824fada1d7f81f28793d01025cf8821f008e65cf2751fe243885ec9cd396d988ffd132
+  data.tar.gz: fc35a1bf337cae4fcf13c8bf7bd40a56bf9a4ca0e821571b32ff37f091b8b829f929fec967f2090d4bee40eee09c492d85a7d7be4c1d61de95e0c22b744e5c2b

data/README.md

@@ -31,6 +31,7 @@ gems: [jekyll-contentful]
 
 Configure in your _config.yml file
 
+
 ```yaml
 contentful:
   preview: No 
@@ -40,6 +41,7 @@ contentful:
   content_types:
    - "First Content Type"
    - "Second Content Type"
+  published_locales_field: "published_languages"
   localization:
   - locale: en-US
     url_prefix: ""
@@ -47,15 +49,32 @@ contentful:
   - locale: de-DE
     url_prefix: "de/"
     lang: "Deutsch"
-```       
+```
+
 
+### Translations
+You can globally specify the languages/locales that you want to generate pages for.
+See the ``localization`` array in the ``_config.yml`` example above. You need to set the ``locale``, a string that this locale's urls will be prefixed with (``url_prefix``) and the language name (``lang``). The ``lang`` setting is used by the language switcher.
 
 #### Language switcher
 you can use the tag ``{% language_switcher %}`` in your templates to insert a link to the translations of the current page.
 
+#### Selective Translations
+By default the plugin will – for every entry – generate a page for every locale you specified in your ``_config.yml``.
+
+You can also **specify** which **locales** should be published **on the entry level**:
+
+1. Add a Content Type called "Languages" to your space (you can name it differently).
+2. Add a field called "locale" to that content type (this field has to be called "locale" and nothing else).
+3. Add an entry of that content type for every locale you have enabled in your space. Set those entries' "locale" field accordingly.
+4. Add a reference field (many) to the content type you want to selectively translate. Call it "published_languages" (you can name it differently but it has to match the name in the next step). Set the validations to allow only the content type "Languages" to be referenced.
+5. Add ``published_locales_field: "published_languages"`` in the ``contentful:``section of your ``_config.yml``
+
+Now for every entry you can specify the languages you want to generate pages for by adding them to your entries "published_languages" list.
 
 #### Content Fields:
-All Entry fields can be used inside the layout templates as {{ page.fieldname }}
+All Entry fields can be used inside the layout templates as ``{{ page.fieldname }}``.
+The plugin adds two fields to pages generated from Contentful entries: ``{ page.contentful_id }}`` and ``{{ page.locale }}``.
   
 #### ULRs and Layouts: 
   

data/lib/jekyll-contentful.rb

@@ -60,19 +60,23 @@ module Jekyll
         throw "Content_type \'#{content_type_name}\' does not exist." if content_type.nil? 
 
         
-        localization = site.config['contentful']['localization'] || [{locale: nil, url_prefix: ""}]      
-        
-        # Get all entries of content type
-
-
+        localization = site.config['contentful']['localization'] || [{locale: nil, url_prefix: ""}]
         localization.each do |loc|
+
           entries = client.entries(content_type: content_type.id, locale: loc["locale"], limit: 1000)
+
           entries.each do |entry|
-            site.pages << ContentfulEntryPage.new(site, entry, content_type_name, "#{loc['url_prefix']}") unless entry.fields.nil?
+              next if entry.fields.nil?
+              
+              pub_langs = entry.fields[site.config['contentful']['published_locales_field'].to_sym]
+
+              if pub_langs.nil? or pub_langs.map{|x| x.fields[:locale]}.include?(loc["locale"])
+                site.pages << ContentfulEntryPage.new(site, entry, content_type_name, "#{loc['url_prefix']}")
+              end
+               
           end
         end
 
-
       end
     end
   end

data/lib/jekyll-contentful/language_switcher_tag.rb

@@ -16,19 +16,21 @@ module Jekyll
         that_page["contentful_id"] == this_page["contentful_id"] and that_page["locale"] != this_page["locale"]
       end
 
-      if translated_pages.length > 1
+      if translated_pages.length == 0
+        return
+      elsif translated_pages.length > 1
         list = translated_pages.dup.map do |tp|
           "<li translation-item>#{anchor(tp)}</li>"
         end.join(' ,')
         return "<ul class='translation-list'>#{list}</uL>"
-      else
+      elsif translated_pages.length == 1
         return anchor(translated_pages[0])
       end
     end
 
     def anchor(page)
-      lang = @site.config['contentful']['localization'].detect{ |loc| loc["locale"] == page['locale']}["lang"]
-      "<a class='translation-link lang-#{page['locale']}' href='#{ page['url']}'>#{ lang }</a>"
+      localization = @site.config['contentful']['localization'].detect{ |loc| loc["locale"] == page['locale']}
+      "<a class='translation-link lang-#{page['locale']}' href='#{ page['url']}'>#{ localization["lang"] }</a>"
     end
   end
 end

data/lib/jekyll-contentful/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Contentful
-    VERSION = "0.1.4"
+    VERSION = "0.1.5.pre2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentful
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5.pre2
 platform: ruby
 authors:
 - Dommmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -97,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5