Town6: Rename Buttons

TYPE: Feature
LINK: OGC-1697

src/onegov/town6/locale/de_CH/LC_MESSAGES/onegov.town6.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OneGov Cloud 1.0\n"
-"POT-Creation-Date: 2024-06-27 12:51+0200\n"
+"POT-Creation-Date: 2024-07-09 08:40+0200\n"
 "PO-Revision-Date: 2021-03-03 16:24+0100\n"
 "Last-Translator: Lukas Burkhard <lukas.burkhard@seantis.ch>\n"
 "Language-Team: German\n"
@@ -668,6 +668,12 @@ msgstr "Neuer Eintrag"
 msgid "Directory"
 msgstr "Verzeichnis"
 
+msgid "Organisation"
+msgstr "Organisation"
+
+msgid "Sub organisation"
+msgstr "Unterorganisation"
+
 msgid "Functions:"
 msgstr "Funktionen:"
 
@@ -1475,14 +1481,46 @@ msgstr "Zu Ihrer Suche wurde nichts gefunden."
 msgid "Hashtags"
 msgstr "Hashtags"
 
-msgid "Subscribe to Selection as RSS"
-msgstr "Hashtags abonnieren"
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+msgid "Subscribe to RSS feed"
+msgstr "RSS Feed abonnieren"
+
+msgid "RSS feed with your current selection of tags"
+msgstr "RSS Feed mit Ihrer aktuellen Auswahl an Hashtags"
+
+msgid "Subscribe to newsletter"
+msgstr "Newsletter abonnieren"
+
+msgid "Receive the newsletter by email"
+msgstr "Newsletter per E-Mail erhalten"
 
 msgid "Years"
 msgstr "Jahre"
 
-msgid "Newsletter Subscription"
-msgstr "Anmeldung Newsletter"
+msgid "Warning secret content"
+msgstr "Achtung geheimer Inhalt"
+
+msgid ""
+"You selected 'secret' content for your newsletter. Secret content will not "
+"be visible unless you enable it in"
+msgstr "Sie haben 'geheime' Inhalte für Ihren Newsletter ausgewählt. "
+"Geheime Inhalte werden nicht sichtbar sein, es sei denn, Sie aktivieren sie "
+"in"
+
+msgid "newsletter settings"
+msgstr "Newsletter Einstellungen"
+
+msgid "Warning private content"
+msgstr "Achtung privater Inhalt"
+
+msgid ""
+"You selected 'private' content for your newsletter. Private content cannot "
+"be part of a newsletter."
+msgstr ""
+"Sie haben 'privaten' Inhalt für Ihren Newsletter ausgewählt. Privater Inhalt "
+"kann nicht Teil eines Newsletters sein."
 
 msgid ""
 "The newsletter is disabled. You can only see this page because you are "
@@ -1592,6 +1630,15 @@ msgstr "Noch keine Zahlungen."
 msgid "No people added yet."
 msgstr "Es wurden noch keine Personen hinzugefügt."
 
+msgid "No people found for current filter selection."
+msgstr "Keine Personen für aktuelle Filterauswahl gefunden."
+
+msgid "Select organisation"
+msgstr "Organisation wählen"
+
+msgid "Select sub organisation"
+msgstr "Unterorganisation wählen"
+
 msgid "Export a vCard of this person"
 msgstr "Elektronische Visitenkarte (vCard)"
 
@@ -2090,6 +2137,12 @@ msgstr ""
 msgid "New Note"
 msgstr "Neue Notiz"
 
+#~ msgid "Subscribe to Selection as RSS"
+#~ msgstr "Hashtags abonnieren"
+
+#~ msgid "Newsletter Subscription"
+#~ msgstr "Anmeldung Newsletter"
+
 #~ msgid "Save"
 #~ msgstr "Speichern"
 
@@ -2281,9 +2334,6 @@ msgstr "Neue Notiz"
 #~ msgid "Occupancy"
 #~ msgstr "Belegung"
 
-#~ msgid "Subscribe"
-#~ msgstr "Abonnieren"
-
 #~ msgid "Rules"
 #~ msgstr "Regeln"
 

src/onegov/town6/locale/fr_CH/LC_MESSAGES/onegov.town6.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OneGov Cloud 1.0\n"
-"POT-Creation-Date: 2024-06-27 12:51+0200\n"
+"POT-Creation-Date: 2024-07-09 08:40+0200\n"
 "PO-Revision-Date: 2021-03-03 14:04+0100\n"
 "Last-Translator: Lukas Burkhard <lukas.burkhard@seantis.ch>\n"
 "Language-Team: French\n"
@@ -669,6 +669,12 @@ msgstr "Nouvelle entrée"
 msgid "Directory"
 msgstr "Dossier"
 
