28 files changed, 47 insertions, 40 deletions
diff --git a/app/views/request/hidden.rhtml b/app/views/request/hidden.rhtml
index 2d038a663..4e0e705c3 100644
--- a/app/views/request/hidden.rhtml
+++ b/app/views/request/hidden.rhtml
@@ -12,7 +12,7 @@ various reasons why we might have done this, sorry we can\'t be more specific he
 </p>
 <% if @info_request.prominence == 'requester_only' %>
     <p>
-		<%= raw(_('If you are the requester, then you may <a href="%s">sign in</a> to view the request.') % [signin_url(:r => request.request_uri)]) %>
+		<%= _('If you are the requester, then you may <a href="{{url}}">sign in</a> to view the request.', :url => signin_url(:r => request.request_uri).html_safe) %>
     </p>
 <% end %>
 
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 04e876fb1..e274a5bc1 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -946,7 +946,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/app.pot b/locale/app.pot
index 9a8f59b85..906284f91 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -944,7 +944,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/ar/app.po b/locale/ar/app.po
index e4ea05922..3ce2e2606 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -966,7 +966,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/bs/app.po b/locale/bs/app.po
index a3b7d3001..dd38c757e 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -1020,8 +1020,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Ako ste podnosioc zahtjeva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtjev."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 2fc174a54..efce3a2a6 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -1036,8 +1036,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Si la solicitud es tuya, puedes <a href=\"{{url}}\">abrir una sesión</a> para verla."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 314c74583..702aaf88e 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -1029,8 +1029,8 @@ msgstr "Pokud nejste spokojeni s odpovědí, kterou jste obdrželi od instituce,
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Pokud jste tazatel, můžete se <a href=\"{{url}}\">přihlásit</a> a podívat se na svůj dotaz."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/cy/app.po b/locale/cy/app.po
index b49c371f5..e0f00ffd3 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -957,7 +957,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/de/app.po b/locale/de/app.po
index 8ecd6d500..f61164116 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -991,8 +991,8 @@ msgstr "Sollten Sie mit den erhaltenen Informationen nicht zufrieden sein, haben
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Falls Sie der Antragsteller sind, <a href=\"{{url}}\">loggen Sie sich ein</a>, um die Anfrage anzusehen."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/en/app.po b/locale/en/app.po
index 369d386d6..5da603463 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -945,7 +945,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 924230a73..c2a979d03 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -947,7 +947,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/es/app.po b/locale/es/app.po
index 2309af5d2..7387929af 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -1056,8 +1056,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Si la solicitud es tuya, puedes <a href=\"{{url}}\">abrir una sesión</a> para verla."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/eu/app.po b/locale/eu/app.po
index b47d4832c..056b4c0b7 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -986,8 +986,8 @@ msgstr "Erakunde publikotik jaso duzun erantzunarekin pozik ez bazaude, apelatze
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Eskabidea zurea baldin bada, <a href=\"{{url}}\">saio bat zabaldu</a> ahal duzu ikusteko."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr "Goitizena erabili nahi izanez gero, mesedez <a href=\"%s\">lehenago irakur ezazu hau</a>."
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 22ea05eba..c3fb03f65 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -955,7 +955,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/gl/app.po b/locale/gl/app.po
index d0562c020..aa9b8bc64 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -1037,8 +1037,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Si la solicitud es tuya, puedes <a href=\"{{url}}\">abrir una sesión</a> para verla."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index d8b815e18..ea067902f 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -1032,8 +1032,8 @@ msgstr ""
 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>. "
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Ha ön az igénylő, az igénylés megtekintéséhez <a href=\"{{url}}\">bejelentkezhet</a>. "
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/id/app.po b/locale/id/app.po
index 214de3d30..ae2a7f478 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -1053,8 +1053,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Jika Anda adalah sang pemohon, maka Anda dapat <a href=\"{{url}}\">mendaftar</a> untuk menampilkan permintaan tersebut."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 11729f632..ff011fd08 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -945,7 +945,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index d6d909e21..80d6b3e4d 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -990,8 +990,8 @@ msgstr "Se você estiver insatisfeito com a resposta que recebeu do órgão púb
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Se você for o solicitante, então pode <a href=\"{{url}}\">entrar</a> para visualizar o pedido."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr "Se você está pensando em usar um pseudônimo, por favor, <a href=\"%s\">leia isso primeiro</a> ."
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 49e16b783..9c119661c 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -952,7 +952,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 41cbc82f3..61bd55421 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -955,7 +955,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/sq/app.po b/locale/sq/app.po
index f9b31c52e..b1ef8a305 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -1030,8 +1030,8 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Nëse ti je kërkuesi, atëherë ti mund të <a href=\"{{url}}\">kyçesh</a> për të parë kërkesën."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr "Nëse je duke mendu me përdor pseudonim, të lutem <a href=\"%s\">lexo këtë së pari</a>."
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 24e9c3a8a..5ecc81f67 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -1016,8 +1016,15 @@ msgstr ""
 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>."
 
+<<<<<<< HEAD
 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."
+=======
+msgid ""
+"If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view "
+"the request."
+msgstr "Ako ste podnosioc zahteva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtev."
+>>>>>>> 46e9f2b... Change %s to {{}} in translation "If you are the requester,..."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index b37314364..7b7f41ab8 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -941,7 +941,7 @@ msgstr ""
 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."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
diff --git a/locale/uk/app.po b/locale/uk/app.po
index eba31211c..842c7ef7a 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -1035,8 +1035,8 @@ msgstr ""
 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>, щоб його переглянути."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Якщо ви автор запиту, ви можете <a href=\"{{url}}\">увійти</a>, щоб його переглянути."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
 msgstr ""
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index c7ae67452..f28f35c01 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -1294,7 +1294,7 @@ msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a
 msgstr ""
 
 #: app/views/request/hidden.rhtml:15
-msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 #: app/views/request/new.rhtml:123
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index d7d0c1986..6ef7babff 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -1294,7 +1294,7 @@ msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a
 msgstr ""
 
 #: app/views/request/hidden.rhtml:15
-msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
 msgstr ""
 
 #: app/views/request/new.rhtml:123
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 3b2eddb47..a9f2f3b63 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -1424,9 +1424,9 @@ msgstr "Si aún tienes problemas, por favor <a href=\"{{url}}\">contáctanos</a>
 
 #: app/views/request/hidden.rhtml:15
 msgid ""
-"If you are the requester, then you may <a href=\"%s\">sign in</a> to view "
+"If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view "
 "the request."
-msgstr "Si la solicitud es tuya, puedes <a href=\"%s\">abrir una sesión</a> para verla."
+msgstr "Si la solicitud es tuya, puedes <a href=\"{{url}}\">abrir una sesión</a> para verla."
 
 #: app/views/request/new.rhtml:123
 msgid ""