Integrate PR review

OneGov · Jan 27, 2025 · b34c04d · b34c04d
1 parent 0375576
commit b34c04d
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 29 deletions.
diff --git a/src/onegov/org/forms/settings.py b/src/onegov/org/forms/settings.py
@@ -1165,8 +1165,8 @@ class NewsletterSettingsForm(Form):
 
     notify_on_unsubscription = ChosenSelectMultipleEmailField(
         label=_('Notify on newsletter unsubscription'),
-        description=_('Send an email notification when a user unsubscribes '
-                      'from the newsletter'),
+        description=_('Send an email notification to the following users '
+                      'when a recipient unsubscribes from the newsletter'),
         validators=[StrictOptional()],
         choices=[]
     )
@@ -1249,10 +1249,11 @@ def process_obj(self, model: Organisation) -> None:  # type:ignore
             self.notify_on_unsubscription.data = model.notify_on_unsubscription
 
     def on_request(self) -> None:
-        user_q = self.request.session.query(User).filter_by(role='admin')
-        user_q = user_q.order_by(User.username.desc())
+        users = self.request.session.query(User).filter(
+            User.role.in_(['admin', 'editor']))
+        users = users.order_by(User.username.desc())
         self.notify_on_unsubscription.choices = [
-            (u.username, u.title) for u in user_q if '@' in u.username
+            (u.username) for u in users if '@' in u.username
         ]
 
 

diff --git a/src/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po b/src/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po
@@ -3858,11 +3858,13 @@ msgstr "Wir wünschen Ihnen einen schönen Tag!"
 msgid "Notify on newsletter unsubscription"
 msgstr "Benachrichtigung bei Abmeldung vom Newsletter"
 
-msgid "Send an email notification when a user unsubscribes from the newsletter"
-msgstr "Sende eine E-Mail-Benachrichtigung, wenn sich ein Benutzer vom Newsletter abmeldet"
+msgid "Send an email notification to the following users when a recipient "
+"unsubscribes from the newsletter"
+msgstr "Sende eine E-Mail-Benachrichtigung an die folgenden Benutzer, wenn "
+"sich ein Empfänger vom Newsletter abmeldet"
 
-msgid "Hi Admin,"
-msgstr "Hallo Administrator"
+msgid "Unsubscription from newsletter"
+msgstr "Abmeldung vom Newsletter"
 
 msgid "The user with the address ${address} just unsubscribed from the newsletter subscriber list."
 msgstr "Der Benutzer mit der Adresse ${address} hat sich soeben von der Newsletter-Abonnentenliste abgemeldet."

diff --git a/src/onegov/org/locale/fr_CH/LC_MESSAGES/onegov.org.po b/src/onegov/org/locale/fr_CH/LC_MESSAGES/onegov.org.po
@@ -3859,11 +3859,13 @@ msgstr "Passez une bonne journée!"
 msgid "Notify on newsletter unsubscription"
 msgstr "Notifier le désabonnement à la lettre d'information"
 
-msgid "Send an email notification when a user unsubscribes from the newsletter"
-msgstr "Envoyer une notification par courrier électronique lorsqu'un utilisateur se désinscrit de la lettre d'information"
+msgid "Send an email notification to the following users when a recipient "
+"unsubscribes from the newsletter"
+msgstr "Envoyer une notification par e-mail aux utilisateurs suivants lorsqu'un "
+"destinataire se désabonne de la newsletter"
 
-msgid "Hi Admin,"
-msgstr "Bonjour administrateur"
+msgid "Unsubscription from newsletter"
+msgstr "Se désabonner de la lettre d'information"
 
 msgid "The user with the address ${address} just unsubscribed from the newsletter subscriber list."
 msgstr "L'utilisateur dont l'adresse est ${address} vient de se désinscrire de la liste des abonnés à la lettre d'information."

diff --git a/src/onegov/org/locale/it_CH/LC_MESSAGES/onegov.org.po b/src/onegov/org/locale/it_CH/LC_MESSAGES/onegov.org.po
@@ -3851,11 +3851,13 @@ msgstr "Ti auguro una buona giornata!"
 msgid "Notify on newsletter unsubscription"
 msgstr "Notifica di annullamento dell'iscrizione alla newsletter"
 
-msgid "Send an email notification when a user unsubscribes from the newsletter"
-msgstr "Inviare una notifica via e-mail quando un utente si cancella dalla newsletter"
+msgid "Send an email notification to the following users when a recipient "
+"unsubscribes from the newsletter"
+msgstr "Inviare una notifica via e-mail ai seguenti utenti quando un "
+"destinatario si cancella dalla newsletter"
 
