Separate default “Sir/Madam” from trans. string.

jazzband · Feb 20, 2020 · 041626c · 041626c
1 parent a1d5db1
commit 041626c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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
@@ -7,7 +7,7 @@
 </title>
 </head>
 <body>
-{% 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
@@ -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
@@ -6,7 +6,7 @@
     <title>{% blocktrans with title=newsletter.title %}Unsubscription from {{ title }}{% endblocktrans %}</title>
 </head>
 <body>
-{% 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
@@ -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
@@ -6,7 +6,7 @@
     <title>{% blocktrans with title=newsletter.title %}Update of subscription to {{ title }}{% endblocktrans %}</title>
 </head>
 <body>
-{% 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
@@ -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 }}.