Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Mahner 2015-01-09 08:49:43 +00:00
commit a42f1d93e7
11 changed files with 220 additions and 202 deletions

View file

@ -1 +0,0 @@
repo_token: z67WCSULvu5k9sSPa9L5IZrfqmTnm0nP9

View file

@ -3,6 +3,7 @@ language: python
python: python:
- 2.7 - 2.7
- 3.3 - 3.3
- 3.4
env: env:
- DJANGO=1.4.16 - DJANGO=1.4.16
@ -15,6 +16,10 @@ matrix:
env: DJANGO=1.4.16 env: DJANGO=1.4.16
- python: 3.3 - python: 3.3
env: DJANGO=1.6.8 env: DJANGO=1.6.8
- python: 3.4
env: DJANGO=1.4.16
- python: 3.4
env: DJANGO=1.6.8
branches: branches:
only: only:
@ -23,12 +28,8 @@ branches:
install: install:
- "pip install coverage==3.7" - "pip install coverage==3.7"
- "pip install python-coveralls==2.4.0"
- "pip install Django==$DJANGO" - "pip install Django==$DJANGO"
- "pip install -e ." - "pip install -e ."
script: script:
coverage run --rcfile=.coverage.rc runtests.py coverage run --rcfile=.coverage.rc runtests.py
after_success:
coveralls --config_file=.coverage.rc --coveralls_yaml=.coveralls.yml

View file

@ -4,7 +4,12 @@ Changelog
2.9 (DEV) 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) 2.8 (2014-08-02)
---------------- ----------------

View file

@ -7,7 +7,7 @@ suite locally with tox_::
$ cd dpaste/ $ cd dpaste/
$ pip install tox $ pip install tox
$ tox $ tox --skip-missing-interpreters
A more manual approach is installing it all by hand in a virtual environment. 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:: This is also the preferred way to setup an environment for local development::

