From ba4aafea9d625f107f039f63d584580badca31ba Mon Sep 17 00:00:00 2001 From: kevin fricovsky Date: Tue, 2 Feb 2010 21:05:09 -0500 Subject: [PATCH] i18n updates, MANIFEST and setup.py updates, check changelog for notes --- MANIFEST.in | 2 +- docs/CHANGELOG.txt | 15 +++ mingus/locale/es/LC_MESSAGES/django.po | 99 ++++++++++--------- mingus/locale/fr/LC_MESSAGES/django.po | 90 ++++++++--------- mingus/settings.py | 4 +- mingus/templates/base.html | 14 ++- .../templates/contact_form/contact_form.html | 2 +- mingus/templates/quotes/quote_detail.html | 6 +- setup.py | 2 +- 9 files changed, 125 insertions(+), 109 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 9326635a..d1d37b6c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,7 +6,7 @@ include docs/CHANGELOG.txt include docs/INSTALL.textile include mingus/requirements.txt include mingus/stable-requirements.txt -include mingus/fixtures/test_data.json +include mingus/core/fixtures/test_data.json include mingus/local_settings.py.template recursive-include mingus/media *.js *.css *.png recursive-include mingus/templates *.html *.txt diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 2117fc16..9e770365 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,6 +1,21 @@ Note: I neglected to keep a CHANGELOG until 0.9 release which is noted below. +2.2.10 +------ +* updated MANIFEST +* updated settings organization +* Some i18n fixes +* Spanish translation added. +* Remove stray +* French translation added. + +2.1.10 +------ +* ran makemessages after alup merge applied to regen .po files +* merged transifex(alup) code, added base locale dirs + + 1.30.10 ------- * added django-memcached-status diff --git a/mingus/locale/es/LC_MESSAGES/django.po b/mingus/locale/es/LC_MESSAGES/django.po index 699a8bcf..348cd589 100644 --- a/mingus/locale/es/LC_MESSAGES/django.po +++ b/mingus/locale/es/LC_MESSAGES/django.po @@ -1,17 +1,16 @@ -# 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. +# django-mingus Spanish translation +# Copyright (C) 2010 +# This file is distributed under the same license as the django-mingus package. +# Pablo Martí , 2010. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: 0.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-01 20:52-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2010-02-02 18:44+0100\n" +"Last-Translator: Pablo Martí \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,94 +18,94 @@ msgstr "" #: core/templatetags/tagging_related.py:21 #, python-format msgid "tagged_get_related tag was given an invalid input: %s" -msgstr "" +msgstr "la etiqueta tagged_get_related recibó una entrada inválida: %s" #: core/templatetags/tagging_related.py:35 #, python-format msgid "%s tag requires either five or seven arguments" -msgstr "" +msgstr "la etiqueta %s requiere cinco o siete argumentos" #: core/templatetags/tagging_related.py:37 #, python-format msgid "second argument to %s tag must be 'in'" -msgstr "" +msgstr "el segundo argumento para la etiqueta %s debe de ser 'in'" #: core/templatetags/tagging_related.py:39 #, python-format msgid "fourth argument to %s tag must be 'as'" -msgstr "" +msgstr "el cuarto argumento para la etiqueta %s debe de ser 'as'" #: core/templatetags/tagging_related.py:42 #, python-format msgid "if given, fourth argument to %s tag must be 'with'" -msgstr "" +msgstr "si es dado, el cuarto argumento para la etiqueta %s debe de ser 'with'" #: core/templatetags/tagging_related.py:49 #, python-format msgid "%(tag)s tag's '%(option)s' option was not a valid integer: '%(value)s'" -msgstr "" +msgstr "la opción '%(option)s' de la etiqueta %(tag)s no es un entero válido: '%(value)s'" #: core/templatetags/tagging_related.py:55 #, python-format msgid "%(tag)s tag was given an invalid option: '%(option)s'" -msgstr "" +msgstr "la etiqueta %(tag)s ha recibido una opción inválida: '%(option)s'" #: core/templatetags/tagging_related.py:60 #, python-format msgid "%(tag)s tag was given a badly formatted option: '%(option)s'" -msgstr "" +msgstr "la etiqueta %(tag)s ha recibido una opción mal formateada: '%(option)s'" #: templates/base.html:87 msgid "About" -msgstr "" +msgstr "Acerca de" #: templates/base.html:105 msgid "Elsewhere" -msgstr "" +msgstr "En otros sitios" #: templates/base.html:117 msgid "Categories" -msgstr "" +msgstr "Categorías" #: templates/base.html:129 templates/contact_form/contact_form_sent.html:13 msgid "Recent Posts" -msgstr "" +msgstr "Entradas Recientes" #: templates/base.html:140 msgid "Archive" -msgstr "" +msgstr "Archivo" #: templates/base.html:151 msgid "BlogRoll" -msgstr "" +msgstr "BlogRoll" #: templates/base.html:163 msgid "Popular Posts" -msgstr "" +msgstr "Entradas Populares" #: templates/base.html:175 msgid "Django Popular" -msgstr "" +msgstr "Django Popular" #: templates/admin/base_site.html:4 msgid "Mingus site admin" -msgstr "" +msgstr "Administración del sitio Mingus" #: templates/admin/base_site.html:16 msgid "Mingus Blog Engine" -msgstr "" +msgstr "Motor del Blog Mingus" #: templates/admin/login.html:19 msgid "Username:" -msgstr "" +msgstr "Usuario:" #: templates/admin/login.html:22 msgid "Password:" -msgstr "" +msgstr "Contraseña:" #: templates/admin/login.html:27 msgid "Log in" -msgstr "" +msgstr "Entrar" #: templates/blog/category_detail.html:5 #: templates/blog/category_detail.html:11 @@ -114,83 +113,85 @@ msgstr "" #: templates/blog/post_archive_month.html:9 #: templates/blog/post_archive_year.html:9 templates/blog/tag_detail.html:4 msgid "Posts for" -msgstr "" +msgstr "Entradas para" #: templates/blog/category_list.html:9 msgid "Post categories" -msgstr "" +msgstr "Categorías de entradas" #: templates/blog/post_detail.html:72 msgid "Twitter this" -msgstr "" +msgstr "Twittealo" #: templates/blog/post_detail.html:75 msgid "Reddit this" -msgstr "" +msgstr "Redittealo" #: templates/blog/post_detail.html:76 msgid "Add to Delicious" -msgstr "" +msgstr "Añadir a Delicious" #: templates/blog/post_detail.html:78 msgid "Subscribe RSS" -msgstr "" +msgstr "Suscribir al RSS" #: templates/blog/post_search.html:5 templates/blog/post_search.html.py:10 msgid "Search results for:" -msgstr "" +msgstr "Resultados de búsqueda para:" #: templates/blog/tag_detail.html:10 msgid "Posts tagged:" -msgstr "" +msgstr "Entradas etiquetadas:" #: templates/contact_form/contact_form.html:4 msgid "Contact" -msgstr "" +msgstr "Contactar" #: templates/contact_form/contact_form.html:10 #: templates/contact_form/contact_form_sent.html:8 msgid "Contact me" -msgstr "" +msgstr "Contáctame" #: templates/contact_form/contact_form.html:12 msgid "Get in touch." -msgstr "" +msgstr "Contacta al autor" #: templates/contact_form/contact_form.html:18 msgid "Woops, looks like you forgot some information." -msgstr "" +msgstr "Oops, parece que olvidaste algún dato." #: templates/contact_form/contact_form.html:28 msgid "Your name" -msgstr "" +msgstr "Tu nombre" #: templates/contact_form/contact_form.html:33 msgid "Your email" -msgstr "" +msgstr "Tu email" #: templates/contact_form/contact_form.html:38 msgid "Your message" -msgstr "" +msgstr "Tu mensaje" #: templates/contact_form/contact_form_sent.html:10 msgid "" "Thanks! I'll make sure to respond shortly. In the meantime, check out some " "of my latest and greatest posts." msgstr "" +"¡Gracias! Me aseguraré de responder en breves. Mientras tanto, puedes echar " +"un vistazo a algunos de mis últimas entradas." #: templates/proxy/proxy_search.html:27 msgid "No results found" -msgstr "" +msgstr "No se encontraron resultados" #: templates/proxy/tag_detail.html:4 msgid "Entries for" -msgstr "" +msgstr "Entradas para" #: templates/proxy/tag_detail.html:10 msgid "Entries tagged:" -msgstr "" +msgstr "Entradas etiquetadas:" #: templates/quotes/quote_list.html:4 templates/quotes/quote_list.html.py:8 msgid "Quotes" -msgstr "" +msgstr "Frases" diff --git a/mingus/locale/fr/LC_MESSAGES/django.po b/mingus/locale/fr/LC_MESSAGES/django.po index 699a8bcf..d01e5c56 100644 --- a/mingus/locale/fr/LC_MESSAGES/django.po +++ b/mingus/locale/fr/LC_MESSAGES/django.po @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Mingus\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-01 20:52-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2010-02-02 23:18+0100\n" +"Last-Translator: Florent Messa \n" +"Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,94 +19,94 @@ msgstr "" #: core/templatetags/tagging_related.py:21 #, python-format msgid "tagged_get_related tag was given an invalid input: %s" -msgstr "" +msgstr "le format d'entrée donné à tagged_get_related n'est pas correct : %s" #: core/templatetags/tagging_related.py:35 #, python-format msgid "%s tag requires either five or seven arguments" -msgstr "" +msgstr "le tag %s nécessite soit cinq, soit sept arguments" #: core/templatetags/tagging_related.py:37 #, python-format msgid "second argument to %s tag must be 'in'" -msgstr "" +msgstr "le deuxième argument passé au tag %s doit être 'in'" #: core/templatetags/tagging_related.py:39 #, python-format msgid "fourth argument to %s tag must be 'as'" -msgstr "" +msgstr "le quatrième argument passé au tag %s doit être 'as'" #: core/templatetags/tagging_related.py:42 #, python-format msgid "if given, fourth argument to %s tag must be 'with'" -msgstr "" +msgstr "si un quatrième argument est donné au tag %s alors celui-ci doit être 'with'" #: core/templatetags/tagging_related.py:49 #, python-format msgid "%(tag)s tag's '%(option)s' option was not a valid integer: '%(value)s'" -msgstr "" +msgstr "l'option '%(option)s' du tag %(tag)s n'est pas un entier valide : '%(value)s'" #: core/templatetags/tagging_related.py:55 #, python-format msgid "%(tag)s tag was given an invalid option: '%(option)s'" -msgstr "" +msgstr "une mauvaise option '%(option)s' à été transmise au tag %(tag)s" #: core/templatetags/tagging_related.py:60 #, python-format msgid "%(tag)s tag was given a badly formatted option: '%(option)s'" -msgstr "" +msgstr "l'option '%(option)s' transmise au tag %(tag)s est mal formatée" #: templates/base.html:87 msgid "About" -msgstr "" +msgstr "A propos" #: templates/base.html:105 msgid "Elsewhere" -msgstr "" +msgstr "Ailleurs" #: templates/base.html:117 msgid "Categories" -msgstr "" +msgstr "Catégories" #: templates/base.html:129 templates/contact_form/contact_form_sent.html:13 msgid "Recent Posts" -msgstr "" +msgstr "Articles récents" #: templates/base.html:140 msgid "Archive" -msgstr "" +msgstr "Archive" #: templates/base.html:151 msgid "BlogRoll" -msgstr "" +msgstr "BlogRoll" #: templates/base.html:163 msgid "Popular Posts" -msgstr "" +msgstr "Articles les plus populaires" #: templates/base.html:175 msgid "Django Popular" -msgstr "" +msgstr "Liens Django les plus populaires" #: templates/admin/base_site.html:4 msgid "Mingus site admin" -msgstr "" +msgstr "Interface d'administration de Mingus" #: templates/admin/base_site.html:16 msgid "Mingus Blog Engine" -msgstr "" +msgstr "Moteur de Blog Mingus" #: templates/admin/login.html:19 msgid "Username:" -msgstr "" +msgstr "Nom d'utilisateur :" #: templates/admin/login.html:22 msgid "Password:" -msgstr "" +msgstr "Mot de passe :" #: templates/admin/login.html:27 msgid "Log in" -msgstr "" +msgstr "S'identifier" #: templates/blog/category_detail.html:5 #: templates/blog/category_detail.html:11 @@ -114,83 +114,85 @@ msgstr "" #: templates/blog/post_archive_month.html:9 #: templates/blog/post_archive_year.html:9 templates/blog/tag_detail.html:4 msgid "Posts for" -msgstr "" +msgstr "Articles pour" #: templates/blog/category_list.html:9 msgid "Post categories" -msgstr "" +msgstr "Catégories des articles" #: templates/blog/post_detail.html:72 msgid "Twitter this" -msgstr "" +msgstr "Publier sur Twitter" #: templates/blog/post_detail.html:75 msgid "Reddit this" -msgstr "" +msgstr "Publier sur Reddit" #: templates/blog/post_detail.html:76 msgid "Add to Delicious" -msgstr "" +msgstr "Ajouter sur Delicious" #: templates/blog/post_detail.html:78 msgid "Subscribe RSS" -msgstr "" +msgstr "Souscrire au flux RSS" #: templates/blog/post_search.html:5 templates/blog/post_search.html.py:10 msgid "Search results for:" -msgstr "" +msgstr "Résultats de la recherche pour :" #: templates/blog/tag_detail.html:10 msgid "Posts tagged:" -msgstr "" +msgstr "Articles tagués" #: templates/contact_form/contact_form.html:4 msgid "Contact" -msgstr "" +msgstr "Contact" #: templates/contact_form/contact_form.html:10 #: templates/contact_form/contact_form_sent.html:8 msgid "Contact me" -msgstr "" +msgstr "Me contacter" #: templates/contact_form/contact_form.html:12 msgid "Get in touch." -msgstr "" +msgstr "Entrer en contact." #: templates/contact_form/contact_form.html:18 msgid "Woops, looks like you forgot some information." -msgstr "" +msgstr "Oups, on dirait que vous avez oublié certaines informations." #: templates/contact_form/contact_form.html:28 msgid "Your name" -msgstr "" +msgstr "Votre nom" #: templates/contact_form/contact_form.html:33 msgid "Your email" -msgstr "" +msgstr "Votre adresse e-mail" #: templates/contact_form/contact_form.html:38 msgid "Your message" -msgstr "" +msgstr "Votre message" #: templates/contact_form/contact_form_sent.html:10 msgid "" "Thanks! I'll make sure to respond shortly. In the meantime, check out some " "of my latest and greatest posts." msgstr "" +"Merci ! Je vais faire en sorte de vous répondre rapidement. En attendant, vous pouvez lire quelques uns" +"de mes derniers articles." #: templates/proxy/proxy_search.html:27 msgid "No results found" -msgstr "" +msgstr "Aucun résultats n'a été trouvé" #: templates/proxy/tag_detail.html:4 msgid "Entries for" -msgstr "" +msgstr "Elements pour" #: templates/proxy/tag_detail.html:10 msgid "Entries tagged:" -msgstr "" +msgstr "Elements tagués:" #: templates/quotes/quote_list.html:4 templates/quotes/quote_list.html.py:8 msgid "Quotes" -msgstr "" +msgstr "Citations" diff --git a/mingus/settings.py b/mingus/settings.py index e6921033..b47379cc 100644 --- a/mingus/settings.py +++ b/mingus/settings.py @@ -4,10 +4,10 @@ PROJECT_ROOT = os.path.dirname(__file__) MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media') MEDIA_URL = '/media/' -ADMIN_MEDIA_PREFIX = '/static/admin/' +ADMIN_MEDIA_PREFIX = '/admin_media/' #staticfiles app values -STATIC_URL = '/media/' +STATIC_URL = '/media/mingus/' STATIC_ROOT = os.path.join(PROJECT_ROOT, 'media') STATICFILES_DIRS = ( os.path.join(PROJECT_ROOT, 'media', 'mingus'), diff --git a/mingus/templates/base.html b/mingus/templates/base.html index 6e48cb4d..7ff5967e 100644 --- a/mingus/templates/base.html +++ b/mingus/templates/base.html @@ -65,7 +65,7 @@

