28 files changed, 42 insertions, 42 deletions
diff --git a/app/views/user/no_cookies.rhtml b/app/views/user/no_cookies.rhtml
index d52322cda..0a4a39b1b 100644
--- a/app/views/user/no_cookies.rhtml
+++ b/app/views/user/no_cookies.rhtml
@@ -17,6 +17,6 @@ then there is probably a fault with our server.')%>
  <%= _('Let us know what you were doing when this message
 appeared and your browser and operating system type and version.')%></p>
 
-<p><%= raw(_('If you are still having trouble, please <a href="%s">contact us</a>.') % [help_contact_path]) %>
+<p><%= _('If you are still having trouble, please <a href="{{url}}">contact us</a>.', :url => help_contact_path.html_safe) %>
 </p>
 
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 49dce5d0f..f7a33d9c7 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -943,7 +943,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/app.pot b/locale/app.pot
index 02ac6d323..dd654e051 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -941,7 +941,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 53620e96f..2c5adae1e 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -963,7 +963,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/bs/app.po b/locale/bs/app.po
index b7ccfd93a..78754568e 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -1017,8 +1017,8 @@ msgstr ""
 "            javne ustanove, imate pravo na\n"
 "            žalbu (<a href=\"{{url}}\">Više informacija</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Ako i dalje imate problema, molimo <a href=\"%s\">kontaktirajte nas</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Ako i dalje imate problema, molimo <a href=\"{{url}}\">kontaktirajte nas</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Ako ste podnosioc zahtjeva, možete se <a href=\"%s\">prijaviti</a> da biste pogledali zahtjev."
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 995e23028..3ce686344 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -1033,8 +1033,8 @@ msgstr ""
 "            organismo público, tiene derecho a\n"
 "            apelar (<a href=\"{{url}}\">detalles</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Si aún tiene problemas, por favor <a href=\"%s\">contáctenos</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Si aún tiene problemas, por favor <a href=\"{{url}}\">contáctenos</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Si la solicitud es tuya, puedes <a href=\"%s\">abrir una sesión</a> para verla."
diff --git a/locale/cs/app.po b/locale/cs/app.po
index f6723ad3d..84252d741 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -1026,8 +1026,8 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr "Pokud nejste spokojeni s odpovědí, kterou jste obdrželi od instituce, máte právo podat stížnost (<a href=\"{{url}}\">detaily</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Pokud máte stále problémy <a href=\"%s\">kontaktujte nás</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Pokud máte stále problémy <a href=\"{{url}}\">kontaktujte nás</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Pokud jste tazatel, můžete se <a href=\"%s\">přihlásit</a> a podívat se na svůj dotaz."
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 90a8bea62..c5140b872 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -954,7 +954,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/de/app.po b/locale/de/app.po
index 24bf1fc64..58b704e94 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -988,8 +988,8 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr "Sollten Sie mit den erhaltenen Informationen nicht zufrieden sein, haben Sie das Recht eine Beschwerde einzureichen (<a href=\"{{url}}\">Details</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Sollten weiterhin Probleme bestehen, bitte <a href=\"%s\">kontaktieren Sie uns</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Sollten weiterhin Probleme bestehen, bitte <a href=\"{{url}}\">kontaktieren Sie uns</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Falls Sie der Antragsteller sind, <a href=\"%s\">loggen Sie sich ein</a>, um die Anfrage anzusehen."
diff --git a/locale/en/app.po b/locale/en/app.po
index 7f7b455f6..be958ef01 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -942,7 +942,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 664a829ac..e9bbdd0ef 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -944,7 +944,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/es/app.po b/locale/es/app.po
index 6be12095e..01c708443 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -1053,8 +1053,8 @@ msgstr ""
 "            organismo público, tienes derecho a\n"
 "            apelar (<a href=\"{{url}}\">detalles</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Si aún tienes problemas, por favor <a href=\"%s\">contáctanos</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Si aún tienes problemas, por favor <a href=\"{{url}}\">contáctanos</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Si la solicitud es tuya, puedes <a href=\"%s\">abrir una sesión</a> para verla."
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 657d41569..1aa316a51 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -983,8 +983,8 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr "Erakunde publikotik jaso duzun erantzunarekin pozik ez bazaude, apelatzeko eskubidea daukazu (<a href=\"{{url}}\">xehetasunak</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Oraindik arazoak baldin badituzu, mesedez, jar zaitez gurekin <a href=\"%s\">harremanetan</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Oraindik arazoak baldin badituzu, mesedez, jar zaitez gurekin <a href=\"{{url}}\">harremanetan</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Eskabidea zurea baldin bada, <a href=\"%s\">saio bat zabaldu</a> ahal duzu ikusteko."
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 7c6fb8158..10324314b 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -952,7 +952,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/gl/app.po b/locale/gl/app.po
index ee8364fb4..b93d0989f 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -1034,8 +1034,8 @@ msgstr ""
 "            organismo público, tiene derecho a\n"
 "            apelar (<a href=\"{{url}}\">detalles</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Si aún tiene problemas, por favor <a href=\"%s\">contáctenos</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Si aún tiene problemas, por favor <a href=\"{{url}}\">contáctenos</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Si la solicitud es tuya, puedes <a href=\"%s\">abrir una sesión</a> para verla."
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 2ae935e53..19d9ff2fe 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -1029,8 +1029,8 @@ msgstr ""
 "            adatgazda válaszával, joga van\n"
 "            panaszt tenni (<a href=\"{{url}}\">részletek</a>). "
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Ha továbbra is fennáll a probléma, <a href=\"%s\">lépjen velünk kapcsolatba</a>. "
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Ha továbbra is fennáll a probléma, <a href=\"{{url}}\">lépjen velünk kapcsolatba</a>. "
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Ha ön az igénylő, az igénylés megtekintéséhez <a href=\"%s\">bejelentkezhet</a>. "
diff --git a/locale/id/app.po b/locale/id/app.po
index 5132d6998..cc7a5fbb9 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -1050,8 +1050,8 @@ msgstr ""
 "            otoritas publik tersebut, Anda berhak untuk\n"
 "            mengajukan keberatan (<a href=\"{{url}}\">rincian</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Jika Anda masih mengalami kesulitan, silakan <a href=\"%s\">hubungi kami</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Jika Anda masih mengalami kesulitan, silakan <a href=\"{{url}}\">hubungi kami</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Jika Anda adalah sang pemohon, maka Anda dapat <a href=\"%s\">mendaftar</a> untuk menampilkan permintaan tersebut."
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index e261777b0..b8f91dcd6 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -942,7 +942,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index c4ef6a932..8ec2ff3bf 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -987,8 +987,8 @@ msgstr "Se isso estiver errado, ou se você gostaria de enviar uma resposta fina
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr "Se você estiver insatisfeito com a resposta que recebeu do órgão público, você tem o direito de reclamar ( <a href=\"{{url}}\">detalhes</a> )."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Se você continua com problemas, <a href=\"%s\">entre em contato conosco</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Se você continua com problemas, <a href=\"{{url}}\">entre em contato conosco</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Se você for o solicitante, então pode <a href=\"%s\">entrar</a> para visualizar o pedido."
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 9d4549f27..f40a2312b 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -949,7 +949,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 5e0d8d54a..0cd95add7 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -952,7 +952,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 56f2ff2a4..04cdf8188 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -1027,8 +1027,8 @@ msgstr ""
 "            institucioni publik, ke të drejtën të\n"
 "            ankohesh (<a href=\"{{url}}\">detajet</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Nëse ende po ka probleme, të lutem <a href=\"%s\">na kontakto</a> ."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Nëse ende po ka probleme, të lutem <a href=\"{{url}}\">na kontakto</a> ."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Nëse ti je kërkuesi, atëherë ti mund të <a href=\"%s\">kyçesh</a> për të parë kërkesën."
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index d75cba5f4..5af281f48 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -1013,8 +1013,8 @@ msgstr ""
 "            javne ustanove, imate pravo na\n"
 "            žalbu (<a href=\"{{url}}\">Više informacija</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Ako i dalje imate problema, molimo <a href=\"%s\">kontaktirajte nas</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Ako i dalje imate problema, molimo <a href=\"{{url}}\">kontaktirajte nas</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Ako ste podnosioc zahteva, možete se <a href=\"%s\">prijaviti</a> da biste pogledali zahtev."
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 68b3794a5..99e902437 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -938,7 +938,7 @@ msgstr ""
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"{{url}}\">details</a>)."
 msgstr ""
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 1fe1fe669..b0ea4f2e7 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -1032,8 +1032,8 @@ msgstr ""
 " розпорядника інформації, ви маєте право на \n"
 "скаргу (<a href=\"{{url}}\">деталі</a>)."
 
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Якщо у вас все ще виникають проблеми, <a href=\"%s\">зверніться до нас</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Якщо у вас все ще виникають проблеми, <a href=\"{{url}}\">зверніться до нас</a>."
 
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr "Якщо ви автор запиту, ви можете <a href=\"%s\">увійти</a>, щоб його переглянути."
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 7e2aba26e..2c33be48c 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -1290,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #: app/views/user/no_cookies.rhtml:20
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 #: app/views/request/hidden.rhtml:15
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 315ae0ba7..ac3bfe507 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -1290,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #: app/views/user/no_cookies.rhtml:20
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
 msgstr ""
 
 #: app/views/request/hidden.rhtml:15
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 70cdda5be..3562e76fc 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -1419,8 +1419,8 @@ msgid ""
 msgstr "Si no estás satisfecho con la respuesta que has recibido del\n            organismo público, tienes derecho a\n            apelar (<a href=\"{{url}}\">detalles</a>)."
 
 #: app/views/user/no_cookies.rhtml:20
-msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
-msgstr "Si aún tienes problemas, por favor <a href=\"%s\">contáctanos</a>."
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Si aún tienes problemas, por favor <a href=\"{{url}}\">contáctanos</a>."
 
 #: app/views/request/hidden.rhtml:15
 msgid ""