View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dpaste\n" "Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2014-10-28 11:20+0100\n"
"Last-Translator: Martin Mahner <martin@mahner.org>\n" "Last-Translator: Martin Mahner <martin@mahner.org>\n"
"Language-Team: DE <LL@li.org>\n" "Language-Team: DE <LL@li.org>\n"
@ -18,161 +18,163 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\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" msgid "One-Time snippet"
msgstr "One-Time snippet" msgstr "One-Time snippet"
#: forms.py:12 #: dpaste/forms.py:12
msgid "In one hour" msgid "In one hour"
msgstr "In einer Stunde" msgstr "In einer Stunde"
#: forms.py:13 #: dpaste/forms.py:13
msgid "In one week" msgid "In one week"
msgstr "In einer Woche" msgstr "In einer Woche"
#: forms.py:14 #: dpaste/forms.py:14
msgid "In one month" msgid "In one month"
msgstr "In einem Monat" msgstr "In einem Monat"
#: forms.py:15 #: dpaste/forms.py:15
msgid "Never" msgid "Never"
msgstr "Niemals" msgstr "Niemals"
#: forms.py:36 models.py:43 #: dpaste/forms.py:36 dpaste/models.py:42
msgid "Content" msgid "Content"
msgstr "Inhalt" msgstr "Inhalt"
#: forms.py:37 #: dpaste/forms.py:37
msgid "Awesome code goes here..." msgid "Awesome code goes here..."
msgstr "Geiler Code hier rein..." msgstr "Geiler Code hier rein..."
#: forms.py:42 models.py:44 #: dpaste/forms.py:42 dpaste/models.py:43
msgid "Lexer" msgid "Lexer"
msgstr "Syntax" msgstr "Syntax"
#: forms.py:49 models.py:48 #: dpaste/forms.py:49 dpaste/models.py:47
msgid "Expires" msgid "Expires"
msgstr "Läuft ab" msgstr "Läuft ab"
#: forms.py:57 #: dpaste/forms.py:57
msgid "Title" msgid "Title"
msgstr "Titel" msgstr "Titel"
#: forms.py:85 #: dpaste/forms.py:85
msgid "This field is required." msgid "This field is required."
msgstr "Dieses Feld ist erforderlich." msgstr "Dieses Feld ist erforderlich."
#: highlight.py:34 #: dpaste/highlight.py:33
msgid "Highlighted" msgid "Highlighted"
msgstr "Markiert" msgstr "Markiert"
#: models.py:36 #: dpaste/models.py:35
msgid "Expire by timestamp" msgid "Expire by timestamp"
msgstr "Nach Zeitstempel auslaufen lassen" msgstr "Nach Zeitstempel auslaufen lassen"
#: models.py:37 #: dpaste/models.py:36
msgid "Keep Forever" msgid "Keep Forever"
msgstr "Für immer behalten" msgstr "Für immer behalten"
#: models.py:41 #: dpaste/models.py:40
msgid "Secret ID" msgid "Secret ID"
msgstr "Geheime ID" msgstr "Geheime ID"
#: models.py:45 #: dpaste/models.py:44
msgid "Published" msgid "Published"
msgstr "Veröffentlicht" msgstr "Veröffentlicht"
#: models.py:46 #: dpaste/models.py:45
msgid "Expire Type" msgid "Expire Type"
msgstr "Auslauftyp" msgstr "Auslauftyp"
#: models.py:49 #: dpaste/models.py:48
msgid "View count" msgid "View count"
msgstr "Anzahl der Besuche" msgstr "Anzahl der Besuche"
#: templates/dpaste/about.html:59 #: dpaste/templates/dpaste/about.html:59
msgid "Statistics" msgid "Statistics"
msgstr "Statistiken" msgstr "Statistiken"
#: templates/dpaste/about.html:61 #: dpaste/templates/dpaste/about.html:61
#, python-format #, python-format
msgid "" msgid ""
"There are %(total)s snippets in the database. The most popular languages are:" "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:" msgstr "Es gibt %(total)s in der Datenbank. Die populärsten Sprachen sind:"
#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 #: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21
#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 #: dpaste/templates/dpaste/snippet_new.html:6
#: dpaste/templates/dpaste/snippet_new.html:7
msgid "New snippet" msgid "New snippet"
msgstr "Neues Snippet" msgstr "Neues Snippet"
#: templates/dpaste/base.html:19 #: dpaste/templates/dpaste/base.html:19
msgid "About" msgid "About"
msgstr "Über" msgstr "Über"
#: templates/dpaste/base.html:20 #: dpaste/templates/dpaste/base.html:20
msgid "History" msgid "History"
msgstr "Verlauf" msgstr "Verlauf"
#: templates/dpaste/snippet_details.html:8 #: dpaste/templates/dpaste/snippet_details.html:8
#: templates/dpaste/snippet_details.html:9 #: dpaste/templates/dpaste/snippet_details.html:9
msgid "Snippet" msgid "Snippet"
msgstr "Snippet" msgstr "Snippet"
#: templates/dpaste/snippet_details.html:41 #: dpaste/templates/dpaste/snippet_details.html:41
msgid "Compare" msgid "Compare"
msgstr "Vergleichen" msgstr "Vergleichen"
#: templates/dpaste/snippet_details.html:55 #: dpaste/templates/dpaste/snippet_details.html:55
#, python-format #, python-format
msgid "Expires in: %(date)s" msgid "Expires in: %(date)s"
msgstr "Erlischt 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" msgid "Snippet never expires"
msgstr "Snippet erlischt niemals" msgstr "Snippet erlischt niemals"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?" msgid "Really delete this snippet?"
msgstr "Dieses Snippet wirklich löschen?" msgstr "Dieses Snippet wirklich löschen?"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Delete Now" msgid "Delete Now"
msgstr "Jetzt löschen" msgstr "Jetzt löschen"
#: templates/dpaste/snippet_details.html:66 #: dpaste/templates/dpaste/snippet_details.html:66
msgid "Compare Snippets" msgid "Compare Snippets"
msgstr "Snippets vergleichen" msgstr "Snippets vergleichen"
#: templates/dpaste/snippet_details.html:69 #: dpaste/templates/dpaste/snippet_details.html:69
msgid "View Raw" msgid "View Raw"
msgstr "Unformatiert" msgstr "Unformatiert"
#: templates/dpaste/snippet_details.html:73 #: dpaste/templates/dpaste/snippet_details.html:73
msgid "Gist" msgid "Gist"
msgstr "Gist" msgstr "Gist"
#: templates/dpaste/snippet_details.html:82 #: dpaste/templates/dpaste/snippet_details.html:82
msgid "This is a one-time snippet." msgid "This is a one-time snippet."
msgstr "Dies ist ein 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 #, python-format
msgid "It is automatically removed after %(remaining)s further views." msgid "It is automatically removed after %(remaining)s further views."
msgstr "Es wird automatisch nach %(remaining)s weiteren Ansichten entfernt." 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." msgid "It is automatically removed after the next view."
msgstr "Es wird automatisch nach der nächsten Ansicht entfernt." 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." msgid "It cannot be viewed again."
msgstr "Es kann nicht noch einmal angesehen werden." 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" msgid "Reply to this snippet"
msgstr "Antworte auf dieses Snippet" msgstr "Antworte auf dieses Snippet"
#: templates/dpaste/snippet_diff.html:5 #: dpaste/templates/dpaste/snippet_diff.html:5
#, python-format #, python-format
msgid "" msgid ""
"\n" "\n"
@ -185,28 +187,28 @@ msgstr ""
"href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n" "href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" " " "
#: templates/dpaste/snippet_form.html:32 #: dpaste/templates/dpaste/snippet_form.html:32
msgid "Expire in" msgid "Expire in"
msgstr "Erlischt in" msgstr "Erlischt in"
#: templates/dpaste/snippet_form.html:38 #: dpaste/templates/dpaste/snippet_form.html:38
msgid "Paste it" msgid "Paste it"
msgstr "Paste" msgstr "Paste"
#: templates/dpaste/snippet_form.html:39 #: dpaste/templates/dpaste/snippet_form.html:39
msgid "or" msgid "or"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:16 #: dpaste/templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT" msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT" msgstr "DATETIME_FORMAT"
#: templates/dpaste/snippet_list.html:17 #: dpaste/templates/dpaste/snippet_list.html:17
#, python-format #, python-format
msgid "%(since)s ago" msgid "%(since)s ago"
msgstr "Vor %(since)s" msgstr "Vor %(since)s"
#: templates/dpaste/snippet_list.html:23 #: dpaste/templates/dpaste/snippet_list.html:23
msgid "" msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has " "No snippets saved. Either all your snippets are expired or your cookie has "
"changed." "changed."
@ -214,7 +216,7 @@ msgstr ""
"Keine Snippets gespeichert. Entweder sind alle deine Snippets erloschen oder " "Keine Snippets gespeichert. Entweder sind alle deine Snippets erloschen oder "
"dein Cookie hat sich geändert." "dein Cookie hat sich geändert."
#: views.py:200 #: dpaste/views.py:199
msgid "No changes were made between this two files." msgid "No changes were made between this two files."
msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht." msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht."

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,161 +17,163 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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" msgid "One-Time snippet"
msgstr "" msgstr ""
#: forms.py:12 #: dpaste/forms.py:12
msgid "In one hour" msgid "In one hour"
msgstr "" msgstr ""
#: forms.py:13 #: dpaste/forms.py:13
msgid "In one week" msgid "In one week"
msgstr "" msgstr ""
#: forms.py:14 #: dpaste/forms.py:14
msgid "In one month" msgid "In one month"
msgstr "" msgstr ""
#: forms.py:15 #: dpaste/forms.py:15
msgid "Never" msgid "Never"
msgstr "" msgstr ""
#: forms.py:36 models.py:43 #: dpaste/forms.py:36 dpaste/models.py:42
msgid "Content" msgid "Content"
msgstr "" msgstr ""
#: forms.py:37 #: dpaste/forms.py:37
msgid "Awesome code goes here..." msgid "Awesome code goes here..."
msgstr "" msgstr ""
#: forms.py:42 models.py:44 #: dpaste/forms.py:42 dpaste/models.py:43
msgid "Lexer" msgid "Lexer"
msgstr "" msgstr ""
#: forms.py:49 models.py:48 #: dpaste/forms.py:49 dpaste/models.py:47
msgid "Expires" msgid "Expires"
msgstr "" msgstr ""
#: forms.py:57 #: dpaste/forms.py:57
msgid "Title" msgid "Title"
msgstr "" msgstr ""
#: forms.py:85 #: dpaste/forms.py:85
msgid "This field is required." msgid "This field is required."
msgstr "" msgstr ""
#: highlight.py:34 #: dpaste/highlight.py:33
msgid "Highlighted" msgid "Highlighted"
msgstr "" msgstr ""
#: models.py:36 #: dpaste/models.py:35
msgid "Expire by timestamp" msgid "Expire by timestamp"
msgstr "" msgstr ""
#: models.py:37 #: dpaste/models.py:36
msgid "Keep Forever" msgid "Keep Forever"
msgstr "" msgstr ""
#: models.py:41 #: dpaste/models.py:40
msgid "Secret ID" msgid "Secret ID"
msgstr "" msgstr ""
#: models.py:45 #: dpaste/models.py:44
msgid "Published" msgid "Published"
msgstr "" msgstr ""
#: models.py:46 #: dpaste/models.py:45
msgid "Expire Type" msgid "Expire Type"
msgstr "" msgstr ""
#: models.py:49 #: dpaste/models.py:48
msgid "View count" msgid "View count"
msgstr "" msgstr ""
#: templates/dpaste/about.html:59 #: dpaste/templates/dpaste/about.html:59
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
#: templates/dpaste/about.html:61 #: dpaste/templates/dpaste/about.html:61
#, python-format #, python-format
msgid "" msgid ""
"There are %(total)s snippets in the database. The most popular languages are:" "There are %(total)s snippets in the database. The most popular languages are:"
msgstr "" msgstr ""
#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 #: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21
#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 #: dpaste/templates/dpaste/snippet_new.html:6
#: dpaste/templates/dpaste/snippet_new.html:7
msgid "New snippet" msgid "New snippet"
msgstr "" msgstr ""
#: templates/dpaste/base.html:19 #: dpaste/templates/dpaste/base.html:19
msgid "About" msgid "About"
msgstr "" msgstr ""
#: templates/dpaste/base.html:20 #: dpaste/templates/dpaste/base.html:20
msgid "History" msgid "History"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:8 #: dpaste/templates/dpaste/snippet_details.html:8
#: templates/dpaste/snippet_details.html:9 #: dpaste/templates/dpaste/snippet_details.html:9
msgid "Snippet" msgid "Snippet"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:41 #: dpaste/templates/dpaste/snippet_details.html:41
msgid "Compare" msgid "Compare"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:55 #: dpaste/templates/dpaste/snippet_details.html:55
#, python-format #, python-format
msgid "Expires in: %(date)s" msgid "Expires in: %(date)s"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:57 #: dpaste/templates/dpaste/snippet_details.html:57
msgid "Snippet never expires" msgid "Snippet never expires"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?" msgid "Really delete this snippet?"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Delete Now" msgid "Delete Now"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:66 #: dpaste/templates/dpaste/snippet_details.html:66
msgid "Compare Snippets" msgid "Compare Snippets"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:69 #: dpaste/templates/dpaste/snippet_details.html:69
msgid "View Raw" msgid "View Raw"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:73 #: dpaste/templates/dpaste/snippet_details.html:73
msgid "Gist" msgid "Gist"
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:82 #: dpaste/templates/dpaste/snippet_details.html:82
msgid "This is a one-time snippet." msgid "This is a one-time snippet."
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:84 #: dpaste/templates/dpaste/snippet_details.html:84
#, python-format #, python-format
msgid "It is automatically removed after %(remaining)s further views." msgid "It is automatically removed after %(remaining)s further views."
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:86 #: dpaste/templates/dpaste/snippet_details.html:86
msgid "It is automatically removed after the next view." msgid "It is automatically removed after the next view."
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:88 #: dpaste/templates/dpaste/snippet_details.html:88
msgid "It cannot be viewed again." msgid "It cannot be viewed again."
msgstr "" msgstr ""
#: templates/dpaste/snippet_details.html:108 #: dpaste/templates/dpaste/snippet_details.html:108
msgid "Reply to this snippet" msgid "Reply to this snippet"
msgstr "" msgstr ""
#: templates/dpaste/snippet_diff.html:5 #: dpaste/templates/dpaste/snippet_diff.html:5
#, python-format #, python-format
msgid "" msgid ""
"\n" "\n"
@ -180,33 +182,33 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/dpaste/snippet_form.html:32 #: dpaste/templates/dpaste/snippet_form.html:32
msgid "Expire in" msgid "Expire in"
msgstr "" msgstr ""
#: templates/dpaste/snippet_form.html:38 #: dpaste/templates/dpaste/snippet_form.html:38
msgid "Paste it" msgid "Paste it"
msgstr "" msgstr ""
#: templates/dpaste/snippet_form.html:39 #: dpaste/templates/dpaste/snippet_form.html:39
msgid "or" msgid "or"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:16 #: dpaste/templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT" msgid "DATETIME_FORMAT"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:17 #: dpaste/templates/dpaste/snippet_list.html:17
#, python-format #, python-format
msgid "%(since)s ago" msgid "%(since)s ago"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:23 #: dpaste/templates/dpaste/snippet_list.html:23
msgid "" msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has " "No snippets saved. Either all your snippets are expired or your cookie has "
"changed." "changed."
msgstr "" msgstr ""
#: views.py:200 #: dpaste/views.py:199
msgid "No changes were made between this two files." msgid "No changes were made between this two files."
msgstr "" msgstr ""

