diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-04-24 15:24:38 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-04-24 15:24:38 +0100 |
commit | 01c18c609fe3e3eb9d50416f2f67375431975ee7 (patch) | |
tree | 5825044ec29145b95b61fe781113b1046ca6c4ce /app/models | |
parent | 7e3444e746f66303517627abb08316ad87023e47 (diff) | |
parent | d3aae5cc48c92473e06b2104bb9431305d5a92f0 (diff) |
Merge branch 'release/0.9' into develop
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/profile_photo.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb index 47ce221b2..f6aec6338 100644 --- a/app/models/profile_photo.rb +++ b/app/models/profile_photo.rb @@ -101,7 +101,7 @@ class ProfilePhoto < ActiveRecord::Base end if !self.draft && (self.image.columns != WIDTH || self.image.rows != HEIGHT) - errors.add(:data, _("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 |