From 968659d1fc62ea0e30924a25ed5f39d78acbb2ab Mon Sep 17 00:00:00 2001 From: Fernando Rocha Date: Tue, 5 Jun 2012 04:22:50 -0300 Subject: [PATCH 1/2] Translation of emails template from subscription app. Signed-off-by: Fernando Rocha --- .../locale/pt_BR/LC_MESSAGES/django.po | 93 ++++++++++++++++++- pythonbrasil8/subscription/views.py | 4 +- .../email_successful_registration.txt | 23 +++-- .../email_unsuccessful_registration.txt | 15 ++- 4 files changed, 111 insertions(+), 24 deletions(-) diff --git a/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po b/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po index 492a905..8ada8fe 100644 --- a/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po +++ b/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PythonBrasil8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-05 00:17-0300\n" +"POT-Creation-Date: 2012-06-05 04:20-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Tatiana Al-Chueyr \n" "Language-Team: Fernando Rocha \n" @@ -372,6 +372,14 @@ msgstr "" "Falha ao gerar a transação para o gateway de pagamento. Por favor, contacte " "a organização." +#: subscription/views.py:108 +msgid "PythonBrasil[8] - Registration Confirmation" +msgstr "PythonBrasil[8] - Confirmação de inscrição" + +#: subscription/views.py:121 +msgid "PythonBrasil[8] - Registration Unsuccessful " +msgstr "PythonBrasil[8] - Falha na inscrição" + #: templates/about.html:4 templates/previous_editions.html:4 msgid "About" msgstr "Sobre" @@ -405,7 +413,7 @@ msgstr "" "A oitava edição da conferência acontecerá entre os dias 21 e 24 de novembro " "de 2012 no" -#: templates/about.html:23 +#: templates/about.html:23 templates/email_successful_registration.txt:5 msgid "SulAmérica Convention Center" msgstr "Centro de Convenções SulAmérica" @@ -578,6 +586,87 @@ msgstr "" "É apoiado pela Associação Python Brasil (APyB) e pela Python Software " "Foundation (PSF)." +#: templates/email_successful_registration.txt:1 +#: templates/email_unsuccessful_registration.txt:1 +msgid "Dear" +msgstr "Caro(a)" + +#: templates/email_successful_registration.txt:3 +msgid "" +"This is your official confirmation for PythonBrasil[8] Conference, to be " +"held from the 21 to 24 November 2012 at:" +msgstr "" +"Essa é a confirmação oficial para a PythonBrasil[8], a ser realizada entre " +"21 e 24 de Novembro de 2012, em:" + +#: templates/email_successful_registration.txt:7 +msgid "Cidade Nova, Downtown" +msgstr "Cidade Nova, Centro" + +#: templates/email_successful_registration.txt:9 +msgid "Brazil" +msgstr "Brasil" + +#: templates/email_successful_registration.txt:12 +#, python-format +msgid "" +"Your payment of a %(profile.type)s registration has been successfully " +"processed." +msgstr "" +"Seu pagamento da inscrição do tipo %(profile.type)s foi processada com " +"sucesso." + +#: templates/email_successful_registration.txt:14 +msgid "" +"Please, note that the tutorials are charged separately from registration and " +"are not included in this payment." +msgstr "" +"Por favor, note que os tutoriais são cobrados separadamente da inscrição e " +"não estão inclusos nesse pagamento." + +#: templates/email_successful_registration.txt:16 +msgid "More information about the conference can be found at:" +msgstr "Mais informações sobre a conferência podem ser encontradas em:" + +#: templates/email_successful_registration.txt:19 +#: templates/email_unsuccessful_registration.txt:10 +msgid "If you need assistance, you can email us at organizacao@python.org.br." +msgstr "" +"Se você precisar de ajuda, você pode mandar um email para organizacao@python." +"org.br." + +#: templates/email_successful_registration.txt:21 +#: templates/email_unsuccessful_registration.txt:12 +msgid "Thank you" +msgstr "Obrigado" + +#: templates/email_successful_registration.txt:23 +#: templates/email_unsuccessful_registration.txt:14 +msgid "PythonBrasil Conference Registration" +msgstr "Inscrição PythonBrasil" + +#: templates/email_unsuccessful_registration.txt:3 +msgid "" +"PythonBrasil[8] Conference will be held from the 21 to 24 November 2012 at " +"SulAmérica Convention Center." +msgstr "" +"A PythonBrasil[8] acontecerá entre os dias 21 e 24 de novembro de 2012 no " +"Centro de Convenções SulAmérica." + +#: templates/email_unsuccessful_registration.txt:5 +#, python-format +msgid "" +"Apparently you tried to pay the fee, related to a %(profile.type)s " +"registration at PythonBrasil[8], but the transaction did not succeed." +msgstr "" +"Aparentemente você tentou pagar a taxa de inscrição, relativa a inscrição do " +"tipo %(profile.type)s na PythonBrasil[8], mas a transação não foi concluída " +"com sucesso." + +#: templates/email_unsuccessful_registration.txt:7 +msgid "Please, try paying it again, from our website:" +msgstr "Por favor, tente pagar novamente pelo nosso site:" + #: templates/news.html:4 msgid "News" msgstr "Notícias" diff --git a/pythonbrasil8/subscription/views.py b/pythonbrasil8/subscription/views.py index 23833d9..400e4e9 100644 --- a/pythonbrasil8/subscription/views.py +++ b/pythonbrasil8/subscription/views.py @@ -105,7 +105,7 @@ def transaction_done(self, subscription_id): context = {"profile": AccountProfile.objects.get(user=transaction.subscription.user), } body = render_to_string("email_successful_registration.txt", context) - subject = "PythonBrasil[8] - Registration Confirmation" + subject = ugettext("PythonBrasil[8] - Registration Confirmation") mail.send(settings.EMAIL_SENDER, [transaction.subscription.user.email], subject, @@ -118,7 +118,7 @@ def transaction_canceled(self, subscription_id): transaction.save() context = {"profile": AccountProfile.objects.get(user=transaction.subscription.user)} body = render_to_string("email_unsuccessful_registration.txt", context) - subject = "PythonBrasil[8] - Registration Unsuccessful " + subject = ugettext("PythonBrasil[8] - Registration Unsuccessful ") mail.send(settings.EMAIL_SENDER, [transaction.subscription.user.email], subject, diff --git a/pythonbrasil8/templates/email_successful_registration.txt b/pythonbrasil8/templates/email_successful_registration.txt index 346571d..dde0fee 100644 --- a/pythonbrasil8/templates/email_successful_registration.txt +++ b/pythonbrasil8/templates/email_successful_registration.txt @@ -1,24 +1,23 @@ -Dear {{ profile.name }}, +{% load i18n %}{% trans 'Dear' %} {{ profile.name }}, -This is your official confirmation for PythonBrasil[8] Conference, to be held during March 23 and 24, 2012 at: +{% trans 'This is your official confirmation for PythonBrasil[8] Conference, to be held from the 21 to 24 November 2012 at:' %} -SulAmérica Convention Center +{% trans 'SulAmérica Convention Center' %} Av, Paulo de Frontin, 1 -Cidade Nova, Downtown +{% trans 'Cidade Nova, Downtown' %} Rio de Janeiro, RJ -Brazil +{% trans 'Brazil' %} + 55 (21) 3293-6700 -Your payment of a {{ profile.type }} registration has been successfully processed. +{% blocktrans %}Your payment of a {{ profile.type }} registration has been successfully processed.{% endblocktrans %} -Please, note that the tutorials are charged separately from registration and are not included in this payment. +{% trans 'Please, note that the tutorials are charged separately from registration and are not included in this payment.' %} -More information about the conference can be found at: +{% trans 'More information about the conference can be found at:' %} http://2012.pythonbrasil.org.br -If you need assistance, you can email us at organizacao@python.org.br. +{% trans 'If you need assistance, you can email us at organizacao@python.org.br.' %} -Thank you, - -PythonBrasil Conference Registration +{% trans 'Thank you' %}, +{% trans 'PythonBrasil Conference Registration' %} diff --git a/pythonbrasil8/templates/email_unsuccessful_registration.txt b/pythonbrasil8/templates/email_unsuccessful_registration.txt index a7f14e0..5d09e63 100644 --- a/pythonbrasil8/templates/email_unsuccessful_registration.txt +++ b/pythonbrasil8/templates/email_unsuccessful_registration.txt @@ -1,15 +1,14 @@ -Dear {{ profile.name }}, +{% load i18n %}{% trans 'Dear' %} {{ profile.name }}, -PythonBrasil[8] Conference will be held during March 23 and 24, 2012 at SulAmérica Convention Center. +{% trans 'PythonBrasil[8] Conference will be held from the 21 to 24 November 2012 at SulAmérica Convention Center.' %} -Apparently you tried to pay the fee, related to a {{ profile.type }} registration at PythonBrasil[8], but the transaction did not succeed. +{% blocktrans %}Apparently you tried to pay the fee, related to a {{ profile.type }} registration at PythonBrasil[8], but the transaction did not succeed.{% endblocktrans %} -Please, try paying it again, from our website: +{% trans 'Please, try paying it again, from our website:' %} http://2012.pythonbrasil.org.br -If you need assistance, you can email us at organizacao@python.org.br. +{% trans 'If you need assistance, you can email us at organizacao@python.org.br.' %} -Thank you, - -PythonBrasil Conference Registration +{% trans 'Thank you' %}, +{% trans 'PythonBrasil Conference Registration' %} From afa662a6911524ead6c8ef3b3396454fb4476f62 Mon Sep 17 00:00:00 2001 From: Fernando Rocha Date: Tue, 5 Jun 2012 04:32:57 -0300 Subject: [PATCH 2/2] Fixed space before comma. Signed-off-by: Fernando Rocha --- pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po | 6 +++--- pythonbrasil8/templates/email_successful_registration.txt | 2 +- pythonbrasil8/templates/email_unsuccessful_registration.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po b/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po index 8ada8fe..5e3dcd2 100644 --- a/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po +++ b/pythonbrasil8/locale/pt_BR/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PythonBrasil8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-05 04:20-0300\n" +"POT-Creation-Date: 2012-06-05 04:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Tatiana Al-Chueyr \n" "Language-Team: Fernando Rocha \n" @@ -637,8 +637,8 @@ msgstr "" #: templates/email_successful_registration.txt:21 #: templates/email_unsuccessful_registration.txt:12 -msgid "Thank you" -msgstr "Obrigado" +msgid "Thank you," +msgstr "Obrigado," #: templates/email_successful_registration.txt:23 #: templates/email_unsuccessful_registration.txt:14 diff --git a/pythonbrasil8/templates/email_successful_registration.txt b/pythonbrasil8/templates/email_successful_registration.txt index dde0fee..3f4bfe3 100644 --- a/pythonbrasil8/templates/email_successful_registration.txt +++ b/pythonbrasil8/templates/email_successful_registration.txt @@ -18,6 +18,6 @@ http://2012.pythonbrasil.org.br {% trans 'If you need assistance, you can email us at organizacao@python.org.br.' %} -{% trans 'Thank you' %}, +{% trans 'Thank you,' %} {% trans 'PythonBrasil Conference Registration' %} diff --git a/pythonbrasil8/templates/email_unsuccessful_registration.txt b/pythonbrasil8/templates/email_unsuccessful_registration.txt index 5d09e63..137f9d9 100644 --- a/pythonbrasil8/templates/email_unsuccessful_registration.txt +++ b/pythonbrasil8/templates/email_unsuccessful_registration.txt @@ -9,6 +9,6 @@ http://2012.pythonbrasil.org.br {% trans 'If you need assistance, you can email us at organizacao@python.org.br.' %} -{% trans 'Thank you' %}, +{% trans 'Thank you,' %} {% trans 'PythonBrasil Conference Registration' %}