From 041626c15201b8913efa91cce625d608d211b0d8 Mon Sep 17 00:00:00 2001 From: Mathijs de Bruin Date: Thu, 20 Feb 2020 11:19:54 +0000 Subject: [PATCH] =?UTF-8?q?Separate=20default=20=E2=80=9CSir/Madam?= =?UTF-8?q?=E2=80=9D=20from=20trans.=20string.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newsletter/locale/en/LC_MESSAGES/django.po | 17 +++++++++++++---- .../templates/newsletter/message/subscribe.html | 2 +- .../templates/newsletter/message/subscribe.txt | 2 +- .../newsletter/message/unsubscribe.html | 2 +- .../newsletter/message/unsubscribe.txt | 2 +- .../templates/newsletter/message/update.html | 2 +- .../templates/newsletter/message/update.txt | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/newsletter/locale/en/LC_MESSAGES/django.po b/newsletter/locale/en/LC_MESSAGES/django.po index dff6b068..50beab50 100644 --- a/newsletter/locale/en/LC_MESSAGES/django.po +++ b/newsletter/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: 2018-11-17 19:25+0000\n" +"POT-Creation-Date: 2020-02-20 11:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -606,11 +606,20 @@ msgstr "" msgid "Subscription to %(title)s" msgstr "" +#: templates/newsletter/message/subscribe.html:10 +#: templates/newsletter/message/subscribe.txt:1 +#: templates/newsletter/message/unsubscribe.html:9 +#: templates/newsletter/message/unsubscribe.txt:1 +#: templates/newsletter/message/update.html:9 +#: templates/newsletter/message/update.txt:1 +msgid "Sir/Madam" +msgstr "" + #: templates/newsletter/message/subscribe.html:10 #: templates/newsletter/message/subscribe.txt:1 #, python-format msgid "" -"Dear %(name|default:\"Sir/Madam\")s,\n" +"Dear %(name)s,\n" "\n" "you, or someone in your name requested a subscription to %(title)s.\n" "\n" @@ -634,7 +643,7 @@ msgstr "" #: templates/newsletter/message/unsubscribe.txt:1 #, python-format msgid "" -"Dear %(name|default:\"Sir/Madam\")s,\n" +"Dear %(name)s,\n" "\n" "you, or someone in your name requested unsubscription from %(title)s.\n" "\n" @@ -658,7 +667,7 @@ msgstr "" #: templates/newsletter/message/update.txt:1 #, python-format msgid "" -"Dear %(name|default:\"Sir/Madam\")s,\n" +"Dear %(name)s,\n" "\n" "you, or someone in your name requested updating your personal information " "for %(title)s.\n" diff --git a/newsletter/templates/newsletter/message/subscribe.html b/newsletter/templates/newsletter/message/subscribe.html index 2de1616d..51e1469b 100644 --- a/newsletter/templates/newsletter/message/subscribe.html +++ b/newsletter/templates/newsletter/message/subscribe.html @@ -7,7 +7,7 @@ -{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name }}, you, or someone in your name requested a subscription to {{ title }}. diff --git a/newsletter/templates/newsletter/message/subscribe.txt b/newsletter/templates/newsletter/message/subscribe.txt index d93bb42d..7912ec44 100644 --- a/newsletter/templates/newsletter/message/subscribe.txt +++ b/newsletter/templates/newsletter/message/subscribe.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% load i18n %}{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name }}, you, or someone in your name requested a subscription to {{ title }}. diff --git a/newsletter/templates/newsletter/message/unsubscribe.html b/newsletter/templates/newsletter/message/unsubscribe.html index bab8538e..99371a4c 100644 --- a/newsletter/templates/newsletter/message/unsubscribe.html +++ b/newsletter/templates/newsletter/message/unsubscribe.html @@ -6,7 +6,7 @@ {% blocktrans with title=newsletter.title %}Unsubscription from {{ title }}{% endblocktrans %} -{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }}, you, or someone in your name requested unsubscription from {{ title }}. diff --git a/newsletter/templates/newsletter/message/unsubscribe.txt b/newsletter/templates/newsletter/message/unsubscribe.txt index afc41660..e152b06e 100644 --- a/newsletter/templates/newsletter/message/unsubscribe.txt +++ b/newsletter/templates/newsletter/message/unsubscribe.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% load i18n %}{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }}, you, or someone in your name requested unsubscription from {{ title }}. diff --git a/newsletter/templates/newsletter/message/update.html b/newsletter/templates/newsletter/message/update.html index 78a1f3f5..21d54bdc 100644 --- a/newsletter/templates/newsletter/message/update.html +++ b/newsletter/templates/newsletter/message/update.html @@ -6,7 +6,7 @@ {% blocktrans with title=newsletter.title %}Update of subscription to {{ title }}{% endblocktrans %} -{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name }}, you, or someone in your name requested updating your personal information for {{ title }}. diff --git a/newsletter/templates/newsletter/message/update.txt b/newsletter/templates/newsletter/message/update.txt index 6a40eebf..bc12140b 100644 --- a/newsletter/templates/newsletter/message/update.txt +++ b/newsletter/templates/newsletter/message/update.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name|default:"Sir/Madam" }}, +{% load i18n %}{% blocktrans with name=subscription.name|default:_("Sir/Madam") title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name }}, you, or someone in your name requested updating your personal information for {{ title }}.