+msgid "Organisation"
+msgstr "Organisation"
+
+msgid "Sub organisation"
+msgstr "Sous-organisation"
+
 msgid "Functions:"
 msgstr "Fonctions:"
 
@@ -1474,14 +1480,46 @@ msgstr "Votre recherche n'a donné aucun résultat."
 msgid "Hashtags"
 msgstr "Hashtags"
 
-msgid "Subscribe to Selection as RSS"
-msgstr "S'abonner aux hashtags"
+msgid "Subscribe"
+msgstr "Souscrire"
+
+msgid "Subscribe to RSS feed"
+msgstr "Souscrire au flux RSS"
+
+msgid "RSS feed with your current selection of tags"
+msgstr "Flux RSS avec votre sélection actuelle d'étiquettes"
+
+msgid "Subscribe to newsletter"
+msgstr "Souscrire à la lettre d'informations"
+
+msgid "Receive the newsletter by email"
+msgstr "Recevoir la lettre d'informations par e-mail"
 
 msgid "Years"
 msgstr "Années"
 
-msgid "Newsletter Subscription"
-msgstr "Abonnement lettre d'informations"
+msgid "Warning secret content"
+msgstr "Avertissement contenu secret"
+
+msgid ""
+"You selected 'secret' content for your newsletter. Secret content will not "
+"be visible unless you enable it in"
+msgstr ""
+"Vous avez sélectionné un contenu 'secret' pour votre newsletter. Le contenu "
+"secret ne sera pas visible à moins que vous ne l'activiez dans les"
+
+msgid "newsletter settings"
+msgstr "paramètres de la newsletter"
+
+msgid "Warning private content"
+msgstr "Attention contenu privé"
+
+msgid ""
+"You selected 'private' content for your newsletter. Private content cannot "
+"be part of a newsletter."
+msgstr ""
+"Vous avez sélectionné un contenu 'privé' pour votre newsletter. Le contenu "
+"privé ne peut pas faire partie d'une newsletter."
 
 msgid ""
 "The newsletter is disabled. You can only see this page because you are "
@@ -1592,6 +1630,15 @@ msgstr "Pas de paiements pour le moment."
 msgid "No people added yet."
 msgstr "Aucune personne n'a encore été ajoutée."
 
+msgid "No people found for current filter selection."
+msgstr "Aucune personne n'a été trouvée pour la sélection de filtre actuelle."
+
+msgid "Select organisation"
+msgstr "Sélectionner une organisation"
+
+msgid "Select sub organisation"
+msgstr "Sélectionner une sous-organisation"
+
 msgid "Export a vCard of this person"
 msgstr "Exporter une vCard de cette personne"
 
@@ -2097,6 +2144,12 @@ msgstr ""
 msgid "New Note"
 msgstr "Nouveau commentaire"
 
+#~ msgid "Subscribe to Selection as RSS"
+#~ msgstr "S'abonner aux hashtags"
+
+#~ msgid "Newsletter Subscription"
+#~ msgstr "Abonnement lettre d'informations"
+
 #~ msgid "Save"
 #~ msgstr "Sauver"
 
@@ -2283,9 +2336,6 @@ msgstr "Nouveau commentaire"
 #~ msgid "Occupancy"
 #~ msgstr "Occupation"
 
-#~ msgid "Subscribe"
-#~ msgstr "Souscrire"
-
 #~ msgid "Rules"
 #~ msgstr "Règles"
 

src/onegov/town6/locale/it_CH/LC_MESSAGES/onegov.town6.po

@@ -1,7 +1,7 @@
 # This file was generated from translations.town6.xlsx
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2024-06-27 12:51+0200\n"
+"POT-Creation-Date: 2024-07-09 08:40+0200\n"
 "PO-Revision-Date: 2021-09-27 16:02+0200\n"
 "Language: it_CH\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -662,6 +662,12 @@ msgstr "Nuovo elemento"
 msgid "Directory"
 msgstr "Cartella"
 
+msgid "Organisation"
+msgstr ""
+
+msgid "Sub organisation"
+msgstr ""
+
 msgid "Functions:"
 msgstr "Funzioni:"
 
@@ -1463,14 +1469,46 @@ msgstr "La tua ricerca non ha restituito alcun risultato."
 msgid "Hashtags"
 msgstr "Hashtags"
 
-msgid "Subscribe to Selection as RSS"
-msgstr "Iscriversi agli hashtag"
+msgid "Subscribe"
+msgstr "Iscriviti"
+
+msgid "Subscribe to RSS feed"
+msgstr "Iscriviti al feed RSS"
+
+msgid "RSS feed with your current selection of tags"
+msgstr "Feed RSS con la tua selezione corrente di tag"
+
+msgid "Subscribe to newsletter"
+msgstr "Iscriviti alla newsletter"
+
+msgid "Receive the newsletter by email"
+msgstr "Ricevi la newsletter via e-mail"
 
 msgid "Years"
 msgstr "Anni"
 
