aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin@lenny.robin>2011-07-14 05:38:49 +0100
committerRobin Houston <robin@lenny.robin>2011-07-14 05:38:49 +0100
commitd2bae4563be978e99b4eb6c7daa95db67a51a41e (patch)
tree06b4c0712a7e6ebe135c9160f5515315b659e019
parent8a7c00b5cc7a36da5e52e61fa5d11daa6f5b18ef (diff)
parent7654323a695d4e9b593f602649cca15f2abe8105 (diff)
Merge branch 'master' into wdtk
-rw-r--r--app/views/request/show.rhtml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index a61b7aa54..7c3f79368 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -33,9 +33,6 @@
<p class="subtitle">
<% if !@user.nil? && @user.admin_page_links? %>
- <%= _('{{user}} made this {{law_used_full}} request',:user=>user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %>
- <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %>
- <% else %>
<%= _('{{user}} (<a href="{{user_admin_url}}">admin</a>) made this {{law_used_full}} request (<a href="{{request_admin_url}}">admin</a>) to {{public_body_link}} (<a href="{{public_body_admin_url}}">admin</a>)',
:user => user_link(@info_request.user),
:law_used_full => h(@info_request.law_used_full),
@@ -43,6 +40,9 @@
:request_admin_url => request_admin_url(@info_request),
:public_body_link => public_body_link(@info_request.public_body),
:public_body_admin_url => public_body_admin_url(@info_request.public_body)) %>
+ <% else %>
+ <%= _('{{user}} made this {{law_used_full}} request',:user=>user_link(@info_request.user), :law_used_full=>h(@info_request.law_used_full)) %>
+ <%= _('to {{public_body}}',:public_body=>public_body_link(@info_request.public_body)) %>
<% end %>
</p>