From ce9afb02501730de50840180fc3bb84f611b8ebb Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Sun, 28 Dec 2014 13:20:29 +0100 Subject: [PATCH 1/8] Added Python 3 trove classifier. Closes issue #68 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 54395fd..3ba7b57 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,8 @@ setup( 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', - 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3', 'Framework :: Django', ], packages=find_packages(), From 5211ebd01d7e044ee46e1d758c8d5576b46d7fde Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Sun, 28 Dec 2014 13:31:05 +0100 Subject: [PATCH 2/8] Updated Changelog --- CHANGELOG | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index abf97d3..5eeead8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,12 @@ Changelog 2.9 (DEV) ---------------- -* TBD +* Fully Django 1.7 support +* Added i18n support and several languages +* More settings can be overrridden, like the jQuery URL, site name and wether + you want to enable Gthub Gist. +* Ships a middleware that blocks anonymous proxies and TOR nodes. Not enabled + by default. 2.8 (2014-08-02) ---------------- From 91c747b7f5c335836de22a9413636d1d52b23ebe Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Sun, 28 Dec 2014 13:31:12 +0100 Subject: [PATCH 3/8] Removed coveralls --- .coveralls.yml | 1 - .travis.yml | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 3455e53..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: z67WCSULvu5k9sSPa9L5IZrfqmTnm0nP9 diff --git a/.travis.yml b/.travis.yml index 3f5976e..8b3c788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,3 @@ install: script: coverage run --rcfile=.coverage.rc runtests.py - -after_success: - coveralls --config_file=.coverage.rc --coveralls_yaml=.coveralls.yml From febae7a34ca7535cce1767ffe0aaf8e54aae0e9b Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Sun, 28 Dec 2014 13:34:50 +0100 Subject: [PATCH 4/8] Added Python 3.3 along 3.4 in testsuite. --- .travis.yml | 5 +++++ tox.ini | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b3c788..631f114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: python python: - 2.7 - 3.3 + - 3.4 env: - DJANGO=1.4.16 @@ -15,6 +16,10 @@ matrix: env: DJANGO=1.4.16 - python: 3.3 env: DJANGO=1.6.8 + - python: 3.4 + env: DJANGO=1.4.16 + - python: 3.4 + env: DJANGO=1.6.8 branches: only: diff --git a/tox.ini b/tox.ini index 9865ebc..10abc5f 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist= py27-django-1.4, py27-django-1.6, py27-django-1.7, + py33-django-1.7, py34-django-1.7, [testenv] @@ -19,5 +20,8 @@ deps=django==1.6.8 [testenv:py27-django-1.7] deps=django==1.7.1 +[testenv:py33-django-1.7] +deps=django==1.7.1 + [testenv:py34-django-1.7] deps=django==1.7.1 From 70f3328e02b5f0a4dfb76c5707d641c5c38fc758 Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Mon, 29 Dec 2014 11:11:28 +0100 Subject: [PATCH 5/8] Requirements update --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 026011e..f01f697 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ django==1.7.1 django-mptt==0.6.1 pygments==2.0.1 -requests==2.5.0 +requests==2.5.1 # Testing python-coveralls==2.4.3 @@ -21,5 +21,5 @@ sphinx_rtd_theme # Deployment specific django-redis==3.8.0 gunicorn==19.1.1 -south==1.0.1 +south==1.0.2 From 011d641c3ba52be4beb3d40931d54ca42bf25024 Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Mon, 29 Dec 2014 11:43:16 +0100 Subject: [PATCH 6/8] Updated message strings. --- dpaste/locale/de/LC_MESSAGES/django.po | 98 ++++++++++++----------- dpaste/locale/en/LC_MESSAGES/django.po | 98 ++++++++++++----------- dpaste/locale/es/LC_MESSAGES/django.po | 98 ++++++++++++----------- dpaste/locale/pt_BR/LC_MESSAGES/django.po | 98 ++++++++++++----------- 4 files changed, 200 insertions(+), 192 deletions(-) diff --git a/dpaste/locale/de/LC_MESSAGES/django.po b/dpaste/locale/de/LC_MESSAGES/django.po index d8fcf34..7159805 100644 --- a/dpaste/locale/de/LC_MESSAGES/django.po +++ b/dpaste/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 11:00+0000\n" +"POT-Creation-Date: 2014-12-29 10:42+0000\n" "PO-Revision-Date: 2014-10-28 11:20+0100\n" "Last-Translator: Martin Mahner \n" "Language-Team: DE \n" @@ -18,161 +18,163 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.10\n" -#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +#: dpaste/forms.py:11 dpaste/models.py:37 +#: dpaste/templates/dpaste/snippet_details.html:59 msgid "One-Time snippet" msgstr "One-Time snippet" -#: forms.py:12 +#: dpaste/forms.py:12 msgid "In one hour" msgstr "In einer Stunde" -#: forms.py:13 +#: dpaste/forms.py:13 msgid "In one week" msgstr "In einer Woche" -#: forms.py:14 +#: dpaste/forms.py:14 msgid "In one month" msgstr "In einem Monat" -#: forms.py:15 +#: dpaste/forms.py:15 msgid "Never" msgstr "Niemals" -#: forms.py:36 models.py:43 +#: dpaste/forms.py:36 dpaste/models.py:42 msgid "Content" msgstr "Inhalt" -#: forms.py:37 +#: dpaste/forms.py:37 msgid "Awesome code goes here..." msgstr "Geiler Code hier rein..." -#: forms.py:42 models.py:44 +#: dpaste/forms.py:42 dpaste/models.py:43 msgid "Lexer" msgstr "Syntax" -#: forms.py:49 models.py:48 +#: dpaste/forms.py:49 dpaste/models.py:47 msgid "Expires" msgstr "Läuft ab" -#: forms.py:57 +#: dpaste/forms.py:57 msgid "Title" msgstr "Titel" -#: forms.py:85 +#: dpaste/forms.py:85 msgid "This field is required." msgstr "Dieses Feld ist erforderlich." -#: highlight.py:34 +#: dpaste/highlight.py:33 msgid "Highlighted" msgstr "Markiert" -#: models.py:36 +#: dpaste/models.py:35 msgid "Expire by timestamp" msgstr "Nach Zeitstempel auslaufen lassen" -#: models.py:37 +#: dpaste/models.py:36 msgid "Keep Forever" msgstr "Für immer behalten" -#: models.py:41 +#: dpaste/models.py:40 msgid "Secret ID" msgstr "Geheime ID" -#: models.py:45 +#: dpaste/models.py:44 msgid "Published" msgstr "Veröffentlicht" -#: models.py:46 +#: dpaste/models.py:45 msgid "Expire Type" msgstr "Auslauftyp" -#: models.py:49 +#: dpaste/models.py:48 msgid "View count" msgstr "Anzahl der Besuche" -#: templates/dpaste/about.html:59 +#: dpaste/templates/dpaste/about.html:59 msgid "Statistics" msgstr "Statistiken" -#: templates/dpaste/about.html:61 +#: dpaste/templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" msgstr "Es gibt %(total)s in der Datenbank. Die populärsten Sprachen sind:" -#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 -#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 +#: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21 +#: dpaste/templates/dpaste/snippet_new.html:6 +#: dpaste/templates/dpaste/snippet_new.html:7 msgid "New snippet" msgstr "Neues Snippet" -#: templates/dpaste/base.html:19 +#: dpaste/templates/dpaste/base.html:19 msgid "About" msgstr "Über" -#: templates/dpaste/base.html:20 +#: dpaste/templates/dpaste/base.html:20 msgid "History" msgstr "Verlauf" -#: templates/dpaste/snippet_details.html:8 -#: templates/dpaste/snippet_details.html:9 +#: dpaste/templates/dpaste/snippet_details.html:8 +#: dpaste/templates/dpaste/snippet_details.html:9 msgid "Snippet" msgstr "Snippet" -#: templates/dpaste/snippet_details.html:41 +#: dpaste/templates/dpaste/snippet_details.html:41 msgid "Compare" msgstr "Vergleichen" -#: templates/dpaste/snippet_details.html:55 +#: dpaste/templates/dpaste/snippet_details.html:55 #, python-format msgid "Expires in: %(date)s" msgstr "Erlischt in: %(date)s" -#: templates/dpaste/snippet_details.html:57 +#: dpaste/templates/dpaste/snippet_details.html:57 msgid "Snippet never expires" msgstr "Snippet erlischt niemals" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "Dieses Snippet wirklich löschen?" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Delete Now" msgstr "Jetzt löschen" -#: templates/dpaste/snippet_details.html:66 +#: dpaste/templates/dpaste/snippet_details.html:66 msgid "Compare Snippets" msgstr "Snippets vergleichen" -#: templates/dpaste/snippet_details.html:69 +#: dpaste/templates/dpaste/snippet_details.html:69 msgid "View Raw" msgstr "Unformatiert" -#: templates/dpaste/snippet_details.html:73 +#: dpaste/templates/dpaste/snippet_details.html:73 msgid "Gist" msgstr "Gist" -#: templates/dpaste/snippet_details.html:82 +#: dpaste/templates/dpaste/snippet_details.html:82 msgid "This is a one-time snippet." msgstr "Dies ist ein One-Time Snippet." -#: templates/dpaste/snippet_details.html:84 +#: dpaste/templates/dpaste/snippet_details.html:84 #, python-format msgid "It is automatically removed after %(remaining)s further views." msgstr "Es wird automatisch nach %(remaining)s weiteren Ansichten entfernt." -#: templates/dpaste/snippet_details.html:86 +#: dpaste/templates/dpaste/snippet_details.html:86 msgid "It is automatically removed after the next view." msgstr "Es wird automatisch nach der nächsten Ansicht entfernt." -#: templates/dpaste/snippet_details.html:88 +#: dpaste/templates/dpaste/snippet_details.html:88 msgid "It cannot be viewed again." msgstr "Es kann nicht noch einmal angesehen werden." -#: templates/dpaste/snippet_details.html:108 +#: dpaste/templates/dpaste/snippet_details.html:108 msgid "Reply to this snippet" msgstr "Antworte auf dieses Snippet" -#: templates/dpaste/snippet_diff.html:5 +#: dpaste/templates/dpaste/snippet_diff.html:5 #, python-format msgid "" "\n" @@ -185,28 +187,28 @@ msgstr "" "href=\"%(fileb_url)s\">#%(fileb_id)s\n" " " -#: templates/dpaste/snippet_form.html:32 +#: dpaste/templates/dpaste/snippet_form.html:32 msgid "Expire in" msgstr "Erlischt in" -#: templates/dpaste/snippet_form.html:38 +#: dpaste/templates/dpaste/snippet_form.html:38 msgid "Paste it" msgstr "Paste" -#: templates/dpaste/snippet_form.html:39 +#: dpaste/templates/dpaste/snippet_form.html:39 msgid "or" msgstr "" -#: templates/dpaste/snippet_list.html:16 +#: dpaste/templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/dpaste/snippet_list.html:17 +#: dpaste/templates/dpaste/snippet_list.html:17 #, python-format msgid "%(since)s ago" msgstr "Vor %(since)s" -#: templates/dpaste/snippet_list.html:23 +#: dpaste/templates/dpaste/snippet_list.html:23 msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." @@ -214,7 +216,7 @@ msgstr "" "Keine Snippets gespeichert. Entweder sind alle deine Snippets erloschen oder " "dein Cookie hat sich geändert." -#: views.py:200 +#: dpaste/views.py:199 msgid "No changes were made between this two files." msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht." diff --git a/dpaste/locale/en/LC_MESSAGES/django.po b/dpaste/locale/en/LC_MESSAGES/django.po index eb26032..5b62e7c 100644 --- a/dpaste/locale/en/LC_MESSAGES/django.po +++ b/dpaste/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 11:01+0000\n" +"POT-Creation-Date: 2014-12-29 10:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,161 +17,163 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +#: dpaste/forms.py:11 dpaste/models.py:37 +#: dpaste/templates/dpaste/snippet_details.html:59 msgid "One-Time snippet" msgstr "" -#: forms.py:12 +#: dpaste/forms.py:12 msgid "In one hour" msgstr "" -#: forms.py:13 +#: dpaste/forms.py:13 msgid "In one week" msgstr "" -#: forms.py:14 +#: dpaste/forms.py:14 msgid "In one month" msgstr "" -#: forms.py:15 +#: dpaste/forms.py:15 msgid "Never" msgstr "" -#: forms.py:36 models.py:43 +#: dpaste/forms.py:36 dpaste/models.py:42 msgid "Content" msgstr "" -#: forms.py:37 +#: dpaste/forms.py:37 msgid "Awesome code goes here..." msgstr "" -#: forms.py:42 models.py:44 +#: dpaste/forms.py:42 dpaste/models.py:43 msgid "Lexer" msgstr "" -#: forms.py:49 models.py:48 +#: dpaste/forms.py:49 dpaste/models.py:47 msgid "Expires" msgstr "" -#: forms.py:57 +#: dpaste/forms.py:57 msgid "Title" msgstr "" -#: forms.py:85 +#: dpaste/forms.py:85 msgid "This field is required." msgstr "" -#: highlight.py:34 +#: dpaste/highlight.py:33 msgid "Highlighted" msgstr "" -#: models.py:36 +#: dpaste/models.py:35 msgid "Expire by timestamp" msgstr "" -#: models.py:37 +#: dpaste/models.py:36 msgid "Keep Forever" msgstr "" -#: models.py:41 +#: dpaste/models.py:40 msgid "Secret ID" msgstr "" -#: models.py:45 +#: dpaste/models.py:44 msgid "Published" msgstr "" -#: models.py:46 +#: dpaste/models.py:45 msgid "Expire Type" msgstr "" -#: models.py:49 +#: dpaste/models.py:48 msgid "View count" msgstr "" -#: templates/dpaste/about.html:59 +#: dpaste/templates/dpaste/about.html:59 msgid "Statistics" msgstr "" -#: templates/dpaste/about.html:61 +#: dpaste/templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" msgstr "" -#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 -#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 +#: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21 +#: dpaste/templates/dpaste/snippet_new.html:6 +#: dpaste/templates/dpaste/snippet_new.html:7 msgid "New snippet" msgstr "" -#: templates/dpaste/base.html:19 +#: dpaste/templates/dpaste/base.html:19 msgid "About" msgstr "" -#: templates/dpaste/base.html:20 +#: dpaste/templates/dpaste/base.html:20 msgid "History" msgstr "" -#: templates/dpaste/snippet_details.html:8 -#: templates/dpaste/snippet_details.html:9 +#: dpaste/templates/dpaste/snippet_details.html:8 +#: dpaste/templates/dpaste/snippet_details.html:9 msgid "Snippet" msgstr "" -#: templates/dpaste/snippet_details.html:41 +#: dpaste/templates/dpaste/snippet_details.html:41 msgid "Compare" msgstr "" -#: templates/dpaste/snippet_details.html:55 +#: dpaste/templates/dpaste/snippet_details.html:55 #, python-format msgid "Expires in: %(date)s" msgstr "" -#: templates/dpaste/snippet_details.html:57 +#: dpaste/templates/dpaste/snippet_details.html:57 msgid "Snippet never expires" msgstr "" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Delete Now" msgstr "" -#: templates/dpaste/snippet_details.html:66 +#: dpaste/templates/dpaste/snippet_details.html:66 msgid "Compare Snippets" msgstr "" -#: templates/dpaste/snippet_details.html:69 +#: dpaste/templates/dpaste/snippet_details.html:69 msgid "View Raw" msgstr "" -#: templates/dpaste/snippet_details.html:73 +#: dpaste/templates/dpaste/snippet_details.html:73 msgid "Gist" msgstr "" -#: templates/dpaste/snippet_details.html:82 +#: dpaste/templates/dpaste/snippet_details.html:82 msgid "This is a one-time snippet." msgstr "" -#: templates/dpaste/snippet_details.html:84 +#: dpaste/templates/dpaste/snippet_details.html:84 #, python-format msgid "It is automatically removed after %(remaining)s further views." msgstr "" -#: templates/dpaste/snippet_details.html:86 +#: dpaste/templates/dpaste/snippet_details.html:86 msgid "It is automatically removed after the next view." msgstr "" -#: templates/dpaste/snippet_details.html:88 +#: dpaste/templates/dpaste/snippet_details.html:88 msgid "It cannot be viewed again." msgstr "" -#: templates/dpaste/snippet_details.html:108 +#: dpaste/templates/dpaste/snippet_details.html:108 msgid "Reply to this snippet" msgstr "" -#: templates/dpaste/snippet_diff.html:5 +#: dpaste/templates/dpaste/snippet_diff.html:5 #, python-format msgid "" "\n" @@ -180,33 +182,33 @@ msgid "" " " msgstr "" -#: templates/dpaste/snippet_form.html:32 +#: dpaste/templates/dpaste/snippet_form.html:32 msgid "Expire in" msgstr "" -#: templates/dpaste/snippet_form.html:38 +#: dpaste/templates/dpaste/snippet_form.html:38 msgid "Paste it" msgstr "" -#: templates/dpaste/snippet_form.html:39 +#: dpaste/templates/dpaste/snippet_form.html:39 msgid "or" msgstr "" -#: templates/dpaste/snippet_list.html:16 +#: dpaste/templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "" -#: templates/dpaste/snippet_list.html:17 +#: dpaste/templates/dpaste/snippet_list.html:17 #, python-format msgid "%(since)s ago" msgstr "" -#: templates/dpaste/snippet_list.html:23 +#: dpaste/templates/dpaste/snippet_list.html:23 msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." msgstr "" -#: views.py:200 +#: dpaste/views.py:199 msgid "No changes were made between this two files." msgstr "" diff --git a/dpaste/locale/es/LC_MESSAGES/django.po b/dpaste/locale/es/LC_MESSAGES/django.po index 8b30bde..743d6a4 100644 --- a/dpaste/locale/es/LC_MESSAGES/django.po +++ b/dpaste/locale/es/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 11:02+0000\n" +"POT-Creation-Date: 2014-12-29 10:42+0000\n" "PO-Revision-Date: 2014-10-27 17:05+0000\n" "Last-Translator: Leonardo J. Caballero G. \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/" @@ -20,83 +20,84 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +#: dpaste/forms.py:11 dpaste/models.py:37 +#: dpaste/templates/dpaste/snippet_details.html:59 msgid "One-Time snippet" msgstr "Apenas una visualización" -#: forms.py:12 +#: dpaste/forms.py:12 msgid "In one hour" msgstr "En una hora" -#: forms.py:13 +#: dpaste/forms.py:13 msgid "In one week" msgstr "En una semana" -#: forms.py:14 +#: dpaste/forms.py:14 msgid "In one month" msgstr "En un mes" -#: forms.py:15 +#: dpaste/forms.py:15 msgid "Never" msgstr "Nunca" -#: forms.py:36 models.py:43 +#: dpaste/forms.py:36 dpaste/models.py:42 msgid "Content" msgstr "Contenido" -#: forms.py:37 +#: dpaste/forms.py:37 msgid "Awesome code goes here..." msgstr "Su código increíble va aquí..." -#: forms.py:42 models.py:44 +#: dpaste/forms.py:42 dpaste/models.py:43 msgid "Lexer" msgstr "Lexer" -#: forms.py:49 models.py:48 +#: dpaste/forms.py:49 dpaste/models.py:47 msgid "Expires" msgstr "Caduca" -#: forms.py:57 +#: dpaste/forms.py:57 msgid "Title" msgstr "Título" -#: forms.py:85 +#: dpaste/forms.py:85 msgid "This field is required." msgstr "Este campo es obligatorio." -#: highlight.py:34 +#: dpaste/highlight.py:33 msgid "Highlighted" msgstr "Destacado" -#: models.py:36 +#: dpaste/models.py:35 msgid "Expire by timestamp" msgstr "Caduca por fecha y hora" -#: models.py:37 +#: dpaste/models.py:36 msgid "Keep Forever" msgstr "Guarde por siempre" -#: models.py:41 +#: dpaste/models.py:40 msgid "Secret ID" msgstr "ID secreto" -#: models.py:45 +#: dpaste/models.py:44 msgid "Published" msgstr "Publicado" -#: models.py:46 +#: dpaste/models.py:45 msgid "Expire Type" msgstr "Tipo de Caducidad " -#: models.py:49 +#: dpaste/models.py:48 msgid "View count" msgstr "Visualizaciones" -#: templates/dpaste/about.html:59 +#: dpaste/templates/dpaste/about.html:59 msgid "Statistics" msgstr " Estadísticas" -#: templates/dpaste/about.html:61 +#: dpaste/templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" @@ -104,80 +105,81 @@ msgstr "" "Hay %(total)s fragmentos en la base de datos. Los lenguajes más populares " "son:" -#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 -#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 +#: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21 +#: dpaste/templates/dpaste/snippet_new.html:6 +#: dpaste/templates/dpaste/snippet_new.html:7 msgid "New snippet" msgstr "Nuevo fragmento" -#: templates/dpaste/base.html:19 +#: dpaste/templates/dpaste/base.html:19 msgid "About" msgstr "Acerca" -#: templates/dpaste/base.html:20 +#: dpaste/templates/dpaste/base.html:20 msgid "History" msgstr "Histórico" -#: templates/dpaste/snippet_details.html:8 -#: templates/dpaste/snippet_details.html:9 +#: dpaste/templates/dpaste/snippet_details.html:8 +#: dpaste/templates/dpaste/snippet_details.html:9 msgid "Snippet" msgstr "Fragmento" -#: templates/dpaste/snippet_details.html:41 +#: dpaste/templates/dpaste/snippet_details.html:41 msgid "Compare" msgstr "Comparar" -#: templates/dpaste/snippet_details.html:55 +#: dpaste/templates/dpaste/snippet_details.html:55 #, python-format msgid "Expires in: %(date)s" msgstr "Caduca en: %(date)s" -#: templates/dpaste/snippet_details.html:57 +#: dpaste/templates/dpaste/snippet_details.html:57 msgid "Snippet never expires" msgstr "El fragmento nunca caduca" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "¿Realmente desea eliminar este fragmento?" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Delete Now" msgstr "Eliminar ahora" -#: templates/dpaste/snippet_details.html:66 +#: dpaste/templates/dpaste/snippet_details.html:66 msgid "Compare Snippets" msgstr "Comparar Snippets" -#: templates/dpaste/snippet_details.html:69 +#: dpaste/templates/dpaste/snippet_details.html:69 msgid "View Raw" msgstr "Ver en crudo" -#: templates/dpaste/snippet_details.html:73 +#: dpaste/templates/dpaste/snippet_details.html:73 msgid "Gist" msgstr "Gist" -#: templates/dpaste/snippet_details.html:82 +#: dpaste/templates/dpaste/snippet_details.html:82 msgid "This is a one-time snippet." msgstr "Este fragmento podrá ser visualizado apenas sólo una vez." -#: templates/dpaste/snippet_details.html:84 +#: dpaste/templates/dpaste/snippet_details.html:84 #, python-format msgid "It is automatically removed after %(remaining)s further views." msgstr "" "Automáticamente eliminado después de más %(remaining)s visualizaciones." -#: templates/dpaste/snippet_details.html:86 +#: dpaste/templates/dpaste/snippet_details.html:86 msgid "It is automatically removed after the next view." msgstr "Automáticamente eliminado después de la próxima visualización." -#: templates/dpaste/snippet_details.html:88 +#: dpaste/templates/dpaste/snippet_details.html:88 msgid "It cannot be viewed again." msgstr "No puede sera más visualizado." -#: templates/dpaste/snippet_details.html:108 +#: dpaste/templates/dpaste/snippet_details.html:108 msgid "Reply to this snippet" msgstr "Responder fragmento" -#: templates/dpaste/snippet_diff.html:5 +#: dpaste/templates/dpaste/snippet_diff.html:5 #, python-format msgid "" "\n" @@ -189,28 +191,28 @@ msgstr "" "Comparar entre #%(filea_id)s y #%(fileb_id)s" -#: templates/dpaste/snippet_form.html:32 +#: dpaste/templates/dpaste/snippet_form.html:32 msgid "Expire in" msgstr "Caduca en" -#: templates/dpaste/snippet_form.html:38 +#: dpaste/templates/dpaste/snippet_form.html:38 msgid "Paste it" msgstr "Pegarlo" -#: templates/dpaste/snippet_form.html:39 +#: dpaste/templates/dpaste/snippet_form.html:39 msgid "or" msgstr "" -#: templates/dpaste/snippet_list.html:16 +#: dpaste/templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/dpaste/snippet_list.html:17 +#: dpaste/templates/dpaste/snippet_list.html:17 #, python-format msgid "%(since)s ago" msgstr "%(since)s atrás" -#: templates/dpaste/snippet_list.html:23 +#: dpaste/templates/dpaste/snippet_list.html:23 msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." @@ -218,6 +220,6 @@ msgstr "" "No hay fragmentos guardados. O sus fragmentos han caducado o su cookie " "cambió." -#: views.py:200 +#: dpaste/views.py:199 msgid "No changes were made between this two files." msgstr "No hay cambios entre estos dos archivos." diff --git a/dpaste/locale/pt_BR/LC_MESSAGES/django.po b/dpaste/locale/pt_BR/LC_MESSAGES/django.po index 4e1cf52..333e1be 100644 --- a/dpaste/locale/pt_BR/LC_MESSAGES/django.po +++ b/dpaste/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpaste\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 11:03+0000\n" +"POT-Creation-Date: 2014-12-29 10:42+0000\n" "PO-Revision-Date: 2014-10-25 14:25+0000\n" "Last-Translator: Sergio Oliveira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -19,161 +19,163 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59 +#: dpaste/forms.py:11 dpaste/models.py:37 +#: dpaste/templates/dpaste/snippet_details.html:59 msgid "One-Time snippet" msgstr "Uma única visualização" -#: forms.py:12 +#: dpaste/forms.py:12 msgid "In one hour" msgstr "Em uma hora" -#: forms.py:13 +#: dpaste/forms.py:13 msgid "In one week" msgstr "Em uma semana" -#: forms.py:14 +#: dpaste/forms.py:14 msgid "In one month" msgstr "Em um mês" -#: forms.py:15 +#: dpaste/forms.py:15 msgid "Never" msgstr "Nunca expira" -#: forms.py:36 models.py:43 +#: dpaste/forms.py:36 dpaste/models.py:42 msgid "Content" msgstr "Conteúdo" -#: forms.py:37 +#: dpaste/forms.py:37 msgid "Awesome code goes here..." msgstr "Cole seu texto ou código aqui..." -#: forms.py:42 models.py:44 +#: dpaste/forms.py:42 dpaste/models.py:43 msgid "Lexer" msgstr "Lexer" -#: forms.py:49 models.py:48 +#: dpaste/forms.py:49 dpaste/models.py:47 msgid "Expires" msgstr "Validade" -#: forms.py:57 +#: dpaste/forms.py:57 msgid "Title" msgstr "Título" -#: forms.py:85 +#: dpaste/forms.py:85 msgid "This field is required." msgstr "Campo obrigatório." -#: highlight.py:34 +#: dpaste/highlight.py:33 msgid "Highlighted" msgstr "Highlighted" -#: models.py:36 +#: dpaste/models.py:35 msgid "Expire by timestamp" msgstr "Expira por tempo" -#: models.py:37 +#: dpaste/models.py:36 msgid "Keep Forever" msgstr "Não expira" -#: models.py:41 +#: dpaste/models.py:40 msgid "Secret ID" msgstr "ID secreto" -#: models.py:45 +#: dpaste/models.py:44 msgid "Published" msgstr "Publicado" -#: models.py:46 +#: dpaste/models.py:45 msgid "Expire Type" msgstr "Tipo de validade" -#: models.py:49 +#: dpaste/models.py:48 msgid "View count" msgstr "Visualizações" -#: templates/dpaste/about.html:59 +#: dpaste/templates/dpaste/about.html:59 msgid "Statistics" msgstr "Estatísticas" -#: templates/dpaste/about.html:61 +#: dpaste/templates/dpaste/about.html:61 #, python-format msgid "" "There are %(total)s snippets in the database. The most popular languages are:" msgstr "Existem %(total)s pastes no banco de dados. A linguagem mais popular é" -#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 -#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 +#: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21 +#: dpaste/templates/dpaste/snippet_new.html:6 +#: dpaste/templates/dpaste/snippet_new.html:7 msgid "New snippet" msgstr "Novo paste" -#: templates/dpaste/base.html:19 +#: dpaste/templates/dpaste/base.html:19 msgid "About" msgstr "Sobre" -#: templates/dpaste/base.html:20 +#: dpaste/templates/dpaste/base.html:20 msgid "History" msgstr "Histórico" -#: templates/dpaste/snippet_details.html:8 -#: templates/dpaste/snippet_details.html:9 +#: dpaste/templates/dpaste/snippet_details.html:8 +#: dpaste/templates/dpaste/snippet_details.html:9 msgid "Snippet" msgstr "Paste" -#: templates/dpaste/snippet_details.html:41 +#: dpaste/templates/dpaste/snippet_details.html:41 msgid "Compare" msgstr "Comparar" -#: templates/dpaste/snippet_details.html:55 +#: dpaste/templates/dpaste/snippet_details.html:55 #, python-format msgid "Expires in: %(date)s" msgstr "Expira em: %(date)s" -#: templates/dpaste/snippet_details.html:57 +#: dpaste/templates/dpaste/snippet_details.html:57 msgid "Snippet never expires" msgstr "Paste nunca expira" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Really delete this snippet?" msgstr "Deseja realmente remover esse paste?" -#: templates/dpaste/snippet_details.html:63 +#: dpaste/templates/dpaste/snippet_details.html:63 msgid "Delete Now" msgstr "Remover agora" -#: templates/dpaste/snippet_details.html:66 +#: dpaste/templates/dpaste/snippet_details.html:66 msgid "Compare Snippets" msgstr "Comparar pastes" -#: templates/dpaste/snippet_details.html:69 +#: dpaste/templates/dpaste/snippet_details.html:69 msgid "View Raw" msgstr "Visualizar sem formatação" -#: templates/dpaste/snippet_details.html:73 +#: dpaste/templates/dpaste/snippet_details.html:73 msgid "Gist" msgstr "Gist" -#: templates/dpaste/snippet_details.html:82 +#: dpaste/templates/dpaste/snippet_details.html:82 msgid "This is a one-time snippet." msgstr "Este paste só pode ser visualizado uma vez." -#: templates/dpaste/snippet_details.html:84 +#: dpaste/templates/dpaste/snippet_details.html:84 #, python-format msgid "It is automatically removed after %(remaining)s further views." msgstr "Automaticamente deletado depois de %(remaining)s visualizações" -#: templates/dpaste/snippet_details.html:86 +#: dpaste/templates/dpaste/snippet_details.html:86 msgid "It is automatically removed after the next view." msgstr "Automaticamente deletado após a próxima visualização." -#: templates/dpaste/snippet_details.html:88 +#: dpaste/templates/dpaste/snippet_details.html:88 msgid "It cannot be viewed again." msgstr "Não pode ser visto novamente." -#: templates/dpaste/snippet_details.html:108 +#: dpaste/templates/dpaste/snippet_details.html:108 msgid "Reply to this snippet" msgstr "Responder paste" -#: templates/dpaste/snippet_diff.html:5 +#: dpaste/templates/dpaste/snippet_diff.html:5 #, python-format msgid "" "\n" @@ -186,28 +188,28 @@ msgstr "" "\"%(fileb_url)s\">#%(fileb_id)s\n" " " -#: templates/dpaste/snippet_form.html:32 +#: dpaste/templates/dpaste/snippet_form.html:32 msgid "Expire in" msgstr "Expira em" -#: templates/dpaste/snippet_form.html:38 +#: dpaste/templates/dpaste/snippet_form.html:38 msgid "Paste it" msgstr "Criar paste" -#: templates/dpaste/snippet_form.html:39 +#: dpaste/templates/dpaste/snippet_form.html:39 msgid "or" msgstr "" -#: templates/dpaste/snippet_list.html:16 +#: dpaste/templates/dpaste/snippet_list.html:16 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: templates/dpaste/snippet_list.html:17 +#: dpaste/templates/dpaste/snippet_list.html:17 #, python-format msgid "%(since)s ago" msgstr "%(since)s atrás" -#: templates/dpaste/snippet_list.html:23 +#: dpaste/templates/dpaste/snippet_list.html:23 msgid "" "No snippets saved. Either all your snippets are expired or your cookie has " "changed." @@ -215,6 +217,6 @@ msgstr "" "Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi " "alterado." -#: views.py:200 +#: dpaste/views.py:199 msgid "No changes were made between this two files." msgstr "Nenhuma alterção feita entre esses dois arquivos." From 1a7cbd13e223229b1753194cb808b8d2dae7b13e Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Mon, 29 Dec 2014 19:34:48 +0100 Subject: [PATCH 7/8] More coveralls removal. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 631f114..9d9b34e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ branches: install: - "pip install coverage==3.7" - - "pip install python-coveralls==2.4.0" - "pip install Django==$DJANGO" - "pip install -e ." From a6c4041b6cff504202a34486bdb05716fd0790c8 Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Mon, 29 Dec 2014 19:35:18 +0100 Subject: [PATCH 8/8] =?UTF-8?q?It=E2=80=99s=20hard=20to=20have=20multiple?= =?UTF-8?q?=20versions=20of=20Python=20installed,=20especially=20when=20us?= =?UTF-8?q?ing=20Homebrew.=20So=20just=20skip=20them.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/testing.rst b/docs/testing.rst index d5026df..7e44262 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -7,7 +7,7 @@ suite locally with tox_:: $ cd dpaste/ $ pip install tox - $ tox + $ tox --skip-missing-interpreters A more manual approach is installing it all by hand in a virtual environment. This is also the preferred way to setup an environment for local development::