View file

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dpaste\n" "Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2014-10-27 17:05+0000\n"
"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n" "Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/" "Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/"
@ -20,83 +20,84 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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" msgid "One-Time snippet"
msgstr "Apenas una visualización" msgstr "Apenas una visualización"
#: forms.py:12 #: dpaste/forms.py:12
msgid "In one hour" msgid "In one hour"
msgstr "En una hora" msgstr "En una hora"
#: forms.py:13 #: dpaste/forms.py:13
msgid "In one week" msgid "In one week"
msgstr "En una semana" msgstr "En una semana"
#: forms.py:14 #: dpaste/forms.py:14
msgid "In one month" msgid "In one month"
msgstr "En un mes" msgstr "En un mes"
#: forms.py:15 #: dpaste/forms.py:15
msgid "Never" msgid "Never"
msgstr "Nunca" msgstr "Nunca"
#: forms.py:36 models.py:43 #: dpaste/forms.py:36 dpaste/models.py:42
msgid "Content" msgid "Content"
msgstr "Contenido" msgstr "Contenido"
#: forms.py:37 #: dpaste/forms.py:37
msgid "Awesome code goes here..." msgid "Awesome code goes here..."
msgstr "Su código increíble va aquí..." msgstr "Su código increíble va aquí..."
#: forms.py:42 models.py:44 #: dpaste/forms.py:42 dpaste/models.py:43
msgid "Lexer" msgid "Lexer"
msgstr "Lexer" msgstr "Lexer"
#: forms.py:49 models.py:48 #: dpaste/forms.py:49 dpaste/models.py:47
msgid "Expires" msgid "Expires"
msgstr "Caduca" msgstr "Caduca"
#: forms.py:57 #: dpaste/forms.py:57
msgid "Title" msgid "Title"
msgstr "Título" msgstr "Título"
#: forms.py:85 #: dpaste/forms.py:85
msgid "This field is required." msgid "This field is required."
msgstr "Este campo es obligatorio." msgstr "Este campo es obligatorio."
#: highlight.py:34 #: dpaste/highlight.py:33
msgid "Highlighted" msgid "Highlighted"
msgstr "Destacado" msgstr "Destacado"
#: models.py:36 #: dpaste/models.py:35
msgid "Expire by timestamp" msgid "Expire by timestamp"
msgstr "Caduca por fecha y hora" msgstr "Caduca por fecha y hora"
#: models.py:37 #: dpaste/models.py:36
msgid "Keep Forever" msgid "Keep Forever"
msgstr "Guarde por siempre" msgstr "Guarde por siempre"
#: models.py:41 #: dpaste/models.py:40
msgid "Secret ID" msgid "Secret ID"
msgstr "ID secreto" msgstr "ID secreto"
#: models.py:45 #: dpaste/models.py:44
msgid "Published" msgid "Published"
msgstr "Publicado" msgstr "Publicado"
#: models.py:46 #: dpaste/models.py:45
msgid "Expire Type" msgid "Expire Type"
msgstr "Tipo de Caducidad " msgstr "Tipo de Caducidad "
#: models.py:49 #: dpaste/models.py:48
msgid "View count" msgid "View count"
msgstr "Visualizaciones" msgstr "Visualizaciones"
#: templates/dpaste/about.html:59 #: dpaste/templates/dpaste/about.html:59
msgid "Statistics" msgid "Statistics"
msgstr " Estadísticas" msgstr " Estadísticas"
#: templates/dpaste/about.html:61 #: dpaste/templates/dpaste/about.html:61
#, python-format #, python-format
msgid "" msgid ""
"There are %(total)s snippets in the database. The most popular languages are:" "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 " "Hay %(total)s fragmentos en la base de datos. Los lenguajes más populares "
"son:" "son:"
#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 #: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21
#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 #: dpaste/templates/dpaste/snippet_new.html:6
#: dpaste/templates/dpaste/snippet_new.html:7
msgid "New snippet" msgid "New snippet"
msgstr "Nuevo fragmento" msgstr "Nuevo fragmento"
#: templates/dpaste/base.html:19 #: dpaste/templates/dpaste/base.html:19
msgid "About" msgid "About"
msgstr "Acerca" msgstr "Acerca"
#: templates/dpaste/base.html:20 #: dpaste/templates/dpaste/base.html:20
msgid "History" msgid "History"
msgstr "Histórico" msgstr "Histórico"
#: templates/dpaste/snippet_details.html:8 #: dpaste/templates/dpaste/snippet_details.html:8
#: templates/dpaste/snippet_details.html:9 #: dpaste/templates/dpaste/snippet_details.html:9
msgid "Snippet" msgid "Snippet"
msgstr "Fragmento" msgstr "Fragmento"
#: templates/dpaste/snippet_details.html:41 #: dpaste/templates/dpaste/snippet_details.html:41
msgid "Compare" msgid "Compare"
msgstr "Comparar" msgstr "Comparar"
#: templates/dpaste/snippet_details.html:55 #: dpaste/templates/dpaste/snippet_details.html:55
#, python-format #, python-format
msgid "Expires in: %(date)s" msgid "Expires in: %(date)s"
msgstr "Caduca en: %(date)s" msgstr "Caduca en: %(date)s"
#: templates/dpaste/snippet_details.html:57 #: dpaste/templates/dpaste/snippet_details.html:57
msgid "Snippet never expires" msgid "Snippet never expires"
msgstr "El fragmento nunca caduca" msgstr "El fragmento nunca caduca"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?" msgid "Really delete this snippet?"
msgstr "¿Realmente desea eliminar este fragmento?" msgstr "¿Realmente desea eliminar este fragmento?"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Delete Now" msgid "Delete Now"
msgstr "Eliminar ahora" msgstr "Eliminar ahora"
#: templates/dpaste/snippet_details.html:66 #: dpaste/templates/dpaste/snippet_details.html:66
msgid "Compare Snippets" msgid "Compare Snippets"
msgstr "Comparar Snippets" msgstr "Comparar Snippets"
#: templates/dpaste/snippet_details.html:69 #: dpaste/templates/dpaste/snippet_details.html:69
msgid "View Raw" msgid "View Raw"
msgstr "Ver en crudo" msgstr "Ver en crudo"
#: templates/dpaste/snippet_details.html:73 #: dpaste/templates/dpaste/snippet_details.html:73
msgid "Gist" msgid "Gist"
msgstr "Gist" msgstr "Gist"
#: templates/dpaste/snippet_details.html:82 #: dpaste/templates/dpaste/snippet_details.html:82
msgid "This is a one-time snippet." msgid "This is a one-time snippet."
msgstr "Este fragmento podrá ser visualizado apenas sólo una vez." 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 #, python-format
msgid "It is automatically removed after %(remaining)s further views." msgid "It is automatically removed after %(remaining)s further views."
msgstr "" msgstr ""
"Automáticamente eliminado después de más %(remaining)s visualizaciones." "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." msgid "It is automatically removed after the next view."
msgstr "Automáticamente eliminado después de la próxima visualización." 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." msgid "It cannot be viewed again."
msgstr "No puede sera más visualizado." 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" msgid "Reply to this snippet"
msgstr "Responder fragmento" msgstr "Responder fragmento"
#: templates/dpaste/snippet_diff.html:5 #: dpaste/templates/dpaste/snippet_diff.html:5
#, python-format #, python-format
msgid "" msgid ""
"\n" "\n"
@ -189,28 +191,28 @@ msgstr ""
"Comparar entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> y <a href=" "Comparar entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> y <a href="
"\"%(fileb_url)s\">#%(fileb_id)s</a>" "\"%(fileb_url)s\">#%(fileb_id)s</a>"
#: templates/dpaste/snippet_form.html:32 #: dpaste/templates/dpaste/snippet_form.html:32
msgid "Expire in" msgid "Expire in"
msgstr "Caduca en" msgstr "Caduca en"
#: templates/dpaste/snippet_form.html:38 #: dpaste/templates/dpaste/snippet_form.html:38
msgid "Paste it" msgid "Paste it"
msgstr "Pegarlo" msgstr "Pegarlo"
#: templates/dpaste/snippet_form.html:39 #: dpaste/templates/dpaste/snippet_form.html:39
msgid "or" msgid "or"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:16 #: dpaste/templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT" msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT" msgstr "DATETIME_FORMAT"
#: templates/dpaste/snippet_list.html:17 #: dpaste/templates/dpaste/snippet_list.html:17
#, python-format #, python-format
msgid "%(since)s ago" msgid "%(since)s ago"
msgstr "%(since)s atrás" msgstr "%(since)s atrás"
#: templates/dpaste/snippet_list.html:23 #: dpaste/templates/dpaste/snippet_list.html:23
msgid "" msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has " "No snippets saved. Either all your snippets are expired or your cookie has "
"changed." "changed."
@ -218,6 +220,6 @@ msgstr ""
"No hay fragmentos guardados. O sus fragmentos han caducado o su cookie " "No hay fragmentos guardados. O sus fragmentos han caducado o su cookie "
"cambió." "cambió."
#: views.py:200 #: dpaste/views.py:199
msgid "No changes were made between this two files." msgid "No changes were made between this two files."
msgstr "No hay cambios entre estos dos archivos." msgstr "No hay cambios entre estos dos archivos."

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: dpaste\n" "Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2014-10-25 14:25+0000\n"
"Last-Translator: Sergio Oliveira <seocam@seocam.com>\n" "Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@ -19,161 +19,163 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\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" msgid "One-Time snippet"
msgstr "Uma única visualização" msgstr "Uma única visualização"
#: forms.py:12 #: dpaste/forms.py:12
msgid "In one hour" msgid "In one hour"
msgstr "Em uma hora" msgstr "Em uma hora"
#: forms.py:13 #: dpaste/forms.py:13
msgid "In one week" msgid "In one week"
msgstr "Em uma semana" msgstr "Em uma semana"
#: forms.py:14 #: dpaste/forms.py:14
msgid "In one month" msgid "In one month"
msgstr "Em um mês" msgstr "Em um mês"
#: forms.py:15 #: dpaste/forms.py:15
msgid "Never" msgid "Never"
msgstr "Nunca expira" msgstr "Nunca expira"
#: forms.py:36 models.py:43 #: dpaste/forms.py:36 dpaste/models.py:42
msgid "Content" msgid "Content"
msgstr "Conteúdo" msgstr "Conteúdo"
#: forms.py:37 #: dpaste/forms.py:37
msgid "Awesome code goes here..." msgid "Awesome code goes here..."
msgstr "Cole seu texto ou código aqui..." msgstr "Cole seu texto ou código aqui..."
#: forms.py:42 models.py:44 #: dpaste/forms.py:42 dpaste/models.py:43
msgid "Lexer" msgid "Lexer"
msgstr "Lexer" msgstr "Lexer"
#: forms.py:49 models.py:48 #: dpaste/forms.py:49 dpaste/models.py:47
msgid "Expires" msgid "Expires"
msgstr "Validade" msgstr "Validade"
#: forms.py:57 #: dpaste/forms.py:57
msgid "Title" msgid "Title"
msgstr "Título" msgstr "Título"
#: forms.py:85 #: dpaste/forms.py:85
msgid "This field is required." msgid "This field is required."
msgstr "Campo obrigatório." msgstr "Campo obrigatório."
#: highlight.py:34 #: dpaste/highlight.py:33
msgid "Highlighted" msgid "Highlighted"
msgstr "Highlighted" msgstr "Highlighted"
#: models.py:36 #: dpaste/models.py:35
msgid "Expire by timestamp" msgid "Expire by timestamp"
msgstr "Expira por tempo" msgstr "Expira por tempo"
#: models.py:37 #: dpaste/models.py:36
msgid "Keep Forever" msgid "Keep Forever"
msgstr "Não expira" msgstr "Não expira"
#: models.py:41 #: dpaste/models.py:40
msgid "Secret ID" msgid "Secret ID"
msgstr "ID secreto" msgstr "ID secreto"
#: models.py:45 #: dpaste/models.py:44
msgid "Published" msgid "Published"
msgstr "Publicado" msgstr "Publicado"
#: models.py:46 #: dpaste/models.py:45
msgid "Expire Type" msgid "Expire Type"
msgstr "Tipo de validade" msgstr "Tipo de validade"
#: models.py:49 #: dpaste/models.py:48
msgid "View count" msgid "View count"
msgstr "Visualizações" msgstr "Visualizações"
#: templates/dpaste/about.html:59 #: dpaste/templates/dpaste/about.html:59
msgid "Statistics" msgid "Statistics"
msgstr "Estatísticas" msgstr "Estatísticas"
#: templates/dpaste/about.html:61 #: dpaste/templates/dpaste/about.html:61
#, python-format #, python-format
msgid "" msgid ""
"There are %(total)s snippets in the database. The most popular languages are:" "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 é" msgstr "Existem %(total)s pastes no banco de dados. A linguagem mais popular é"
#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21 #: dpaste/templates/dpaste/base.html:8 dpaste/templates/dpaste/base.html:21
#: templates/dpaste/snippet_new.html:6 templates/dpaste/snippet_new.html:7 #: dpaste/templates/dpaste/snippet_new.html:6
#: dpaste/templates/dpaste/snippet_new.html:7
msgid "New snippet" msgid "New snippet"
msgstr "Novo paste" msgstr "Novo paste"
#: templates/dpaste/base.html:19 #: dpaste/templates/dpaste/base.html:19
msgid "About" msgid "About"
msgstr "Sobre" msgstr "Sobre"
#: templates/dpaste/base.html:20 #: dpaste/templates/dpaste/base.html:20
msgid "History" msgid "History"
msgstr "Histórico" msgstr "Histórico"
#: templates/dpaste/snippet_details.html:8 #: dpaste/templates/dpaste/snippet_details.html:8
#: templates/dpaste/snippet_details.html:9 #: dpaste/templates/dpaste/snippet_details.html:9
msgid "Snippet" msgid "Snippet"
msgstr "Paste" msgstr "Paste"
#: templates/dpaste/snippet_details.html:41 #: dpaste/templates/dpaste/snippet_details.html:41
msgid "Compare" msgid "Compare"
msgstr "Comparar" msgstr "Comparar"
#: templates/dpaste/snippet_details.html:55 #: dpaste/templates/dpaste/snippet_details.html:55
#, python-format #, python-format
msgid "Expires in: %(date)s" msgid "Expires in: %(date)s"
msgstr "Expira em: %(date)s" msgstr "Expira em: %(date)s"
#: templates/dpaste/snippet_details.html:57 #: dpaste/templates/dpaste/snippet_details.html:57
msgid "Snippet never expires" msgid "Snippet never expires"
msgstr "Paste nunca expira" msgstr "Paste nunca expira"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?" msgid "Really delete this snippet?"
msgstr "Deseja realmente remover esse paste?" msgstr "Deseja realmente remover esse paste?"
#: templates/dpaste/snippet_details.html:63 #: dpaste/templates/dpaste/snippet_details.html:63
msgid "Delete Now" msgid "Delete Now"
msgstr "Remover agora" msgstr "Remover agora"
#: templates/dpaste/snippet_details.html:66 #: dpaste/templates/dpaste/snippet_details.html:66
msgid "Compare Snippets" msgid "Compare Snippets"
msgstr "Comparar pastes" msgstr "Comparar pastes"
#: templates/dpaste/snippet_details.html:69 #: dpaste/templates/dpaste/snippet_details.html:69
msgid "View Raw" msgid "View Raw"
msgstr "Visualizar sem formatação" msgstr "Visualizar sem formatação"
#: templates/dpaste/snippet_details.html:73 #: dpaste/templates/dpaste/snippet_details.html:73
msgid "Gist" msgid "Gist"
msgstr "Gist" msgstr "Gist"
#: templates/dpaste/snippet_details.html:82 #: dpaste/templates/dpaste/snippet_details.html:82
msgid "This is a one-time snippet." msgid "This is a one-time snippet."
msgstr "Este paste só pode ser visualizado uma vez." msgstr "Este paste só pode ser visualizado uma vez."
#: templates/dpaste/snippet_details.html:84 #: dpaste/templates/dpaste/snippet_details.html:84
#, python-format #, python-format
msgid "It is automatically removed after %(remaining)s further views." msgid "It is automatically removed after %(remaining)s further views."
msgstr "Automaticamente deletado depois de %(remaining)s visualizações" 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." msgid "It is automatically removed after the next view."
msgstr "Automaticamente deletado após a próxima visualização." 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." msgid "It cannot be viewed again."
msgstr "Não pode ser visto novamente." 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" msgid "Reply to this snippet"
msgstr "Responder paste" msgstr "Responder paste"
#: templates/dpaste/snippet_diff.html:5 #: dpaste/templates/dpaste/snippet_diff.html:5
#, python-format #, python-format
msgid "" msgid ""
"\n" "\n"
@ -186,28 +188,28 @@ msgstr ""
"\"%(fileb_url)s\">#%(fileb_id)s</a>\n" "\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" " " "
#: templates/dpaste/snippet_form.html:32 #: dpaste/templates/dpaste/snippet_form.html:32
msgid "Expire in" msgid "Expire in"
msgstr "Expira em" msgstr "Expira em"
#: templates/dpaste/snippet_form.html:38 #: dpaste/templates/dpaste/snippet_form.html:38
msgid "Paste it" msgid "Paste it"
msgstr "Criar paste" msgstr "Criar paste"
#: templates/dpaste/snippet_form.html:39 #: dpaste/templates/dpaste/snippet_form.html:39
msgid "or" msgid "or"
msgstr "" msgstr ""
#: templates/dpaste/snippet_list.html:16 #: dpaste/templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT" msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT" msgstr "DATETIME_FORMAT"
#: templates/dpaste/snippet_list.html:17 #: dpaste/templates/dpaste/snippet_list.html:17
#, python-format #, python-format
msgid "%(since)s ago" msgid "%(since)s ago"
msgstr "%(since)s atrás" msgstr "%(since)s atrás"
#: templates/dpaste/snippet_list.html:23 #: dpaste/templates/dpaste/snippet_list.html:23
msgid "" msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has " "No snippets saved. Either all your snippets are expired or your cookie has "
"changed." "changed."
@ -215,6 +217,6 @@ msgstr ""
"Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi " "Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi "
"alterado." "alterado."
#: views.py:200 #: dpaste/views.py:199
msgid "No changes were made between this two files." msgid "No changes were made between this two files."
msgstr "Nenhuma alterção feita entre esses dois arquivos." msgstr "Nenhuma alterção feita entre esses dois arquivos."