-msgid "Hi Admin,"
-msgstr "Salve amministratore"
+msgid "Unsubscription from newsletter"
+msgstr "Cancellazione dalla newsletter"
 
 msgid "The user with the address ${address} just unsubscribed from the newsletter subscriber list."
 msgstr "L'utente con l'indirizzo ${indirizzo} si è appena cancellato dalla lista degli iscritti alla newsletter."

diff --git a/src/onegov/org/templates/mail_notify_unsubscribe.pt b/src/onegov/org/templates/mail_notify_unsubscribe.pt
@@ -3,7 +3,7 @@
         ${title}
     </tal:b>
     <tal:b metal:fill-slot="body">
-        <p i18n:translate>Hi Admin,</p>
+        <p i18n:translate>Hello</p>
 
         <p i18n:translate>
             The user with the address <strong i18n:name="address">${address}</strong> just unsubscribed from the newsletter subscriber list.

diff --git a/src/onegov/org/views/subscription.py b/src/onegov/org/views/subscription.py
@@ -66,7 +66,7 @@ def view_unsubscribe(
         receivers = request.app.org.notify_on_unsubscription or None
         if receivers:
             subject = _(
-                'Unsubscription from the newsletter at ${address}',
+                'Unsubscription from newsletter',
                 mapping={'address': address}
             )
             send_transactional_html_mail(

diff --git a/src/onegov/town6/locale/de_CH/LC_MESSAGES/onegov.town6.po b/src/onegov/town6/locale/de_CH/LC_MESSAGES/onegov.town6.po
@@ -1074,9 +1074,6 @@ msgstr "Benachrichtigung bei Abmeldung vom Newsletter"
 msgid "Send an email notification when a user unsubscribes from the newsletter"
 msgstr "Sende eine E-Mail-Benachrichtigung, wenn sich ein Benutzer vom Newsletter abmeldet"
 
-msgid "Hi Admin,"
-msgstr "Hallo Administrator"
-
 msgid "The user with the address <strong>${address}</strong> just unsubscribed from the newsletter subscriber list."
 msgstr "Der Benutzer mit der Adresse <strong>${address}</strong> hat sich soeben von der Newsletter-Abonnentenliste abgemeldet."
 

diff --git a/src/onegov/town6/locale/fr_CH/LC_MESSAGES/onegov.town6.po b/src/onegov/town6/locale/fr_CH/LC_MESSAGES/onegov.town6.po
@@ -1075,9 +1075,6 @@ msgstr "Notifier le désabonnement à la lettre d'information"
 msgid "Send an email notification when a user unsubscribes from the newsletter"
 msgstr "Envoyer une notification par courrier électronique lorsqu'un utilisateur se désinscrit de la lettre d'information"
 
-msgid "Hi Admin,"
-msgstr "Bonjour administrateur"
-
 msgid "The user with the address ${address} just unsubscribed from the newsletter subscriber list."
 msgstr "L'utilisateur dont l'adresse est ${address} vient de se désinscrire de la liste des abonnés à la lettre d'information."
 

diff --git a/src/onegov/town6/locale/it_CH/LC_MESSAGES/onegov.town6.po b/src/onegov/town6/locale/it_CH/LC_MESSAGES/onegov.town6.po
@@ -1076,9 +1076,6 @@ msgstr "Notifica di annullamento dell'iscrizione alla newsletter"
 msgid "Send an email notification when a user unsubscribes from the newsletter"
 msgstr "Inviare una notifica via e-mail quando un utente si cancella dalla newsletter"
 
-msgid "Hi Admin,"
-msgstr "Salve amministratore"
-
 msgid "The user with the address ${address} just unsubscribed from the newsletter subscriber list."
 msgstr "L'utente con l'indirizzo ${indirizzo} si è appena cancellato dalla lista degli iscritti alla newsletter."
 

diff --git a/src/onegov/town6/templates/mail_notify_unsubscribe.pt b/src/onegov/town6/templates/mail_notify_unsubscribe.pt
@@ -3,7 +3,7 @@
         ${title}
     </tal:b>
     <tal:b metal:fill-slot="body">
-        <p i18n:translate>Hi Admin,</p>
+        <p i18n:translate>Hello</p>
 
         <p i18n:translate>
             The user with the address <strong i18n:name="address">${address}</strong> just unsubscribed from the newsletter subscriber list.