fix: Remove HTML escape for custom state in Email subjects (#35)

* New Crowdin updates (#15) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (Romanian) * Update Crowdin configuration file * Add crowdim config (#17) * Update Crowdin configuration file * New Crowdin updates (#18) New translations en.yml (Romanian) * Change the event (#20) * Change the event * Fix specs * Fixing chrome version (#24) * Add more translations (#23) * Add more translations * Normalize * New Crowdin updates (#19) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (French) * Add more translations (#34) * New Crowdin updates (#33) * New translations en.yml (French) * New translations en.yml (Romanian) * New translations en.yml (French) * New translations en.yml (German) * New translations en.yml (French) * New translations en.yml (French) * fix: Remove HTML escape for custom state in Email subjects --------- Co-authored-by: Alexandru Emil Lupu <[email protected]>
alecslupu-pfa · Mar 22, 2024 · 4d08345 · 4d08345
1 parent b18a5f2
commit 4d08345
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 2 deletions.
diff --git a/app/events/decidim/custom_proposal_states/proposal_state_changed_event.rb b/app/events/decidim/custom_proposal_states/proposal_state_changed_event.rb
@@ -17,7 +17,7 @@ def event_has_roles?
         true
       end
 
-      def default_i18n_options
+      def i18n_options
         super.merge({ state: state })
       end
 

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -0,0 +1,68 @@
+---
+de:
+  decidim:
+    admin:
+      filters:
+        proposals:
+          proposal_state_id_eq:
+            label: State
+    components:
+      custom_proposal_states:
+        name: CustomProposalStates
+    custom_proposal_states:
+      admin:
+        proposal_states:
+          edit:
+            save: Save
+            title: Edit state
+          index:
+            title: States
+          new:
+            create: Create
+            title: New state
+    events:
+      custom_proposal_states:
+        proposal_state_changed:
+          affected_user:
+            email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
+            email_outro: You have received this notification because you are an author of "%{resource_title}".
+            email_subject: Your proposal has changed its state (%{state})
+            notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has changed its state to "%{state}".
+          follower:
+            email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
+            email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+            email_subject: A proposal you are following has changed its state (%{state})
+            notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has changed its state to "%{state}".
+    proposals:
+      actions:
+        delete_proposal_state_confirm: Are you sure you want to delete this state?
+        destroy: Destroy
+        edit_proposal_state: Edit state
+        new_proposal_state: New state
+        title: Actions
+      admin:
+        proposal_states:
+          create:
+            error: Error creating state
+            success: State created successfully
+          destroy:
+            success: State deleted successfully
+          update:
+            error: Error updating state
+            success: State updated successfully
+        proposals:
+          bulk-actions:
+            statuses: States
+      models:
+        proposal_state:
+          announcement_title: Announcement title
+          answerable: Answerable
+          css_class: CSS class
+          default: Default
+          description: Description
+          gamified: Gamified
+          include_in_stats: Include in stats
+          notifiable: Notifiable
+          system: System
+          title: State
+          token: Token
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -61,8 +61,14 @@ en:
             statuses: States
       models:
         proposal_state:
+          announcement_title: Announcement title
+          answerable: Answerable
           css_class: CSS class
           default: Default
+          description: Description
+          gamified: Gamified
+          include_in_stats: Include in stats
+          notifiable: Notifiable
           system: System
           title: State
           token: Token
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -0,0 +1,68 @@
+---
+fr:
+  decidim:
+    admin:
+      filters:
+        proposals:
+          proposal_state_id_eq:
+            label: État de réponse
+    components:
+      custom_proposal_states:
+        name: États des réponses
+    custom_proposal_states:
+      admin:
+        proposal_states:
+          edit:
+            save: Sauvegarder
+            title: Modifier l'état de réponse
+          index:
+            title: États des réponses
+          new:
+            create: Créer un état de réponse
+            title: Nouvel état de réponse
+    events:
+      custom_proposal_states:
+        proposal_state_changed:
+          affected_user:
+            email_intro: 'La proposition "%{resource_title}" a une nouvelle réponse: "%{state}". Pour en savoir plus:'
+            email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de "%{resource_title}".
+            email_subject: 'L''état de votre proposition a changé. L''état est désormais: (%{state})'
+            notification_title: L'état de votre proposition <a href="%{resource_path}">%{resource_title}</a> a été changé à %{state}.
+          follower:
+            email_intro: 'La proposition "%{resource_title}" a une nouvelle réponse: "%{state}". Pour en savoir plus:'
+            email_outro: Cette notification vous a été envoyée parce que vous suivez "%{resource_title}". Vous pouvez vous désabonner en cliquant sur le lien précédent.
+            email_subject: Une proposition que vous suivez a changé de statut (%{state})
+            notification_title: L'état de la proposition <a href="%{resource_path}">%{resource_title}</a> est passé à "%{state}".
+    proposals:
+      actions:
+        delete_proposal_state_confirm: Etes-vous sur de vouloir supprimer cet état?
+        destroy: Supprimer
+        edit_proposal_state: Modifier l'état de réponse
+        new_proposal_state: Nouvel état de réponse
+        title: Actions
+      admin:
+        proposal_states:
+          create:
+            error: Erreur lors de la création d'état de réponse
+            success: État de réponse créé avec succès
+          destroy:
+            success: État de réponse supprimé avec succès
+          update:
+            error: Erreur lors de la mise à jour de l'état de réponse
+            success: État de réponse mis à jour avec succès
+        proposals:
+          bulk-actions:
+            statuses: États des réponses
+      models:
+        proposal_state:
+          announcement_title: Phrase de réponse à la proposition 
+          answerable: État choisisable
+          css_class: Classe CSS
+          default: Assigné par défaut
+          description: Description
+          gamified: Ludifié
+          include_in_stats: Disponible dans les statistiques
+          notifiable: Envoie une notification
+          system: État original Decidim
+          title: État de réponse
+          token: Jeton d'identification
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
@@ -0,0 +1,68 @@
+---
+ro:
+  decidim:
+    admin:
+      filters:
+        proposals:
+          proposal_state_id_eq:
+            label: Stare
+    components:
+      custom_proposal_states:
+        name: CustomProposalStates
+    custom_proposal_states:
+      admin:
+        proposal_states:
+          edit:
+            save: Actualizați
+            title: Actualizați starea
+          index:
+            title: Stări
+          new:
+            create: Creați
+            title: Stare nouă
+    events:
+      custom_proposal_states:
+        proposal_state_changed:
+          affected_user:
+            email_intro: 'Propunerea "%{resource_title}" și-a modificat starea în "%{state}". Puteți citi răspunsul în această pagină:'
+            email_outro: Ați primit această notificare deoarece sunteți autor al "%{resource_title}".
+            email_subject: Propunerea dvs. și-a modificat starea (%{state})
+            notification_title: Propunerea dumneavoastră <a href="%{resource_path}">%{resource_title}</a> și-a schimbat starea în "%{state}".
+          follower:
+            email_intro: 'Propunerea "%{resource_title}" și-a modificat starea în "%{state}". Puteți citi răspunsul în această pagină:'
+            email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+            email_subject: A proposal you are following has changed its state (%{state})
+            notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has changed its state to "%{state}".
+    proposals:
+      actions:
+        delete_proposal_state_confirm: Are you sure you want to delete this state?
+        destroy: Destroy
+        edit_proposal_state: Editați starea
+        new_proposal_state: Stare nouă
+        title: Acțiuni
+      admin:
+        proposal_states:
+          create:
+            error: Eroare la crearea stării
+            success: State created successfully
+          destroy:
+            success: State deleted successfully
+          update:
+            error: Eroare la actualizarea stării
+            success: State updated successfully
+        proposals:
+          bulk-actions:
+            statuses: Stări
+      models:
+        proposal_state:
+          announcement_title: Announcement title
+          answerable: Answerable
+          css_class: CSS class
+          default: Default
+          description: Description
+          gamified: Gamified
+          include_in_stats: Include in stats
+          notifiable: Notifiable
+          system: System
+          title: Stare
+          token: Token
diff --git a/crowdin.yml b/crowdin.yml
@@ -1,3 +1,52 @@
 files:
   - source: /config/locales/en.yml
-    translation: /config/locales/%two_letters_code%.yml
+    translation: /config/locales/%two_letters_code%.yml
+    languages_mapping:
+      locale:
+        ar: ar
+        bg: bg
+        ca: ca
+        cs: cs
+        da: da
+        de: de
+        el: el
+        eo: eo
+        es-ES: es
+        es-MX: es-MX
+        es-PY: es-PY
+        et: et
+        eu: eu
+        fi: fi
+        fi-plain: fi-plain
+        fr: fr
+        fr-CA: fr-CA
+        ga: ga
+        gl: gl
+        hr: hr
+        hu: hu
+        id-ID: id
+        is-IS: is
+        it: it
+        ja: ja
+        ko: ko
+        lb: lb
+        lt: lt
+        lv: lv
+        mt: mt
+        nl: nl
+        'no': 'no'
+        pl: pl
+        pt: pt
+        pt-PT: pt
+        pt-BR: pt-BR
+        ro-RO: ro
+        rumany: ru
+        sk: sk
+        sl: sl
+        sr: sr
+        sv-SE: sv
+        tr-TR: tr
+        ukmany: uk
+        vi: vi
+        zh-CN: zh-CN
+        zh-TW: zh-TW
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ def event_has_roles? @@
             true
           end
-          def default_i18n_options
+          def i18n_options
             super.merge({ state: state })
           end
@@ Expand Down @@