View file

@ -8,7 +8,7 @@
django==1.7.1 django==1.7.1
django-mptt==0.6.1 django-mptt==0.6.1
pygments==2.0.1 pygments==2.0.1
requests==2.5.0 requests==2.5.1
# Testing # Testing
python-coveralls==2.4.3 python-coveralls==2.4.3
@ -21,5 +21,5 @@ sphinx_rtd_theme
# Deployment specific # Deployment specific
django-redis==3.8.0 django-redis==3.8.0
gunicorn==19.1.1 gunicorn==19.1.1
south==1.0.1 south==1.0.2

View file

@ -38,7 +38,8 @@ setup(
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python', 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Framework :: Django', 'Framework :: Django',
], ],
packages=find_packages(), packages=find_packages(),

View file

@ -4,6 +4,7 @@ envlist=
py27-django-1.4, py27-django-1.4,
py27-django-1.6, py27-django-1.6,
py27-django-1.7, py27-django-1.7,
py33-django-1.7,
py34-django-1.7, py34-django-1.7,
[testenv] [testenv]
@ -19,5 +20,8 @@ deps=django==1.6.8
[testenv:py27-django-1.7] [testenv:py27-django-1.7]
deps=django==1.7.1 deps=django==1.7.1
[testenv:py33-django-1.7]
deps=django==1.7.1
[testenv:py34-django-1.7] [testenv:py34-django-1.7]
deps=django==1.7.1 deps=django==1.7.1