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

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 8a6fe1636..5d542daf1 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -85,7 +85,7 @@ class ProfilePhoto < ActiveRecord::Base
         end
 
         if !self.draft && (self.image.columns != WIDTH || self.image.rows != HEIGHT)
-            errors.add(:data, N_("Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}" % { :cols => self.image.columns, :rows => self.image.rows, :width => WIDTH, :height => HEIGHT }))
+            errors.add(:data, N_("Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}", :cols => self.image.columns, :rows => self.image.rows, :width => WIDTH, :height => HEIGHT))
         end
 
         if self.draft && self.user_id