From bf2c97184aadf54508e6a664c11866de8f564d30 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 31 Jul 2022 20:34:05 +0200
Subject: [PATCH] Add new translations for feedback pages

---
 app/views/feedback/consent.haml | 24 +++++++-----------------
 app/views/layouts/feedback.haml |  6 +++---
 config/locales/views.en.yml     | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/views/feedback/consent.haml b/app/views/feedback/consent.haml
index e2a33871..94706697 100644
--- a/app/views/feedback/consent.haml
+++ b/app/views/feedback/consent.haml
@@ -1,26 +1,16 @@
 - provide(:title, generate_title(t('.title')))
 
 .text-center.mx-sm-5
-  %h2 Notice
+  %h2= t(".heading")
+
+  = t(".notice_html", app_name: APP_CONFIG["site_name"])
 
   %p
-    = APP_CONFIG["site_name"]
-    uses Canny to collect feedback or bug reports on the following pages.
+    %a.text-muted{ href: "https://canny.io/privacy" }= t(".privacy")
 
   %p
-    Canny collects the username, user ID and email address for these purposes.
-    Unless you specifically consent to this,
-    = APP_CONFIG["site_name"]
-    will not send your data to Canny, but you can't use the feedback forms either.
+    = button_to t(".consent"), feedback_consent_update_path, class: "btn btn-primary", method: :post, params: { consent: true }
 
+  %p= t(".alternative")
   %p
-    %a.text-muted{ href: "https://canny.io/privacy" } Canny's Privacy Policy
-
-  %p
-    = button_to "Consent and proceed", feedback_consent_update_path, class: "btn btn-primary", method: :post, params: { consent: true }
-
-  %p
-    Alternatively, you can send us bug reports and feature requests directly on GitHub.
-
-  %p
-    %a.btn.btn-outline-primary{ href: "https://github.com/Retrospring/retrospring/issues" } GitHub Issues
+    %a.btn.btn-outline-primary{ href: "https://github.com/Retrospring/retrospring/issues" }= t(".issues")
diff --git a/app/views/layouts/feedback.haml b/app/views/layouts/feedback.haml
index 6941130f..f264b929 100644
--- a/app/views/layouts/feedback.haml
+++ b/app/views/layouts/feedback.haml
@@ -1,13 +1,13 @@
 .jumbotron.jumbotron--particles
   .jumbotron__particles#particles
   .jumbotron__content
-    %h1 Feedback
+    %h1= t(".heading")
 .container
   - unless params[:action] == "consent"
     .card
       .list-group.list-group-horizontal-sm.text-center
-        = list_group_item "Bugs", feedback_bugs_path
-        = list_group_item "Feature Requests", feedback_features_path
+        = list_group_item t(".tab.bugs"), feedback_bugs_path
+        = list_group_item t(".tab.features"), feedback_features_path
   .card
     .card-body
       = yield
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index e316160d..d80e76a3 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -163,6 +163,21 @@ en:
   feedback:
     consent:
       title: "Feedback"
+      heading: "Notice"
+      notice_html: |
+        <p>
+          %{app_name} uses Canny to collect feedback or bug reports on the following pages.
+        </p>
+        <p>
+          Canny collects the username, user ID and email address for these purposes.
+          Unless you specifically consent to this,
+          %{app_name}
+          will not send your data to Canny, but you can't use the feedback forms either.
+        </p>
+      privacy: "Canny's Privacy Policy"
+      consent: "Consent and proceed"
+      alternative: "Alternatively, you can send us bug reports and feature requests directly on GitHub."
+      issues: "GitHub Issues"
     bugs:
       title: "Bugs – Feedback"
     features:
@@ -198,6 +213,11 @@ en:
         heading: "Share"
         button: "Share on %{service}"
   layouts:
+    feedback:
+      heading: "Feedback"
+      tab:
+        bugs: "Bugs"
+        features: "Feature Requests"
     messages:
       noscript: "Please activate JavaScript."
   link_filter: