Merge branch 'master' into patch-1

.travis.yml

@@ -1,15 +1,20 @@
 language: python
-python: 2.7
-env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-  - TOX_ENV=squeeze
-  - TOX_ENV=wheezy
 matrix:
   allow_failures:
     - env: TOX_ENV=squeeze
+  include:
+    - python: 2.6
+      env: TOX_ENV=py26
+    - python: 2.7
+      env: TOX_ENV=py27
+    - python: 3.3
+      env: TOX_ENV=py33
+    - python: 3.4
+      env: TOX_ENV=py34
+    - python: 2.6
+      env: TOX_ENV=squeeze
+    - python: 2.7
+      env: TOX_ENV=wheezy
 install:
   - pip install -U pip
   - pip install tox

docs/_isso/layout.html

@@ -10,7 +10,8 @@
         VERSION:     '{{ release|e }}',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
+        HAS_SOURCE:  {{ has_source|lower }},
+        SOURCELINK_SUFFIX:  '{{ sourcelink_suffix }}'
       };
     </script>
     {%- for scriptfile in script_files %}

docs/docs/extras/api.rst

@@ -23,11 +23,11 @@ Isso:
         "mode": 1,
         "hash": "4505c1eeda98",
         "author": null,
-        "website": null
+        "website": null,
         "created": 1387321261.572392,
         "modified": null,
         "likes": 3,
-        "dislikes": 0,
+        "dislikes": 0
     }
 
 id :
@@ -70,7 +70,7 @@ modified :
 List comments
 -------------
 
-List all publicely visible comments for thread `uri`:
+List all publicly visible comments for thread `uri`:
 
 .. code-block:: text
 

isso/js/app/i18n.js

