Merge branch 'master' into smarter-CDN

getnikola · May 5, 2015 · 2f5743b · 2f5743b
2 parents 1d24dfd + 8c2c32b
commit 2f5743b
Show file tree

Hide file tree

Showing 20 changed files with 822 additions and 15 deletions.
diff --git a/bower_components/jquery/.bower.json b/bower_components/jquery/.bower.json
@@ -1,11 +1,12 @@
 {
   "name": "jquery",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "main": "dist/jquery.js",
   "license": "MIT",
   "ignore": [
     "**/.*",
     "build",
+    "dist/cdn",
     "speed",
     "test",
     "*.md",
@@ -25,11 +26,11 @@
     "library"
   ],
   "homepage": "https://github.com/jquery/jquery",
-  "_release": "1.11.2",
+  "_release": "1.11.3",
   "_resolution": {
     "type": "version",
-    "tag": "1.11.2",
-    "commit": "9690801db01709bfbff5f977d07fb7cc14472908"
+    "tag": "1.11.3",
+    "commit": "1472290917f17af05e98007136096784f9051fab"
   },
   "_source": "git://github.com/jquery/jquery.git",
   "_target": "<2.0.0",

diff --git a/bower_components/jquery/bower.json b/bower_components/jquery/bower.json
@@ -1,11 +1,12 @@
 {
   "name": "jquery",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "main": "dist/jquery.js",
   "license": "MIT",
   "ignore": [
     "**/.*",
     "build",
+    "dist/cdn",
     "speed",
     "test",
     "*.md",

diff --git a/bower_components/jquery/dist/jquery.js b/bower_components/jquery/dist/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.11.2
+ * jQuery JavaScript Library v1.11.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-12-17T15:27Z
+ * Date: 2015-04-28T16:19Z
  */
 
 (function( global, factory ) {
@@ -64,7 +64,7 @@ var support = {};
 
 
 var
-	version = "1.11.2",
+	version = "1.11.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -569,7 +569,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
 });
 
 function isArraylike( obj ) {
-	var length = obj.length,
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = "length" in obj && obj.length,
 		type = jQuery.type( obj );
 
 	if ( type === "function" || jQuery.isWindow( obj ) ) {

diff --git a/bower_components/jquery/dist/jquery.min.js b/bower_components/jquery/dist/jquery.min.js
diff --git a/bower_components/jquery/dist/jquery.min.map b/bower_components/jquery/dist/jquery.min.map
diff --git a/bower_components/jquery/src/core.js b/bower_components/jquery/src/core.js
@@ -516,7 +516,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
 });
 
 function isArraylike( obj ) {
-	var length = obj.length,
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = "length" in obj && obj.length,
 		type = jQuery.type( obj );
 
 	if ( type === "function" || jQuery.isWindow( obj ) ) {

diff --git a/nikola/data/themes/base/messages/messages_az.py b/nikola/data/themes/base/messages/messages_az.py
@@ -0,0 +1,35 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "%d dəqiqəlik oxuma",
+    "Also available in:": "Həmçinin mövcuddur:",
+    "Archive": "Arxiv",
+    "Categories": "Kateqoriyalar",
+    "Comments": "Şərhlər",
+    "LANGUAGE": "Azərbaycan dili",
+    "Languages:": "Dillər:",
+    "More posts about %s": "%s ilə bağlı digər yazılar",
+    "Newer posts": "Yeni yazılar",
+    "Next post": "Növbəti yazı",
+    "No posts found.": "Heç bir yazı tapılmadı",
+    "Nothing found.": "Heç nə tapılmadı",
+    "Older posts": "Köhnə yazılar",
+    "Original site": "Original sayt",
+    "Posted:": "yazılma tarixi:",
+    "Posts about %s": "%s ilə bağlı yazılar",
+    "Posts for year %s": "%s ilindəki yazılar",
+    "Posts for {month} {day}, {year}": "{month} {day}, {year} üçün yazılar",
+    "Posts for {month} {year}": "{month} {year} üçün yazılar",
+    "Previous post": "Əvvəlki yazı",
+    "Publication date": "Buraxılış tarixi",
+    "RSS feed": "RSS",
+    "Read in English": "Azərbaycan dilində oxu",
+    "Read more": "Davamı",
+    "Skip to main content": "Əsas mövzuya keç",
+    "Source": "Mənbə",
+    "Tags and Categories": "Teqlər və Kateqoriyalar",
+    "Tags": "Teqlər",
+    "old posts, page %d": "köhnə yazılar, səhifə %s",
+    "page %d": "səhifə %d",
+}
diff --git a/nikola/data/themes/base/messages/messages_fil.py b/nikola/data/themes/base/messages/messages_fil.py
@@ -0,0 +1,35 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "",
+    "Also available in:": "",
+    "Archive": "",
+    "Categories": "",
+    "Comments": "",
+    "LANGUAGE": "",
+    "Languages:": "",
+    "More posts about %s": "",
+    "Newer posts": "",
+    "Next post": "",
+    "No posts found.": "",
+    "Nothing found.": "",
+    "Older posts": "",
+    "Original site": "",
+    "Posted:": "",
+    "Posts about %s": "",
+    "Posts for year %s": "",
+    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {year}": "",
+    "Previous post": "",
+    "Publication date": "",
+    "RSS feed": "",
+    "Read in English": "",
+    "Read more": "",
+    "Skip to main content": "",
+    "Source": "",
+    "Tags and Categories": "",
+    "Tags": "",
+    "old posts, page %d": "",
+    "page %d": "",
+}
diff --git a/nikola/data/themes/base/messages/messages_tl.py b/nikola/data/themes/base/messages/messages_tl.py
@@ -0,0 +1,35 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "",
+    "Also available in:": "",
+    "Archive": "",
+    "Categories": "",
+    "Comments": "",
+    "LANGUAGE": "Ingles",
+    "Languages:": "Mga Wika:",
+    "More posts about %s": "",
+    "Newer posts": "",
+    "Next post": "Susunod",
+    "No posts found.": "",
+    "Nothing found.": "",
+    "Older posts": "",
+    "Original site": "",
+    "Posted:": "",
+    "Posts about %s": "",
+    "Posts for year %s": "",
+    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {year}": "",
+    "Previous post": "",
+    "Publication date": "",
+    "RSS feed": "",
+    "Read in English": "",
+    "Read more": "",
+    "Skip to main content": "",
+    "Source": "",
+    "Tags and Categories": "",
+    "Tags": "Mga Tag",
+    "old posts, page %d": "",
+    "page %d": "",
+}
diff --git a/nikola/data/themes/base/messages/messages_uk.py b/nikola/data/themes/base/messages/messages_uk.py
@@ -0,0 +1,35 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "Залишилось читати %d хвилин",
+    "Also available in:": "Іншою мовою:",
+    "Archive": "Архів",
+    "Categories": "Категорії",
+    "Comments": "Коментарі",
+    "LANGUAGE": "Українська",
+    "Languages:": "Мови:",
+    "More posts about %s": "Більше статей про  %s",
+    "Newer posts": "Нові статті",
+    "Next post": "Наступна стаття",
+    "No posts found.": "Не знайдено жодної статті",
+    "Nothing found.": "Нічого не знайдено",
+    "Older posts": "Більш старі статті",
+    "Original site": "Оригінал сайту",
+    "Posted:": "Опублікована:",
+    "Posts about %s": "Статті про %s",
+    "Posts for year %s": "Статті за %s рік",
+    "Posts for {month} {day}, {year}": "Статті за {month} {day}, {year}",
+    "Posts for {month} {year}": "Статті за {month} {year}",
+    "Previous post": "Попередня стаття",
+    "Publication date": "Дата публікації",
+    "RSS feed": "RSS-стрічка",
+    "Read in English": "Читати українською",
+    "Read more": "Читати далі",
+    "Skip to main content": "Перейти до основного матеріалу",
+    "Source": "Джерело",
+    "Tags and Categories": "Теги і категорії",
+    "Tags": "Теги",
+    "old posts, page %d": "старі статті, сторінка %d",
+    "page %d": "сторінка %d",
+}
diff --git a/nikola/data/themes/base/messages/messages_zh_tw.py b/nikola/data/themes/base/messages/messages_zh_tw.py
@@ -0,0 +1,35 @@
+# -*- encoding:utf-8 -*-
+from __future__ import unicode_literals
+
+MESSAGES = {
+    "%d min remaining to read": "",
+    "Also available in:": "",
+    "Archive": "",
+    "Categories": "",
+    "Comments": "",
+    "LANGUAGE": "",
+    "Languages:": "",
+    "More posts about %s": "",
+    "Newer posts": "",
+    "Next post": "",
+    "No posts found.": "",
+    "Nothing found.": "",
+    "Older posts": "",
+    "Original site": "",
+    "Posted:": "",
+    "Posts about %s": "",
+    "Posts for year %s": "",
+    "Posts for {month} {day}, {year}": "",
+    "Posts for {month} {year}": "",
+    "Previous post": "",
+    "Publication date": "",
+    "RSS feed": "",
+    "Read in English": "",
+    "Read more": "",
+    "Skip to main content": "",
+    "Source": "",
+    "Tags and Categories": "",
+    "Tags": "",
+    "old posts, page %d": "",
+    "page %d": "",
+}
diff --git a/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap-jinja/templates/base_helper.tmpl
@@ -160,6 +160,15 @@ lang="{{ lang }}">
             <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}">
         {% endif %}
     {% endif %}
