diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
| commit | d3eec6f983f8524e28e8ffe42ba3a10efaa0a30e (patch) | |
| tree | 4c9cd3a9709a18a46d179e4af63bc7bcfa117b66 /app/views/comment | |
| parent | cc3da49bc927175a49d7150b98d762f65e143d21 (diff) | |
| parent | d3aae5cc48c92473e06b2104bb9431305d5a92f0 (diff) | |
Merge branch 'release/0.9' into rails-3-develop
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
Diffstat (limited to 'app/views/comment')
| -rw-r--r-- | app/views/comment/_comment_form.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/comment/_comment_form.html.erb b/app/views/comment/_comment_form.html.erb index 91cd8f7d0..b78532768 100644 --- a/app/views/comment/_comment_form.html.erb +++ b/app/views/comment/_comment_form.html.erb @@ -13,7 +13,7 @@ <%= hidden_field_tag 'submitted_comment', 1 %> <%= hidden_field_tag 'preview', 1 %> <%= submit_tag _('Preview your annotation') %> - <%= raw(_(' (<strong>no ranty</strong> politics, read our <a href="%s">moderation policy</a>)') % [help_requesting_path+'#moderation']) %> + <%= _(' (<strong>no ranty</strong> politics, read our <a href="{{url}}">moderation policy</a>)', :url => (help_requesting_path+'#moderation').html_safe) %> </p> <% end %> |