From 7ffa8c9bcaf8d76560869b23724e1108a9fa0f2a Mon Sep 17 00:00:00 2001
From: Ahonen Mika J <mika.ahonen@helsinki.fi>
Date: Tue, 2 Mar 2021 17:10:56 +0200
Subject: [PATCH 1/5] Sends a feedback with a Subject field. Next steps:
 language support/unittests

---
 controller/WebController.php | 15 +++++----------
 resource/js/docready.js      |  2 +-
 view/feedback.twig           |  2 ++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index 0b41b6ecd..c7708b0f0 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -213,18 +213,16 @@ public function invokeFeedbackForm($request)
         }
         $feedbackName = $request->getQueryParamPOST('name');
         $feedbackEmail = $request->getQueryParamPOST('email');
+        $msgSubject = $request->getQueryParamPOST('msgsubject');
         $feedbackVocab = $request->getQueryParamPOST('vocab');
-
         $feedbackVocabEmail = ($feedbackVocab !== null && $feedbackVocab !== '') ?
             $this->model->getVocabulary($feedbackVocab)->getConfig()->getFeedbackRecipient() : null;
-
         // if the hidden field has been set a value we have found a spam bot
         // and we do not actually send the message.
         if ($this->honeypot->validateHoneypot($request->getQueryParamPOST('item-description')) &&
             $this->honeypot->validateHoneytime($request->getQueryParamPOST('user-captcha'), $this->model->getConfig()->getHoneypotTime())) {
-            $this->sendFeedback($request, $feedbackMsg, $feedbackName, $feedbackEmail, $feedbackVocab, $feedbackVocabEmail);
+            $this->sendFeedback($request, $feedbackMsg, $feedbackName, $feedbackEmail, $feedbackVocab, $feedbackVocabEmail, $msgSubject);
         }