+    {% if generate_atom %}
+        {% if translations|length > 1 %}
+            {% for language in translations %}
+                <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
+            {% endfor %}
+        {% else %}
+            <link rel="alternate" type="application/atom+xml" title="Atom" href="{{ _link('index_atom', None) }}">
+        {% endif %}
+    {% endif %}
 {% endmacro %}
 
 {% macro html_translations() %}

diff --git a/nikola/data/themes/bootstrap/templates/base_helper.tmpl b/nikola/data/themes/bootstrap/templates/base_helper.tmpl
@@ -160,6 +160,15 @@ lang="${lang}">
             <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
         %endif
     %endif
+    %if generate_atom:
+        %if len(translations) > 1:
+            %for language in translations:
+                <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
+            %endfor
+        %else:
+            <link rel="alternate" type="application/atom+xml" title="Atom" href="${_link('index_atom', None)}">
+        %endif
+    %endif
 </%def>
 
 <%def name="html_translations()">

diff --git a/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
@@ -147,6 +147,15 @@ lang="{{ lang }}">
             <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ _link('rss', None) }}">
         {% endif %}
     {% endif %}
+    {% if generate_atom %}
+        {% if translations|length > 1 %}
+            {% for language in translations %}
+                <link rel="alternate" type="application/atom+xml" title="Atom ({{ language }})" href="{{ _link('index_atom', None, language) }}">
+            {% endfor %}
+        {% else %}
+            <link rel="alternate" type="application/atom+xml" title="Atom" href="{{ _link('index_atom', None) }}">
+        {% endif %}
+    {% endif %}
 {% endmacro %}
 
 {% macro html_translations() %}

diff --git a/nikola/data/themes/bootstrap3/templates/base_helper.tmpl b/nikola/data/themes/bootstrap3/templates/base_helper.tmpl
@@ -147,6 +147,15 @@ lang="${lang}">
             <link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
         %endif
     %endif
+    %if generate_atom:
+        %if len(translations) > 1:
+            %for language in translations:
+                <link rel="alternate" type="application/atom+xml" title="Atom (${language})" href="${_link('index_atom', None, language)}">
+            %endfor
+        %else:
+            <link rel="alternate" type="application/atom+xml" title="Atom" href="${_link('index_atom', None)}">
+        %endif
+    %endif
 </%def>
 
 <%def name="html_translations()">