t#30220:i18n system error message

[pettanr/pettanr.git] / app / models / resource_picture.rb

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index 663c78b..c8bd3f7 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -145,7 +145,7 @@ class ResourcePicture < ActiveRecord::Base
     pc.overwrite self
     r = pc.store imager
     return pc if r
-    self.errors.add :base, 'picture does not create' + pc.errors.full_messages.join("\n")
+    self.errors.add :base, Picture.model_name.human + I18n.t('errors.not_create')
     false
   end
   
@@ -171,14 +171,17 @@ class ResourcePicture < ActiveRecord::Base
     if res = self.store_picture(imager, self.filename)
       if self.to_gif?
         if gifimager = imager.to_gif
-          res = self.store_picture(gifimager, self.gifname)
+          if res = self.store_picture(gifimager, self.gifname)
+          else
+            self.errors.add :base, I18n.t('picture_io.error')
+          end
         else
-          self.errors.add :base, 'picture data can not conv to gif'
+          self.errors.add :base, I18n.t('errors.not_convert')
           res = false
         end
       end
     else
-      self.errors.add :base, 'resource picture io does not work'
+      self.errors.add :base, I18n.t('picture_io.error')
     end
     res
   end
@@ -187,9 +190,14 @@ class ResourcePicture < ActiveRecord::Base
     res = false
     thumbnail_imager = self.flag_thumbnail >= 0 ? imager.to_thumbnail : imager
     return false unless thumbnail_imager
-    return false unless PictureIO.resource_picture_io.put(thumbnail_imager.binary, fn)
-    return false unless PictureIO.resource_picture_io.put(imager.binary, fn, 'full')
-    true
+    begin
+      PictureIO.resource_picture_io.put(thumbnail_imager.binary, fn)
+      PictureIO.resource_picture_io.put(imager.binary, fn, 'full')
+      res = true
+    rescue PictureIO::Error
+      res = false
+    end
+    res
   end
   
   def restore(subdir = nil)