Merge remote-tracking branch 'origin/master'

avatar/locale/es/LC_MESSAGES/django.po

@@ -0,0 +1,143 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.0a10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-26 23:53-0500\n"
+"PO-Revision-Date: 2013-08-27 00:21-0600\n"
+"Last-Translator: David Loaiza M. <david@zooluciones.com>\n"
+"Language-Team: es <david.loaiza@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.7\n"
+"Language: es\n"
+
+#: admin.py:19
+msgid "Avatar"
+msgstr "Avatar"
+
+#: forms.py:23
+msgid "avatar"
+msgstr "avatar"
+
+#: forms.py:35
+#, python-format
+msgid ""
+"%(ext)s is an invalid file extension. Authorized extensions are : "
+"%(valid_exts_list)s"
+msgstr ""
+"%(ext)s es una extensión de archivo inválida. Las extensiones de archivo "
+"autorizadas son: %(valid_exts_list)s"
+
+#: forms.py:39
+#, python-format
+msgid ""
+"Your file is too big (%(size)s), the maximum allowed size is "
+"%(max_valid_size)s"
+msgstr ""
+"Su archivo es muy grande (%(size)s), el tamaño máximo permitido es "
+"%(max_valid_size)s"
+
+#: forms.py:49
+#, python-format
+msgid ""
+"You already have %(nb_avatars)d avatars, and the maximum allowed is "
+"%(nb_max_avatars)d."
+msgstr ""
+"Usted ya tiene %(nb_avatars)d avatares, y el máximo permitido es "
+"%(nb_max_avatars)d."
+
+#: forms.py:65 forms.py:77
+msgid "Choices"
+msgstr "Opciones"
+
+#: views.py:71
+msgid "Successfully uploaded a new avatar."
+msgstr "Se ha subido correctamente un nuevo avatar"
+
+#: views.py:106
+msgid "Successfully updated your avatar."
+msgstr "Se ha actualizado correctamente su avatar."
+
+#: views.py:141
+msgid "Successfully deleted the requested avatars."
+msgstr "Se han eliminado correctamente los avatares solicitados."
+
+#: templates/avatar/add.html:6 templates/avatar/change.html:6
+msgid "Your current avatar: "
+msgstr "Su avatar actual:"
+
+#: templates/avatar/add.html:9 templates/avatar/change.html:9
+msgid "You haven't uploaded an avatar yet. Please upload one now."
+msgstr "No ha subido un avatar aún. Por favor, suba uno ahora."
+
+#: templates/avatar/add.html:13 templates/avatar/change.html:20
+msgid "Upload New Image"
+msgstr "Subir Nueva Imagen"
+
+#: templates/avatar/change.html:15
+msgid "Choose new Default"
+msgstr "Elige nuevo predeterminado"
+
+#: templates/avatar/confirm_delete.html:6
+msgid "Please select the avatars that you would like to delete."
+msgstr "Por favor seleccione los avatares que le gustaría eliminar."
+
+#: templates/avatar/confirm_delete.html:9
+#, python-format
+msgid ""
+"You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
+"\">upload one</a> now."
+msgstr ""
+"No tiene avatares para borrar. Por favor <a href=\"%(avatar_change_url)s"
+"\">suba uno</a> ahora."
+
+#: templates/avatar/confirm_delete.html:15
+msgid "Delete These"
+msgstr "Eliminar Estos"
+
+#: templates/notification/avatar_friend_updated/full.txt:1
+#, python-format
+msgid ""
+"%(avatar_creator)s has updated their avatar %(avatar)s.\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+msgstr ""
+"%(avatar_creator)s ha actualizado su avatar %(avatar)s.\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+
+#: templates/notification/avatar_friend_updated/notice.html:2
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> has updated their avatar <a "
+"href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgstr ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> ha actualizado su avatar <a "
+"href=\"%(avatar_url)s\">%(avatar)s</a>."
+
+#: templates/notification/avatar_updated/full.txt:1
+#, python-format
+msgid ""
+"Your avatar has been updated.  %(avatar)s\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+msgstr ""
+"Su avatar ha sido actualizado.  %(avatar)s\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+
+#: templates/notification/avatar_updated/notice.html:2
+#, python-format
+msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgstr "Ha actualizado su avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
+
+#: templatetags/avatar_tags.py:57
+msgid "Default Avatar"
+msgstr "Avatar Predeterminado"

avatar/models.py

@@ -5,6 +5,7 @@ from PIL import Image
 
 from django.conf import settings
 from django.db import models
+from django.core.files import File
 from django.core.files.base import ContentFile
 from django.core.files.storage import get_storage_class
 from django.utils.translation import ugettext as _
@@ -121,7 +122,7 @@ class Avatar(models.Model):
                 image.save(thumb, AVATAR_THUMB_FORMAT, quality=quality)
                 thumb_file = ContentFile(thumb.getvalue())
             else:
-                thumb_file = ContentFile(orig)
+                thumb_file = File(orig)
             thumb = self.avatar.storage.save(self.avatar_name(size), thumb_file)
         except IOError:
             return  # What should we do here?  Render a "sorry, didn't work" img?