-
         echo $template->render(
             array(
                 'languages' => $this->languages,
@@ -245,7 +243,6 @@ private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
         if (!empty($fromEmail)) {
             $headers .= "Reply-To: $fromName <$fromEmail>\r\n";
         }
-
         $service = $this->model->getConfig()->getServiceName();
         return $headers . "From: $fromName via $service <$sender>";
     }
@@ -253,11 +250,12 @@ private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     /**
      * Sends the user entered message through the php's mailer.
      * @param string $message only required parameter is the actual message.
+     * @param string $messageSubject from the sender.
      * @param string $fromName senders own name.
      * @param string $fromEmail senders email address.
      * @param string $fromVocab which vocabulary is the feedback related to.
      */
-    public function sendFeedback($request, $message, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
+    public function sendFeedback($request, $message, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null, $messageSubject)
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         if ($fromVocab !== null && $fromVocab !== '') {
@@ -265,7 +263,6 @@ public function sendFeedback($request, $message, $fromName = null, $fromEmail =
         }
 
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
-        $subject = $this->model->getConfig()->getServiceName() . " feedback";
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
         if (empty($sender)) $sender = $envelopeSender;
@@ -273,10 +270,8 @@ public function sendFeedback($request, $message, $fromName = null, $fromEmail =
 
         // determine sender name - default to "anonymous user" if not given by user
         if (empty($fromName)) $fromName = "anonymous user";
-
         $headers = $this->createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender);
         $params = empty($envelopeSender) ? '' : "-f $envelopeSender";
-
         // adding some information about the user for debugging purposes.
         $message = $message . "<br /><br /> Debugging information:"
             . "<br />Timestamp: " . date(DATE_RFC2822)
@@ -284,7 +279,7 @@ public function sendFeedback($request, $message, $fromName = null, $fromEmail =
             . "<br />Referer: " . $request->getServerConstant('HTTP_REFERER');
 
         try {
-            mail($toAddress, $subject, $message, $headers, $params);
+            mail($toAddress, $messageSubject, $message, $headers, $params);
         } catch (Exception $e) {
             header("HTTP/1.0 404 Not Found");
             $template = $this->twig->loadTemplate('error-page.twig');
diff --git a/resource/js/docready.js b/resource/js/docready.js
index 2300065e3..bf662f386 100644
--- a/resource/js/docready.js
+++ b/resource/js/docready.js
@@ -712,7 +712,7 @@ $(function() { // DOCUMENT READY
       // changes the response so it can be easily displayed in the handlebars template.
       filter: function(data) {
         // looping the matches to see if there are hits where the concept has been hit by a property other than hiddenLabel
-        var hasNonHiddenMatch = {};
+        var hasNonHiddenMatch = {feedback};
         for (var i = 0; i < data.results.length; i++) {
             var hit = data.results[i];
             if (!hit.hiddenLabel) {
diff --git a/view/feedback.twig b/view/feedback.twig
index f5869e9be..f385aae95 100644
--- a/view/feedback.twig
+++ b/view/feedback.twig
@@ -35,6 +35,8 @@
         <input id="name" class="form-control" type ="text" size="40" name="name" placeholder="{% trans %}Enter your name{% endtrans %}">
         <p>{% trans %}E-mail:{% endtrans %}</p>
         <input id="email" class="form-control" type ="text" size="40" name="email" placeholder="{% trans %}Enter your e-mail address{% endtrans %}">
+        <p>{% trans %}Subject:{% endtrans %}</p>
+        <input id="msgsubject" class="form-control" type ="text" size="40" name="msgsubject" placeholder="Write a subject">
         <p>{% trans %}Message:{% endtrans %} *</p>
         <textarea id="message" class="form-control" name="message"></textarea>
         {{ honeypot.generate('item-description', 'user-captcha')|raw }}

From 96fd12fec412cc9e36854892b41fe64235ff5a25 Mon Sep 17 00:00:00 2001
From: Ahonen Mika J <mika.ahonen@helsinki.fi>
Date: Wed, 3 Mar 2021 11:32:49 +0200
Subject: [PATCH 2/5] Language support for Finnish, English and Swedish added.
 Next stepes: Unittests and review

---
 .../translations/en/LC_MESSAGES/skosmos.mo    | Bin 13102 -> 13184 bytes
 .../translations/fi/LC_MESSAGES/skosmos.mo    | Bin 13384 -> 13461 bytes
 resource/translations/skosmos_en.po           |   6 ++++++
 resource/translations/skosmos_fi.po           |   6 ++++++
 resource/translations/skosmos_sv.po           |   6 ++++++
 .../translations/sv/LC_MESSAGES/skosmos.mo    | Bin 13258 -> 13338 bytes
 view/feedback.twig                            |   2 +-
 7 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/resource/translations/en/LC_MESSAGES/skosmos.mo b/resource/translations/en/LC_MESSAGES/skosmos.mo
index e0701302490141b43c661981086faf2c207ecefc..265d0a24e1293933283a5c53a30fe5776ef23a16 100644
GIT binary patch
delta 4344
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

delta 4260
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
BhlKzD

diff --git a/resource/translations/fi/LC_MESSAGES/skosmos.mo b/resource/translations/fi/LC_MESSAGES/skosmos.mo
index 91a1cdb81a631ad2472f6859d8e5c36c01e65e41..2c265d006f6422b3951ce1833e0be99badc15f63 100644
GIT binary patch
delta 4331
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

delta 4257
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

diff --git a/resource/translations/skosmos_en.po b/resource/translations/skosmos_en.po
index 2f722e7f0..cda4767ca 100644
--- a/resource/translations/skosmos_en.po
+++ b/resource/translations/skosmos_en.po
@@ -839,3 +839,9 @@ msgstr "Search results"
 
 msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
 msgstr "Sidebar listing: list and traverse vocabulary contents by a criterion"
+
+msgid "Subject:"
+msgstr "Subject:"
+
+msgid "Write a subject"
+msgstr "Write a subject"
diff --git a/resource/translations/skosmos_fi.po b/resource/translations/skosmos_fi.po
index 2743438ce..a9bab240f 100644
--- a/resource/translations/skosmos_fi.po
+++ b/resource/translations/skosmos_fi.po
@@ -838,3 +838,9 @@ msgstr "Hakutulokset"
 
 msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
 msgstr "Sivupalkin lista: listaa ja selaa käsitteitä eri kriteerien mukaan"
+
+msgid "Subject:"
+msgstr "Aihe:"
+
+msgid "Write a subject"
+msgstr "Kirjoita aihe"
diff --git a/resource/translations/skosmos_sv.po b/resource/translations/skosmos_sv.po
index bd7fc0bcf..833c585ec 100644
--- a/resource/translations/skosmos_sv.po
+++ b/resource/translations/skosmos_sv.po
@@ -836,3 +836,9 @@ msgstr "Sökresultat"
 
 msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
 msgstr "Sidofältlista: ordna och bläddra begrepp efter kriterier"
+
+msgid "Subject:"
+msgstr "Ämne:"
+
+msgid "Write a subject"
+msgstr "Skriv ett ämne"
diff --git a/resource/translations/sv/LC_MESSAGES/skosmos.mo b/resource/translations/sv/LC_MESSAGES/skosmos.mo
index e9e13a6dc01ee731153cd5fa019a2156ab32bbad..4a063c55fe38b6920c242d2a8ba3623b66fa3282 100644
GIT binary patch
delta 4334
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
Jw-i*j`#%KQp$Gr~

delta 4257
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

diff --git a/view/feedback.twig b/view/feedback.twig
index f385aae95..7c6a7ce25 100644
--- a/view/feedback.twig
+++ b/view/feedback.twig
@@ -36,7 +36,7 @@
         <p>{% trans %}E-mail:{% endtrans %}</p>
         <input id="email" class="form-control" type ="text" size="40" name="email" placeholder="{% trans %}Enter your e-mail address{% endtrans %}">
         <p>{% trans %}Subject:{% endtrans %}</p>
-        <input id="msgsubject" class="form-control" type ="text" size="40" name="msgsubject" placeholder="Write a subject">
+        <input id="msgsubject" class="form-control" type ="text" size="40" name="msgsubject" placeholder="{% trans %}Write a subject{% endtrans %}">
         <p>{% trans %}Message:{% endtrans %} *</p>
         <textarea id="message" class="form-control" name="message"></textarea>
         {{ honeypot.generate('item-description', 'user-captcha')|raw }}

From f35050c20b1bd8b3ac43d4d0e9279674cf958a95 Mon Sep 17 00:00:00 2001
From: Ahonen Mika J <mika.ahonen@helsinki.fi>
Date: Wed, 3 Mar 2021 18:39:18 +0200
Subject: [PATCH 3/5] Some WCAG 2.1 AA level improvements added to the feedback
 form

---
 controller/WebController.php                  |   3 ++-
 resource/css/styles.css                       |  18 ++++++++-----
 resource/js/docready.js                       |   2 +-
 .../translations/en/LC_MESSAGES/skosmos.mo    | Bin 13184 -> 13248 bytes
 .../translations/fi/LC_MESSAGES/skosmos.mo    | Bin 13461 -> 13530 bytes
 resource/translations/skosmos_en.po           |   3 +++
 resource/translations/skosmos_fi.po           |   3 +++
 resource/translations/skosmos_sv.po           |   3 +++
 .../translations/sv/LC_MESSAGES/skosmos.mo    | Bin 13338 -> 13403 bytes
 tests/testconfig-fordefaults.ttl              |   3 +--
 view/feedback.twig                            |  25 +++++++++++-------
 11 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index c7708b0f0..11e5f3894 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -213,7 +213,8 @@ public function invokeFeedbackForm($request)
         }
         $feedbackName = $request->getQueryParamPOST('name');
         $feedbackEmail = $request->getQueryParamPOST('email');
-        $msgSubject = $request->getQueryParamPOST('msgsubject');
+        $msgSubject = $this->model->getConfig()->getServiceName() . ": ";
+        $msgSubject .= $request->getQueryParamPOST('msgsubject');
         $feedbackVocab = $request->getQueryParamPOST('vocab');
         $feedbackVocabEmail = ($feedbackVocab !== null && $feedbackVocab !== '') ?
             $this->model->getVocabulary($feedbackVocab)->getConfig()->getFeedbackRecipient() : null;
diff --git a/resource/css/styles.css b/resource/css/styles.css
index cb28d3dc9..5ec7f9508 100644
--- a/resource/css/styles.css
+++ b/resource/css/styles.css
@@ -5,6 +5,10 @@ li, td > a {
   font-size: 14px;
 }
 
+label {
+  font-weight: normal;
+}
+
 h1, .prefLabel, .prefLabelLang, .notation {
   font-family: 'Fira Sans', sans-serif;
   font-size: 24px;
@@ -667,7 +671,7 @@ span.xl-pref-label > img {
 .welcome-box, .right-box, #vocabulary-list {
   vertical-align: top;
 }
-  
+
 .welcome-box {
   background-color: #ffffff;
   display: inline-block;
@@ -2000,7 +2004,7 @@ body, .versal, h1, h2, h3, p, .versal-bold {
     margin: 2px 0 0 0;
     line-height: 30px;
   }
-  
+
   .concept-main > .row > .property-label-pref {
       margin-top: 10px;
       line-height: 20px;
@@ -2022,7 +2026,7 @@ body, .versal, h1, h2, h3, p, .versal-bold {
     margin: 0;
     width: 100%;
   }
-  
+
   .headerbar-coloured {
     overflow: hidden;
   }
@@ -2034,7 +2038,7 @@ body, .versal, h1, h2, h3, p, .versal-bold {
 }
 
 @media (max-width: 800px) {
-  
+
   .twitter-typeahead {
     width: 100%;
   }
@@ -2103,7 +2107,7 @@ body, .versal, h1, h2, h3, p, .versal-bold {
   .right-box {
     display: inline;
   }
-  
+
   .voclist-wide > .right-box {
     left: 0;
     top: 425px;
@@ -2161,12 +2165,12 @@ body, .versal, h1, h2, h3, p, .versal-bold {
   .frontpage > .welcome-box, .frontpage > .right-box {
     width: 200px;
   }
-    
+
   .voclist #vocabulary-list {
     margin-left: 20px;
     width: calc(100% - 225px);
   }
-  
+
    .voclist-right #vocabulary-list {
     margin-left: 20px;
     width: auto;
diff --git a/resource/js/docready.js b/resource/js/docready.js
index bf662f386..2300065e3 100644
--- a/resource/js/docready.js
+++ b/resource/js/docready.js
@@ -712,7 +712,7 @@ $(function() { // DOCUMENT READY
       // changes the response so it can be easily displayed in the handlebars template.
       filter: function(data) {
         // looping the matches to see if there are hits where the concept has been hit by a property other than hiddenLabel
-        var hasNonHiddenMatch = {feedback};
+        var hasNonHiddenMatch = {};
         for (var i = 0; i < data.results.length; i++) {
             var hit = data.results[i];
             if (!hit.hiddenLabel) {
diff --git a/resource/translations/en/LC_MESSAGES/skosmos.mo b/resource/translations/en/LC_MESSAGES/skosmos.mo
index 265d0a24e1293933283a5c53a30fe5776ef23a16..a7cf4c9c83fa4569790d9da8b7d95d7715b02016 100644
GIT binary patch
delta 4359
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
BqhSC5

delta 4284
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
Dfw++L

diff --git a/resource/translations/fi/LC_MESSAGES/skosmos.mo b/resource/translations/fi/LC_MESSAGES/skosmos.mo
index 2c265d006f6422b3951ce1833e0be99badc15f63..f2de39e225f1e35ea5392a51a8356ab7c6f64432 100644
GIT binary patch
delta 4360
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
YRaNP#@>ErNM!KrHa>m}K-B;)S4^DWYQUCw|

delta 4280
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
BkCgxb

diff --git a/resource/translations/skosmos_en.po b/resource/translations/skosmos_en.po
index cda4767ca..0ddbf8457 100644
--- a/resource/translations/skosmos_en.po
+++ b/resource/translations/skosmos_en.po
@@ -845,3 +845,6 @@ msgstr "Subject:"
 
 msgid "Write a subject"
 msgstr "Write a subject"
+
+msgid "Select a vocabulary"
+msgstr "You can select a vocabulary"
diff --git a/resource/translations/skosmos_fi.po b/resource/translations/skosmos_fi.po
index a9bab240f..5208799cc 100644
--- a/resource/translations/skosmos_fi.po
+++ b/resource/translations/skosmos_fi.po
@@ -844,3 +844,6 @@ msgstr "Aihe:"
 
 msgid "Write a subject"
 msgstr "Kirjoita aihe"
+
+msgid "Select a vocabulary"
+msgstr "Voit valita halutessasi sanaston"
diff --git a/resource/translations/skosmos_sv.po b/resource/translations/skosmos_sv.po
index 833c585ec..a70425192 100644
--- a/resource/translations/skosmos_sv.po
+++ b/resource/translations/skosmos_sv.po
@@ -842,3 +842,6 @@ msgstr "Ämne:"
 
 msgid "Write a subject"
 msgstr "Skriv ett ämne"
+
+msgid "Select a vocabulary"
+msgstr "Du kan välja ett vokabulär"
diff --git a/resource/translations/sv/LC_MESSAGES/skosmos.mo b/resource/translations/sv/LC_MESSAGES/skosmos.mo
index 4a063c55fe38b6920c242d2a8ba3623b66fa3282..fe85b4eb6944ea7f81292c100b534b58644a5b85 100644
GIT binary patch
delta 4356
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
KxcyX0M)bd?bf+8u

delta 4280
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
Hq3QnvYf+Al

diff --git a/tests/testconfig-fordefaults.ttl b/tests/testconfig-fordefaults.ttl
index fba8424b1..78ffc774a 100644
--- a/tests/testconfig-fordefaults.ttl
+++ b/tests/testconfig-fordefaults.ttl
@@ -28,7 +28,7 @@
     skos:prefLabel "Test ontology"@en ;
 	skosmos:arrayClass isothes:ThesaurusArray ;
 	skosmos:defaultLanguage "en";
-    skosmos:feedbackRecipient "developer@vocabulary.org";
+  skosmos:feedbackRecipient "developer@vocabulary.org";
 	skosmos:groupClass skos:Collection;
 	skosmos:language "en";
 	skosmos:showTopConcepts "true";
@@ -48,4 +48,3 @@ mdrtype:THESAURUS a skos:Concept ;
 
 mdrtype:ONTOLOGY a skos:Concept ;
     skos:prefLabel "Онтология"@bg, "Ontologie"@cs, "Ontologi"@da, "Ontologie"@de, "Οντολογία"@el, "Ontology"@en, "Ontoloogia"@et, "Ontologia"@fi, "Ontologie"@fr, "Ontologija"@hr, "Ontológia"@hu, "Ontologia"@it, "Ontoloģija"@lv, "Ontologija"@lt, "Ontoloġija"@mt, "Ontologie"@nl, "Ontologi"@no, "Struktura pojęciowa"@pl, "Ontologia"@pt, "Ontologie"@ro, "Ontológia"@sk, "Ontologija"@sl, "Ontología"@es, "Ontologi"@sv .
-
diff --git a/view/feedback.twig b/view/feedback.twig
index 7c6a7ce25..2af2c11ec 100644
--- a/view/feedback.twig
+++ b/view/feedback.twig
@@ -19,7 +19,7 @@
         {% if vocabList %}
         <input id="feedback-vocid-input" name="vocab" type="hidden"{% if request.vocabid %} value="{{ request.vocabid }}"{% endif %}>
         <div class="dropdown">
-          <button class="btn btn-default dropdown-toggle" type="button" id="feedback-vocid" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+          <button class="btn btn-default dropdown-toggle" type="button" id="feedback-vocid" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-label="{% trans %}Select a vocabulary{% endtrans %}">
             {% if request.vocabid %}{{ request.vocab.title }}{% else %}{% trans %}Not to a specific vocabulary{% endtrans %}{% endif %}
             <span class="caret"></span>
           </button>
@@ -30,17 +30,22 @@
         </div>
         {% endif %}
         <p>{% trans "feedback_enter_name_email" %}</p>
-
-        <p>{% trans %}Name:{% endtrans %}</p>
-        <input id="name" class="form-control" type ="text" size="40" name="name" placeholder="{% trans %}Enter your name{% endtrans %}">
-        <p>{% trans %}E-mail:{% endtrans %}</p>
-        <input id="email" class="form-control" type ="text" size="40" name="email" placeholder="{% trans %}Enter your e-mail address{% endtrans %}">
-        <p>{% trans %}Subject:{% endtrans %}</p>
-        <input id="msgsubject" class="form-control" type ="text" size="40" name="msgsubject" placeholder="{% trans %}Write a subject{% endtrans %}">
-        <p>{% trans %}Message:{% endtrans %} *</p>
+        <p>
+          <label for="name">{% trans %}Name:{% endtrans %}</label>
+          <input id="name" class="form-control" type="text" size="40" name="name" placeholder="{% trans %}Enter your name{% endtrans %}">
+        </p>
+        <p>
+          <label for="email">{% trans %}E-mail:{% endtrans %}</label>
+          <input id="email" class="form-control" type="text" size="40" name="email" placeholder="{% trans %}Enter your e-mail address{% endtrans %}">
+        </p>
+        <p>
+          <label for="msgsubject">{% trans %}Subject:{% endtrans %}</label>
+          <input id="msgsubject" class="form-control" type="text" size="40" name="msgsubject" placeholder="{% trans %}Write a subject{% endtrans %}">
+        </p>
+        <label for="message">{% trans %}Message:{% endtrans %}</label>
         <textarea id="message" class="form-control" name="message"></textarea>
         {{ honeypot.generate('item-description', 'user-captcha')|raw }}
-        <button type="submit" class="btn btn-primary" id="send-feedback">{% trans %}Send feedback{% endtrans %}</button>
+        <button type="submit" class="btn btn-primary" id="send-feedback" aria-label="{% trans %}Send feedback{% endtrans %}">{% trans %}Send feedback{% endtrans %}</button>
       </form>
     {% endif %}
     </div>

From 038e4a307e242220cbc2c985ad8abf90510349e7 Mon Sep 17 00:00:00 2001
From: Ahonen Mika J <mika.ahonen@helsinki.fi>
Date: Thu, 4 Mar 2021 10:17:09 +0200
Subject: [PATCH 4/5] Some WCAG 2.1 AA level improvements added to the feedback
 form + changed argument order in the method WebController.php/sendFeecback

---
 controller/WebController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index 11e5f3894..b815eca7c 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -222,7 +222,7 @@ public function invokeFeedbackForm($request)
         // and we do not actually send the message.
         if ($this->honeypot->validateHoneypot($request->getQueryParamPOST('item-description')) &&
             $this->honeypot->validateHoneytime($request->getQueryParamPOST('user-captcha'), $this->model->getConfig()->getHoneypotTime())) {
-            $this->sendFeedback($request, $feedbackMsg, $feedbackName, $feedbackEmail, $feedbackVocab, $feedbackVocabEmail, $msgSubject);
+            $this->sendFeedback($request, $feedbackMsg, $msgSubject, $feedbackName, $feedbackEmail, $feedbackVocab, $feedbackVocabEmail);
         }
         echo $template->render(
             array(
@@ -256,7 +256,7 @@ private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
      * @param string $fromEmail senders email address.
      * @param string $fromVocab which vocabulary is the feedback related to.
      */
-    public function sendFeedback($request, $message, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null, $messageSubject)
+    public function sendFeedback($request, $message, $messageSubject, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
         if ($fromVocab !== null && $fromVocab !== '') {

From f67a739757d00d39540cbe1583902dfbcf194013 Mon Sep 17 00:00:00 2001
From: Ahonen Mika J <mika.ahonen@helsinki.fi>
Date: Thu, 4 Mar 2021 17:34:17 +0200
Subject: [PATCH 5/5] Change requests in draft pull request
 (https://github.com/NatLibFi/Skosmos/pull/1130#pullrequestreview-604120061)
 checked and fixed

---
 controller/WebController.php                  |   9 ++++-----
 resource/translations/skosmos_sv.po           |   2 +-
 .../translations/sv/LC_MESSAGES/skosmos.mo    | Bin 13403 -> 13402 bytes
 view/feedback.twig                            |   2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index b815eca7c..cca6e1c54 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -213,8 +213,7 @@ public function invokeFeedbackForm($request)
         }
         $feedbackName = $request->getQueryParamPOST('name');
         $feedbackEmail = $request->getQueryParamPOST('email');
-        $msgSubject = $this->model->getConfig()->getServiceName() . ": ";
-        $msgSubject .= $request->getQueryParamPOST('msgsubject');
+        $msgSubject = $request->getQueryParamPOST('msgsubject');
         $feedbackVocab = $request->getQueryParamPOST('vocab');
         $feedbackVocabEmail = ($feedbackVocab !== null && $feedbackVocab !== '') ?
             $this->model->getVocabulary($feedbackVocab)->getConfig()->getFeedbackRecipient() : null;
@@ -250,8 +249,8 @@ private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
 
     /**
      * Sends the user entered message through the php's mailer.
-     * @param string $message only required parameter is the actual message.
-     * @param string $messageSubject from the sender.
+     * @param string $message content given by user.
+     * @param string $messageSubject subject line given by user.
      * @param string $fromName senders own name.
      * @param string $fromEmail senders email address.
      * @param string $fromVocab which vocabulary is the feedback related to.
@@ -259,10 +258,10 @@ private function createFeedbackHeaders($fromName, $fromEmail, $toMail, $sender)
     public function sendFeedback($request, $message, $messageSubject, $fromName = null, $fromEmail = null, $fromVocab = null, $toMail = null)
     {
         $toAddress = ($toMail) ? $toMail : $this->model->getConfig()->getFeedbackAddress();
+        $messageSubject = "[" . $this->model->getConfig()->getServiceName() . "] " . $messageSubject;
         if ($fromVocab !== null && $fromVocab !== '') {
             $message = 'Feedback from vocab: ' . strtoupper($fromVocab) . "<br />" . $message;
         }
-
         $envelopeSender = $this->model->getConfig()->getFeedbackEnvelopeSender();
         // determine the sender address of the message
         $sender = $this->model->getConfig()->getFeedbackSender();
diff --git a/resource/translations/skosmos_sv.po b/resource/translations/skosmos_sv.po
index a70425192..4c501d76c 100644
--- a/resource/translations/skosmos_sv.po
+++ b/resource/translations/skosmos_sv.po
@@ -844,4 +844,4 @@ msgid "Write a subject"
 msgstr "Skriv ett ämne"
 
 msgid "Select a vocabulary"
-msgstr "Du kan välja ett vokabulär"
+msgstr "Du kan välja en vokabulär"
diff --git a/resource/translations/sv/LC_MESSAGES/skosmos.mo b/resource/translations/sv/LC_MESSAGES/skosmos.mo
index fe85b4eb6944ea7f81292c100b534b58644a5b85..ca12018b82bb7aba5f17b7632ac225c62bc5983b 100644
GIT binary patch
delta 1097
zcmXZbPe@cz6vy!sX*s?b|232LRLt_vSpLh5frQASawS2vY17ccTxcyMT132D7zl0z
z7a>v&1QSFd*dL@-L`8+93z5oAO+gSugbTx<zQ1`FhWXrk-@E6YbMJkh20sqYP80>z
zW>(y67Q-eyh~2myFX0Znfm`qnmSPqw@hP6h_gH}qNwXeI;bt5`&A)<CoOIqot$ROd
zK|bJX20R8<FpfFYg6o*Te^`Tw7PAuU!gB0&{ZkmBe;ze&2o-Mx3o&s0G535D73XG4
z5C+OJ5Mf{*75D`z(6VzCH6e#Z_}jUG+vpeU2`j8ZCESRb--EmH2&%9F)J|VTy*D1v
zD4=m0wPkm)7VqH#zQV0IwKsfk2H9=PppM`TYN5|~4!>gx`&z>txQ<$I0)3oDCGr@_
z-Ga9?%4n>)2Ze2B?6&z>j7L#B((lI8sIwkNRX&3XJd29+&W*34690uNY#pocFM610
z&leO}J&gzhP51~qQD^oImFW-ELe>!mj5}*Ef9Y@+k5i~b&f-42jGC84?btKaj^$97
zZv)%7e^%KUR(cHi*-8GC=_o3|G}hxo*Iz^>_7!*HAJh){tSVbk?;pY_rg1+GqvmCh
zQ?e)MvA%twL6P<o%doa9tgIay==b7r96(j@0QLS$)MvVeCFrqA41H|GB<gPTV>zBd
xUAhaXOL+|s)X~V$D8=WfGh0G(u@9)*?sfCYVH_*)#N2!|?Qgm`SKWL#_8+XVbb|l@

delta 1098
zcmXZbO-R&17{~Fa7hl%>uWz-R?rJZVty^toCP@l~iP%X3@zSBBgL^4DEYTtQmxltW
zi_jrNvV~xS=mn!JIz?1eLUjl+yx0~5K}2{k4Ep}|KOlZ)=0Eey^UTc7XTD?}TrKw-
z%&a157QrMQzz&Sz8LY=ESc<o>3iG%DXK)ZdU@bPcm~~+%uE8v7{W<h-+<6ld^zXKq
zUkvz$fiMGexE>3r4VN*BmNHYKF|5RPtic}FAH)#-lc;s4Q1P-@f)`!?vim-cigP37
z2Z8bogcx{+3j7ik=(BSHwV;6I_{X_|>*$y42r8^cCA=NAz8kmVVN_uwsFOaAnm6Xt
zSW9CHb!4}(5%1tEzQ!`VzB8CNiJZ3OP*?C4wb3FT#~-*KkL(Ig;1X)XYZ%7~R3eX&
z+|7SSqngH&`%s!T<J2vI71)b9kpVY8jJoSFROOSXzz<Pz-n;PyRN}u;g)L(p{=+cF
zb{7lst%*j6fh0b{Hq@PcM`ijGwb829AYjzlh{Z>TO?>Y}C2|bg@GNRw9(7{RQ72YF
zJ-!u8^Zu-EPf%$e@@Gf+r%Xpt0VZ$@-go_vsKmbEX8emfp#;0iG;01q^l%v4@ib~(
z4!I?Jf?@WzuQVvqeql9k+#6KZireV-U>}a4D!7N5{|fapUBXKA*d>AqY{nGoZ46)y
z4xt`h2K6W}V8<pJIT}^?0(EDfkX&pY_1e9CX6#{6ti}H6r{0P9>TGs8o;(!!52;^t
Aga7~l

diff --git a/view/feedback.twig b/view/feedback.twig
index 2af2c11ec..eb370ff3e 100644
--- a/view/feedback.twig
+++ b/view/feedback.twig
@@ -45,7 +45,7 @@
         <label for="message">{% trans %}Message:{% endtrans %}</label>
         <textarea id="message" class="form-control" name="message"></textarea>
         {{ honeypot.generate('item-description', 'user-captcha')|raw }}
-        <button type="submit" class="btn btn-primary" id="send-feedback" aria-label="{% trans %}Send feedback{% endtrans %}">{% trans %}Send feedback{% endtrans %}</button>
+        <button type="submit" class="btn btn-primary" id="send-feedback">{% trans %}Send feedback{% endtrans %}</button>
       </form>
     {% endif %}
     </div>