{{ BLOG_SETTINGS.site_name {% cache 3600 "base.navbars" %} {% navbars %} {% endcache %} -
+
@@ -89,14 +89,12 @@

{% trans "About" %}

Subscribe

 + {% if BLOG_SETTINGS.twitter_url %}
  • {% trans "Twitter" %}
    • {% endif %} + {% if BLOG_SETTINGS.rss_url %}
  • RSS
    • {% endif %} + {% if BLOG_SETTINGS.email_subscribe_url %}
  • Email
    • {% endif %} + {% if category %}
  • RSS - {{ category }}
    • {% endif %} + {% if BLOG_SETTINGS_email_subscribe_url %}
  • {% trans "Email" %}
    • {% endif %} {% cache 3600 "base.profiles" %} diff --git a/mingus/templates/contact_form/contact_form.html b/mingus/templates/contact_form/contact_form.html index cfc5f23f..b9b87cc7 100644 --- a/mingus/templates/contact_form/contact_form.html +++ b/mingus/templates/contact_form/contact_form.html @@ -41,7 +41,7 @@

    {% trans "Contact me" %}

    {% render_honeypot_field %} - + {% endblock %} \ No newline at end of file diff --git a/mingus/templates/quotes/quote_detail.html b/mingus/templates/quotes/quote_detail.html index 8c0b4b04..c5fe14ad 100644 --- a/mingus/templates/quotes/quote_detail.html +++ b/mingus/templates/quotes/quote_detail.html @@ -29,7 +29,7 @@

    {{ object.title }}

    {% tags_for_object object as tag_list %} {% if tag_list %}
    - Tags: + {% trans "Tags" %}:
      {% for tag in tag_list %}
    • {{ tag }}
      • @@ -43,7 +43,7 @@

      {{ object.title }}

      {% tagged_get_related object in quoteme.Quote as quote_list with num=3 %} {% if quote_list %}
      - Related quotes: + {% trans "Related quotes" %}:
        {% for quote in quote_list %}
      1. {{ quote.title }}
        2. @@ -58,4 +58,4 @@

        {{ object.title }}

        {% include "blog/includes/comments.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/setup.py b/setup.py index 6e79457f..7ad933ac 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def read(fname): packages=[ 'mingus', 'mingus.core', - 'mingus.templatetags' + 'mingus.core.templatetags', ], classifiers=[ 'Development Status :: 4 - Beta',