-msgid "Newsletter Subscription"
-msgstr "Abbonamento alla newsletter"
+msgid "Warning secret content"
+msgstr "Avviso contenuto segreto"
+
+msgid ""
+"You selected 'secret' content for your newsletter. Secret content will not "
+"be visible unless you enable it in"
+msgstr ""
+"Avete selezionato un contenuto 'segreto' per la vostra newsletter. I "
+"contenuti segreti non saranno visibili a meno che non vengano abilitati nelle"
+
+msgid "newsletter settings"
+msgstr "impostazioni della newsletter"
+
+msgid "Warning private content"
+msgstr "Avviso contenuto privato"
+
+msgid ""
+"You selected 'private' content for your newsletter. Private content cannot "
+"be part of a newsletter."
+msgstr ""
+"Avete selezionato un contenuto 'privato' per la vostra newsletter. I "
+"contenuti privati non possono far parte di una newsletter."
 
 msgid ""
 "The newsletter is disabled. You can only see this page because you are "
@@ -1580,6 +1618,15 @@ msgstr "Nessun pagamento ancora."
 msgid "No people added yet."
 msgstr "Nessuna persona aggiunta ancora."
 
+msgid "No people found for current filter selection."
+msgstr "Non sono state trovate persone per la selezione del filtro corrente."
+
+msgid "Select organisation"
+msgstr "Selezionare l'organizzazione"
+
+msgid "Select sub organisation"
+msgstr "Selezionare la sotto-organizzazione"
+
 msgid "Export a vCard of this person"
 msgstr "Esporta una vCard di questa persona"
 
@@ -2088,6 +2135,12 @@ msgstr ""
 msgid "New Note"
 msgstr "Nuova nota"
 
+#~ msgid "Subscribe to Selection as RSS"
+#~ msgstr "Iscriversi agli hashtag"
+
+#~ msgid "Newsletter Subscription"
+#~ msgstr "Abbonamento alla newsletter"
+
 #~ msgid "Save"
 #~ msgstr "Risparmiare"
 
@@ -2276,9 +2329,6 @@ msgstr "Nuova nota"
 #~ msgid "Occupancy"
 #~ msgstr "Occupazione"
 
-#~ msgid "Subscribe"
-#~ msgstr "Iscriviti"
-
 #~ msgid "Rules"
 #~ msgstr "Regole"
 

src/onegov/town6/templates/news.pt

@@ -24,26 +24,33 @@
                         <h3 class="filter-title" i18n:translate>Hashtags</h3>
                         <div metal:use-macro="layout.macros['tags']" tal:define="tags tag_links" />
                     </div>
-                    <div tal:condition="rss_link" class="rss-sidepanel side-panel">
-                        <a class="button rss-button" href="${rss_link}">
-                            <i class="fas fa-rss fa-lg"></i>
-                            <span i18n:translate="">Subscribe to Selection as RSS</span>
-                        </a>
+                    <div class="side-panel">
+                        <h3 i18n:translate="">Subscribe</h3>
+                        <ul class="more-list">
+                            <li tal:condition="rss_link">
+                                <a  class="list-link" href="${layout.newsletter_url}">
+                                    <i class="fas fa-rss"></i> <span class="list-title" i18n:translate>Subscribe to RSS feed</span>
+                                </a>
+                                <a href="${layout.newsletter_url}">
+                                    <p class="list-lead preview" i18n:translate>RSS feed with your current selection of tags</p>
+                                </a>
+                            </li>
+                            <li tal:condition="layout.org.show_newsletter">
+                                <a class="list-link" href="${rss_link}">
+                                    <i class="fa fa-envelope"></i> <span class="list-title" i18n:translate>Subscribe to newsletter</span>
+                                </a>
+                                <a href="${rss_link}">
+                                    <p class="list-lead preview" i18n:translate>Receive the newsletter by email</p>
+                                </a>
+                            </li>
+                        </ul>
                     </div>
                     <!--! Show years only if there is more than one year -->
                     <div tal:condition="len(year_links) > 1" class="filter-years side-panel">
                         <h3 class="filter-title" i18n:translate>Years</h3>
                         <div metal:use-macro="layout.macros['tags']" tal:define="tags year_links" />
                     </div>
                 </tal:b>
-                <tal:b metal:fill-slot="after-panels">
-                    <div tal:condition="layout.org.show_newsletter" class="newsletter-sidepanel side-panel">
-                        <a class="button expanded" href="${layout.newsletter_url}">
-                            <span class="h5" i18n:translate="">Newsletter Subscription</span>
-                        </a>
-                    </div>
-
-                </tal:b>
             </tal:b>
         </div>