Merge branch 'master' into doit-0.28.0

Conflicts: CHANGES.txt
getnikola · Apr 24, 2015 · 6eb3702 · 6eb3702
2 parents 8e12971 + 4e983b8
commit 6eb3702
Show file tree

Hide file tree

Showing 23 changed files with 166 additions and 98 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,7 @@ Features
 --------
 
 * Compatibility with doit v0.28.0 (Issue #1655)
+* New translations (az, fil, tl, uk, zh_TW)
 * Add reStructuredText transform support (Issue #1647)
 * Produce Unicode output in ``nikola init`` (via Issue #1644)
 * Add ``HIDDEN_TAGS`` and ``HIDDEN_CATEGORIES`` settings to hide some
@@ -16,6 +17,9 @@ Features
 Bugfixes
 --------
 
+* Make ``images`` the default output directory for IMAGE_FOLDERS
+  (Issue #1663)
+* Don't default to any swatch in bootswatch_theme (Issue #1656)
 * Fix ``nikola check -l`` for absolute and full-path URL styles
   (Issue #1650)
 * Really add missing trailing slashes in ``BASE_URL`` (Issue #1651)
@@ -29,6 +33,12 @@ Bugfixes
 * Listings in posts now work in Windows (Issue #1631)
 * Add 20 seconds to reading time per embedded media
 
+New in v7.3.1.1
+===============
+
+* Emergency release to pin doit version to 0.27.0
+* No code changes since v7.3.1 (not even ``nikola --version``)
+
 New in v7.3.1
 =============
 

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -538,6 +538,9 @@ to your configuration::
 
        That template needs to either be part of the theme, or be placed in a ``templates/``
        folder inside your site.
+
+    enclosure
+        Add an enclosure to this post when it's used in RSS. See `more information about enclosures <http://en.wikipedia.org/wiki/RSS_enclosure>`__
 
 .. note:: The Two-File Format
 

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -436,7 +436,7 @@ REDIRECTIONS = ${REDIRECTIONS}
 # to be visible on the site. The format is a dictionary of {source:
 # relative destination}.
 #
-# IMAGE_FOLDERS = {'images': ''}
+IMAGE_FOLDERS = {'images': 'images'}
 # IMAGE_THUMBNAIL_SIZE = 400
 
 # #############################################################################
@@ -488,8 +488,35 @@ REDIRECTIONS = ${REDIRECTIONS}
 
 # Color scheme to be used for code blocks. If your theme provides
 # "assets/css/code.css" this is ignored.
-# Can be any of autumn borland bw colorful default emacs friendly fruity manni
-# monokai murphy native pastie perldoc rrt tango trac vim vs
+# Can be any of:
+# algol
+# algol_nu
+# arduino
+# autumn 
+# borland 
+# bw 
+# colorful 
+# default 
+# emacs 
+# friendly 
+# fruity 
+# igor
+# lovelace
+# manni
+# monokai 
+# murphy 
+# native 
+# paraiso_dark
+# paraiso_light
+# pastie 
+# perldoc 
+# rrt 
+# tango 
+# trac 
+# vim 
+# vs
+# xcode
+# This list MAY be incomplete since pygments adds styles every now and then.
 # CODE_COLOR_SCHEME = 'default'
 
 # If you use 'site-reveal' theme you can select several subthemes

diff --git a/nikola/data/themes/base/assets/js/mathjax.js b/nikola/data/themes/base/assets/js/mathjax.js
@@ -5,12 +5,7 @@
 window.onload = function () {
   setTimeout(function () {
     var script = document.createElement("script");
-    if (location.protocol == 'https:') {
-        scriptbase = "https://c328740.ssl.cf1.rackcdn.com/";
-    } else {
-        scriptbase = "http://cdn.mathjax.org/";
-    }
-    script.src  = scriptbase + "mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+    script.src  = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
     document.getElementsByTagName("body")[0].appendChild(script);
   },1)
 }
diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py
@@ -6,23 +6,23 @@
     "Also available in:": "Διαθέσιμο και στα:",
     "Archive": "Αρχείο",
     "Categories": "Κατηγορίες",
-    "Comments": "",
+    "Comments": "Σχόλια",
     "LANGUAGE": "Ελληνικά",
-    "Languages:": "",
+    "Languages:": "Γλώσσες",
     "More posts about %s": "Περισσότερες αναρτήσεις για %s",
     "Newer posts": "Νεότερες αναρτήσεις",
     "Next post": "Επόμενη ανάρτηση",
-    "No posts found.": "",
-    "Nothing found.": "",
+    "No posts found.": "Δε βρέθηκαν αναρτήσεις",
+    "Nothing found.": "Δε βρέθηκε περιεχόμενο",
     "Older posts": "Παλαιότερες αναρτήσεις",
     "Original site": "Ιστοσελίδα αρχικής ανάρτησης",
     "Posted:": "Αναρτήθηκε:",
     "Posts about %s": "Αναρτήσεις για %s",
     "Posts for year %s": "Αναρτήσεις για το έτος %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "Αναρτήσεις στις {day} {month}, {year}",
     "Posts for {month} {year}": "Αναρτήσεις για τον {month} του {year}",
     "Previous post": "Προηγούμενη ανάρτηση",
-    "Publication date": "",
+    "Publication date": "Ημερομηνία δημοσίευσης",
     "RSS feed": "",
     "Read in English": "Διαβάστε στα Ελληνικά",
     "Read more": "Διαβάστε περισσότερα",

diff --git a/nikola/data/themes/base/messages/messages_fa.py b/nikola/data/themes/base/messages/messages_fa.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
+    "%d min remaining to read": "%d دقیقه برای خواندن باقی مانده",
     "Also available in:": "همچنین قابل دسترس از:",
     "Archive": "آرشیو",
     "Categories": "دسته‌ها",
@@ -19,14 +19,14 @@
     "Posted:": "ارسال شده:",
     "Posts about %s": "ارسال‌ها دربارهٔ %s",
     "Posts for year %s": "ارسال‌ها برای سال %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "ارسال برای {month} {day}. {year}",
     "Posts for {month} {year}": "ارسال برای {month} {year}",
     "Previous post": "ارسال پیشین",
     "Publication date": "تاریخ انتشار",
     "RSS feed": "خوراک",
     "Read in English": "به فارسی بخوانید",
     "Read more": "بیشتر بخوانید",
-    "Skip to main content": "",
+    "Skip to main content": "متن اصلی را نادیده بگیر",
     "Source": "منبع",
     "Tags and Categories": "برچسب‌ها و دسته‌ها",
     "Tags": "برچسب‌ها",

diff --git a/nikola/data/themes/base/messages/messages_fr.py b/nikola/data/themes/base/messages/messages_fr.py
@@ -3,23 +3,23 @@
 
 MESSAGES = {
     "%d min remaining to read": "Il reste encore %d min. de lecture",
-    "Also available in:": "Egalement disponible en:",
+    "Also available in:": "Également disponible en:",
     "Archive": "Archives",
     "Categories": "Catégories",
     "Comments": "Commentaires",
     "LANGUAGE": "Français",
     "Languages:": "Langues:",
     "More posts about %s": "Plus d'articles sur %s",
-    "Newer posts": "Billets récents",
+    "Newer posts": "Articles récents",
     "Next post": "Article suivant",
-    "No posts found.": "Pas de billets.",
+    "No posts found.": "Pas d'articles.",
     "Nothing found.": "Pas de résultats.",
     "Older posts": "Anciens articles",
     "Original site": "Site d'origine",
     "Posted:": "Publié:",
     "Posts about %s": "Articles sur %s",
     "Posts for year %s": "Articles de l'année %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "Articles du {day} {month} {year}",
     "Posts for {month} {year}": "Articles de {month} {year}",
     "Previous post": "Article précédent",
     "Publication date": "Date de publication",

diff --git a/nikola/data/themes/base/messages/messages_hi.py b/nikola/data/themes/base/messages/messages_hi.py
@@ -2,31 +2,31 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
+    "%d min remaining to read": "पढ़ने में %d मिनट बाकी",
     "Also available in:": "उपलब्ध भाषाएँ:",
     "Archive": "आर्काइव",
     "Categories": "श्रेणियाँ",
-    "Comments": "",
+    "Comments": "टिप्पणियाँ",
     "LANGUAGE": "हिन्दी",
-    "Languages:": "",
+    "Languages:": "भाषाएँ:",
     "More posts about %s": "%s के बारे में अौर पोस्टें",
     "Newer posts": "नई पोस्टें",
     "Next post": "अगली पोस्ट",
-    "No posts found.": "",
-    "Nothing found.": "",
+    "No posts found.": "कोई पोस्ट नहीं मिल सकी",
+    "Nothing found.": "कुछ नहीं मिल सका",
     "Older posts": "पुरानी पोस्टें",
     "Original site": "असली साइट",
     "Posted:": "पोस्टेड:",
     "Posts about %s": "%s के बारे में पोस्टें",
     "Posts for year %s": "साल %s की पोस्टें",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "{day} {month} {year} की पोस्टें",
     "Posts for {month} {year}": "{month} {year} की पोस्टें",
     "Previous post": "पिछली पोस्ट",
-    "Publication date": "",
-    "RSS feed": "",
+    "Publication date": "प्रकाशन की तारीख",
+    "RSS feed": "आर एस एस फ़ीड",
     "Read in English": "हिन्दी में पढ़िए",
     "Read more": "और पढ़िए",
-    "Skip to main content": "",
+    "Skip to main content": "मुख्य सामग्री पर जाएँ",
     "Source": "सोर्स",
     "Tags and Categories": "टैग्स और श्रेणियाँ",
     "Tags": "टैग्स",

diff --git a/nikola/data/themes/base/messages/messages_ja.py b/nikola/data/themes/base/messages/messages_ja.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 MESSAGES = {
-    "%d min remaining to read": "",
+    "%d min remaining to read": "読込むまで残り %d 分",
     "Also available in:": "他の言語で読む：",
     "Archive": "過去の記事",
     "Categories": "カテゴリー",
@@ -19,14 +19,14 @@
     "Posted:": "投稿日時：",
     "Posts about %s": "%sについての記事",
     "Posts for year %s": "%s年の記事",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "{year}年{month}月{day}日の記事",
     "Posts for {month} {year}": "{year}年{month}月の記事",
     "Previous post": "前の記事",
     "Publication date": "投稿日",
     "RSS feed": "RSS フィード",
     "Read in English": "日本語で読む",
     "Read more": "続きを読む",
-    "Skip to main content": "",
+    "Skip to main content": "メインコンテンツをスキップ",
     "Source": "ソース",
     "Tags and Categories": "タグとカテゴリー",
     "Tags": "タグ",

diff --git a/nikola/data/themes/base/messages/messages_sl.py b/nikola/data/themes/base/messages/messages_sl.py
@@ -19,7 +19,7 @@
     "Posted:": "Objavljeno:",
     "Posts about %s": "Objave o %s",
     "Posts for year %s": "Objave za leto %s",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "Objave za {day}. {month}, {year}",
     "Posts for {month} {year}": "Objave za {month} {year}",
     "Previous post": "Prejšnja objava",
     "Publication date": "Datum objave",

diff --git a/nikola/data/themes/base/messages/messages_tr.py b/nikola/data/themes/base/messages/messages_tr.py
@@ -19,7 +19,7 @@
     "Posted:": "Yayın tarihi:",
     "Posts about %s": "%s ile ilgili yazılar",
     "Posts for year %s": "%s yılındaki yazılar",
-    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {day}, {year}": "{month} {day}, {year} 'den beri olan yazılar",
     "Posts for {month} {year}": "{month} {year} göre yazılar",
     "Previous post": "Önceki yazı",
     "Publication date": "Yayınlanma tarihi",

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -98,6 +98,7 @@
     ],
     'TRANSLATIONS': {
         'ar': 'Arabic',
+        'az': 'Azerbaijani',
         'bg': 'Bulgarian',
         'ca': 'Catalan',
         ('cs', 'cz'): 'Czech',
@@ -111,6 +112,7 @@
         'eu': 'Basque',
         'fa': 'Persian',
         'fi': 'Finnish',
+        'fil': 'Filipino',
         'fr': 'French',
         'hi': 'Hindi',
         'hr': 'Croatian',
@@ -128,16 +130,20 @@
         'sr': 'Serbian (Cyrillic)',
         'sv': 'Swedish',
         ('tr', '!tr_TR'): 'Turkish',
+        'tl': 'Tagalog',
         'ur': 'Urdu',
+        'uk': 'Ukrainian',
         'zh_cn': 'Chinese (Simplified)',
+        'zh_TW': 'Chinese (Taiwan)',
     },
     '_TRANSLATIONS_WITH_COUNTRY_SPECIFIERS': {
         # This dict is used in `init` in case of locales that exist with a
         # country specifier.  If there is no other locale that has the same
         # language with a different country, ``nikola init`` (but nobody else!)
         # will accept it, warning the user about it.
         'pt': 'pt_br',
-        'zh': 'zh_cn'
+        'zh': 'zh_cn',
+        'zh': 'zh_TW'
     },
     'RTL_LANGUAGES': ('ar', 'fa', 'ur'),
     'COLORBOX_LOCALES': defaultdict(

diff --git a/nikola/plugins/command/bootswatch_theme.py b/nikola/plugins/command/bootswatch_theme.py
@@ -26,6 +26,7 @@
 
 from __future__ import print_function
 import os
+import sys
 
 try:
     import requests
@@ -57,7 +58,7 @@ class CommandBootswatchTheme(Command):
         {
             'name': 'swatch',
             'short': 's',
-            'default': 'slate',
+            'default': '',
             'type': str,
             'help': 'Name of the swatch from bootswatch.com.'
         },
@@ -77,6 +78,9 @@ def _execute(self, options, args):
 
         name = options['name']
         swatch = options['swatch']
+        if not swatch:
+            LOGGER.error('The -s option is mandatory')
+            sys.exit(1)
         parent = options['parent']
         version = ''
 

diff --git a/nikola/plugins/task/rss.py b/nikola/plugins/task/rss.py
@@ -75,9 +75,9 @@ def gen_tasks(self):
             deps = []
             deps_uptodate = []
             if kw["show_untranslated_posts"]:
-                posts = self.site.posts[:10]
+                posts = self.site.posts[:kw['feed_length']]
             else:
-                posts = [x for x in self.site.posts if x.is_translation_available(lang)][:10]
+                posts = [x for x in self.site.posts if x.is_translation_available(lang)][:kw['feed_length']]
             for post in posts:
                 deps += post.deps(lang)
                 deps_uptodate += post.deps_uptodate(lang)

diff --git a/nikola/plugins/task/tags.py b/nikola/plugins/task/tags.py
@@ -263,8 +263,10 @@ def tag_page_as_list(self, tag, lang, post_list, kw, is_category):
         context["tag"] = tag
         context["kind"] = kind
         context["description"] = None
-        if lang in kw["tag_pages_descriptions"] and tag in kw["tag_pages_descriptions"][lang]:
-            context["description"] = kw["tag_pages_descriptions"][lang][tag]
+        descriptions = (kw["category_pages_descriptions"] if is_category
+                        else kw["tag_pages_descriptions"])
+        if lang in descriptions and tag in descriptions[lang]:
+            context["description"] = descriptions[lang][tag]
         task = self.site.generic_post_list_renderer(
             lang,
             post_list,

diff --git a/setup.py b/setup.py
@@ -112,7 +112,7 @@ def run(self):
 
 
 setup(name='Nikola',
-      version='7.3.1',
+      version='7.3.1.1',
       description='A modular, fast, simple, static website generator',
       long_description=open('README.rst').read(),
       author='Roberto Alsina and others',