From 5585c5320fd455f990cc6a0a722904879c243e03 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 19 Aug 2009 20:51:26 +0200 Subject: [PATCH 01/18] Bumped version up to 0.5.9 and added dev flag --- dbtemplates/__init__.py | 2 +- setup.cfg | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 setup.cfg diff --git a/dbtemplates/__init__.py b/dbtemplates/__init__.py index d7ecfb2..5805fa3 100644 --- a/dbtemplates/__init__.py +++ b/dbtemplates/__init__.py @@ -1,2 +1,2 @@ -VERSION = (0, 5, 8) +VERSION = (0, 5, 9) __version__ = '.'.join(map(str, VERSION)) \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..3c2fdf5 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[egg_info] +tag_build = dev From 74c30f1eecc8b23097c1dacc3bc01f216d46fcc6 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 19 Aug 2009 20:55:07 +0200 Subject: [PATCH 02/18] Fixes an ambiguity problem with the cache invalidation --- dbtemplates/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbtemplates/models.py b/dbtemplates/models.py index 0b93427..5853796 100644 --- a/dbtemplates/models.py +++ b/dbtemplates/models.py @@ -72,6 +72,7 @@ def add_template_to_cache(instance, **kwargs): Called via Django's signals to cache the templates, if the template in the database was added or changed. """ + remove_cached_template(instance) backend.save(instance.name, instance.content) def remove_cached_template(instance, **kwargs): @@ -82,6 +83,5 @@ def remove_cached_template(instance, **kwargs): backend.remove(instance.name) if backend: - signals.post_save.connect(remove_cached_template, sender=Template) signals.post_save.connect(add_template_to_cache, sender=Template) signals.pre_delete.connect(remove_cached_template, sender=Template) From ac0932fb593ada7f64f032755f400c4865c2f138 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 25 Aug 2009 09:11:14 +0000 Subject: [PATCH 03/18] l10n: Updates to German (de) translation Transmitted-via: Transifex (www.transifex.net) --- dbtemplates/locale/de/LC_MESSAGES/django.po | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.po b/dbtemplates/locale/de/LC_MESSAGES/django.po index 497a13c..d93c78a 100644 --- a/dbtemplates/locale/de/LC_MESSAGES/django.po +++ b/dbtemplates/locale/de/LC_MESSAGES/django.po @@ -1,3 +1,4 @@ +# msgid "" msgstr "" "Project-Id-Version: 0.4\n" @@ -12,20 +13,8 @@ msgstr "" "X-Poedit-Language: German\n" #: admin.py:21 -msgid "" -"Leaving this empty causes Django to look for a template with the given name " -"and populate this field with its content." -msgstr "" -"Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit " -"dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen." - -#: admin.py:35 -msgid "Date/time" -msgstr "" - -#: admin.py:46 -msgid "sites" -msgstr "" +msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." +msgstr "Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen." #: models.py:18 msgid "name" @@ -54,3 +43,11 @@ msgstr "Template" #: models.py:30 msgid "templates" msgstr "Templates" + +#: admin.py:46 +msgid "sites" +msgstr "Seiten" + +#: admin.py:35 +msgid "Date/time" +msgstr "Datum/Uhrzeit" From abf6d70a1f767a057c66bcb6d3d4cc68031d3590 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 25 Aug 2009 17:43:09 +0000 Subject: [PATCH 04/18] l10n: Updates to Hebrew (he) translation Transmitted-via: Transifex (www.transifex.net) --- dbtemplates/locale/he/LC_MESSAGES/django.po | 28 ++++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.po b/dbtemplates/locale/he/LC_MESSAGES/django.po index 59051fd..74c7a87 100644 --- a/dbtemplates/locale/he/LC_MESSAGES/django.po +++ b/dbtemplates/locale/he/LC_MESSAGES/django.po @@ -2,35 +2,25 @@ # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # <>, 2008. -# , fuzzy -# -# +#, fuzzy +# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-03-01 00:56+0100\n" "PO-Revision-Date: 2008-08-21 12:31+0300\n" -"Last-Translator: <>\n" +"Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: admin.py:21 -msgid "" -"Leaving this empty causes Django to look for a template with the given name " -"and populate this field with its content." +msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." msgstr "אם זה ריק אז ג'נגו מחפש תבנית עם שם סיפק וממלא את השדה עם תוכנו" -#: admin.py:35 -msgid "Date/time" -msgstr "" - -#: admin.py:46 -msgid "sites" -msgstr "" - #: models.py:18 msgid "name" msgstr "שם" @@ -58,3 +48,11 @@ msgstr "תבנית" #: models.py:30 msgid "templates" msgstr "תבניות" + +#: admin.py:46 +msgid "sites" +msgstr "אתרים" + +#: admin.py:35 +msgid "Date/time" +msgstr "תאריך / זמן" From 2129bb136133c0461ae1f6d7a9648569a30535b1 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 4 Sep 2009 15:15:23 +0000 Subject: [PATCH 05/18] l10n: Added Danish locale, thanks illio. Fixed issue #2. Transmitted-via: Transifex (www.transifex.net) --- dbtemplates/locale/da/LC_MESSAGES/django.po | 62 +++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 dbtemplates/locale/da/LC_MESSAGES/django.po diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.po b/dbtemplates/locale/da/LC_MESSAGES/django.po new file mode 100644 index 0000000..25f41f0 --- /dev/null +++ b/dbtemplates/locale/da/LC_MESSAGES/django.po @@ -0,0 +1,62 @@ +# django-dbtemplates in Danish. +# django-dbtemplates på Dansk. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Michael Lind Mortensen , 2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-04 11:44+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:21 +msgid "" +"Leaving this empty causes Django to look for a template with the given name " +"and populate this field with its content." +msgstr "" +"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med det givne navn " +"og udfylde dette felt med dets indhold." + +#: admin.py:35 +msgid "Date/time" +msgstr "Dato/tid" + +#: admin.py:46 +msgid "sites" +msgstr "websider" + +#: models.py:18 +msgid "name" +msgstr "navn" + +#: models.py:19 +msgid "Example: 'flatpages/default.html'" +msgstr "Eksempel: 'flatpages/default.html'" + +#: models.py:20 +msgid "content" +msgstr "indhold" + +#: models.py:22 +msgid "creation date" +msgstr "oprettelsesdato" + +#: models.py:24 +msgid "last changed" +msgstr "sidst ændret" + +#: models.py:32 +msgid "template" +msgstr "skabelon" + +#: models.py:33 +msgid "templates" +msgstr "skabeloner" From 5f198ee276301464a79f690f6774acda9ad8ac90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20B=C3=BArigo=20Zacar=C3=A3o?= Date: Thu, 10 Sep 2009 18:46:38 +0000 Subject: [PATCH 06/18] l10n: Added Brazilian Portuguese translation Transmitted-via: Transifex (www.transifex.net) --- .../locale/pt_BR/LC_MESSAGES/django.po | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 dbtemplates/locale/pt_BR/LC_MESSAGES/django.po diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 0000000..9883423 --- /dev/null +++ b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,52 @@ +# Diego Búrigo Zacarão 2009. +msgid "" +msgstr "" +"Project-Id-Version: 0.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-31 11:45-0300\n" +"PO-Revision-Date: 2008-08-31 11:45-0300\n" +"Last-Translator: Diego Búrigo Zacarão \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:21 +msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." +msgstr "Manter isto vazio faz com que o Django procure por um modelo (template) com o dado nome e preencha este campo com o seu conteúdo" + +#: models.py:18 +msgid "name" +msgstr "Name" + +#: models.py:18 +msgid "Example: 'flatpages/default.html'" +msgstr "Exemplo: 'flatpages/default.html'" + +#: models.py:19 +msgid "content" +msgstr "conteúdo" + +#: models.py:21 +msgid "creation date" +msgstr "Data de criação" + +#: models.py:22 +msgid "last changed" +msgstr "ultima modificação" + +#: models.py:29 +msgid "template" +msgstr "modelo" + +#: models.py:30 +msgid "templates" +msgstr "modelos" + +#: admin.py:46 +msgid "sites" +msgstr "sites" + +#: admin.py:35 +msgid "Date/time" +msgstr "Data/hora" From 88999da27df172470009ad9f3c67d39d34ef6a86 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 20 Sep 2009 16:51:38 +0200 Subject: [PATCH 07/18] Updated locales and added empty en locale --- dbtemplates/locale/de/LC_MESSAGES/django.mo | Bin 1021 -> 1021 bytes dbtemplates/locale/de/LC_MESSAGES/django.po | 14 +++++++------- dbtemplates/locale/fr/LC_MESSAGES/django.mo | Bin 789 -> 789 bytes dbtemplates/locale/fr/LC_MESSAGES/django.po | 14 +++++++------- dbtemplates/locale/he/LC_MESSAGES/django.mo | Bin 915 -> 915 bytes dbtemplates/locale/he/LC_MESSAGES/django.po | 14 +++++++------- dbtemplates/locale/it/LC_MESSAGES/django.mo | Bin 1030 -> 1030 bytes dbtemplates/locale/it/LC_MESSAGES/django.po | 14 +++++++------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.mo b/dbtemplates/locale/de/LC_MESSAGES/django.mo index 06721afd667c1b6caaef21a99a9d0a5f2845601c..5e4576361e1c06119d84d8c65de20e5394b71899 100644 GIT binary patch delta 29 kcmey%{+E5jPeuVtT?0#9BLf9PGb>XAZ3CmtoJ?OB0g?#_hX4Qo delta 29 kcmey%{+E5jPeuU?T|+}%Lo)>fLn~7=Z3Dy2oJ?OB0gk diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.po b/dbtemplates/locale/de/LC_MESSAGES/django.po index 497a13c..f31c1e0 100644 --- a/dbtemplates/locale/de/LC_MESSAGES/django.po +++ b/dbtemplates/locale/de/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-01 00:56+0100\n" +"POT-Creation-Date: 2009-09-20 16:50+0200\n" "PO-Revision-Date: 2008-08-19 17:11+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Jannis Leidel \n" @@ -31,26 +31,26 @@ msgstr "" msgid "name" msgstr "Name" -#: models.py:18 +#: models.py:19 msgid "Example: 'flatpages/default.html'" msgstr "Zum Beispiel: 'flatpages/default.html'" -#: models.py:19 +#: models.py:20 msgid "content" msgstr "Inhalt" -#: models.py:21 +#: models.py:22 msgid "creation date" msgstr "Erstellt" -#: models.py:22 +#: models.py:24 msgid "last changed" msgstr "Geändert" -#: models.py:29 +#: models.py:32 msgid "template" msgstr "Template" -#: models.py:30 +#: models.py:33 msgid "templates" msgstr "Templates" diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.mo b/dbtemplates/locale/fr/LC_MESSAGES/django.mo index b923ef53b8fa01c45e6800eb9df9c92412b83ebf..3bedd024941ab98aab57acdd73e998886f8c9c91 100644 GIT binary patch delta 29 kcmbQrHkEBdHlu*0u7Rblk%5AtnU$%5wt>;+YQ|ZN0B+O=J^%m! delta 29 kcmbQrHkEBdHlu)ruA!l>p_zh#p_Qqbwt?a1YQ|ZN0B&;!IsgCw diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.po b/dbtemplates/locale/fr/LC_MESSAGES/django.po index 7542d7c..5447496 100644 --- a/dbtemplates/locale/fr/LC_MESSAGES/django.po +++ b/dbtemplates/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-01 00:56+0100\n" +"POT-Creation-Date: 2009-09-20 16:50+0200\n" "PO-Revision-Date: 2008-08-09 21:39+0100\n" "Last-Translator: Roland Frédéric \n" "Language-Team: Frédéric Roland \n" @@ -29,26 +29,26 @@ msgstr "" msgid "name" msgstr "nom" -#: models.py:18 +#: models.py:19 msgid "Example: 'flatpages/default.html'" msgstr "Exemple: 'flatpages/default.html'" -#: models.py:19 +#: models.py:20 msgid "content" msgstr "contenu" -#: models.py:21 +#: models.py:22 msgid "creation date" msgstr "date de création" -#: models.py:22 +#: models.py:24 msgid "last changed" msgstr "dernier changement" -#: models.py:29 +#: models.py:32 msgid "template" msgstr "modèle" -#: models.py:30 +#: models.py:33 msgid "templates" msgstr "modèles" diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.mo b/dbtemplates/locale/he/LC_MESSAGES/django.mo index f657673aa6bf947c716b70236a4b24b196e03934..dca6d7945e5041724b2b42204b6d48526bfeb881 100644 GIT binary patch delta 29 kcmbQtKAC+3E0chwu7Rblk%5AtnU$%5wt>-RQKmXZ0Ao}JRsaA1 delta 29 kcmbQtKAC+3E0chQuA!l>p_zh#p_Qqbwt?YhQKmXZ0Alk7QUCw| diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.po b/dbtemplates/locale/he/LC_MESSAGES/django.po index 59051fd..8b56e8c 100644 --- a/dbtemplates/locale/he/LC_MESSAGES/django.po +++ b/dbtemplates/locale/he/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-01 00:56+0100\n" +"POT-Creation-Date: 2009-09-20 16:50+0200\n" "PO-Revision-Date: 2008-08-21 12:31+0300\n" "Last-Translator: <>\n" "Language-Team: \n" @@ -35,26 +35,26 @@ msgstr "" msgid "name" msgstr "שם" -#: models.py:18 +#: models.py:19 msgid "Example: 'flatpages/default.html'" msgstr "דוגמא: 'flatpages/default.html'" -#: models.py:19 +#: models.py:20 msgid "content" msgstr "תוכן" -#: models.py:21 +#: models.py:22 msgid "creation date" msgstr "נוצר ב" -#: models.py:22 +#: models.py:24 msgid "last changed" msgstr "שונה ב" -#: models.py:29 +#: models.py:32 msgid "template" msgstr "תבנית" -#: models.py:30 +#: models.py:33 msgid "templates" msgstr "תבניות" diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.mo b/dbtemplates/locale/it/LC_MESSAGES/django.mo index b56c9fbb19da8ebfa1620b20618790f0e8124025..ffe26eb2bb91aad9794043333ed8dc6b1ff5109e 100644 GIT binary patch delta 26 hcmZqUXye%MhmqG(*T_J@(9FuzK-<7*GbhtuMgU|92Mz!L delta 26 hcmZqUXye%MhmqG<*T7K0z`)AXMBBh{GbhtuMgU_~2Lk{A diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.po b/dbtemplates/locale/it/LC_MESSAGES/django.po index 383a42a..11bbeab 100644 --- a/dbtemplates/locale/it/LC_MESSAGES/django.po +++ b/dbtemplates/locale/it/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-01 00:56+0100\n" +"POT-Creation-Date: 2009-09-20 16:50+0200\n" "PO-Revision-Date: 2009-01-22 01:27+0100\n" "Last-Translator: Marco Beri \n" "Language-Team: Jannis Leidel \n" @@ -31,26 +31,26 @@ msgstr "" msgid "name" msgstr "nome" -#: models.py:18 +#: models.py:19 msgid "Example: 'flatpages/default.html'" msgstr "Esempio: 'flatpages/default.html'" -#: models.py:19 +#: models.py:20 msgid "content" msgstr "contenuto" -#: models.py:21 +#: models.py:22 msgid "creation date" msgstr "data di creazione" -#: models.py:22 +#: models.py:24 msgid "last changed" msgstr "ultimo cambiamento" -#: models.py:29 +#: models.py:32 msgid "template" msgstr "template" -#: models.py:30 +#: models.py:33 msgid "templates" msgstr "template" From 5cc3dc62a6cf8a7661de45f131e04c0a1afabf9e Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 20 Sep 2009 16:54:05 +0200 Subject: [PATCH 08/18] Updated locales and added empty en locale --- dbtemplates/locale/en/LC_MESSAGES/django.mo | Bin 0 -> 367 bytes dbtemplates/locale/en/LC_MESSAGES/django.po | 59 ++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 dbtemplates/locale/en/LC_MESSAGES/django.mo create mode 100644 dbtemplates/locale/en/LC_MESSAGES/django.po diff --git a/dbtemplates/locale/en/LC_MESSAGES/django.mo b/dbtemplates/locale/en/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..96c41deb7528ef6831ef010712bc7c99d4dfa25b GIT binary patch literal 367 zcmYL^K~KUk7=|@^+R?Lz9=zd)g9HN=36&LGY&S9niQX#IS%WRiJY{too z7mGB{qC)SS4Thn&F8bvad{P3wxJB}vK25s?;uN{^R`ZHYZw#wKWvVK** d*5P(pPN9GBnl3Ne1Gj6pF}9+l|7=2Z^a}(UVzmGO literal 0 HcmV?d00001 diff --git a/dbtemplates/locale/en/LC_MESSAGES/django.po b/dbtemplates/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..5527ac0 --- /dev/null +++ b/dbtemplates/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,59 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-20 16:51+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:21 +msgid "" +"Leaving this empty causes Django to look for a template with the given name " +"and populate this field with its content." +msgstr "" + +#: admin.py:35 +msgid "Date/time" +msgstr "" + +#: admin.py:46 +msgid "sites" +msgstr "" + +#: models.py:18 +msgid "name" +msgstr "" + +#: models.py:19 +msgid "Example: 'flatpages/default.html'" +msgstr "" + +#: models.py:20 +msgid "content" +msgstr "" + +#: models.py:22 +msgid "creation date" +msgstr "" + +#: models.py:24 +msgid "last changed" +msgstr "" + +#: models.py:32 +msgid "template" +msgstr "" + +#: models.py:33 +msgid "templates" +msgstr "" From 73c756ed47a2457bc7c33f80c10c814104b55760 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 20 Sep 2009 16:55:11 +0200 Subject: [PATCH 09/18] Updated locales again --- dbtemplates/locale/de/LC_MESSAGES/django.mo | Bin 1021 -> 1106 bytes dbtemplates/locale/he/LC_MESSAGES/django.mo | Bin 915 -> 1009 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.mo b/dbtemplates/locale/de/LC_MESSAGES/django.mo index 5e4576361e1c06119d84d8c65de20e5394b71899..38cf587966499aea886d85ba14d7ddc348a85e56 100644 GIT binary patch delta 348 zcmX}nuTMfz7{>AU0#}e94s8AiP}ocaip5z7Gy_`P42H9LH?K19p;##X0}SZ?4@8rZ z%|xK!98@xu&F|wT@All!**SaPbI&$A%k_T_Gh?F)VS`zrmYN{>{pDn&v)SwmFZ`*(r0?!9aHD0YM8XP89ZC6o8yIViE;iyJo& aFRw20!-MqqafgL_vTGN2A8Fbx68i-)Yb(qE delta 263 zcmcb_@t3{+o)F7a1|Z-BVi_P#0b*VtUIWA+@BoMvf%qX1mjW>}BLf3Fkgf#MAa#vE zng>Yt18Ei@JqJj00O^H58f4}wARPt7TYy*%$meHfV3-1=&44r;14AOiX&?in;S!Jr zX}ArfK?XgAiob%2e+JS(GeDZa@*q7R^)SE$WB`>gumUm2fiN&xit*s)hm3iQlVh20 S3x}lU7UU$Bq%y!5#S8#hJRgYw diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.mo b/dbtemplates/locale/he/LC_MESSAGES/django.mo index dca6d7945e5041724b2b42204b6d48526bfeb881..059c79cb0bd5be05e940d900c16058fe4304fffa 100644 GIT binary patch delta 364 zcmYMvv1-Cl6vpvmOiXKAFgn)3mhP@y-1-E4gAN%S#KAcG3QDlhLR&}47CMTQjza0! zLn%mwPHuvG{hy2Afsfx!ZtgiZX}Ado%c?&X>V(uuLL%}(tSSYOV~p?u&#{j!4Dl7u zaE7P2Kp(#_z#lxq6ST4vf+b}E6y8&`@m&DDa-HAuP??JDf#JzM<$kSV|Tg`N+ jQ+?3KMzf*!`m8VMn>W84YUW-)35$_V_#!(j$2{x+7&1hz delta 270 zcmXwzJqiLb5JqP=tLtwgf*>}6SF#lZD;sST#6oOrRl*j6g|@-M!p=rdkxtyg19$`9 zfEjqaOfr0vZ)(%ktC3_vm7xP8sKW)c-q3{{W?&+b6fdyOt#J)+ae|MygwI$r9j?L+ zdi0N2WP(4KxuNt816&OL9%Buf;|gA4U9iDqND=g1m*|2} Date: Sun, 20 Sep 2009 16:55:51 +0200 Subject: [PATCH 10/18] Compiled danish and pt_BR locales --- dbtemplates/locale/da/LC_MESSAGES/django.mo | Bin 0 -> 1060 bytes dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo | Bin 0 -> 1104 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 dbtemplates/locale/da/LC_MESSAGES/django.mo create mode 100644 dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.mo b/dbtemplates/locale/da/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..e32b95627c38466b1f7c92048abc063b11faea98 GIT binary patch literal 1060 zcmaKq&rVZ86vjtI(W(*L8C@LRkchVw#RRWFxY7$Wwv?1YqPwAUdVAq^rnxgM@Blu7 zkDxE$#>6En6W4AuCMK?2^8kKR3cB*7bAP9kGvE9<-;dj4Zw2By#yt#&F^Ta7!^gx0 zA+CXw;C=8e*asKEaqt6p6Z{0;06&9c;8*Z6_zk=Y{sg_wZ}2I`$!PxJB_SSQ{t5U7 z+yTArckmYY3-tOYpx3>KkJlR?aRMyh{~ZvL!yFif-_M8F^WpD!Wtc$+^yl+hJ|I8T z7iH;q#-&{r@uBSYG7f2~ok`b|3ELUPZQ0LUvE#bgl&G>Cq&gwjNiA`==Z>f)`<5-0 z_oPk?IYXH-`_wi$NpdKG64OEII#|S%qyyHZWtT~6MLpB&4-1BZ?UXZhTAMmcEu$T4 zR}`Z}v~rd%HJTJOMJBDIRtMX%5?)c*)Ug$3o1Q0DZ02TRM@OHgO$;~fq$xy9+yhb0{@$%+1YSzZn}gS z6b20*q+Wbf_bQGWL9HH?BU-PAwaWDC`bJ!+;@Ckmm)hduCJ$+KyIQ4iyCGGhjkRrm(mQm<#Nb|d?D|llV7(9SjE5?3SK#WuNCIum4Oxqyo*`Rh259C KoEd$dVD1kAdmgg@ literal 0 HcmV?d00001 diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..3853b4a2cb5b980f731a28d5bea9cd05409e1853 GIT binary patch literal 1104 zcmZ{iJ8u&~5XTotco+}_(Lph(0>%140y54+ArC~P7^294M1$6MV|&Bh?XkOOl5~jA zz$c*K1JH%i6%sWK5)v&nAAtY*feXY)I1cS~munqq`{{Q^UNLPVx@%bL@42j{_{dk;TBcNshjJ^(`y*Xzp-S_F8??|#l+RU{T_xs@DiUAr`7~J&yR7;;>yqzjN1W#Vh$2-ucC>Y% zvaTU-C^6<0b&MrN9wAU-dZT?0hnTv$&lzPZWl~v8xyg%Rz)-NGIf+NH+B=F&<~j3a zF@6w{W#zTWD2Ap;l=Bqzkd|W+6ou2CotPy3`{2Z$H3uAdxf9E0Y#k&TR4p%+_Bl7! z%ckq8`9UR;vh<``p(-a2i+t zH*OcD%9d4`L$k&TT^yVT)9yhoZ4XVd}WY z|87xJVX&68!?yI%hM|r+#<){@T`-x+E}{LXu#6?KRHT%em=i;{CiA^LJYld5v7yXh zqY!GDGgMCOuyqmE*^Hwc7kEP6!AWey^eNO$F=DM&gO3=3z_#mDg><^3qw&kf)BPIN IAx3cG4^Z$kq5uE@ literal 0 HcmV?d00001 From e266593ac4343a06cf93c0bd7a3894cd058dfa0a Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 13:47:08 +0200 Subject: [PATCH 11/18] Enabled egg template loader in case someone is trying to test with django-reversion which might get zipped when installed with easy_install --- example/settings.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/example/settings.py b/example/settings.py index dc39774..ebdeeac 100644 --- a/example/settings.py +++ b/example/settings.py @@ -54,7 +54,7 @@ SECRET_KEY = 'e-%(1e1f8ar2v)_8d!%-75a2ag(w(ht*l%n-wts5$li!5=97)8' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', + 'django.template.loaders.eggs.load_template_source', 'dbtemplates.loader.load_template_source', ) @@ -81,9 +81,10 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'django.contrib.flatpages', 'dbtemplates', + #'reversion', ) # Uncomment the following two settings to use the file system cache backend. # It will cache in the directory "cache" inside the example project directory. -# DBTEMPLATES_CACHE_BACKEND = "dbtemplates.cache.FileSystemBackend" -# DBTEMPLATES_CACHE_DIR = "cache" +#DBTEMPLATES_CACHE_BACKEND = "dbtemplates.cache.FileSystemBackend" +#DBTEMPLATES_CACHE_DIR = "cache" From 62b371d1eeec11e91eb90b79df6318ab8f9d9920 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 14:01:57 +0200 Subject: [PATCH 12/18] Added admin actions to invalidate and repopulate template cache --- dbtemplates/admin.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dbtemplates/admin.py b/dbtemplates/admin.py index b50b1c1..22ca016 100644 --- a/dbtemplates/admin.py +++ b/dbtemplates/admin.py @@ -1,9 +1,10 @@ from django import forms from django.conf import settings from django.contrib import admin -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ungettext, ugettext_lazy as _ -from dbtemplates.models import Template +from dbtemplates.models import Template, backend, remove_cached_template, \ + add_template_to_cache # Check if django-reversion is installed and use reversions' VersionAdmin # as the base admin class if yes @@ -40,6 +41,34 @@ class TemplateAdmin(TemplateModelAdmin): list_display = ('name', 'creation_date', 'last_changed', 'site_list') list_filter = ('sites',) search_fields = ('name', 'content') + if backend: + actions = ['invalidate_cache', 'repopulate_cache'] + + def invalidate_cache(self, request, queryset): + if not backend: + self.message_user(request, ("There is no active cache backend.")) + return + for template in queryset: + remove_cached_template(template) + message = ungettext( + "Cache of one template successfully invalidated.", + "Cache of %(count)d templates successfully invalidated.", + len(queryset)) + self.message_user(request, message % {'count': len(queryset)}) + invalidate_cache.short_description = _("Invalidate cache of selected templates") + + def repopulate_cache(self, request, queryset): + if not backend: + self.message_user(request, ("There is no active cache backend.")) + return + for template in queryset: + add_template_to_cache(template) + message = ungettext( + "Cache successfully repopulated with one template.", + "Cache successfully repopulated with %(count)d templates.", + len(queryset)) + self.message_user(request, message % {'count': len(queryset)}) + repopulate_cache.short_description = _("Repopulate cache with selected templates") def site_list(self, template): return ", ".join([site.name for site in template.sites.all()]) From 085b7bab84058143aa7d4e393c3f29ab917a5287 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 14:02:39 +0200 Subject: [PATCH 13/18] Added example project db to hgignore --- .hgignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.hgignore b/.hgignore index 0ff3e91..64f1443 100644 --- a/.hgignore +++ b/.hgignore @@ -4,4 +4,5 @@ syntax: glob MANIFEST build dist -django_dbtemplates.egg-info/ \ No newline at end of file +django_dbtemplates.egg-info/ +example/example.db \ No newline at end of file From 62caa94e14aab6f1863bd959f2c10bdf9d16beb1 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 14:03:26 +0200 Subject: [PATCH 14/18] Updated locales after latest changes --- dbtemplates/locale/da/LC_MESSAGES/django.po | 34 ++++++++-- dbtemplates/locale/de/LC_MESSAGES/django.po | 52 ++++++++++++---- dbtemplates/locale/en/LC_MESSAGES/django.po | 30 +++++++-- dbtemplates/locale/fr/LC_MESSAGES/django.po | 30 +++++++-- dbtemplates/locale/he/LC_MESSAGES/django.po | 50 +++++++++++---- dbtemplates/locale/it/LC_MESSAGES/django.po | 30 +++++++-- .../locale/pt_BR/LC_MESSAGES/django.po | 62 +++++++++++++------ 7 files changed, 226 insertions(+), 62 deletions(-) diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.po b/dbtemplates/locale/da/LC_MESSAGES/django.po index 25f41f0..f6ba713 100644 --- a/dbtemplates/locale/da/LC_MESSAGES/django.po +++ b/dbtemplates/locale/da/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-04 11:44+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,19 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:21 +#: admin.py:29 msgid "" "Leaving this empty causes Django to look for a template with the given name " "and populate this field with its content." msgstr "" -"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med det givne navn " -"og udfylde dette felt med dets indhold." +"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med " +"det givne navn og udfylde dette felt med dets indhold." -#: admin.py:35 +#: admin.py:43 msgid "Date/time" msgstr "Dato/tid" -#: admin.py:46 +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 msgid "sites" msgstr "websider" diff --git a/dbtemplates/locale/de/LC_MESSAGES/django.po b/dbtemplates/locale/de/LC_MESSAGES/django.po index 0897d85..434c80c 100644 --- a/dbtemplates/locale/de/LC_MESSAGES/django.po +++ b/dbtemplates/locale/de/LC_MESSAGES/django.po @@ -1,9 +1,9 @@ -# +# msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-20 16:50+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: 2008-08-19 17:11+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Jannis Leidel \n" @@ -12,9 +12,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" -#: admin.py:21 -msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." -msgstr "Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen." +#: admin.py:29 +msgid "" +"Leaving this empty causes Django to look for a template with the given name " +"and populate this field with its content." +msgstr "" +"Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit " +"dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen." + +#: admin.py:43 +msgid "Date/time" +msgstr "Datum/Uhrzeit" + +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 +msgid "sites" +msgstr "Seiten" #: models.py:18 msgid "name" @@ -43,11 +77,3 @@ msgstr "Template" #: models.py:33 msgid "templates" msgstr "Templates" - -#: admin.py:46 -msgid "sites" -msgstr "Seiten" - -#: admin.py:35 -msgid "Date/time" -msgstr "Datum/Uhrzeit" diff --git a/dbtemplates/locale/en/LC_MESSAGES/django.po b/dbtemplates/locale/en/LC_MESSAGES/django.po index 5527ac0..79e77d0 100644 --- a/dbtemplates/locale/en/LC_MESSAGES/django.po +++ b/dbtemplates/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: 2009-09-20 16:51+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,17 +16,39 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:21 +#: admin.py:29 msgid "" "Leaving this empty causes Django to look for a template with the given name " "and populate this field with its content." msgstr "" -#: admin.py:35 +#: admin.py:43 msgid "Date/time" msgstr "" -#: admin.py:46 +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 msgid "sites" msgstr "" diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.po b/dbtemplates/locale/fr/LC_MESSAGES/django.po index 5447496..a6e5e8f 100644 --- a/dbtemplates/locale/fr/LC_MESSAGES/django.po +++ b/dbtemplates/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-20 16:50+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: 2008-08-09 21:39+0100\n" "Last-Translator: Roland Frédéric \n" "Language-Team: Frédéric Roland \n" @@ -11,17 +11,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" -#: admin.py:21 +#: admin.py:29 msgid "" "Leaving this empty causes Django to look for a template with the given name " "and populate this field with its content." msgstr "" -#: admin.py:35 +#: admin.py:43 msgid "Date/time" msgstr "" -#: admin.py:46 +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 msgid "sites" msgstr "" diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.po b/dbtemplates/locale/he/LC_MESSAGES/django.po index 31a4dbe..b5fcf25 100644 --- a/dbtemplates/locale/he/LC_MESSAGES/django.po +++ b/dbtemplates/locale/he/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # <>, 2008. +# +# #, fuzzy -# -# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-20 16:50+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: 2008-08-21 12:31+0300\n" "Last-Translator: <>\n" "Language-Team: \n" @@ -17,10 +17,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:21 -msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." +#: admin.py:29 +msgid "" +"Leaving this empty causes Django to look for a template with the given name " +"and populate this field with its content." msgstr "אם זה ריק אז ג'נגו מחפש תבנית עם שם סיפק וממלא את השדה עם תוכנו" +#: admin.py:43 +msgid "Date/time" +msgstr "תאריך / זמן" + +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 +msgid "sites" +msgstr "אתרים" + #: models.py:18 msgid "name" msgstr "שם" @@ -48,11 +80,3 @@ msgstr "תבנית" #: models.py:33 msgid "templates" msgstr "תבניות" - -#: admin.py:46 -msgid "sites" -msgstr "אתרים" - -#: admin.py:35 -msgid "Date/time" -msgstr "תאריך / זמן" diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.po b/dbtemplates/locale/it/LC_MESSAGES/django.po index 11bbeab..7b93b58 100644 --- a/dbtemplates/locale/it/LC_MESSAGES/django.po +++ b/dbtemplates/locale/it/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-20 16:50+0200\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: 2009-01-22 01:27+0100\n" "Last-Translator: Marco Beri \n" "Language-Team: Jannis Leidel \n" @@ -11,7 +11,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" -#: admin.py:21 +#: admin.py:29 msgid "" "Leaving this empty causes Django to look for a template with the given name " "and populate this field with its content." @@ -19,11 +19,33 @@ msgstr "" "Lasciandolo vuoto, Django cercherà un template con lo stesso nome che avete " "indicato sopra e userà il suo contenuto per riempire questo campo." -#: admin.py:35 +#: admin.py:43 msgid "Date/time" msgstr "" -#: admin.py:46 +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 msgid "sites" msgstr "" diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po index 9883423..fea37ca 100644 --- a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po +++ b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-31 11:45-0300\n" +"POT-Creation-Date: 2009-10-09 13:45+0200\n" "PO-Revision-Date: 2008-08-31 11:45-0300\n" "Last-Translator: Diego Búrigo Zacarão \n" "Language-Team: Brazilian Portuguese \n" @@ -11,42 +11,68 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:21 -msgid "Leaving this empty causes Django to look for a template with the given name and populate this field with its content." -msgstr "Manter isto vazio faz com que o Django procure por um modelo (template) com o dado nome e preencha este campo com o seu conteúdo" +#: admin.py:29 +msgid "" +"Leaving this empty causes Django to look for a template with the given name " +"and populate this field with its content." +msgstr "" +"Manter isto vazio faz com que o Django procure por um modelo (template) com " +"o dado nome e preencha este campo com o seu conteúdo" + +#: admin.py:43 +msgid "Date/time" +msgstr "Data/hora" + +#: admin.py:61 +#, python-format +msgid "Cache of one template successfully invalidated." +msgid_plural "Cache of %(count)d templates successfully invalidated." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:65 +msgid "Invalidate cache of selected templates" +msgstr "" + +#: admin.py:74 +#, python-format +msgid "Cache successfully repopulated with one template." +msgid_plural "Cache successfully repopulated with %(count)d templates." +msgstr[0] "" +msgstr[1] "" + +#: admin.py:78 +msgid "Repopulate cache with selected templates" +msgstr "" + +#: admin.py:82 +msgid "sites" +msgstr "sites" #: models.py:18 msgid "name" msgstr "Name" -#: models.py:18 +#: models.py:19 msgid "Example: 'flatpages/default.html'" msgstr "Exemplo: 'flatpages/default.html'" -#: models.py:19 +#: models.py:20 msgid "content" msgstr "conteúdo" -#: models.py:21 +#: models.py:22 msgid "creation date" msgstr "Data de criação" -#: models.py:22 +#: models.py:24 msgid "last changed" msgstr "ultima modificação" -#: models.py:29 +#: models.py:32 msgid "template" msgstr "modelo" -#: models.py:30 +#: models.py:33 msgid "templates" msgstr "modelos" - -#: admin.py:46 -msgid "sites" -msgstr "sites" - -#: admin.py:35 -msgid "Date/time" -msgstr "Data/hora" From bd214ad336a2dfdbb4ae89801e9dba38a79884b0 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 14:12:48 +0200 Subject: [PATCH 15/18] Compiled translations --- dbtemplates/locale/da/LC_MESSAGES/django.mo | Bin 1060 -> 1060 bytes dbtemplates/locale/de/LC_MESSAGES/django.mo | Bin 1106 -> 1833 bytes dbtemplates/locale/de/LC_MESSAGES/django.po | 12 ++++++------ dbtemplates/locale/en/LC_MESSAGES/django.mo | Bin 367 -> 367 bytes dbtemplates/locale/fr/LC_MESSAGES/django.mo | Bin 789 -> 789 bytes dbtemplates/locale/he/LC_MESSAGES/django.mo | Bin 1009 -> 1009 bytes dbtemplates/locale/it/LC_MESSAGES/django.mo | Bin 1030 -> 1030 bytes .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 1104 -> 1104 bytes 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dbtemplates/locale/da/LC_MESSAGES/django.mo b/dbtemplates/locale/da/LC_MESSAGES/django.mo index e32b95627c38466b1f7c92048abc063b11faea98..8acc5709e4503343b53914c11563e3ad037b7260 100644 GIT binary patch delta 24 fcmZ3&v4mrTI}^8|fv$n2f}ydMiRtDbrb~RT1#FNwEFeLl#xsxzXAB6%b|NDitYi!*tSVinyUTP}4^`FU zI1j-Fc!N9!E4*R_F96TLjxGP0nVun%Wr9+g>aVB!-0H77{pYJ|KPilhm~UYIi1|9^ zg{N@AD8U?b;1T#c_#(LZv{G+@JK#HD0k+`x;AL>_8Ks^FHTW`k4ZHwufotFa_$+t` zz5sp$N?Z%xMGg;shyTCA_y=$k#uDc@Q1bl&&hk7ruUUf{&wl~&Q-9$iasLJ-t`sAA zd!W3(2+I4{KzaWrh_ni6XLi7Byn?IPNv++Gb;#&p!cAexv+)wHqGLCtUWqOF)RxIg zrY5JxGbOGkl}Svo%`%QLZ>#EroS&M?SvmHpe7v!?awUAy#(|LOKf*uax!(n>l@ z$1atRRL~_l-{XuL`f3{y*ORMR?c6t550B_ljx-Zfa9p>Xo3={*GS$^3wYyvzWt|X_ zE6${-PK~Jc*i4--D3vY}G)gBhZzD(AJ~F;&C^b|y&9{^{fy~lzzN`d&3pZs?-qcLS zTj~}*512cy781A=DQkRUpZeY_w$NujA&T4(b{-C!tms*ccCRjt_ z`)M8L-}z0^EksTqAC7P8jg_60m~+rOK5Hya#E3TTxzzhwA2e)T(p^y_y2YV3zNfZ1 z(7eakc^sJWqQxQ|x4|-T$eXGN?6Q&yoIDQL`IXZYySX~$|I_)gGg6B~>A6J(`RUIU z+T%$|I4hb-ZM}Y2h6n7Dy4%)tgI%29;Gff+bJ;8eM6VTmeEP7g&>8=dP~>8-zGCm` zj$^Wpr73SpKgl~n4@CCwp%H`adUc8u-r}Q&$JVSigld<_a*YNpxZr#2k?M1_ji(1K z<<48&iB5AniA%e_G!?uMW|mV7ML+i4_v^gsMev0=K132p?Sz;Z`m0-f`VbjIQc{At O1KF_9ZvU4zQT+oI9v`6q delta 320 zcmXxfJrBW96vpw}R*QOx+JvDNiJ?io28md0c8PC+wTr=IxqJw-(PEVt#9)y~tR{mG z;D3mdJpCp2~x{%Kw(g0r!3{&^T>BQ+b08cCjC;$Ke delta 21 ccmaFQ^qy%#54VA(u91O)p_!Gb;l$}T08d#5DF6Tf diff --git a/dbtemplates/locale/fr/LC_MESSAGES/django.mo b/dbtemplates/locale/fr/LC_MESSAGES/django.mo index 3bedd024941ab98aab57acdd73e998886f8c9c91..5b975da8c1af834fb385f6f88da144149ecf3de8 100644 GIT binary patch delta 24 fcmbQrHkEBdE+e<0fv$n2f}ydMiRtDF#<`3DP$&jS delta 24 fcmbQrHkEBdE+e;rrLK{If}xp}slnz7#<`3DP*Da* diff --git a/dbtemplates/locale/he/LC_MESSAGES/django.mo b/dbtemplates/locale/he/LC_MESSAGES/django.mo index 059c79cb0bd5be05e940d900c16058fe4304fffa..857a7df0d3b5c2c05321c1f8316394eb4dfcb39d 100644 GIT binary patch delta 24 fcmey!{*iryI}^8|fv$n2f}ydMiRtDbrumEjU5f^~ delta 24 fcmey!{*iryI}^8orLK{If}xp}slnzTrumEjU9<+e diff --git a/dbtemplates/locale/it/LC_MESSAGES/django.mo b/dbtemplates/locale/it/LC_MESSAGES/django.mo index ffe26eb2bb91aad9794043333ed8dc6b1ff5109e..407043464c2e8e4e6f3f8c5d92be9c08cc314765 100644 GIT binary patch delta 23 ecmZqUXye%Mn~~elK-a)h!O+;s#B?zm6B7VWZ3UkI delta 23 ecmZqUXye%Mn~~eVQrE~p!O+ag)L=0i6B7VWmIa>x diff --git a/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo b/dbtemplates/locale/pt_BR/LC_MESSAGES/django.mo index 3853b4a2cb5b980f731a28d5bea9cd05409e1853..14e12f38c91d4fa89c2f91efa1bd8c654427f8eb 100644 GIT binary patch delta 27 icmcb>ae-rlH4~qqfv$n2f}ydMiK(`M(PmF3b|wI4_Xb`7 delta 27 icmcb>ae-rlH4~qKg|4xof}x?6iK(uE@n%mZb|wI5Dh6Qy From 5ccb175589ba0024764695950b9dfc81603cfd94 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 15:01:26 +0200 Subject: [PATCH 16/18] Added Sphinx configuration and updated the docs with latest changes --- .hgignore | 3 +- LICENSE | 2 +- docs/conf.py | 194 ++++++++++++++++++++++++++++++++++++++++++++++ docs/index.txt | 4 +- docs/overview.txt | 34 +++++++- 5 files changed, 232 insertions(+), 5 deletions(-) create mode 100644 docs/conf.py diff --git a/.hgignore b/.hgignore index 64f1443..508637e 100644 --- a/.hgignore +++ b/.hgignore @@ -5,4 +5,5 @@ MANIFEST build dist django_dbtemplates.egg-info/ -example/example.db \ No newline at end of file +example/example.db +docs/_build \ No newline at end of file diff --git a/LICENSE b/LICENSE index c0d146f..420c261 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2007-2009, Jannis Leidel +Copyright (c) 2007-2009, Jannis Leidel and contributors All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..c7385f2 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,194 @@ +# -*- coding: utf-8 -*- +# +# django-dbtemplates documentation build configuration file, created by +# sphinx-quickstart on Fri Oct 9 14:52:11 2009. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.append(os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.coverage'] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.txt' + +# The encoding of source files. +#source_encoding = 'utf-8' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'django-dbtemplates' +copyright = u'2009, Jannis Leidel' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.6.0' +# The full version, including alpha/beta/rc tags. +release = '0.6.0' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +html_title = "django-dbtemplates documentation" + +# A shorter title for the navigation bar. Default is the same as html_title. +html_short_title = "django-dbtemplates" + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_use_modindex = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'django-dbtemplatesdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'django-dbtemplates.tex', u'django-dbtemplates Documentation', + u'Jannis Leidel', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True diff --git a/docs/index.txt b/docs/index.txt index 6481551..4eef226 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -1,4 +1,3 @@ -================== django-dbtemplates ================== @@ -12,5 +11,6 @@ created in the database. Contents: .. toctree:: + :maxdepth: 2 - overview.txt + overview diff --git a/docs/overview.txt b/docs/overview.txt index 1a4443b..3883d6a 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -217,7 +217,8 @@ Short installation howto Management commands =================== -``dbtemplates`` comes with two `Django management commands`_ to be used with ``django-admin.py`` or ``manage.py``: +``dbtemplates`` comes with two `Django management commands`_ to be used with +``django-admin.py`` or ``manage.py``: * ``sync_templates`` @@ -231,6 +232,37 @@ Management commands .. _Django management commands: http://docs.djangoproject.com/en/dev/ref/django-admin/ +Admin actions +============= + +``dbtemplates`` provides two `admin actions`_ to be used with Django>=1.1. + +* ``invalidate_cache`` + + Invalidates the cache of the selected templates by calling the appropriate + cache backend methods. + +* ``repopulate_cache`` + + Repopulates the cache with selected templates by invalidating it first and + filling then after that. + +.. _admin actions: http://docs.djangoproject.com/en/1.1/ref/contrib/admin/actions/#ref-contrib-admin-actions + +Changelog: +========== + +v0.6 (10-09-09): +---------------- + +* Updated and added locales (Danish, Brazilian Portuguese) + +* Fixes an ambiguity problem with the cache invalidation + +* Added ``invalidate_cache`` and ``repopulate_cache`` admin actions + +* Added Sphinx documentation + Support ======= From a2547a90bec7d963e5c719bcd1db68cf153e43b7 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 15:01:57 +0200 Subject: [PATCH 17/18] Getting ready for 0.6.0 --- dbtemplates/__init__.py | 2 +- setup.cfg | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dbtemplates/__init__.py b/dbtemplates/__init__.py index 5805fa3..d1fc581 100644 --- a/dbtemplates/__init__.py +++ b/dbtemplates/__init__.py @@ -1,2 +1,2 @@ -VERSION = (0, 5, 9) +VERSION = (0, 6, 0) __version__ = '.'.join(map(str, VERSION)) \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 3c2fdf5..98cef66 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,10 @@ [egg_info] -tag_build = dev +#tag_build = dev + +[build_sphinx] +source-dir = docs/ +build-dir = docs/_build +all_files = 1 + +[upload_docs] +upload-dir = docs/_build/html From a8e0a7208780e926cddf1366685dac64365c3e8c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Oct 2009 15:02:22 +0200 Subject: [PATCH 18/18] Added tag 0.6.0 for changeset 4b36382cdfd7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7e81158..c33f6be 100644 --- a/.hgtags +++ b/.hgtags @@ -17,3 +17,4 @@ bf3db2fe192d4a02bf531e61e23df342c36d6b1b 0.5.1 4109e0db4340042cb85ea8a7d2b6ce37245738c6 0.5.5 ade167225d06cb6888ea8bfa84e7d020590171c6 0.5.6 dff01be9c8af328f8fcbc2fc97edcbe8d97840e2 0.5.7 +4b36382cdfd756f45f81b0d042aaf331c3eabe30 0.6.0