Further cleanup of all „One-Time snippet“ strings.

This commit is contained in:
Martin Mahner 2014-10-28 12:05:47 +01:00
parent d8056a83ea
commit 7821056b64
14 changed files with 94 additions and 94 deletions

View file

@ -36,7 +36,7 @@ Changelog
----------------
* IRC lexer is now in the default lexer list.
* One-time snippet support. Snippets get automatically deleted after the
* One-Time snippet support. Snippets get automatically deleted after the
another user looks at it.
* Toggle wordwrap for code snippets.
* General UI and readability improvements.

View file

@ -61,7 +61,7 @@ behavior without touching the code:
(3600 * 24 * 30 * 12 * 100, ugettext(u'100 Years')),
)
**One-time snippets** are supported. One-Time snippets are automatically
**One-Time snippets** are supported. One-Time snippets are automatically
deleted once a defined view count has reached (Default: ``2``). To
enable one-time snippets you have to add a choice ``onetime`` to the
expire choices::

View file

@ -8,7 +8,7 @@ from dpaste.models import Snippet
from dpaste.highlight import LEXER_LIST, LEXER_DEFAULT, LEXER_KEYS
EXPIRE_CHOICES = getattr(settings, 'DPASTE_EXPIRE_CHOICES', (
('onetime', _(u'One Time Snippet')),
('onetime', _(u'One-Time snippet')),
(3600, _(u'In one hour')),
(3600 * 24 * 7, _(u'In one week')),
(3600 * 24 * 30, _(u'In one month')),

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-25 10:06+0000\n"
"POT-Creation-Date: 2014-10-28 11:00+0000\n"
"PO-Revision-Date: 2014-10-28 11:20+0100\n"
"Last-Translator: Martin Mahner <martin@mahner.org>\n"
"Language-Team: DE <LL@li.org>\n"
@ -18,8 +18,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
#: forms.py:11
msgid "One Time Snippet"
#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59
msgid "One-Time snippet"
msgstr "One-Time snippet"
#: forms.py:12
@ -74,10 +74,6 @@ msgstr "Nach Zeitstempel auslaufen lassen"
msgid "Keep Forever"
msgstr "Für immer behalten"
#: models.py:38
msgid "One-Time snippet"
msgstr "One-Time snippet"
#: models.py:41
msgid "Secret ID"
msgstr "Geheime ID"
@ -94,15 +90,11 @@ msgstr "Auslauftyp"
msgid "View count"
msgstr "Anzahl der Besuche"
#: views.py:200
msgid "No changes were made between this two files."
msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht."
#: templates/dpaste/about.html:44
#: templates/dpaste/about.html:59
msgid "Statistics"
msgstr "Statistiken"
#: templates/dpaste/about.html:46
#: templates/dpaste/about.html:61
#, python-format
msgid ""
"There are %(total)s snippets in the database. The most popular languages are:"
@ -139,10 +131,6 @@ msgstr "Erlischt in: %(date)s"
msgid "Snippet never expires"
msgstr "Snippet erlischt niemals"
#: templates/dpaste/snippet_details.html:59
msgid "One-time snippet"
msgstr "One-Time snippet"
#: templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?"
msgstr "Dieses Snippet wirklich löschen?"
@ -165,7 +153,7 @@ msgstr "Gist"
#: templates/dpaste/snippet_details.html:82
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
#, python-format
@ -205,6 +193,10 @@ msgstr "Erlischt in"
msgid "Paste it"
msgstr "Paste"
#: templates/dpaste/snippet_form.html:39
msgid "or"
msgstr ""
#: templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
@ -212,7 +204,7 @@ msgstr "DATETIME_FORMAT"
#: templates/dpaste/snippet_list.html:17
#, python-format
msgid "%(since)s ago"
msgstr "seit %(since)s"
msgstr "Vor %(since)s"
#: templates/dpaste/snippet_list.html:23
msgid ""
@ -222,6 +214,10 @@ msgstr ""
"Keine Snippets gespeichert. Entweder sind alle deine Snippets erloschen oder "
"dein Cookie hat sich geändert."
#: views.py:200
msgid "No changes were made between this two files."
msgstr "Zwischen diesen beiden Dateien wurden keine Änderungen gemacht."
#, fuzzy
#~ msgid "Please fill out this field."
#~ msgstr "Bitte dieses Feld ausfüllen."

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-25 10:08+0000\n"
"POT-Creation-Date: 2014-10-28 11:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: forms.py:11
msgid "One Time Snippet"
#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59
msgid "One-Time snippet"
msgstr ""
#: forms.py:12
@ -73,10 +73,6 @@ msgstr ""
msgid "Keep Forever"
msgstr ""
#: models.py:38
msgid "One-Time snippet"
msgstr ""
#: models.py:41
msgid "Secret ID"
msgstr ""
@ -93,15 +89,11 @@ msgstr ""
msgid "View count"
msgstr ""
#: views.py:200
msgid "No changes were made between this two files."
msgstr ""
#: templates/dpaste/about.html:44
#: templates/dpaste/about.html:59
msgid "Statistics"
msgstr ""
#: templates/dpaste/about.html:46
#: templates/dpaste/about.html:61
#, python-format
msgid ""
"There are %(total)s snippets in the database. The most popular languages are:"
@ -138,10 +130,6 @@ msgstr ""
msgid "Snippet never expires"
msgstr ""
#: templates/dpaste/snippet_details.html:59
msgid "One-time snippet"
msgstr ""
#: templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?"
msgstr ""
@ -200,6 +188,10 @@ msgstr ""
msgid "Paste it"
msgstr ""
#: templates/dpaste/snippet_form.html:39
msgid "or"
msgstr ""
#: templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT"
msgstr ""
@ -214,3 +206,7 @@ msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has "
"changed."
msgstr ""
#: views.py:200
msgid "No changes were made between this two files."
msgstr ""

View file

@ -9,18 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-25 10:08+0000\n"
"POT-Creation-Date: 2014-10-28 11:02+0000\n"
"PO-Revision-Date: 2014-10-27 17:05+0000\n"
"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/es/)\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/dpaste/language/"
"es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: forms.py:11
msgid "One Time Snippet"
#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59
msgid "One-Time snippet"
msgstr "Apenas una visualización"
#: forms.py:12
@ -75,10 +76,6 @@ msgstr "Caduca por fecha y hora"
msgid "Keep Forever"
msgstr "Guarde por siempre"
#: models.py:38
msgid "One-Time snippet"
msgstr "Apenas una visualización"
#: models.py:41
msgid "Secret ID"
msgstr "ID secreto"
@ -95,20 +92,17 @@ msgstr "Tipo de Caducidad "
msgid "View count"
msgstr "Visualizaciones"
#: views.py:200
msgid "No changes were made between this two files."
msgstr "No hay cambios entre estos dos archivos."
#: templates/dpaste/about.html:44
#: templates/dpaste/about.html:59
msgid "Statistics"
msgstr " Estadísticas"
#: templates/dpaste/about.html:46
#: templates/dpaste/about.html:61
#, python-format
msgid ""
"There are %(total)s snippets in the database. The most popular languages "
"are:"
msgstr "Hay %(total)s fragmentos en la base de datos. Los lenguajes más populares son:"
"There are %(total)s snippets in the database. The most popular languages are:"
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
@ -141,10 +135,6 @@ msgstr "Caduca en: %(date)s"
msgid "Snippet never expires"
msgstr "El fragmento nunca caduca"
#: templates/dpaste/snippet_details.html:59
msgid "One-time snippet"
msgstr "Apenas una visualización"
#: templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?"
msgstr "¿Realmente desea eliminar este fragmento?"
@ -172,7 +162,8 @@ msgstr "Este fragmento podrá ser visualizado apenas sólo una vez."
#: 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."
msgstr ""
"Automáticamente eliminado después de más %(remaining)s visualizaciones."
#: templates/dpaste/snippet_details.html:86
msgid "It is automatically removed after the next view."
@ -190,9 +181,13 @@ msgstr "Responder fragmento"
#, python-format
msgid ""
"\n"
" Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href="
"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" "
msgstr "\nComparar entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> y <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>"
msgstr ""
"\n"
"Comparar entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> y <a href="
"\"%(fileb_url)s\">#%(fileb_id)s</a>"
#: templates/dpaste/snippet_form.html:32
msgid "Expire in"
@ -202,6 +197,10 @@ msgstr "Caduca en"
msgid "Paste it"
msgstr "Pegarlo"
#: templates/dpaste/snippet_form.html:39
msgid "or"
msgstr ""
#: templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
@ -215,4 +214,10 @@ msgstr "%(since)s atrás"
msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has "
"changed."
msgstr "No hay fragmentos guardados. O sus fragmentos han caducado o su cookie cambió."
msgstr ""
"No hay fragmentos guardados. O sus fragmentos han caducado o su cookie "
"cambió."
#: views.py:200
msgid "No changes were made between this two files."
msgstr "No hay cambios entre estos dos archivos."

View file

@ -8,18 +8,19 @@ msgid ""
msgstr ""
"Project-Id-Version: dpaste\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-25 10:08+0000\n"
"POT-Creation-Date: 2014-10-28 11:03+0000\n"
"PO-Revision-Date: 2014-10-25 14:25+0000\n"
"Last-Translator: Sergio Oliveira <seocam@seocam.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/dpaste/language/pt_BR/)\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"dpaste/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: forms.py:11
msgid "One Time Snippet"
#: forms.py:11 models.py:38 templates/dpaste/snippet_details.html:59
msgid "One-Time snippet"
msgstr "Uma única visualização"
#: forms.py:12
@ -74,10 +75,6 @@ msgstr "Expira por tempo"
msgid "Keep Forever"
msgstr "Não expira"
#: models.py:38
msgid "One-Time snippet"
msgstr "Uma única visualização"
#: models.py:41
msgid "Secret ID"
msgstr "ID secreto"
@ -94,19 +91,14 @@ msgstr "Tipo de validade"
msgid "View count"
msgstr "Visualizações"
#: views.py:200
msgid "No changes were made between this two files."
msgstr "Nenhuma alterção feita entre esses dois arquivos."
#: templates/dpaste/about.html:44
#: templates/dpaste/about.html:59
msgid "Statistics"
msgstr "Estatísticas"
#: templates/dpaste/about.html:46
#: templates/dpaste/about.html:61
#, python-format
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 é"
#: templates/dpaste/base.html:8 templates/dpaste/base.html.py:21
@ -140,10 +132,6 @@ msgstr "Expira em: %(date)s"
msgid "Snippet never expires"
msgstr "Paste nunca expira"
#: templates/dpaste/snippet_details.html:59
msgid "One-time snippet"
msgstr "Uma única visualização"
#: templates/dpaste/snippet_details.html:63
msgid "Really delete this snippet?"
msgstr "Deseja realmente remover esse paste?"
@ -189,9 +177,14 @@ msgstr "Responder paste"
#, python-format
msgid ""
"\n"
" Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" Diff between <a href=\"%(filea_url)s\">#%(filea_id)s</a> and <a href="
"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" "
msgstr ""
"\n"
" Diff entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href="
"\"%(fileb_url)s\">#%(fileb_id)s</a>\n"
" "
msgstr "\n Diff entre <a href=\"%(filea_url)s\">#%(filea_id)s</a> e <a href=\"%(fileb_url)s\">#%(fileb_id)s</a>\n "
#: templates/dpaste/snippet_form.html:32
msgid "Expire in"
@ -201,6 +194,10 @@ msgstr "Expira em"
msgid "Paste it"
msgstr "Criar paste"
#: templates/dpaste/snippet_form.html:39
msgid "or"
msgstr ""
#: templates/dpaste/snippet_list.html:16
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
@ -214,4 +211,10 @@ msgstr "%(since)s atrás"
msgid ""
"No snippets saved. Either all your snippets are expired or your cookie has "
"changed."
msgstr "Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi alterado."
msgstr ""
"Nenhum paste salvo. Ou todos os seus pastes expiraram ou seu cookie foi "
"alterado."
#: views.py:200
msgid "No changes were made between this two files."
msgstr "Nenhuma alterção feita entre esses dois arquivos."

View file

@ -56,7 +56,7 @@
{% elif snippet.expire_type == 2 %}
{% trans "Snippet never expires" %}
{% elif snippet.expire_type == 3 %}
{% trans "One-time snippet" %}
{% trans "One-Time snippet" %}
{% endif %}
</span>
{% if snippet.pk|in_list:request.session.snippet_list %}

View file

@ -36,6 +36,6 @@
</div>
<div class="form-actions">
<input tabindex="0" type="submit"class="btn btn-primary" value="{% trans "Paste it" %}">
<span class="shortcut">&#8984;+&#9166; or Ctrl+&#9166;</span>
<span class="shortcut">&#8984;+&#9166; {% trans "or" %} Ctrl+&#9166;</span>
</div>
</form>

View file

@ -108,7 +108,7 @@ class SnippetTestCase(TestCase):
def test_new_snippet_onetime(self):
"""
One-time snippets get deleted after two views.
One-Time snippets get deleted after two views.
"""
# POST data
data = self.valid_form_data()