@@ -1,9 +1,9 @@
-define(["app/config", "app/i18n/bg", "app/i18n/cs", "app/i18n/de",
+define(["app/config", "app/i18n/bg", "app/i18n/cs", "app/i18n/da",
-        "app/i18n/en", "app/i18n/fa", "app/i18n/fi", "app/i18n/fr",
+        "app/i18n/de", "app/i18n/en", "app/i18n/fa", "app/i18n/fi",
-        "app/i18n/hr", "app/i18n/ru", "app/i18n/it", "app/i18n/eo",
+        "app/i18n/fr", "app/i18n/hr", "app/i18n/ru", "app/i18n/it",
-        "app/i18n/sv", "app/i18n/nl", "app/i18n/el_GR", "app/i18n/es",
+        "app/i18n/eo", "app/i18n/sv", "app/i18n/nl", "app/i18n/el_GR",
-        "app/i18n/vi", "app/i18n/zh_CN", "app/i18n/zh_CN", "app/i18n/zh_TW"],
+        "app/i18n/es", "app/i18n/vi", "app/i18n/zh_CN", "app/i18n/zh_CN", "app/i18n/zh_TW"],
-        function(config, bg, cs, de, en, fa, fi, fr, hr, ru, it, eo, sv, nl, el, es, vi, zh, zh_CN, zh_TW) {
+        function(config, bg, cs, da, de, en, fa, fi, fr, hr, ru, it, eo, sv, nl, el, es, vi, zh, zh_CN, zh_TW) {
 
     "use strict";
 
@@ -11,6 +11,7 @@ define(["app/config", "app/i18n/bg", "app/i18n/cs", "app/i18n/de",
         switch (lang) {
         case "bg":
         case "cs":
+        case "da":
         case "de":
         case "el":
         case "en":
@@ -57,7 +58,9 @@ define(["app/config", "app/i18n/bg", "app/i18n/cs", "app/i18n/de",
     }
 
     var catalogue = {
+        bg: bg,
         cs: cs,
+        da: da,
         de: de,
         el: el,
         en: en,

isso/js/app/i18n/da.js

@@ -0,0 +1,30 @@
+define({
+    "postbox-text": "Type Comment Here (at least 3 chars)",
+    "postbox-author": "Name (optional)",
+    "postbox-email": "E-mail (optional)",
+    "postbox-website": "Website (optional)",
+    "postbox-submit": "Submit",
+
+    "num-comments": "One Comment\n{{ n }} Comments",
+    "no-comments": "Ingen kommentarer endnu",
+
+    "comment-reply": "Svar",
+    "comment-edit": "Rediger",
+    "comment-save": "Gem",
+    "comment-delete": "Fjern",
+    "comment-confirm": "Bekræft",
+    "comment-close": "Luk",
+    "comment-cancel": "Annuller",
+    "comment-deleted": "Kommentar slettet.",
+    "comment-queued": "Kommentar i kø for moderation.",
+    "comment-anonymous": "Anonym",
+    "comment-hidden": "{{ n }} Skjult",
+
+    "date-now": "lige nu",
+    "date-minute": "et minut siden\n{{ n }} minutter siden",
+    "date-hour": "en time siden\n{{ n }} timer siden",
+    "date-day": "Igår\n{{ n }} dage siden",
+    "date-week": "sidste uge\n{{ n }} uger siden",
+    "date-month": "sidste måned\n{{ n }} måneder siden",
+    "date-year": "sidste år\n{{ n }} år siden"
+});

isso/js/app/isso.js

@@ -41,8 +41,8 @@ define(["app/dom", "app/utils", "app/config", "app/api", "app/jade", "app/i18n",
 
         // email is not optional if this config parameter is set
         if (config["require-email"]) {
-          $("[name='email']", el).placeholder =
+            $("[name='email']", el).setAttribute("placeholder",
-            $("[name='email']", el).placeholder.replace(/ \(.*\)/, "");
+                $("[name='email']", el).getAttribute("placeholder").replace(/ \(.*\)/, ""));
         }
 
         // author is not optional if this config parameter is set

isso/js/app/utils.js

@@ -20,8 +20,8 @@ define(["app/i18n"], function(i18n) {
             secs = 0;
         }
 
-        var mins = Math.ceil(secs / 60), hours = Math.ceil(mins / 60),
+        var mins = Math.floor(secs / 60), hours = Math.floor(mins / 60),
-            days = Math.ceil(hours / 24);
+            days = Math.floor(hours / 24);
 
         return secs  <=  45 && i18n.translate("date-now")  ||
                secs  <=  90 && i18n.pluralize("date-minute", 1) ||
@@ -31,11 +31,11 @@ define(["app/i18n"], function(i18n) {
                hours <=  36 && i18n.pluralize("date-day", 1) ||
                days  <=   5 && i18n.pluralize("date-day", days) ||
                days  <=   8 && i18n.pluralize("date-week", 1) ||
-               days  <=  21 && i18n.pluralize("date-week", Math.ceil(days / 7)) ||
+               days  <=  21 && i18n.pluralize("date-week", Math.floor(days / 7)) ||
                days  <=  45 && i18n.pluralize("date-month", 1) ||
-               days  <= 345 && i18n.pluralize("date-month", Math.ceil(days / 30)) ||
+               days  <= 345 && i18n.pluralize("date-month", Math.floor(days / 30)) ||
                days  <= 547 && i18n.pluralize("date-year", 1) ||
-                               i18n.pluralize("date-year", Math.ceil(days / 365.25));
+                               i18n.pluralize("date-year", Math.floor(days / 365.25));
     };
 
     var HTMLEntity = {

share/isso.conf

@@ -10,7 +10,7 @@ dbpath = /tmp/comments.db
 # required to dispatch multiple websites, not used otherwise.
 name =
 
-# Your website(s). If Isso is unable to connect to at least on site, you'll
+# Your website(s). If Isso is unable to connect to at least one site, you'll
 # get a warning during startup and comments are most likely non-functional.
 #
 # You'll need at least one host/website to run Isso. This is due to security