From a3053273c8a5d450a0cd73ee8deebc277d8c4170 Mon Sep 17 00:00:00 2001 From: Boulder Sprinters Date: Mon, 2 Apr 2007 15:36:31 +0000 Subject: [PATCH] boulder-oracle-sprint: Merged to [4905]. git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4906 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 6 + .../conf/locale/es_AR/LC_MESSAGES/django.mo | Bin 40281 -> 41308 bytes .../conf/locale/es_AR/LC_MESSAGES/django.po | 3712 +++++++++-------- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 39707 -> 41139 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 24 +- django/conf/locale/ja/LC_MESSAGES/django.mo | Bin 43571 -> 47042 bytes django/conf/locale/ja/LC_MESSAGES/django.po | 544 ++- django/conf/locale/ja/LC_MESSAGES/djangojs.mo | Bin 1604 -> 1601 bytes django/conf/locale/ja/LC_MESSAGES/djangojs.po | 14 +- django/conf/locale/te/LC_MESSAGES/django.mo | Bin 35017 -> 35037 bytes django/conf/locale/te/LC_MESSAGES/django.po | 132 +- django/conf/urls/defaults.py | 22 +- django/contrib/comments/models.py | 2 +- .../contrib/humanize/templatetags/humanize.py | 2 +- django/contrib/localflavor/br/__init__.py | 0 django/contrib/localflavor/br/br_states.py | 39 + django/contrib/localflavor/br/forms.py | 39 + django/contrib/localflavor/fi/__init__.py | 0 .../localflavor/fi/fi_municipalities.py | 427 ++ django/contrib/localflavor/fi/forms.py | 47 + django/contrib/localflavor/it/__init__.py | 0 django/contrib/localflavor/it/forms.py | 32 + django/contrib/localflavor/it/it_province.py | 114 + django/contrib/localflavor/it/it_region.py | 24 + django/contrib/localflavor/no/__init__.py | 0 django/contrib/localflavor/no/forms.py | 77 + .../localflavor/no/no_municipalities.py | 32 + django/contrib/webdesign/__init__.py | 0 django/contrib/webdesign/lorem_ipsum.py | 66 + .../webdesign/templatetags/__init__.py | 0 .../webdesign/templatetags/webdesign.py | 67 + django/core/servers/fastcgi.py | 25 +- django/core/urlresolvers.py | 8 +- django/db/models/base.py | 7 +- django/http/__init__.py | 34 +- django/newforms/fields.py | 19 +- django/newforms/models.py | 5 +- django/newforms/util.py | 11 + django/newforms/widgets.py | 5 +- django/oldforms/__init__.py | 3 +- django/template/defaulttags.py | 92 +- django/utils/html.py | 4 +- django/utils/text.py | 5 +- django/utils/translation/__init__.py | 98 +- django/utils/translation/trans_real.py | 5 - docs/faq.txt | 7 +- docs/fastcgi.txt | 38 +- docs/forms.txt | 8 +- docs/generic_views.txt | 2 +- docs/model-api.txt | 38 +- docs/modpython.txt | 21 +- docs/request_response.txt | 4 + docs/templates.txt | 31 +- docs/url_dispatch.txt | 62 +- docs/webdesign.txt | 53 + tests/modeltests/invalid_models/models.py | 10 + tests/regressiontests/forms/localflavor.py | 842 ++++ tests/regressiontests/forms/regressions.py | 29 + tests/regressiontests/forms/tests.py | 622 +-- tests/regressiontests/humanize/tests.py | 6 +- tests/regressiontests/templates/tests.py | 18 +- tests/regressiontests/templates/urls.py | 1 + tests/regressiontests/text/__init__.py | 0 tests/regressiontests/text/models.py | 0 tests/regressiontests/text/tests.py | 17 + 65 files changed, 4729 insertions(+), 2823 deletions(-) create mode 100644 django/contrib/localflavor/br/__init__.py create mode 100644 django/contrib/localflavor/br/br_states.py create mode 100644 django/contrib/localflavor/br/forms.py create mode 100644 django/contrib/localflavor/fi/__init__.py create mode 100644 django/contrib/localflavor/fi/fi_municipalities.py create mode 100644 django/contrib/localflavor/fi/forms.py create mode 100644 django/contrib/localflavor/it/__init__.py create mode 100644 django/contrib/localflavor/it/forms.py create mode 100644 django/contrib/localflavor/it/it_province.py create mode 100644 django/contrib/localflavor/it/it_region.py create mode 100644 django/contrib/localflavor/no/__init__.py create mode 100644 django/contrib/localflavor/no/forms.py create mode 100644 django/contrib/localflavor/no/no_municipalities.py create mode 100644 django/contrib/webdesign/__init__.py create mode 100644 django/contrib/webdesign/lorem_ipsum.py create mode 100644 django/contrib/webdesign/templatetags/__init__.py create mode 100644 django/contrib/webdesign/templatetags/webdesign.py create mode 100644 docs/webdesign.txt create mode 100644 tests/regressiontests/forms/localflavor.py create mode 100644 tests/regressiontests/forms/regressions.py create mode 100644 tests/regressiontests/text/__init__.py create mode 100644 tests/regressiontests/text/models.py create mode 100644 tests/regressiontests/text/tests.py diff --git a/AUTHORS b/AUTHORS index ec4a222a4e..a05d2b4e49 100644 --- a/AUTHORS +++ b/AUTHORS @@ -64,9 +64,11 @@ answer newbie questions, and generally made Django that much better: Chris Chamberlin Amit Chakradeo ChaosKCW + ivan.chelubeev@gmail.com Ian Clelland crankycoder@gmail.com Matt Croydon + flavio.curella@gmail.com Jure Cuhalev dackze+django@gmail.com Dirk Datzert @@ -154,6 +156,7 @@ answer newbie questions, and generally made Django that much better: oggie rob Jay Parlar pavithran s + Barry Pederson pgross@thoughtworks.com phaedo phil@produxion.net @@ -177,13 +180,16 @@ answer newbie questions, and generally made Django that much better: SmileyChris smurf@smurf.noris.de sopel + Wiliam Alves de Souza Georgi Stanojevski Thomas Steinacher nowell strite Radek Švarz Swaroop C H Aaron Swartz + Ville Säävuori Tyson Tate + thebjorn Tom Tobin Joe Topjian torne-django@wolfpuppy.org.uk diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index b7f777611b1d17eedf5809d93b7ef03695339b51..7fb381c78f0f035144f0509d5e655b43c77380e2 100644 GIT binary patch delta 11935 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 diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po index c299f2c502..27472353e4 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/django.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-25 17:21-0300\n" -"PO-Revision-Date: 2007-02-25 17:46-0300\n" +"POT-Creation-Date: 2007-03-24 11:16-0300\n" +"PO-Revision-Date: 2007-03-24 11:54-0300\n" "Last-Translator: Ramiro Morales \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,1529 +16,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: contrib/contenttypes/models.py:26 -msgid "python model class name" -msgstr "nombre de la clase python del modelo" - -#: contrib/contenttypes/models.py:29 -msgid "content type" -msgstr "tipo de contenido" - -#: contrib/contenttypes/models.py:30 -msgid "content types" -msgstr "tipos de contenido" - -#: contrib/auth/views.py:39 -msgid "Logged out" -msgstr "Sesin cerrada" - -#: contrib/auth/models.py:38 contrib/auth/models.py:57 -msgid "name" -msgstr "nombre" - -#: contrib/auth/models.py:40 -msgid "codename" -msgstr "nombre en cdigo" - -#: contrib/auth/models.py:42 -msgid "permission" -msgstr "permiso" - -#: contrib/auth/models.py:43 contrib/auth/models.py:58 -msgid "permissions" -msgstr "permisos" - -#: contrib/auth/models.py:60 -msgid "group" -msgstr "grupo" - -#: contrib/auth/models.py:61 contrib/auth/models.py:100 -msgid "groups" -msgstr "grupos" - -#: contrib/auth/models.py:90 -msgid "username" -msgstr "nombre de usuario" - -#: contrib/auth/models.py:90 -msgid "" -"Required. 30 characters or fewer. Alphanumeric characters only (letters, " -"digits and underscores)." -msgstr "" -"Requerido. Longitud mxima 30 caracteres alfanumricos (letras, dgitos y " -"guiones bajos)." - -#: contrib/auth/models.py:91 -msgid "first name" -msgstr "nombre" - -#: contrib/auth/models.py:92 -msgid "last name" -msgstr "apellido" - -#: contrib/auth/models.py:93 -msgid "e-mail address" -msgstr "direccin de correo" - -#: contrib/auth/models.py:94 -msgid "password" -msgstr "contrasea" - -#: contrib/auth/models.py:94 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' o use el formulario de " -"cambio de contrasea." - -#: contrib/auth/models.py:95 -msgid "staff status" -msgstr "es staff" - -#: contrib/auth/models.py:95 -msgid "Designates whether the user can log into this admin site." -msgstr "Indica si el usuario puede ingresar a este sitio de administracin." - -#: contrib/auth/models.py:96 -msgid "active" -msgstr "activo" - -#: contrib/auth/models.py:96 -msgid "" -"Designates whether this user can log into the Django admin. Unselect this " -"instead of deleting accounts." -msgstr "" -"Indica si el usuario puede ingresar al sitio de administracin Django." -"Desactive este campo en lugar de eliminar usuarios." - -#: contrib/auth/models.py:97 -msgid "superuser status" -msgstr "es superusuario" - -#: contrib/auth/models.py:97 -msgid "" -"Designates that this user has all permissions without explicitly assigning " -"them." -msgstr "" -"Indica que este usuario posee todos los permisos, sin asignarle los mismos " -"explcitamente." - -#: contrib/auth/models.py:98 -msgid "last login" -msgstr "ltimo registro" - -#: contrib/auth/models.py:99 -msgid "date joined" -msgstr "fecha de creacin" - -#: contrib/auth/models.py:101 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "" -"Adems de los permisos asignados manualmente, este usuario tambin poseer " -"todos los permisos de los grupos a los que pertenezca." - -#: contrib/auth/models.py:102 -msgid "user permissions" -msgstr "permisos de usuario" - -#: contrib/auth/models.py:105 -msgid "user" -msgstr "usuario" - -#: contrib/auth/models.py:106 -msgid "users" -msgstr "usuarios" - -#: contrib/auth/models.py:111 -msgid "Personal info" -msgstr "Informacin personal" - -#: contrib/auth/models.py:112 -msgid "Permissions" -msgstr "Permisos" - -#: contrib/auth/models.py:113 -msgid "Important dates" -msgstr "Fechas importantes" - -#: contrib/auth/models.py:114 -msgid "Groups" -msgstr "Grupos" - -#: contrib/auth/models.py:258 -msgid "message" -msgstr "mensaje" - -#: contrib/auth/forms.py:17 contrib/auth/forms.py:138 -msgid "The two password fields didn't match." -msgstr "Los dos campos de contraseas no coinciden entre si." - -#: contrib/auth/forms.py:25 -msgid "A user with that username already exists." -msgstr "Ya existe un usuario con ese nombre." - -#: contrib/auth/forms.py:53 -msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." -msgstr "" -"Su navegador Web aparenta no tener cookies activas. Las cookies son un " -"requerimiento para poder ingresar." - -#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10 -msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." -msgstr "" -"Por favor introduzca un nombre de usuario y una contrasea correctos. Note " -"que ambos campos son sensibles a maysculas/minsculas." - -#: contrib/auth/forms.py:62 -msgid "This account is inactive." -msgstr "Esta cuenta est inactiva" - -#: contrib/auth/forms.py:85 -msgid "" -"That e-mail address doesn't have an associated user account. Are you sure " -"you've registered?" -msgstr "" -"Esa direccin de e-mail no est asociada a ninguna cuenta de usuario. Est " -"seguro de que ya se ha registrado?" - -#: contrib/auth/forms.py:117 -msgid "The two 'new password' fields didn't match." -msgstr "Los dos campos 'nueva contrasea' no coinciden entre si." - -#: contrib/auth/forms.py:124 -msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "" -"La antigua contrasea ingresada es incorrecta. Por favor ingrsela " -"nuevamente." - -#: contrib/redirects/models.py:7 -msgid "redirect from" -msgstr "redirigir desde" - -#: contrib/redirects/models.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/" -"events/search/'." - -#: contrib/redirects/models.py:9 -msgid "redirect to" -msgstr "redirigir a" - -#: contrib/redirects/models.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " -"empiece con 'http://'." - -#: contrib/redirects/models.py:13 -msgid "redirect" -msgstr "redireccin" - -#: contrib/redirects/models.py:14 -msgid "redirects" -msgstr "redirecciones" - -#: contrib/comments/models.py:67 contrib/comments/models.py:166 -msgid "object ID" -msgstr "ID de objeto" - -#: contrib/comments/models.py:68 -msgid "headline" -msgstr "encabezado" - -#: contrib/comments/models.py:69 contrib/comments/models.py:90 -#: contrib/comments/models.py:167 -msgid "comment" -msgstr "comentario" - -#: contrib/comments/models.py:70 -msgid "rating #1" -msgstr "calificacin 1" - -#: contrib/comments/models.py:71 -msgid "rating #2" -msgstr "calificacin 2" - -#: contrib/comments/models.py:72 -msgid "rating #3" -msgstr "calificacin 3" - -#: contrib/comments/models.py:73 -msgid "rating #4" -msgstr "calificacin 4" - -#: contrib/comments/models.py:74 -msgid "rating #5" -msgstr "calificacin 5" - -#: contrib/comments/models.py:75 -msgid "rating #6" -msgstr "calificacin 6" - -#: contrib/comments/models.py:76 -msgid "rating #7" -msgstr "calificacin 7" - -#: contrib/comments/models.py:77 -msgid "rating #8" -msgstr "calificacin 8" - -#: contrib/comments/models.py:82 -msgid "is valid rating" -msgstr "es calificacin vlida" - -#: contrib/comments/models.py:83 contrib/comments/models.py:169 -msgid "date/time submitted" -msgstr "fecha/hora de envo" - -#: contrib/comments/models.py:84 contrib/comments/models.py:170 -msgid "is public" -msgstr "es pblico" - -#: contrib/comments/models.py:85 contrib/admin/views/doc.py:304 -msgid "IP address" -msgstr "Direccin IP" - -#: contrib/comments/models.py:86 -msgid "is removed" -msgstr "est eliminado" - -#: contrib/comments/models.py:86 -msgid "" -"Check this box if the comment is inappropriate. A \"This comment has been " -"removed\" message will be displayed instead." -msgstr "" -"Marque esta caja si el comentario es inapropiado. En su lugar se mostrar " -"\"Este comentario ha sido eliminado\"." - -#: contrib/comments/models.py:91 -msgid "comments" -msgstr "comentarios" - -#: contrib/comments/models.py:131 contrib/comments/models.py:207 -msgid "Content object" -msgstr "Objeto contenido" - -#: contrib/comments/models.py:159 +#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450 +#: newforms/fields.py:461 newforms/models.py:177 +#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274 +#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621 +#: oldforms/__init__.py:357 +msgid "This field is required." +msgstr "Este campo es obligatorio." + +#: newforms/fields.py:101 newforms/fields.py:254 #, python-format -msgid "" -"Posted by %(user)s at %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" -msgstr "" -"Enviado por %(user)s el %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" +msgid "Ensure this value has at most %d characters." +msgstr "Asegrese de que este valor tenga como mximo %d caracteres." -#: contrib/comments/models.py:168 -msgid "person's name" -msgstr "nombre de la persona" - -#: contrib/comments/models.py:171 -msgid "ip address" -msgstr "direccin ip" - -#: contrib/comments/models.py:173 -msgid "approved by staff" -msgstr "aprobado por el staff" - -#: contrib/comments/models.py:176 -msgid "free comment" -msgstr "comentario libre" - -#: contrib/comments/models.py:177 -msgid "free comments" -msgstr "comentarios libres" - -#: contrib/comments/models.py:233 -msgid "score" -msgstr "puntuacin" - -#: contrib/comments/models.py:234 -msgid "score date" -msgstr "fecha de la puntuacin" - -#: contrib/comments/models.py:237 -msgid "karma score" -msgstr "punto karma" - -#: contrib/comments/models.py:238 -msgid "karma scores" -msgstr "puntos karma" - -#: contrib/comments/models.py:242 +#: newforms/fields.py:103 newforms/fields.py:256 #, python-format -msgid "%(score)d rating by %(user)s" -msgstr "puntuado %(score)d por %(user)s" +msgid "Ensure this value has at least %d characters." +msgstr "Asegrese de que este valor tenga al menos %d caracteres." -#: contrib/comments/models.py:258 +#: newforms/fields.py:126 core/validators.py:120 +msgid "Enter a whole number." +msgstr "Introduzca un nmero entero." + +#: newforms/fields.py:128 #, python-format -msgid "" -"This comment was flagged by %(user)s:\n" -"\n" -"%(text)s" -msgstr "" -"Este comentario fue marcado por %(user)s:\n" -"\n" -"%(text)s" +msgid "Ensure this value is less than or equal to %s." +msgstr "Asegrese de que este valor sea menor o igual a %s." -#: contrib/comments/models.py:265 -msgid "flag date" -msgstr "fecha de la marca" - -#: contrib/comments/models.py:268 -msgid "user flag" -msgstr "marca de usuario" - -#: contrib/comments/models.py:269 -msgid "user flags" -msgstr "marcas de usuario" - -#: contrib/comments/models.py:273 +#: newforms/fields.py:130 #, python-format -msgid "Flag by %r" -msgstr "Marca de %r" +msgid "Ensure this value is greater than or equal to %s." +msgstr "Asegrese de que este valor sea mayor o igual a %s." -#: contrib/comments/models.py:278 -msgid "deletion date" -msgstr "fecha de eliminacin" +#: newforms/fields.py:163 +msgid "Enter a valid date." +msgstr "Ingrese una fecha vlida." -#: contrib/comments/models.py:280 -msgid "moderator deletion" -msgstr "Eliminacin por moderador" +#: newforms/fields.py:190 +msgid "Enter a valid time." +msgstr "Introduzca una hora vlida." -#: contrib/comments/models.py:281 -msgid "moderator deletions" -msgstr "eliminaciones por moderador" +#: newforms/fields.py:226 +msgid "Enter a valid date/time." +msgstr "Introduzca una fecha/hora vlida." -#: contrib/comments/models.py:285 +#: newforms/fields.py:240 +msgid "Enter a valid value." +msgstr "Introduzca un valor vlido." + +#: newforms/fields.py:269 core/validators.py:162 +msgid "Enter a valid e-mail address." +msgstr "Introduzca una direccin de correo electrnico vlida" + +#: newforms/fields.py:287 newforms/fields.py:309 +msgid "Enter a valid URL." +msgstr "Introduzca una URL vlida." + +#: newforms/fields.py:311 +msgid "This URL appears to be a broken link." +msgstr "La URL parece ser un enlace roto." + +#: newforms/fields.py:360 newforms/models.py:164 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "" +"Seleccione una opcin vlida. Esa opcin no es una de las opciones " +"disponibles." + +#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181 +msgid "Enter a list of values." +msgstr "Introduzca una lista de valores." + +#: newforms/fields.py:387 newforms/models.py:187 #, python-format -msgid "Moderator deletion by %r" -msgstr "Eliminacin del moderador %r" - -#: contrib/comments/views/karma.py:19 -msgid "Anonymous users cannot vote" -msgstr "Los usuarios annimos no pueden votar" - -#: contrib/comments/views/karma.py:23 -msgid "Invalid comment ID" -msgstr "ID de comentario no vlido" - -#: contrib/comments/views/karma.py:25 -msgid "No voting for yourself" -msgstr "No puedes votarte t mismo" - -#: contrib/comments/views/comments.py:27 -msgid "" -"This rating is required because you've entered at least one other rating." -msgstr "Se precisa esta puntuacin porque ha introducido al menos otra ms." - -#: contrib/comments/views/comments.py:111 -#, python-format -msgid "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -"Este comentario lo envi un usuario que ha enviado menos de %(count)s " -"comentario:\n" -"\n" -"%(text)s" -msgstr[1] "" -"Este comentario lo envi un usuario que ha enviado menos de %(count)s " -"comentarios:\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:116 -#, python-format -msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" +msgid "Select a valid choice. %s is not one of the available choices." msgstr "" -"Este comentario ha sido enviado por un usuario 'semi-annimo':\n" -"\n" -"%(text)s" +"Seleccione una opcin vlida. %s no es una de las opciones disponibles." -#: contrib/comments/views/comments.py:188 -#: contrib/comments/views/comments.py:280 -msgid "Only POSTs are allowed" -msgstr "Slo se admiten POSTs" - -#: contrib/comments/views/comments.py:192 -#: contrib/comments/views/comments.py:284 -msgid "One or more of the required fields wasn't submitted" -msgstr "No se proporcion uno o ms de los siguientes campos requeridos" - -#: contrib/comments/views/comments.py:196 -#: contrib/comments/views/comments.py:286 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "" -"Alguien est jugando con el formulario de comentarios (violacin de " -"seguridad)" - -#: contrib/comments/views/comments.py:206 -#: contrib/comments/views/comments.py:292 -msgid "" -"The comment form had an invalid 'target' parameter -- the object ID was " -"invalid" -msgstr "" -"El formulario de comentarios tiene un parmetro 'target' no vlido (el ID de " -"objeto era invlido)" - -#: contrib/comments/views/comments.py:257 -#: contrib/comments/views/comments.py:321 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "El formulario de comentario no proporcion 'previsualizar' ni 'enviar'" - -#: contrib/comments/templates/comments/freeform.html:4 -msgid "Your name:" -msgstr "Su nombre:" - -#: contrib/comments/templates/comments/freeform.html:5 -#: contrib/comments/templates/comments/form.html:28 -msgid "Comment:" -msgstr "Comentario:" - -#: contrib/comments/templates/comments/freeform.html:10 -#: contrib/comments/templates/comments/form.html:35 -msgid "Preview comment" -msgstr "Previsualizar comentario" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:17 -msgid "Username:" -msgstr "Usuario:" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Cerrar sesin" - -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:20 -msgid "Password:" -msgstr "Contrasea:" - -#: contrib/comments/templates/comments/form.html:8 -msgid "Forgotten your password?" -msgstr "Olvid su contrasea?" - -#: contrib/comments/templates/comments/form.html:12 -msgid "Ratings" -msgstr "Calificaciones" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Required" -msgstr "Requerido" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Optional" -msgstr "Opcional" - -#: contrib/comments/templates/comments/form.html:23 -msgid "Post a photo" -msgstr "Enviar una foto" - -#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:315 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models.py:8 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Ejemplo: '/about/contact/'. Asegrese de que pone barras al principio y al " -"final." - -#: contrib/flatpages/models.py:9 -msgid "title" -msgstr "ttulo" - -#: contrib/flatpages/models.py:10 -msgid "content" -msgstr "contenido" - -#: contrib/flatpages/models.py:11 -msgid "enable comments" -msgstr "activar comentarios" - -#: contrib/flatpages/models.py:12 -msgid "template name" -msgstr "nombre de plantilla" - -#: contrib/flatpages/models.py:13 -msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." -msgstr "" -"Ejemplo: 'flatpages/contact_page.html'. Si no lo proporciona, el sistema " -"usar 'flatpages/default.html'." - -#: contrib/flatpages/models.py:14 -msgid "registration required" -msgstr "debe estar registrado" - -#: contrib/flatpages/models.py:14 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Si est marcado, slo los usuarios registrados podrn ver la pgina." - -#: contrib/flatpages/models.py:18 -msgid "flat page" -msgstr "pgina esttica" - -#: contrib/flatpages/models.py:19 -msgid "flat pages" -msgstr "pginas estticas" - -#: contrib/sessions/models.py:51 -msgid "session key" -msgstr "clave de sesin" - -#: contrib/sessions/models.py:52 -msgid "session data" -msgstr "datos de sesin" - -#: contrib/sessions/models.py:53 -msgid "expire date" -msgstr "fecha de caducidad" - -#: contrib/sessions/models.py:57 -msgid "session" -msgstr "sesin" - -#: contrib/sessions/models.py:58 -msgid "sessions" -msgstr "sesiones" - -#: contrib/sites/models.py:10 -msgid "domain name" -msgstr "nombre de dominio" - -#: contrib/sites/models.py:11 -msgid "display name" -msgstr "nombre para visualizar" - -#: contrib/sites/models.py:15 -msgid "site" -msgstr "sitio" - -#: contrib/sites/models.py:16 -msgid "sites" -msgstr "sitios" - -#: contrib/admin/filterspecs.py:40 -#, python-format -msgid "" -"

By %s:

\n" -"
    \n" -msgstr "" -"

    Por %s:

    \n" -"
      \n" - -#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 -#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169 -msgid "All" -msgstr "Todos/as" - -#: contrib/admin/filterspecs.py:109 -msgid "Any date" -msgstr "Cualquier fecha" - -#: contrib/admin/filterspecs.py:110 -msgid "Today" -msgstr "Hoy" - -#: contrib/admin/filterspecs.py:113 -msgid "Past 7 days" -msgstr "ltimos 7 das" - -#: contrib/admin/filterspecs.py:115 -msgid "This month" -msgstr "Este mes" - -#: contrib/admin/filterspecs.py:117 -msgid "This year" -msgstr "Este ao" - -#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170 -#: oldforms/__init__.py:572 -msgid "Yes" -msgstr "S" - -#: contrib/admin/filterspecs.py:143 newforms/widgets.py:170 -#: oldforms/__init__.py:572 -msgid "No" -msgstr "No" - -#: contrib/admin/filterspecs.py:150 newforms/widgets.py:170 -#: oldforms/__init__.py:572 +#: newforms/widgets.py:170 contrib/admin/filterspecs.py:150 +#: oldforms/__init__.py:577 msgid "Unknown" msgstr "Desconocido" -#: contrib/admin/models.py:16 -msgid "action time" -msgstr "hora de accin" +#: newforms/widgets.py:170 contrib/admin/filterspecs.py:143 +#: oldforms/__init__.py:577 +msgid "Yes" +msgstr "S" -#: contrib/admin/models.py:19 -msgid "object id" -msgstr "id de objeto" +#: newforms/widgets.py:170 contrib/admin/filterspecs.py:143 +#: oldforms/__init__.py:577 +msgid "No" +msgstr "No" -#: contrib/admin/models.py:20 -msgid "object repr" -msgstr "repr de objeto" - -#: contrib/admin/models.py:21 -msgid "action flag" -msgstr "marca de accin" - -#: contrib/admin/models.py:22 -msgid "change message" -msgstr "mensaje de cambio" - -#: contrib/admin/models.py:25 -msgid "log entry" -msgstr "entrada de registro" - -#: contrib/admin/models.py:26 -msgid "log entries" -msgstr "entradas de registro" - -#: contrib/admin/templatetags/admin_list.py:238 -msgid "All dates" -msgstr "Todas las fechas" - -#: contrib/admin/views/decorators.py:24 -#: contrib/admin/templates/admin/login.html:25 -msgid "Log in" -msgstr "Identificarse" - -#: contrib/admin/views/decorators.py:62 -msgid "" -"Please log in again, because your session has expired. Don't worry: Your " -"submission has been saved." +#: utils/dateformat.py:40 +msgid "p.m." msgstr "" -"Por favor, identifquese de nuevo porque su sesin ha caducado. No se " -"preocupe: se ha guardado su envo." -#: contrib/admin/views/decorators.py:69 -msgid "" -"Looks like your browser isn't configured to accept cookies. Please enable " -"cookies, reload this page, and try again." +#: utils/dateformat.py:41 +msgid "a.m." msgstr "" -"Parece que su navegador no est configurado para aceptar cookies. Actvelas " -"por favor, recargue esta pgina, e intntelo de nuevo." -#: contrib/admin/views/decorators.py:83 -msgid "Usernames cannot contain the '@' character." -msgstr "Los nombres de usuario no pueden contener el carcter '@'." - -#: contrib/admin/views/decorators.py:85 -#, python-format -msgid "Your e-mail address is not your username. Try '%s' instead." +#: utils/dateformat.py:46 +msgid "PM" msgstr "" -"Su direccin de correo no es su nombre de usuario. Pruebe con '%s' en su " -"lugar." -#: contrib/admin/views/main.py:223 -msgid "Site administration" -msgstr "Sitio administrativo" - -#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:19 -#, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "Se agreg con xito %(name)s \"%(obj)s\"." - -#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347 -#: contrib/admin/views/auth.py:24 -msgid "You may edit it again below." -msgstr "Puede modificarlo nuevamente abajo." - -#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356 -#, python-format -msgid "You may add another %s below." -msgstr "Puede agregar otro %s abajo." - -#: contrib/admin/views/main.py:289 -#, python-format -msgid "Add %s" -msgstr "Agregar %s" - -#: contrib/admin/views/main.py:335 -#, python-format -msgid "Added %s." -msgstr "Agregado %s." - -#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337 -#: contrib/admin/views/main.py:339 db/models/manipulators.py:306 -msgid "and" -msgstr "y" - -#: contrib/admin/views/main.py:337 -#, python-format -msgid "Changed %s." -msgstr "Modifica %s." - -#: contrib/admin/views/main.py:339 -#, python-format -msgid "Deleted %s." -msgstr "Elimina %s." - -#: contrib/admin/views/main.py:342 -msgid "No fields changed." -msgstr "No ha modificado ningn campo." - -#: contrib/admin/views/main.py:345 -#, python-format -msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "Se modific con xito %(name)s \"%(obj)s." - -#: contrib/admin/views/main.py:353 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +#: utils/dateformat.py:47 +msgid "AM" msgstr "" -"Se agreg con xito %(name)s \"%(obj)s. Puede modificarlo nuevamente abajo." -#: contrib/admin/views/main.py:391 -#, python-format -msgid "Change %s" -msgstr "Modificar %s" - -#: contrib/admin/views/main.py:473 -#, python-format -msgid "One or more %(fieldname)s in %(name)s: %(obj)s" -msgstr "Uno o ms %(fieldname)s en %(name)s: %(obj)s" - -#: contrib/admin/views/main.py:478 -#, python-format -msgid "One or more %(fieldname)s in %(name)s:" -msgstr "Uno o ms %(fieldname)s en %(name)s:" - -#: contrib/admin/views/main.py:511 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se elimin con xito %(name)s \"%(obj)s\"." - -#: contrib/admin/views/main.py:514 -msgid "Are you sure?" -msgstr "Est seguro?" - -#: contrib/admin/views/main.py:536 -#, python-format -msgid "Change history: %s" -msgstr "Historia de modificaciones: %s" - -#: contrib/admin/views/main.py:570 -#, python-format -msgid "Select %s" -msgstr "Seleccione %s" - -#: contrib/admin/views/main.py:570 -#, python-format -msgid "Select %s to change" -msgstr "Seleccione %s a modificar" - -#: contrib/admin/views/main.py:758 -msgid "Database error" -msgstr "Error de base de datos" - -#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48 -#: contrib/admin/views/doc.py:50 -msgid "tag:" -msgstr "etiqueta:" - -#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79 -#: contrib/admin/views/doc.py:81 -msgid "filter:" -msgstr "Filtrar:" - -#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137 -#: contrib/admin/views/doc.py:139 -msgid "view:" -msgstr "ver:" - -#: contrib/admin/views/doc.py:164 -#, python-format -msgid "App %r not found" -msgstr "App %r no encontrada" - -#: contrib/admin/views/doc.py:171 -#, python-format -msgid "Model %r not found in app %r" -msgstr "Modelo %r no encontrado en app %r" - -#: contrib/admin/views/doc.py:183 -#, python-format -msgid "the related `%s.%s` object" -msgstr "El objeto relacionado `%s.%s`" - -#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205 -#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224 -msgid "model:" -msgstr "modelo:" - -#: contrib/admin/views/doc.py:214 -#, python-format -msgid "related `%s.%s` objects" -msgstr "objetos relacionados `%s.%s`" - -#: contrib/admin/views/doc.py:219 -#, python-format -msgid "all %s" -msgstr "todos %s" - -#: contrib/admin/views/doc.py:224 -#, python-format -msgid "number of %s" -msgstr "nmero de %s" - -#: contrib/admin/views/doc.py:229 -#, python-format -msgid "Fields on %s objects" -msgstr "Campos en %s objetos" - -#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301 -#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309 -#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312 -msgid "Integer" -msgstr "Entero" - -#: contrib/admin/views/doc.py:292 -msgid "Boolean (Either True or False)" -msgstr "Booleano (Verdadero o Falso)" - -#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311 -#, python-format -msgid "String (up to %(maxlength)s)" -msgstr "Cadena (mximo %(maxlength)s)" - -#: contrib/admin/views/doc.py:294 -msgid "Comma-separated integers" -msgstr "Enteros separados por comas" - -#: contrib/admin/views/doc.py:295 -msgid "Date (without time)" -msgstr "Fecha (sin hora)" - -#: contrib/admin/views/doc.py:296 -msgid "Date (with time)" -msgstr "Fecha (con hora)" - -#: contrib/admin/views/doc.py:297 -msgid "E-mail address" -msgstr "Direccin de correo electrnico" - -#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299 -#: contrib/admin/views/doc.py:302 -msgid "File path" -msgstr "Ruta de archivo" - -#: contrib/admin/views/doc.py:300 -msgid "Decimal number" -msgstr "Nmero decimal" - -#: contrib/admin/views/doc.py:306 -msgid "Boolean (Either True, False or None)" -msgstr "Booleano (Verdadero, Falso o Nulo)" - -#: contrib/admin/views/doc.py:307 -msgid "Relation to parent model" -msgstr "Relacin con el modelo padre" - -#: contrib/admin/views/doc.py:308 -msgid "Phone number" -msgstr "Nmero de telfono" - -#: contrib/admin/views/doc.py:313 -msgid "Text" -msgstr "Texto" - -#: contrib/admin/views/doc.py:314 -msgid "Time" -msgstr "Hora" - -#: contrib/admin/views/doc.py:316 -msgid "U.S. state (two uppercase letters)" -msgstr "Estado de los EEUU (dos letras maysculas)" - -#: contrib/admin/views/doc.py:317 -msgid "XML text" -msgstr "Texto XML" - -#: contrib/admin/views/doc.py:343 -#, python-format -msgid "%s does not appear to be a urlpattern object" -msgstr "%s no parece ser un objeto urlpattern" - -#: contrib/admin/views/auth.py:30 -msgid "Add user" -msgstr "Agregar usuario" - -#: contrib/admin/views/auth.py:57 -msgid "Password changed successfully." -msgstr "Cambio de contrasea exitoso" - -#: contrib/admin/views/auth.py:64 -#, python-format -msgid "Change password: %s" -msgstr "Cambiar contrasea: %S" - -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "Actualmente" - -#: contrib/admin/templates/widget/file.html:3 -msgid "Change:" -msgstr "Modificar:" - -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Fecha:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Hora:" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentacin" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin/auth/user/change_password.html:15 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Change password" -msgstr "Cambiar contrasea" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_list.html:6 -#: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/change_form.html:13 -#: contrib/admin/templates/admin/base.html:30 -#: contrib/admin/templates/admin/delete_confirmation.html:6 -#: contrib/admin/templates/admin/invalid_setup.html:4 -#: contrib/admin/templates/admin/auth/user/change_password.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Home" -msgstr "Inicio" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_form.html:21 -msgid "History" -msgstr "Historia" - -#: contrib/admin/templates/admin/object_history.html:18 -msgid "Date/time" -msgstr "Fecha/hora" - -#: contrib/admin/templates/admin/object_history.html:19 -msgid "User" -msgstr "Usuario" - -#: contrib/admin/templates/admin/object_history.html:20 -msgid "Action" -msgstr "Accin" - -#: contrib/admin/templates/admin/object_history.html:26 -msgid "DATE_WITH_TIME_FULL" -msgstr "j M Y P" - -#: contrib/admin/templates/admin/object_history.html:36 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"Este objeto no tiene historia de modificaciones. Probablemente no fue " -"aadido usando este sitio de administracin." - -#: contrib/admin/templates/admin/change_list.html:12 -#, python-format -msgid "Add %(name)s" -msgstr "Agregar %(name)s" - -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(filter_title)s " -msgstr " Por %(filter_title)s " - -#: contrib/admin/templates/admin/500.html:4 -msgid "Server error" -msgstr "Error del servidor" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Error del servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Error de servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Ha ocurrido un error. Se ha informado a los administradores del sitio " -"mediante correo electrnico y debera arreglarse en breve. Gracias por su " -"paciencia" - -#: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Buscar" - -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "1 result" -msgid_plural "%(counter)s results" -msgstr[0] "un resultado" -msgstr[1] "%(counter)s resultados" - -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "%(full_result_count)s total" -msgstr "total: %(full_result_count)s" - -#: contrib/admin/templates/admin/pagination.html:10 -msgid "Show all" -msgstr "Mostrar todos/as" - -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Sitio de administracin de Django" - -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administracin de Django" - -#: contrib/admin/templates/admin/index.html:17 -#, python-format -msgid "Models available in the %(name)s application." -msgstr "Modelos disponibles en la aplicacin %(name)s." - -#: contrib/admin/templates/admin/index.html:18 -#, python-format -msgid "%(name)s" -msgstr "%(name)s" - -#: contrib/admin/templates/admin/index.html:28 -#: contrib/admin/templates/admin/change_form.html:15 -msgid "Add" -msgstr "Agregar" - -#: contrib/admin/templates/admin/index.html:34 -msgid "Change" -msgstr "Modificar" - -#: contrib/admin/templates/admin/index.html:44 -msgid "You don't have permission to edit anything." -msgstr "No tiene permiso para editar nada." - -#: contrib/admin/templates/admin/index.html:52 -msgid "Recent Actions" -msgstr "Acciones recientes" - -#: contrib/admin/templates/admin/index.html:53 -msgid "My Actions" -msgstr "Mis acciones" - -#: contrib/admin/templates/admin/index.html:57 -msgid "None available" -msgstr "Ninguna disponible" - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pgina no encontrada" - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." - -#: contrib/admin/templates/admin/filters.html:4 -msgid "Filter" -msgstr "Filtrar" - -#: contrib/admin/templates/admin/change_form.html:22 -msgid "View on site" -msgstr "Ver en el sitio" - -#: contrib/admin/templates/admin/change_form.html:32 -#: contrib/admin/templates/admin/auth/user/change_password.html:24 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Por favor, corrija el siguiente error." -msgstr[1] "Por favor, corrija los siguientes errores." - -#: contrib/admin/templates/admin/change_form.html:50 -msgid "Ordering" -msgstr "Ordenacin" - -#: contrib/admin/templates/admin/change_form.html:53 -msgid "Order:" -msgstr "Orden:" - -#: contrib/admin/templates/admin/base.html:25 -msgid "Welcome," -msgstr "Bienvenido," - -#: contrib/admin/templates/admin/delete_confirmation.html:9 -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Delete" -msgstr "Eliminar" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " -"related objects, but your account doesn't have permission to delete the " -"following types of objects:" -msgstr "" -"Eliminar el %(object_name)s '%(escaped_object)s' provocara la eliminacin " -"de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " -"siguientes tipos de objetos:" - -#: contrib/admin/templates/admin/delete_confirmation.html:21 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " -"All of the following related items will be deleted:" -msgstr "" -"Est seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s" -"\"? Se eliminarn los siguientes objetos relacionados:" - -#: contrib/admin/templates/admin/delete_confirmation.html:26 -msgid "Yes, I'm sure" -msgstr "S, estoy seguro" - -#: contrib/admin/templates/admin/submit_line.html:4 -msgid "Save as new" -msgstr "Grabar como nuevo" - -#: contrib/admin/templates/admin/submit_line.html:5 -msgid "Save and add another" -msgstr "Grabar y aadir otro" - -#: contrib/admin/templates/admin/submit_line.html:6 -msgid "Save and continue editing" -msgstr "Grabar y continuar editando" - -#: contrib/admin/templates/admin/submit_line.html:7 -msgid "Save" -msgstr "Grabar" - -#: contrib/admin/templates/admin/invalid_setup.html:8 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" -"hay algn problema con su instalacin de base de datos. Asegrese de que las " -"tablas de la misma hayan sido creadas, y asegrese de que el usuario " -"apropiado tenga permisos de escritura en la base de datos." - -#: contrib/admin/templates/admin/auth/user/change_password.html:28 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduzca una nueva contrasena para el usuario %(username)s." - -#: contrib/admin/templates/admin/auth/user/change_password.html:34 -#: contrib/admin/templates/admin/auth/user/add_form.html:18 -msgid "Password" -msgstr "Contrasea:" - -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/admin/templates/admin/auth/user/add_form.html:23 -msgid "Password (again)" -msgstr "Contrasea (de nuevo)" - -#: contrib/admin/templates/admin/auth/user/change_password.html:40 -#: contrib/admin/templates/admin/auth/user/add_form.html:24 -msgid "Enter the same password as above, for verification." -msgstr "Para verificacin, introduzca la misma contrasea que ingres arriba." - -#: contrib/admin/templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primero, introduzca un nombre de usuario y una contrasea. Luego podr " -"configurar opciones adicionales." - -#: contrib/admin/templates/admin/auth/user/add_form.html:12 -msgid "Username" -msgstr "Nombre de usuario:" - -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/registration/password_change_form.html:6 -#: contrib/admin/templates/registration/password_change_form.html:10 -msgid "Password change" -msgstr "Cambio de contrasea" - -#: contrib/admin/templates/registration/password_change_done.html:6 -#: contrib/admin/templates/registration/password_change_done.html:10 -msgid "Password change successful" -msgstr "Cambio de contrasea exitoso" - -#: contrib/admin/templates/registration/password_change_done.html:12 -msgid "Your password was changed." -msgstr "Su contrasea ha sido cambiada." - -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_form.html:10 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Recuperar contrasea" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -"Ha olvidado su contrasea? Introduzca su direccin de correo electrnico, y " -"crearemos una nueva que le enviaremos por correo." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Direccin de correo electrnico:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Recuperar mi cntrasea" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Identificarse de nuevo" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Recuperacin de contrasea exitosa" - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" -"Le hemos enviado una nueva contrasea a la direccin que ha suministrado. " -"Debera recibirla en breve." - -#: contrib/admin/templates/registration/password_change_form.html:12 -msgid "" -"Please enter your old password, for security's sake, and then enter your new " -"password twice so we can verify you typed it in correctly." -msgstr "" -"Por favor, introduzca su contrasea antigua, por seguridad, y despus " -"introduzca la nueva contrasea dos veces para verificar que la ha escrito " -"correctamente." - -#: contrib/admin/templates/registration/password_change_form.html:17 -msgid "Old password:" -msgstr "Contrasea antigua:" - -#: contrib/admin/templates/registration/password_change_form.html:19 -msgid "New password:" -msgstr "Contrasea nueva:" - -#: contrib/admin/templates/registration/password_change_form.html:21 -msgid "Confirm password:" -msgstr "Confirme contrasea:" - -#: contrib/admin/templates/registration/password_change_form.html:23 -msgid "Change my password" -msgstr "Cambiar mi contrasea" - -#: contrib/admin/templates/registration/password_reset_email.html:2 -msgid "You're receiving this e-mail because you requested a password reset" -msgstr "" -"Est recibiendo este mensaje debido a que solicit recuperar la contrasea" - -#: contrib/admin/templates/registration/password_reset_email.html:3 -#, python-format -msgid "for your user account at %(site_name)s" -msgstr "de su cuenta de usuario en %(site_name)s." - -#: contrib/admin/templates/registration/password_reset_email.html:5 -#, python-format -msgid "Your new password is: %(new_password)s" -msgstr "Su nueva contrasea es: %(new_password)s" - -#: contrib/admin/templates/registration/password_reset_email.html:7 -msgid "Feel free to change this password by going to this page:" -msgstr "Puede cambiarla accediendo a esta pgina:" - -#: contrib/admin/templates/registration/password_reset_email.html:11 -msgid "Your username, in case you've forgotten:" -msgstr "Su nombre de usuario, en caso de haberlo olvidado:" - -#: contrib/admin/templates/registration/password_reset_email.html:13 -msgid "Thanks for using our site!" -msgstr "Gracias por usar nuestro sitio!" - -#: contrib/admin/templates/registration/password_reset_email.html:15 -#, python-format -msgid "The %(site_name)s team" -msgstr "El equipo de %(site_name)s" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Bookmarklets" -msgstr "Bookmarklets" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:5 -msgid "Documentation bookmarklets" -msgstr "Bookmarklets de documentacin" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:9 -msgid "" -"\n" -"

      To install bookmarklets, drag the link to your bookmarks\n" -"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" -"select the bookmarklet from any page in the site. Note that some of these\n" -"bookmarklets require you to be viewing the site from a computer designated\n" -"as \"internal\" (talk to your system administrator if you aren't sure if\n" -"your computer is \"internal\").

      \n" -msgstr "" -"\n" -"

      Para instalar bookmarklets, arrastre el enlace a su barra\n" -"de favoritos, o pulse con el botn derecho el enlace y adalo a sus " -"favoritos.\n" -"Ahora puede sleccionar el bookmarklet desde cualquier pgina en el sitio.\n" -"Observer que algunos de estos bookmarklets precisan que est viendo\n" -"el sitio desde un equipo sealado como \"interno\" (hable\n" -"con su administrador de sistemas si no est seguro de si el suyo lo es).\n" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:19 -msgid "Documentation for this page" -msgstr "Documentacin de esta pgina" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "" -"Jumps you from any page to the documentation for the view that generates " -"that page." -msgstr "" -"Le lleva desde cualquier pgina a la documentacin de la vista que la genera." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:22 -msgid "Show object ID" -msgstr "Mostrar ID de objeto" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "" -"Shows the content-type and unique ID for pages that represent a single " -"object." -msgstr "" -"Muestra el tipo de contenido e ID unvoco de las pginas que representan un " -"nico objeto." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:25 -msgid "Edit this object (current window)" -msgstr "Editar este objeto (ventana actual)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:26 -msgid "Jumps to the admin page for pages that represent a single object." -msgstr "" -"Le lleva a la pgina de administracin de pginas que representan un nico " -"objeto." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:28 -msgid "Edit this object (new window)" -msgstr "Editar este objeto (nueva ventana)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:29 -msgid "As above, but opens the admin page in a new window." -msgstr "" -"Como antes, pero abre la pgina de administracin en una nueva ventana." - -#: contrib/localflavor/uk/forms.py:18 -msgid "Enter a postcode. A space is required between the two postcode parts." -msgstr "" -"Introduzca un postcode. Se requiere un espacio entre ambas partes del " -"postcode." - -#: contrib/localflavor/usa/forms.py:17 -msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." -msgstr "Introduzca un zip code en el formato XXXXX o XXXXX-XXXX." +#: utils/dateformat.py:95 +msgid "midnight" +msgstr "medianoche" + +#: utils/dateformat.py:97 +msgid "noon" +msgstr "medioda" + +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "ao" +msgstr[1] "aos" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "mes" +msgstr[1] "meses" + +#: utils/timesince.py:14 +msgid "week" +msgid_plural "weeks" +msgstr[0] "semana" +msgstr[1] "semanas" + +#: utils/timesince.py:15 +msgid "day" +msgid_plural "days" +msgstr[0] "da" +msgstr[1] "das" + +#: utils/timesince.py:16 +msgid "hour" +msgid_plural "hours" +msgstr[0] "hora" +msgstr[1] "horas" + +#: utils/timesince.py:17 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minutos" #: utils/dates.py:6 msgid "Monday" @@ -1692,42 +319,6 @@ msgstr "Nov." msgid "Dec." msgstr "Dic." -#: utils/timesince.py:12 -msgid "year" -msgid_plural "years" -msgstr[0] "ao" -msgstr[1] "aos" - -#: utils/timesince.py:13 -msgid "month" -msgid_plural "months" -msgstr[0] "mes" -msgstr[1] "meses" - -#: utils/timesince.py:14 -msgid "week" -msgid_plural "weeks" -msgstr[0] "semana" -msgstr[1] "semanas" - -#: utils/timesince.py:15 -msgid "day" -msgid_plural "days" -msgstr[0] "da" -msgstr[1] "das" - -#: utils/timesince.py:16 -msgid "hour" -msgid_plural "hours" -msgstr[0] "hora" -msgstr[1] "horas" - -#: utils/timesince.py:17 -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minuto" -msgstr[1] "minutos" - #: utils/translation/trans_real.py:362 msgid "DATE_FORMAT" msgstr "j N Y" @@ -1748,6 +339,1706 @@ msgstr "F Y" msgid "MONTH_DAY_FORMAT" msgstr "j \\de F" +#: contrib/redirects/models.py:7 +msgid "redirect from" +msgstr "redirigir desde" + +#: contrib/redirects/models.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/" +"events/search/'." + +#: contrib/redirects/models.py:9 +msgid "redirect to" +msgstr "redirigir a" + +#: contrib/redirects/models.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " +"empiece con 'http://'." + +#: contrib/redirects/models.py:13 +msgid "redirect" +msgstr "redireccin" + +#: contrib/redirects/models.py:14 +msgid "redirects" +msgstr "redirecciones" + +#: contrib/auth/models.py:38 contrib/auth/models.py:57 +msgid "name" +msgstr "nombre" + +#: contrib/auth/models.py:40 +msgid "codename" +msgstr "nombre en cdigo" + +#: contrib/auth/models.py:42 +msgid "permission" +msgstr "permiso" + +#: contrib/auth/models.py:43 contrib/auth/models.py:58 +msgid "permissions" +msgstr "permisos" + +#: contrib/auth/models.py:60 +msgid "group" +msgstr "grupo" + +#: contrib/auth/models.py:61 contrib/auth/models.py:100 +msgid "groups" +msgstr "grupos" + +#: contrib/auth/models.py:90 +msgid "username" +msgstr "nombre de usuario" + +#: contrib/auth/models.py:90 +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." +msgstr "" +"Requerido. Longitud mxima 30 caracteres alfanumricos (letras, dgitos y " +"guiones bajos)." + +#: contrib/auth/models.py:91 +msgid "first name" +msgstr "nombre" + +#: contrib/auth/models.py:92 +msgid "last name" +msgstr "apellido" + +#: contrib/auth/models.py:93 +msgid "e-mail address" +msgstr "direccin de correo" + +#: contrib/auth/models.py:94 +msgid "password" +msgstr "contrasea" + +#: contrib/auth/models.py:94 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"Use '[algo]$[salt]$[hexdigest]' o use el formulario de " +"cambio de contrasea." + +#: contrib/auth/models.py:95 +msgid "staff status" +msgstr "es staff" + +#: contrib/auth/models.py:95 +msgid "Designates whether the user can log into this admin site." +msgstr "Indica si el usuario puede ingresar a este sitio de administracin." + +#: contrib/auth/models.py:96 +msgid "active" +msgstr "activo" + +#: contrib/auth/models.py:96 +msgid "" +"Designates whether this user can log into the Django admin. Unselect this " +"instead of deleting accounts." +msgstr "" +"Indica si el usuario puede ingresar al sitio de administracin Django." +"Desactive este campo en lugar de eliminar usuarios." + +#: contrib/auth/models.py:97 +msgid "superuser status" +msgstr "es superusuario" + +#: contrib/auth/models.py:97 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Indica que este usuario posee todos los permisos, sin asignarle los mismos " +"explcitamente." + +#: contrib/auth/models.py:98 +msgid "last login" +msgstr "ltimo ingreso" + +#: contrib/auth/models.py:99 +msgid "date joined" +msgstr "fecha de creacin" + +#: contrib/auth/models.py:101 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Adems de los permisos asignados manualmente, este usuario tambin poseer " +"todos los permisos de los grupos a los que pertenezca." + +#: contrib/auth/models.py:102 +msgid "user permissions" +msgstr "permisos de usuario" + +#: contrib/auth/models.py:105 +msgid "user" +msgstr "usuario" + +#: contrib/auth/models.py:106 +msgid "users" +msgstr "usuarios" + +#: contrib/auth/models.py:111 +msgid "Personal info" +msgstr "Informacin personal" + +#: contrib/auth/models.py:112 +msgid "Permissions" +msgstr "Permisos" + +#: contrib/auth/models.py:113 +msgid "Important dates" +msgstr "Fechas importantes" + +#: contrib/auth/models.py:114 +msgid "Groups" +msgstr "Grupos" + +#: contrib/auth/models.py:258 +msgid "message" +msgstr "mensaje" + +#: contrib/auth/forms.py:17 contrib/auth/forms.py:138 +msgid "The two password fields didn't match." +msgstr "Los dos campos de contraseas no coinciden entre si." + +#: contrib/auth/forms.py:25 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con ese nombre." + +#: contrib/auth/forms.py:53 +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Su navegador Web aparenta no tener cookies activas. Las cookies son un " +"requerimiento para poder ingresar." + +#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10 +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Por favor introduzca un nombre de usuario y una contrasea correctos. Note " +"que ambos campos son sensibles a maysculas/minsculas." + +#: contrib/auth/forms.py:62 +msgid "This account is inactive." +msgstr "Esta cuenta est inactiva" + +#: contrib/auth/forms.py:85 +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "" +"Esa direccin de e-mail no est asociada a ninguna cuenta de usuario. Est " +"seguro de que ya se ha registrado?" + +#: contrib/auth/forms.py:117 +msgid "The two 'new password' fields didn't match." +msgstr "Los dos campos 'nueva contrasea' no coinciden entre si." + +#: contrib/auth/forms.py:124 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "" +"La antigua contrasea ingresada es incorrecta. Por favor ingrsela " +"nuevamente." + +#: contrib/auth/views.py:39 +msgid "Logged out" +msgstr "Sesin cerrada" + +#: contrib/admin/filterspecs.py:40 +#, python-format +msgid "" +"

      By %s:

      \n" +"
        \n" +msgstr "" +"

        Por %s:

        \n" +"
          \n" + +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169 +msgid "All" +msgstr "Todos/as" + +#: contrib/admin/filterspecs.py:109 +msgid "Any date" +msgstr "Cualquier fecha" + +#: contrib/admin/filterspecs.py:110 +msgid "Today" +msgstr "Hoy" + +#: contrib/admin/filterspecs.py:113 +msgid "Past 7 days" +msgstr "ltimos 7 das" + +#: contrib/admin/filterspecs.py:115 +msgid "This month" +msgstr "Este mes" + +#: contrib/admin/filterspecs.py:117 +msgid "This year" +msgstr "Este ao" + +#: contrib/admin/models.py:16 +msgid "action time" +msgstr "hora de accin" + +#: contrib/admin/models.py:19 +msgid "object id" +msgstr "id de objeto" + +#: contrib/admin/models.py:20 +msgid "object repr" +msgstr "repr de objeto" + +#: contrib/admin/models.py:21 +msgid "action flag" +msgstr "marca de accin" + +#: contrib/admin/models.py:22 +msgid "change message" +msgstr "mensaje de cambio" + +#: contrib/admin/models.py:25 +msgid "log entry" +msgstr "entrada de registro" + +#: contrib/admin/models.py:26 +msgid "log entries" +msgstr "entradas de registro" + +#: contrib/admin/views/decorators.py:24 +#: contrib/admin/templates/admin/login.html:25 +msgid "Log in" +msgstr "Identificarse" + +#: contrib/admin/views/decorators.py:62 +msgid "" +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." +msgstr "" +"Por favor, identifquese de nuevo porque su sesin ha caducado. No se " +"preocupe: se ha guardado su envo." + +#: contrib/admin/views/decorators.py:69 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"Parece que su navegador no est configurado para aceptar cookies. Actvelas " +"por favor, recargue esta pgina, e intntelo de nuevo." + +#: contrib/admin/views/decorators.py:83 +msgid "Usernames cannot contain the '@' character." +msgstr "Los nombres de usuario no pueden contener el carcter '@'." + +#: contrib/admin/views/decorators.py:85 +#, python-format +msgid "Your e-mail address is not your username. Try '%s' instead." +msgstr "" +"Su direccin de correo no es su nombre de usuario. Intente nuevamente " +"usando '%s'." + +#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "Se agreg con xito %(name)s \"%(obj)s\"." + +#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261 +#: contrib/admin/views/main.py:347 +msgid "You may edit it again below." +msgstr "Puede modificarlo nuevamente abajo." + +#: contrib/admin/views/auth.py:30 +msgid "Add user" +msgstr "Agregar usuario" + +#: contrib/admin/views/auth.py:57 +msgid "Password changed successfully." +msgstr "Cambio de contrasea exitoso" + +#: contrib/admin/views/auth.py:64 +#, python-format +msgid "Change password: %s" +msgstr "Cambiar contrasea: %S" + +#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48 +#: contrib/admin/views/doc.py:50 +msgid "tag:" +msgstr "etiqueta:" + +#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79 +#: contrib/admin/views/doc.py:81 +msgid "filter:" +msgstr "filtrar:" + +#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137 +#: contrib/admin/views/doc.py:139 +msgid "view:" +msgstr "ver:" + +#: contrib/admin/views/doc.py:164 +#, python-format +msgid "App %r not found" +msgstr "Aplicacin %r no encontrada" + +#: contrib/admin/views/doc.py:171 +#, python-format +msgid "Model %(name)r not found in app %(label)r" +msgstr "Modelo %(name)r no encontrado en aplicacin %(label)r" + +#: contrib/admin/views/doc.py:183 +#, python-format +msgid "the related `%(label)s.%(type)s` object" +msgstr "el objeto relacionado `%(label)s%(type)s`" + +#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205 +#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224 +msgid "model:" +msgstr "modelo:" + +#: contrib/admin/views/doc.py:214 +#, python-format +msgid "related `%(label)s.%(name)s` objects" +msgstr "objetos relacionados `%(label)s.%(name)s`" + +#: contrib/admin/views/doc.py:219 +#, python-format +msgid "all %s" +msgstr "todos %s" + +#: contrib/admin/views/doc.py:224 +#, python-format +msgid "number of %s" +msgstr "nmero de %s" + +#: contrib/admin/views/doc.py:229 +#, python-format +msgid "Fields on %s objects" +msgstr "Campos en %s objetos" + +#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301 +#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309 +#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312 +msgid "Integer" +msgstr "Entero" + +#: contrib/admin/views/doc.py:292 +msgid "Boolean (Either True or False)" +msgstr "Booleano (Verdadero o Falso)" + +#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "Cadena (mximo %(maxlength)s)" + +#: contrib/admin/views/doc.py:294 +msgid "Comma-separated integers" +msgstr "Enteros separados por comas" + +#: contrib/admin/views/doc.py:295 +msgid "Date (without time)" +msgstr "Fecha (sin hora)" + +#: contrib/admin/views/doc.py:296 +msgid "Date (with time)" +msgstr "Fecha (con hora)" + +#: contrib/admin/views/doc.py:297 +msgid "E-mail address" +msgstr "Direccin de correo electrnico" + +#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299 +#: contrib/admin/views/doc.py:302 +msgid "File path" +msgstr "Ruta de archivo" + +#: contrib/admin/views/doc.py:300 +msgid "Decimal number" +msgstr "Nmero decimal" + +#: contrib/admin/views/doc.py:304 contrib/comments/models.py:85 +msgid "IP address" +msgstr "Direccin IP" + +#: contrib/admin/views/doc.py:306 +msgid "Boolean (Either True, False or None)" +msgstr "Booleano (Verdadero, Falso o Nulo)" + +#: contrib/admin/views/doc.py:307 +msgid "Relation to parent model" +msgstr "Relacin con el modelo padre" + +#: contrib/admin/views/doc.py:308 +msgid "Phone number" +msgstr "Nmero de telfono" + +#: contrib/admin/views/doc.py:313 +msgid "Text" +msgstr "Texto" + +#: contrib/admin/views/doc.py:314 +msgid "Time" +msgstr "Hora" + +#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7 +msgid "URL" +msgstr "URL" + +#: contrib/admin/views/doc.py:316 +msgid "U.S. state (two uppercase letters)" +msgstr "Estado de los EE.UU. (dos letras maysculas)" + +#: contrib/admin/views/doc.py:317 +msgid "XML text" +msgstr "Texto XML" + +#: contrib/admin/views/doc.py:343 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s no parece ser un objeto urlpattern" + +#: contrib/admin/views/main.py:223 +msgid "Site administration" +msgstr "Sitio administrativo" + +#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356 +#, python-format +msgid "You may add another %s below." +msgstr "Puede agregar otro %s abajo." + +#: contrib/admin/views/main.py:289 +#, python-format +msgid "Add %s" +msgstr "Agregar %s" + +#: contrib/admin/views/main.py:335 +#, python-format +msgid "Added %s." +msgstr "Agregado %s." + +#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337 +#: contrib/admin/views/main.py:339 db/models/manipulators.py:308 +msgid "and" +msgstr "y" + +#: contrib/admin/views/main.py:337 +#, python-format +msgid "Changed %s." +msgstr "Modifica %s." + +#: contrib/admin/views/main.py:339 +#, python-format +msgid "Deleted %s." +msgstr "Elimina %s." + +#: contrib/admin/views/main.py:342 +msgid "No fields changed." +msgstr "No ha modificado ningn campo." + +#: contrib/admin/views/main.py:345 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "Se modific con xito %(name)s \"%(obj)s." + +#: contrib/admin/views/main.py:353 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"Se agreg con xito %(name)s \"%(obj)s. Puede modificarlo nuevamente abajo." + +#: contrib/admin/views/main.py:391 +#, python-format +msgid "Change %s" +msgstr "Modificar %s" + +#: contrib/admin/views/main.py:476 +#, python-format +msgid "One or more %(fieldname)s in %(name)s: %(obj)s" +msgstr "Uno o ms %(fieldname)s en %(name)s: %(obj)s" + +#: contrib/admin/views/main.py:481 +#, python-format +msgid "One or more %(fieldname)s in %(name)s:" +msgstr "Uno o ms %(fieldname)s en %(name)s:" + +#: contrib/admin/views/main.py:514 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Se elimin con xito %(name)s \"%(obj)s\"." + +#: contrib/admin/views/main.py:517 +msgid "Are you sure?" +msgstr "Est seguro?" + +#: contrib/admin/views/main.py:539 +#, python-format +msgid "Change history: %s" +msgstr "Historia de modificaciones: %s" + +#: contrib/admin/views/main.py:573 +#, python-format +msgid "Select %s" +msgstr "Seleccione %s" + +#: contrib/admin/views/main.py:573 +#, python-format +msgid "Select %s to change" +msgstr "Seleccione %s a modificar" + +#: contrib/admin/views/main.py:768 +msgid "Database error" +msgstr "Error de base de datos" + +#: contrib/admin/templatetags/admin_list.py:247 +msgid "All dates" +msgstr "Todas las fechas" + +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Fecha:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/templates/widget/file.html:2 +msgid "Currently:" +msgstr "Actualmente" + +#: contrib/admin/templates/widget/file.html:3 +msgid "Change:" +msgstr "Modificar:" + +#: contrib/admin/templates/admin/index.html:17 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "Modelos disponibles en la aplicacin %(name)s." + +#: contrib/admin/templates/admin/index.html:18 +#, python-format +msgid "%(name)s" +msgstr "%(name)s" + +#: contrib/admin/templates/admin/index.html:28 +#: contrib/admin/templates/admin/change_form.html:15 +msgid "Add" +msgstr "Agregar" + +#: contrib/admin/templates/admin/index.html:34 +msgid "Change" +msgstr "Modificar" + +#: contrib/admin/templates/admin/index.html:44 +msgid "You don't have permission to edit anything." +msgstr "No tiene permiso para editar nada." + +#: contrib/admin/templates/admin/index.html:52 +msgid "Recent Actions" +msgstr "Acciones recientes" + +#: contrib/admin/templates/admin/index.html:53 +msgid "My Actions" +msgstr "Mis acciones" + +#: contrib/admin/templates/admin/index.html:57 +msgid "None available" +msgstr "Ninguna disponible" + +#: contrib/admin/templates/admin/filters.html:4 +msgid "Filter" +msgstr "Filtrar" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Go" +msgstr "Buscar" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "1 result" +msgid_plural "%(counter)s results" +msgstr[0] "un resultado" +msgstr[1] "%(counter)s resultados" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "%(full_result_count)s total" +msgstr "total: %(full_result_count)s" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr " Por %(filter_title)s " + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "Mostrar todos/as" + +#: contrib/admin/templates/admin/change_form.html:10 +#: contrib/admin/templates/admin/change_list.html:5 +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/auth/user/change_password.html:9 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentacin" + +#: contrib/admin/templates/admin/change_form.html:10 +#: contrib/admin/templates/admin/change_list.html:5 +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/auth/user/change_password.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:15 +#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +msgid "Change password" +msgstr "Cambiar contrasea" + +#: contrib/admin/templates/admin/change_form.html:10 +#: contrib/admin/templates/admin/change_list.html:5 +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/auth/user/change_password.html:9 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/comments/templates/comments/form.html:6 +msgid "Log out" +msgstr "Cerrar sesin" + +#: contrib/admin/templates/admin/change_form.html:13 +#: contrib/admin/templates/admin/change_list.html:6 +#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/invalid_setup.html:4 +#: contrib/admin/templates/admin/auth/user/change_password.html:12 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Home" +msgstr "Inicio" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/object_history.html:5 +msgid "History" +msgstr "Historia" + +#: contrib/admin/templates/admin/change_form.html:22 +msgid "View on site" +msgstr "Ver en el sitio" + +#: contrib/admin/templates/admin/change_form.html:32 +#: contrib/admin/templates/admin/auth/user/change_password.html:24 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Por favor, corrija el siguiente error." +msgstr[1] "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/change_form.html:50 +msgid "Ordering" +msgstr "Ordenacin" + +#: contrib/admin/templates/admin/change_form.html:53 +msgid "Order:" +msgstr "Orden:" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pgina no encontrada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Sitio de administracin de Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administracin de Django" + +#: contrib/admin/templates/admin/change_list.html:12 +#, python-format +msgid "Add %(name)s" +msgstr "Agregar %(name)s" + +#: contrib/admin/templates/admin/login.html:17 +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +msgid "Username:" +msgstr "Usuario:" + +#: contrib/admin/templates/admin/login.html:20 +#: contrib/comments/templates/comments/form.html:8 +msgid "Password:" +msgstr "Contrasea:" + +#: contrib/admin/templates/admin/base.html:25 +msgid "Welcome," +msgstr "Bienvenido," + +#: contrib/admin/templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/delete_confirmation.html:9 +msgid "Delete" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/submit_line.html:4 +msgid "Save as new" +msgstr "Grabar como nuevo" + +#: contrib/admin/templates/admin/submit_line.html:5 +msgid "Save and add another" +msgstr "Grabar y aadir otro" + +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Save and continue editing" +msgstr "Grabar y continuar editando" + +#: contrib/admin/templates/admin/submit_line.html:7 +msgid "Save" +msgstr "Grabar" + +#: contrib/admin/templates/admin/object_history.html:18 +msgid "Date/time" +msgstr "Fecha/hora" + +#: contrib/admin/templates/admin/object_history.html:19 +msgid "User" +msgstr "Usuario" + +#: contrib/admin/templates/admin/object_history.html:20 +msgid "Action" +msgstr "Accin" + +#: contrib/admin/templates/admin/object_history.html:26 +msgid "DATE_WITH_TIME_FULL" +msgstr "j M Y P" + +#: contrib/admin/templates/admin/object_history.html:36 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Este objeto no tiene historia de modificaciones. Probablemente no fu " +"aadido usando este sitio de administracin." + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "Error del servidor" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Error del servidor (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Error de servidor (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Ha ocurrido un error. Se ha informado a los administradores del sitio " +"mediante correo electrnico y debera ser solucionado en breve. Gracias " +"por su paciencia." + +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"Eliminar el %(object_name)s '%(escaped_object)s' provocara la eliminacin " +"de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " +"siguientes tipos de objetos:" + +#: contrib/admin/templates/admin/delete_confirmation.html:21 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Est seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s" +"\"? Se eliminarn los siguientes objetos relacionados:" + +#: contrib/admin/templates/admin/delete_confirmation.html:26 +msgid "Yes, I'm sure" +msgstr "S, estoy seguro" + +#: contrib/admin/templates/admin/invalid_setup.html:8 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Hay algn problema con su instalacin de base de datos. Asegrese de que las " +"tablas de la misma hayan sido creadas, y asegrese de que el usuario " +"apropiado tenga permisos de lectura en la base de datos." + +#: contrib/admin/templates/admin/auth/user/change_password.html:28 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduzca una nueva contrasea para el usuario %(username)s" +"." + +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/admin/templates/admin/auth/user/add_form.html:18 +msgid "Password" +msgstr "Contrasea:" + +#: contrib/admin/templates/admin/auth/user/change_password.html:39 +#: contrib/admin/templates/admin/auth/user/add_form.html:23 +msgid "Password (again)" +msgstr "Contrasea (de nuevo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/add_form.html:24 +msgid "Enter the same password as above, for verification." +msgstr "Para verificacin, introduzca la misma contrasea que ingres arriba." + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primero, introduzca un nombre de usuario y una contrasea. Luego podr " +"configurar opciones adicionales." + +#: contrib/admin/templates/admin/auth/user/add_form.html:12 +msgid "Username" +msgstr "Nombre de usuario:" + +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +msgid "Password change" +msgstr "Cambio de contrasea" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "Cambio de contrasea exitoso" + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "Su contrasea ha sido cambiada." + +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +#: contrib/admin/templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Recuperar contrasea" + +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"Ha olvidado su contrasea? Introduzca su direccin de correo electrnico, y " +"crearemos una nueva que le enviaremos por correo." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Direccin de correo electrnico:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Recuperar mi contrasea" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Recuperacin de contrasea exitosa" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Le hemos enviado una nueva contrasea a la direccin que ha suministrado. " +"Debera recibirla en breve." + +#: contrib/admin/templates/registration/password_change_form.html:12 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Por favor, por razones de seguridad, introduzca su contrasea antigua, y " +"luego introduzca la nueva contrasea dos veces para verificar que la ha " +"escrito correctamente." + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "Contrasea antigua:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +msgid "New password:" +msgstr "Contrasea nueva:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Confirm password:" +msgstr "Confirme contrasea:" + +#: contrib/admin/templates/registration/password_change_form.html:23 +msgid "Change my password" +msgstr "Cambiar mi contrasea" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "" +"Est recibiendo este mensaje debido a que solicit recuperar la contrasea" + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "de su cuenta de usuario en %(site_name)s." + +#: contrib/admin/templates/registration/password_reset_email.html:5 +#, python-format +msgid "Your new password is: %(new_password)s" +msgstr "Su nueva contrasea es: %(new_password)s" + +#: contrib/admin/templates/registration/password_reset_email.html:7 +msgid "Feel free to change this password by going to this page:" +msgstr "Puede cambiarla accediendo a esta pgina:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Your username, in case you've forgotten:" +msgstr "Su nombre de usuario, en caso de haberlo olvidado:" + +#: contrib/admin/templates/registration/password_reset_email.html:13 +msgid "Thanks for using our site!" +msgstr "Gracias por usar nuestro sitio!" + +#: contrib/admin/templates/registration/password_reset_email.html:15 +#, python-format +msgid "The %(site_name)s team" +msgstr "El equipo de %(site_name)s" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Identificarse de nuevo" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Bookmarklets" +msgstr "Bookmarklets" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:5 +msgid "Documentation bookmarklets" +msgstr "Bookmarklets de documentacin" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:9 +msgid "" +"\n" +"

          To install bookmarklets, drag the link to your bookmarks\n" +"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" +"select the bookmarklet from any page in the site. Note that some of these\n" +"bookmarklets require you to be viewing the site from a computer designated\n" +"as \"internal\" (talk to your system administrator if you aren't sure if\n" +"your computer is \"internal\").

          \n" +msgstr "" +"\n" +"

          Para instalar bookmarklets, arrastre el enlace a su barra\n" +"de favoritos, o pulse con el botn derecho el enlace y adalo a sus " +"favoritos.\n" +"Ahora puede seleccionar el bookmarklet desde cualquier pgina en el sitio.\n" +"Tenga en cuenta que algunos de estos bookmarklets precisan que est viendo\n" +"el sitio desde un equipo sealado como \"interno\" (hable\n" +"con su administrador de sistemas si no est seguro de si el suyo lo es).\n" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:19 +msgid "Documentation for this page" +msgstr "Documentacin de esta pgina" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:20 +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Le lleva desde cualquier pgina a la documentacin de la vista que la genera." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:22 +msgid "Show object ID" +msgstr "Mostrar ID de objeto" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:23 +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Muestra el tipo de contenido e ID unvoco de las pginas que representan un " +"nico objeto." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:25 +msgid "Edit this object (current window)" +msgstr "Editar este objeto (ventana actual)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:26 +msgid "Jumps to the admin page for pages that represent a single object." +msgstr "" +"Le lleva a la pgina de administracin de pginas que representan un nico " +"objeto." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:28 +msgid "Edit this object (new window)" +msgstr "Editar este objeto (nueva ventana)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:29 +msgid "As above, but opens the admin page in a new window." +msgstr "" +"Como antes, pero abre la pgina de administracin en una nueva ventana." + +#: contrib/sites/models.py:10 +msgid "domain name" +msgstr "nombre de dominio" + +#: contrib/sites/models.py:11 +msgid "display name" +msgstr "nombre para visualizar" + +#: contrib/sites/models.py:15 +msgid "site" +msgstr "sitio" + +#: contrib/sites/models.py:16 +msgid "sites" +msgstr "sitios" + +#: contrib/sessions/models.py:68 +msgid "session key" +msgstr "clave de sesin" + +#: contrib/sessions/models.py:69 +msgid "session data" +msgstr "datos de sesin" + +#: contrib/sessions/models.py:70 +msgid "expire date" +msgstr "fecha de caducidad" + +#: contrib/sessions/models.py:74 +msgid "session" +msgstr "sesin" + +#: contrib/sessions/models.py:75 +msgid "sessions" +msgstr "sesiones" + +#: contrib/contenttypes/models.py:36 +msgid "python model class name" +msgstr "nombre de la clase python del modelo" + +#: contrib/contenttypes/models.py:39 +msgid "content type" +msgstr "tipo de contenido" + +#: contrib/contenttypes/models.py:40 +msgid "content types" +msgstr "tipos de contenido" + +#: contrib/flatpages/models.py:8 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Ejemplo: '/about/contact/'. Asegrese de que pone barras al principio y al " +"final." + +#: contrib/flatpages/models.py:9 +msgid "title" +msgstr "ttulo" + +#: contrib/flatpages/models.py:10 +msgid "content" +msgstr "contenido" + +#: contrib/flatpages/models.py:11 +msgid "enable comments" +msgstr "activar comentarios" + +#: contrib/flatpages/models.py:12 +msgid "template name" +msgstr "nombre de plantilla" + +#: contrib/flatpages/models.py:13 +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "" +"Ejemplo: 'flatpages/contact_page.html'. Si no lo proporciona, el sistema " +"usar 'flatpages/default.html'." + +#: contrib/flatpages/models.py:14 +msgid "registration required" +msgstr "debe estar registrado" + +#: contrib/flatpages/models.py:14 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Si est marcado, slo los usuarios registrados podrn ver la pgina." + +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "pgina esttica" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "pginas estticas" + +#: contrib/localflavor/usa/forms.py:17 +msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." +msgstr "Introduzca un zip code en el formato XXXXX o XXXXX-XXXX." + +#: contrib/localflavor/uk/forms.py:18 +msgid "Enter a postcode. A space is required between the two postcode parts." +msgstr "" +"Introduzca un postcode. Se requiere un espacio entre las dos secciones del " +"mismo." + +#: contrib/comments/models.py:67 contrib/comments/models.py:166 +msgid "object ID" +msgstr "ID de objeto" + +#: contrib/comments/models.py:68 +msgid "headline" +msgstr "encabezado" + +#: contrib/comments/models.py:69 contrib/comments/models.py:90 +#: contrib/comments/models.py:167 +msgid "comment" +msgstr "comentario" + +#: contrib/comments/models.py:70 +msgid "rating #1" +msgstr "calificacin 1" + +#: contrib/comments/models.py:71 +msgid "rating #2" +msgstr "calificacin 2" + +#: contrib/comments/models.py:72 +msgid "rating #3" +msgstr "calificacin 3" + +#: contrib/comments/models.py:73 +msgid "rating #4" +msgstr "calificacin 4" + +#: contrib/comments/models.py:74 +msgid "rating #5" +msgstr "calificacin 5" + +#: contrib/comments/models.py:75 +msgid "rating #6" +msgstr "calificacin 6" + +#: contrib/comments/models.py:76 +msgid "rating #7" +msgstr "calificacin 7" + +#: contrib/comments/models.py:77 +msgid "rating #8" +msgstr "calificacin 8" + +#: contrib/comments/models.py:82 +msgid "is valid rating" +msgstr "es calificacin vlida" + +#: contrib/comments/models.py:83 contrib/comments/models.py:169 +msgid "date/time submitted" +msgstr "fecha/hora de envo" + +#: contrib/comments/models.py:84 contrib/comments/models.py:170 +msgid "is public" +msgstr "es pblico" + +#: contrib/comments/models.py:86 +msgid "is removed" +msgstr "est eliminado" + +#: contrib/comments/models.py:86 +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Marque esta caja si el comentario es inapropiado. En su lugar se mostrar " +"\"Este comentario ha sido eliminado\"." + +#: contrib/comments/models.py:91 +msgid "comments" +msgstr "comentarios" + +#: contrib/comments/models.py:131 contrib/comments/models.py:207 +msgid "Content object" +msgstr "Objeto contenido" + +#: contrib/comments/models.py:159 +#, python-format +msgid "" +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" +msgstr "" +"Enviado por %(user)s el %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/comments/models.py:168 +msgid "person's name" +msgstr "nombre de la persona" + +#: contrib/comments/models.py:171 +msgid "ip address" +msgstr "direccin ip" + +#: contrib/comments/models.py:173 +msgid "approved by staff" +msgstr "aprobado por el staff" + +#: contrib/comments/models.py:176 +msgid "free comment" +msgstr "comentario libre" + +#: contrib/comments/models.py:177 +msgid "free comments" +msgstr "comentarios libres" + +#: contrib/comments/models.py:233 +msgid "score" +msgstr "puntuacin" + +#: contrib/comments/models.py:234 +msgid "score date" +msgstr "fecha de la puntuacin" + +#: contrib/comments/models.py:237 +msgid "karma score" +msgstr "punto karma" + +#: contrib/comments/models.py:238 +msgid "karma scores" +msgstr "puntos karma" + +#: contrib/comments/models.py:242 +#, python-format +msgid "%(score)d rating by %(user)s" +msgstr "puntuado %(score)d por %(user)s" + +#: contrib/comments/models.py:258 +#, python-format +msgid "" +"This comment was flagged by %(user)s:\n" +"\n" +"%(text)s" +msgstr "" +"Este comentario fue marcado por %(user)s:\n" +"\n" +"%(text)s" + +#: contrib/comments/models.py:265 +msgid "flag date" +msgstr "fecha de la marca" + +#: contrib/comments/models.py:268 +msgid "user flag" +msgstr "marca de usuario" + +#: contrib/comments/models.py:269 +msgid "user flags" +msgstr "marcas de usuario" + +#: contrib/comments/models.py:273 +#, python-format +msgid "Flag by %r" +msgstr "Marca de %r" + +#: contrib/comments/models.py:278 +msgid "deletion date" +msgstr "fecha de eliminacin" + +#: contrib/comments/models.py:280 +msgid "moderator deletion" +msgstr "Eliminacin por moderador" + +#: contrib/comments/models.py:281 +msgid "moderator deletions" +msgstr "eliminaciones por moderador" + +#: contrib/comments/models.py:285 +#, python-format +msgid "Moderator deletion by %r" +msgstr "Eliminacin del moderador %r" + +#: contrib/comments/views/karma.py:19 +msgid "Anonymous users cannot vote" +msgstr "Los usuarios annimos no pueden votar" + +#: contrib/comments/views/karma.py:23 +msgid "Invalid comment ID" +msgstr "ID de comentario no vlido" + +#: contrib/comments/views/karma.py:25 +msgid "No voting for yourself" +msgstr "Ud. no puede votarse a s mismo" + +#: contrib/comments/views/comments.py:27 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "Se precisa esta puntuacin porque ha introducido al menos otra ms." + +#: contrib/comments/views/comments.py:111 +#, python-format +msgid "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" +"\n" +"%(text)s" +msgid_plural "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" +"\n" +"%(text)s" +msgstr[0] "" +"Este comentario lo envi un usuario que ha enviado menos de %(count)s " +"comentario:\n" +"\n" +"%(text)s" +msgstr[1] "" +"Este comentario lo envi un usuario que ha enviado menos de %(count)s " +"comentarios:\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:116 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" +"Este comentario ha sido enviado por un usuario 'semi-annimo':\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:188 +#: contrib/comments/views/comments.py:280 +msgid "Only POSTs are allowed" +msgstr "Slo se admiten POSTs" + +#: contrib/comments/views/comments.py:192 +#: contrib/comments/views/comments.py:284 +msgid "One or more of the required fields wasn't submitted" +msgstr "No se proporcion uno o ms de los siguientes campos requeridos" + +#: contrib/comments/views/comments.py:196 +#: contrib/comments/views/comments.py:286 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" +"Alguien est jugando con el formulario de comentarios (violacin de " +"seguridad)" + +#: contrib/comments/views/comments.py:206 +#: contrib/comments/views/comments.py:292 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"El formulario de comentarios tiene un parmetro 'target' no vlido (el ID de " +"objeto era invlido)" + +#: contrib/comments/views/comments.py:257 +#: contrib/comments/views/comments.py:321 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "El formulario de comentario no proporcion 'previsualizar' ni 'enviar'" + +#: contrib/comments/templates/comments/form.html:8 +msgid "Forgotten your password?" +msgstr "Olvid su contrasea?" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "Calificaciones" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "Requerido" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "Opcional" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "Enviar una foto" + +#: contrib/comments/templates/comments/form.html:28 +#: contrib/comments/templates/comments/freeform.html:5 +msgid "Comment:" +msgstr "Comentario:" + +#: contrib/comments/templates/comments/form.html:35 +#: contrib/comments/templates/comments/freeform.html:10 +msgid "Preview comment" +msgstr "Previsualizar comentario" + +#: contrib/comments/templates/comments/freeform.html:4 +msgid "Your name:" +msgstr "Su nombre:" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "th" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "st" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "nd" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "rd" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:47 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f milln" +msgstr[1] "%(value).1f millones" + +#: contrib/humanize/templatetags/humanize.py:50 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f millardo" +msgstr[1] "%(value).1f millardos" + +#: contrib/humanize/templatetags/humanize.py:53 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f billn" +msgstr[1] "%(value).1f billones" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "one" +msgstr "uno" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "two" +msgstr "dos" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "three" +msgstr "tres" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "four" +msgstr "cuatro" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "five" +msgstr "cinco" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "six" +msgstr "seis" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "seven" +msgstr "siete" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "eight" +msgstr "ocho" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "nine" +msgstr "nueve" + +#: db/models/manipulators.py:307 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s." + +#: db/models/fields/__init__.py:42 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "Ya existe %(optname)s con este %(fieldname)s." + +#: db/models/fields/__init__.py:367 +msgid "This value must be an integer." +msgstr "Este valor debe ser un nmero entero." + +#: db/models/fields/__init__.py:402 +msgid "This value must be either True or False." +msgstr "Este valor debe ser True o False." + +#: db/models/fields/__init__.py:423 +msgid "This field cannot be null." +msgstr "Este campo no puede ser nulo." + +#: db/models/fields/__init__.py:457 core/validators.py:148 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD." + +#: db/models/fields/__init__.py:526 core/validators.py:157 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." +msgstr "Introduzca una fecha/hora vlida en formato AAAA-MM-DD HH:MM." + +#: db/models/fields/__init__.py:630 +msgid "Enter a valid filename." +msgstr "Introduzca un nombre de archivo vlido." + +#: db/models/fields/__init__.py:751 +msgid "This value must be either None, True or False." +msgstr "Este valor debe ser None, True o False." + +#: db/models/fields/related.py:53 +#, python-format +msgid "Please enter a valid %s." +msgstr "Por favor, introduzca un %s vlido." + +#: db/models/fields/related.py:642 +msgid "Separate multiple IDs with commas." +msgstr " Separe mltiples identificadores con comas." + +#: db/models/fields/related.py:644 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar " +"ms de uno." + +#: db/models/fields/related.py:691 +#, python-format +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "" +"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es " +"vlido." +msgstr[1] "" +"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " +"vlidos." + +#: oldforms/__init__.py:392 +#, python-format +msgid "Ensure your text is less than %s character." +msgid_plural "Ensure your text is less than %s characters." +msgstr[0] "Asegrese de que su texto tiene menos de %s caracter." +msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." + +#: oldforms/__init__.py:397 +msgid "Line breaks are not allowed here." +msgstr "No se permiten saltos de lnea." + +#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "Seleccione una opcin vlida; '%(data)s' no est en %(choices)s." + +#: oldforms/__init__.py:672 core/validators.py:174 core/validators.py:445 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "" +"No se envi un archivo. Verifique el tipo de codificacin en el formulario." + +#: oldforms/__init__.py:674 +msgid "The submitted file is empty." +msgstr "El archivo enviado est vaco." + +#: oldforms/__init__.py:730 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Introduzca un nmero entero entre -32.768 y 32.767." + +#: oldforms/__init__.py:740 +msgid "Enter a positive number." +msgstr "Introduzca un nmero positivo." + +#: oldforms/__init__.py:750 +msgid "Enter a whole number between 0 and 32,767." +msgstr "Introduzca un nmero entero entre 0 y 32.767." + +#: views/generic/create_update.py:43 +#, python-format +msgid "The %(verbose_name)s was created successfully." +msgstr "Se cre con xito %(verbose_name)." + +#: views/generic/create_update.py:117 +#, python-format +msgid "The %(verbose_name)s was updated successfully." +msgstr "Se actualiz con xito %(verbose_name)s." + +#: views/generic/create_update.py:184 +#, python-format +msgid "The %(verbose_name)s was deleted." +msgstr "Se elimin %(verbose_name)s." + #: conf/global_settings.py:39 msgid "Arabic" msgstr "rabe" @@ -1825,141 +2116,88 @@ msgid "Japanese" msgstr "Japons" #: conf/global_settings.py:58 -msgid "Latvian" -msgstr "Latvio" +msgid "Kannada" +msgstr "Canars" #: conf/global_settings.py:59 +msgid "Latvian" +msgstr "Letn" + +#: conf/global_settings.py:60 msgid "Macedonian" msgstr "Macedonio" -#: conf/global_settings.py:60 +#: conf/global_settings.py:61 msgid "Dutch" msgstr "Holands" -#: conf/global_settings.py:61 +#: conf/global_settings.py:62 msgid "Norwegian" msgstr "Noruego" -#: conf/global_settings.py:62 +#: conf/global_settings.py:63 msgid "Polish" msgstr "Polaco" -#: conf/global_settings.py:63 +#: conf/global_settings.py:64 +msgid "Portugese" +msgstr "Portugus" + +#: conf/global_settings.py:65 msgid "Brazilian" msgstr "Brasileo" -#: conf/global_settings.py:64 +#: conf/global_settings.py:66 msgid "Romanian" msgstr "Rumano" -#: conf/global_settings.py:65 +#: conf/global_settings.py:67 msgid "Russian" msgstr "Ruso" -#: conf/global_settings.py:66 +#: conf/global_settings.py:68 msgid "Slovak" msgstr "Eslovaco" -#: conf/global_settings.py:67 +#: conf/global_settings.py:69 msgid "Slovenian" msgstr "Esloveno" -#: conf/global_settings.py:68 +#: conf/global_settings.py:70 msgid "Serbian" msgstr "Serbio" -#: conf/global_settings.py:69 +#: conf/global_settings.py:71 msgid "Swedish" msgstr "Sueco" -#: conf/global_settings.py:70 +#: conf/global_settings.py:72 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:71 +#: conf/global_settings.py:73 +msgid "Telugu" +msgstr "Telugu" + +#: conf/global_settings.py:74 msgid "Turkish" msgstr "Turco" -#: conf/global_settings.py:72 +#: conf/global_settings.py:75 msgid "Ukrainian" msgstr "Ucraniano" -#: conf/global_settings.py:73 +#: conf/global_settings.py:76 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: conf/global_settings.py:74 +#: conf/global_settings.py:77 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: db/models/manipulators.py:305 -#, python-format -msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s." - -#: db/models/fields/__init__.py:42 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "Ya existe %(optname)s con este %(fieldname)s." - -#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273 -#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616 -#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450 -#: newforms/fields.py:461 newforms/models.py:177 oldforms/__init__.py:352 -msgid "This field is required." -msgstr "Este campo es obligatorio." - -#: db/models/fields/__init__.py:366 -msgid "This value must be an integer." -msgstr "Este valor debe ser un nmero entero." - -#: db/models/fields/__init__.py:401 -msgid "This value must be either True or False." -msgstr "Este valor debe ser True o False." - -#: db/models/fields/__init__.py:422 -msgid "This field cannot be null." -msgstr "Este campo no puede ser nulo." - -#: db/models/fields/__init__.py:454 core/validators.py:147 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD." - -#: db/models/fields/__init__.py:521 core/validators.py:156 -msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "Introduzca una fecha/hora vlida en formato YYYY-MM-DD HH:MM." - -#: db/models/fields/__init__.py:625 -msgid "Enter a valid filename." -msgstr "Introduzca un nombre de achivo vlido." - -#: db/models/fields/related.py:53 -#, python-format -msgid "Please enter a valid %s." -msgstr "Por favor, introduzca un %s vlido." - -#: db/models/fields/related.py:642 -msgid "Separate multiple IDs with commas." -msgstr " Separe mltiples IDs con comas." - -#: db/models/fields/related.py:644 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"Mantenga presionada \"Control\" (\"Command\" en un Mac) para seleccionar ms " -"de uno." - -#: db/models/fields/related.py:691 -#, python-format -msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es " -"vlido." -msgstr[1] "" -"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " -"vlidos." +#: template/defaultfilters.py:491 +msgid "yes,no,maybe" +msgstr "si,no,talvez" #: core/validators.py:64 msgid "This value must contain only letters, numbers and underscores." @@ -2010,10 +2248,6 @@ msgstr "No se admiten caracteres no num msgid "This value can't be comprised solely of digits." msgstr "Este valor no puede estar formado slo por dgitos." -#: core/validators.py:120 newforms/fields.py:126 -msgid "Enter a whole number." -msgstr "Introduzca un nmero entero." - #: core/validators.py:124 msgid "Only alphabetical characters are allowed here." msgstr "Slo se admiten caracteres alfabticos." @@ -2024,23 +2258,14 @@ msgstr "El a #: core/validators.py:143 #, python-format -msgid "Invalid date: %s." -msgstr "Fecha no vlida: %s." +msgid "Invalid date: %s" +msgstr "Fecha no vlida: %s" -#: core/validators.py:152 +#: core/validators.py:153 msgid "Enter a valid time in HH:MM format." msgstr "Introduzca una hora vlida en formato HH:MM." -#: core/validators.py:161 newforms/fields.py:269 -msgid "Enter a valid e-mail address." -msgstr "Introduzca una direccin de correo electrnico vlida" - -#: core/validators.py:173 core/validators.py:444 oldforms/__init__.py:667 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "" -"No se envi un archivo. Verifique el tipo de codificacin en el formulario." - -#: core/validators.py:177 +#: core/validators.py:178 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -2048,28 +2273,28 @@ msgstr "" "Enve una imagen vlida. El archivo que ha enviado no era una imagen o se " "trataba de una imagen corrupta." -#: core/validators.py:184 +#: core/validators.py:185 #, python-format msgid "The URL %s does not point to a valid image." msgstr "La URL %s no apunta a una imagen vlida." -#: core/validators.py:188 +#: core/validators.py:189 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -"Los nmeros telefnicos deben respetar el formato XXX-XXX-XXXX. \"%s\" no es " -"vlido." +"Los nmeros telefnicos deben respetar el formato XXX-XXX-XXXX. \"%s\" " +"no es vlido." -#: core/validators.py:196 +#: core/validators.py:197 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "La URL %s no apunta a un vdeo QuickTime vlido." -#: core/validators.py:200 +#: core/validators.py:201 msgid "A valid URL is required." msgstr "Se precisa una URL vlida." -#: core/validators.py:214 +#: core/validators.py:215 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -2078,96 +2303,96 @@ msgstr "" "Se precisa HTML vlido. Los errores especficos son:\n" "%s" -#: core/validators.py:221 +#: core/validators.py:222 #, python-format msgid "Badly formed XML: %s" msgstr "XML mal formado: %s" -#: core/validators.py:238 +#: core/validators.py:239 #, python-format msgid "Invalid URL: %s" msgstr "URL no vlida: %s" -#: core/validators.py:243 core/validators.py:245 +#: core/validators.py:244 core/validators.py:246 #, python-format msgid "The URL %s is a broken link." msgstr "La URL %s es un enlace roto." -#: core/validators.py:251 +#: core/validators.py:252 msgid "Enter a valid U.S. state abbreviation." -msgstr "Introduzca una abreviatura vlida de estado de los EEUU." +msgstr "Introduzca una abreviatura vlida de estado de los EE.UU." -#: core/validators.py:265 +#: core/validators.py:266 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Vigila tu boca! Aqu no admitimos la palabra %s." msgstr[1] "Vigila tu boca! Aqu no admitimos las palabras %s." -#: core/validators.py:272 +#: core/validators.py:273 #, python-format msgid "This field must match the '%s' field." msgstr "Este campo debe concordar con el campo '%s'." -#: core/validators.py:291 +#: core/validators.py:292 msgid "Please enter something for at least one field." msgstr "Por favor, introduzca algo en al menos un campo." -#: core/validators.py:300 core/validators.py:311 +#: core/validators.py:301 core/validators.py:312 msgid "Please enter both fields or leave them both empty." msgstr "Por favor, rellene ambos campos o deje ambos vacos." -#: core/validators.py:319 +#: core/validators.py:320 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" -#: core/validators.py:332 +#: core/validators.py:333 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" -#: core/validators.py:351 +#: core/validators.py:352 msgid "Duplicate values are not allowed." msgstr "No se admiten valores duplicados." -#: core/validators.py:366 +#: core/validators.py:367 #, python-format -msgid "This value must be between %s and %s." -msgstr "Este valor debe ser estar entre %s y %s." +msgid "This value must be between %(lower)s and %(upper)s." +msgstr "Este valor debe estar entre %(lower)s y %(upper)s." -#: core/validators.py:368 +#: core/validators.py:369 #, python-format msgid "This value must be at least %s." msgstr "Este valor debe ser al menos %s." -#: core/validators.py:370 +#: core/validators.py:371 #, python-format msgid "This value must be no more than %s." msgstr "Este valor debe ser no mayor que %s." -#: core/validators.py:406 +#: core/validators.py:407 #, python-format msgid "This value must be a power of %s." msgstr "Este valor debe ser una potencia de %s." -#: core/validators.py:417 +#: core/validators.py:418 msgid "Please enter a valid decimal number." msgstr "Por favor, introduzca un nmero decimal vlido." -#: core/validators.py:421 +#: core/validators.py:422 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" "Please enter a valid decimal number with at most %s total digits." msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con con un mximo de un " +"Por favor, introduzca un nmero decimal vlido con un mximo de un " "dgito en total." msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un maximo de %s dgitos " "en total." -#: core/validators.py:424 +#: core/validators.py:425 #, python-format msgid "" "Please enter a valid decimal number with a whole part of at most %s digit." @@ -2180,7 +2405,7 @@ msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un mximo de %s dgitos " "enteros." -#: core/validators.py:427 +#: core/validators.py:428 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -2192,34 +2417,32 @@ msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un mximo de %s " "posiciones decimales." -#: core/validators.py:437 +#: core/validators.py:438 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" -"Asegrese de que el archivo que enva es de un tamao mnimo de " -"%s bytes." +"Asegrese de que el archivo que enva es de un tamao mnimo de %s bytes." -#: core/validators.py:438 +#: core/validators.py:439 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" -"Asegrese de que el archivo que enva es de un tamao mximo de " -"%s bytes." +"Asegrese de que el archivo que enva es de un tamao mximo de %s bytes." -#: core/validators.py:455 +#: core/validators.py:456 msgid "The format for this field is wrong." msgstr "El formato de este campo es incorrecto." -#: core/validators.py:470 +#: core/validators.py:471 msgid "This field is invalid." msgstr "Este campo no es vlido." -#: core/validators.py:506 +#: core/validators.py:507 #, python-format msgid "Could not retrieve anything from %s." -msgstr "No pude obtener nada de %s." +msgstr "No se pudo obtener nada de %s." -#: core/validators.py:509 +#: core/validators.py:510 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -2227,170 +2450,59 @@ msgstr "" "La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no " "es vlida." -#: core/validators.py:542 +#: core/validators.py:543 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" "Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea " -"empieza por \"%(start)s\".)" +"empieza con \"%(start)s\".)" -#: core/validators.py:546 +#: core/validators.py:547 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" "Parte del texto que comienza en la lnea %(line)s no est permitido en ese " -"contexto. (La lnea empieza por \"%(start)s\".)" +"contexto. (La lnea empieza con \"%(start)s\".)" -#: core/validators.py:551 +#: core/validators.py:552 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" "El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea " -"empieza por \"%(start)s\".)" +"empieza con \"%(start)s\".)" -#: core/validators.py:556 +#: core/validators.py:557 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" "La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea " -"empieza por \"%(start)s\".)" +"empieza con \"%(start)s\".)" -#: core/validators.py:560 +#: core/validators.py:561 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" "A una etiqueta de la lnea %(line)s le faltan uno o ms atributos " -"requeridos. (La lnea empieza por \"%(start)s\".)" +"requeridos. (La lnea empieza con \"%(start)s\".)" -#: core/validators.py:565 +#: core/validators.py:566 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " "starts with \"%(start)s\".)" msgstr "" "El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es " -"vlido. (La lnea empieza por \"%(start)s\".)" - -#: template/defaultfilters.py:490 -msgid "yes,no,maybe" -msgstr "si,no,talvez" - -#: views/generic/create_update.py:43 -#, python-format -msgid "The %(verbose_name)s was created successfully." -msgstr "Se cre con xito %(verbose_name)." - -#: views/generic/create_update.py:117 -#, python-format -msgid "The %(verbose_name)s was updated successfully." -msgstr "Se actualiz con xito %(verbose_name)s." - -#: views/generic/create_update.py:184 -#, python-format -msgid "The %(verbose_name)s was deleted." -msgstr "Se elimin %(verbose_name)s." - -#: newforms/fields.py:101 newforms/fields.py:254 -#, python-format -msgid "Ensure this value has at most %d characters." -msgstr "Asegrese de que este valor tenga como mximo %d caracteres." - -#: newforms/fields.py:103 newforms/fields.py:256 -#, python-format -msgid "Ensure this value has at least %d characters." -msgstr "Asegrese de que este valor tenga al menos %d caracteres." - -#: newforms/fields.py:128 -#, python-format -msgid "Ensure this value is less than or equal to %s." -msgstr "Asegrese de que este valor sea menor o igual a %s." - -#: newforms/fields.py:130 -#, python-format -msgid "Ensure this value is greater than or equal to %s." -msgstr "Asegrese de que este valor sea mayor o igual a %s." - -#: newforms/fields.py:163 -msgid "Enter a valid date." -msgstr "Ingrse una fecha vlida." - -#: newforms/fields.py:190 -msgid "Enter a valid time." -msgstr "Introduzca una hora vlida." - -#: newforms/fields.py:226 -msgid "Enter a valid date/time." -msgstr "Introduzca una fecha/hora vlida." - -#: newforms/fields.py:240 -msgid "Enter a valid value." -msgstr "Introduzca un valor vlido." - -#: newforms/fields.py:287 newforms/fields.py:309 -msgid "Enter a valid URL." -msgstr "Introduzca una URL vlida." - -#: newforms/fields.py:311 -msgid "This URL appears to be a broken link." -msgstr "La URL parece ser un enlace roto." - -#: newforms/fields.py:360 newforms/models.py:164 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "" -"Seleccione una opcin vlida. Esa opcin no es una de las opciones " -"disponibles." - -#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181 -msgid "Enter a list of values." -msgstr "Introduzca una lista de valores." - -#: newforms/fields.py:387 newforms/models.py:187 -#, python-format -msgid "Select a valid choice. %s is not one of the available choices." -msgstr "" -"Seleccione una opcin vlida. %s no es una de las opciones disponibles." - -#: oldforms/__init__.py:387 -#, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Asegrese de que su texto tiene menos de %s caracter." -msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." - -#: oldforms/__init__.py:392 -msgid "Line breaks are not allowed here." -msgstr "No se permiten saltos de lnea." - -#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605 -#, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "Seleccione una opcin vlida; '%(data)s' no est en %(choices)s." - -#: oldforms/__init__.py:669 -msgid "The submitted file is empty." -msgstr "El archivo enviado est vaco." - -#: oldforms/__init__.py:725 -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Introduzca un nmero entero entre -32.768 y 32.767." - -#: oldforms/__init__.py:735 -msgid "Enter a positive number." -msgstr "Introduzca un nmero positivo." - -#: oldforms/__init__.py:745 -msgid "Enter a whole number between 0 and 32,767." -msgstr "Introduzca un nmero entero entre 0 y 32.767." +"vlido. (La lnea empieza con \"%(start)s\".)" #~ msgid "Use '[algo]$[salt]$[hexdigest]'" #~ msgstr "Use '[algoritmo]$[salt]$[hexdigest]'" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 14b8a935a1acefb7805096d8647061b564a15853..7250343b45a25afdefca2e222f5931f017abaf9d 100644 GIT binary patch delta 11878 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 diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 62f3b46c37..14fc0083b8 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -673,19 +673,19 @@ msgstr "L'URL est un lien cassé." #: contrib/humanize/templatetags/humanize.py:16 msgid "th" -msgstr "e" +msgstr "e" #: contrib/humanize/templatetags/humanize.py:16 msgid "st" -msgstr "er" +msgstr "er" #: contrib/humanize/templatetags/humanize.py:16 msgid "nd" -msgstr "d" +msgstr "d" #: contrib/humanize/templatetags/humanize.py:16 msgid "rd" -msgstr "e" +msgstr "e" #: contrib/humanize/templatetags/humanize.py:48 #, python-format @@ -1346,7 +1346,7 @@ msgstr "Sélectionnez %s pour changer" #: contrib/admin/views/main.py:768 msgid "Database error" -msgstr "" +msgstr "Erreur de base de données" #: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48 #: contrib/admin/views/doc.py:50 @@ -1391,7 +1391,7 @@ msgstr "les objets `%(label)s.%(type)s en relation" #: contrib/admin/views/doc.py:219 #, python-format msgid "all %s" -msgstr "" +msgstr "tous les %s" #: contrib/admin/views/doc.py:224 #, python-format @@ -1401,7 +1401,7 @@ msgstr "nombre de %s" #: contrib/admin/views/doc.py:229 #, python-format msgid "Fields on %s objects" -msgstr "" +msgstr "Champs sur les objets %s" #: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301 #: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309 @@ -1613,7 +1613,8 @@ msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." -msgstr "" +msgstr "Quelque chose ne va pas avec votre base de données. Vérifiez que les" +"bonnes bases ont été créées, et qu'elle est lisible par le bon utilisateur." #: contrib/admin/templates/admin/search_form.html:8 msgid "Go" @@ -1930,6 +1931,13 @@ msgid "" "as \"internal\" (talk to your system administrator if you aren't sure if\n" "your computer is \"internal\").

          \n" msgstr "" +"\n" +"

          Pour installer des bookmarklets, faîtes glisser le lien vers\n" +"votre barre de marques-pages, ou cliquez droit dessus et ajoutez-y le.\n" +"Maintenant vous pouvez le sélectionner depuis n'importe quelle page\n" +"du site. Notez que certains d'entre eux nécessitent que vous visionniez\n" +"le site depuis un ordinateur dit \"interne\" (veuillez contacter votre\n" +"administrateur système si vous n'êtes pas sûr que votre ordinateur le soit).

          \n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index 97b8f4145bcb7fc15caa8b79e9b3e6861ad7cf01..07d39947554d7039d4b12c55c3c3b40b73711adb 100644 GIT binary patch delta 14186 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 X*i*A?OKv-DcfdwkE&MO++4%ne)xh<# delta 10902 zcmZwM30PIt`p5Bo06|CvCmcY<0mmEwM>MB!N(D7B4K+YOF$4n~DC;ETfL7i-PHAb* zLuu(w&7rcav~p;$k}NApGpk$KHM4Hs`~97@`aeDQ`R}LqeAc`6+H0@1_HYjN`i}wb znE>zkT0zSlwhE8qMB~>r9A{R5<2=_$wT`o}mE$a9Updw#Z`{UlMq_78!E%hk3apCP zZ~)%K1Wamc`kjrpk}tRU>qviI=L-s%IuJR=8Qacr>SHMe;~EUa4Ok7g*m@Ur!h;x! zM^Wug+WdXgz|NuCUB?L2D5^kB4Cee!Jqiy}(HN`aQ&<~!pl0w22H{oIfUaX5yon)L zyS*7$6gDPrjV*8xYG8S&b~91OKV<9YVJ*(@EKvbBU^wnY4d6}GffaZQeuc&O18Rjb zJD8b0fHlb4hlX8aMV|8uDRzC*80be)1mc1uUoK`qo$HAU@@N6lm) zs-qF86&ZtC+BB?zS*U)BP$#$_cj0^-fn7Q|P7mcc8IN>g{dH5djx#gpjn&CVU_+dU zx`rj#6qln0upf28moXeq*!`cO?%SK#45Q=C3id%3%^8GTHD?CW#Muzf`ZIaw3>9NB zkPBW9$75eCMlJPTY>B6^7GA^FShcfRp*W<<8GveEf*QzDRDUmEb3Bf<@q4U;j<<{B zuo_NXcS2zDorK%Hm^>Jm;w zU7{(dd&^ruA(g@`)Xj1dHG{J_6Mshk0rVydP}h8>&ArI$!kLe{H08E_iFF0)L{DQ9 zZbl9C3Nj$C^CJbF_=c%)g1AElk=H<7+cBueGY8et*S7w9)TQ`0*2M5cv%e|o1Z`~I z0X5*Rw!RPcBTvFR_59DbJ3d97;0x5v_6=&rp*_v>9f8{42sPkXEW%FM3O8W{p0N8r zN3M!<8M$gslU`q2se-8!SopZ20?m(URDC$J-pq`44P)l8jn)xN9Z|4R^ zVwc+-ryUMMJsq=A*L(qLMV>&d#0s0QL$7AEiGoh>9Ja)RsHfs9)J+)C+ngW?RiB3H zXc20lKAW#bop__o_n=nf5c(feY)JkYHpc6{S$`c6*~f7jU@U6HeNZouA=XsX05h-} z79f2%b8s9U!oFCSkGpUTY9)7J3?9Q3cp2xTmm8oIgZq2UtFpX5Z#gPiOM=TA_DQD{~RGQa__!D1V?S$qGmP~HPV@=6_|sX*<94ka|FlZIlKqE-(fDO(K&}Psa?@ zrF|6jcpviTT>sB0@Sjs{n0ZdeVmtE3F&YmduL9>2Ou<^i&AU7kwSPXU{YH$%(>Ncm z*?bPmrc1X0^`{p|e+qkW7HWoVN0<>0zV>iub)xeahCw6E zmsdElD9#krQ?LhhqOehB#)+uMZag-@2hgjI)=+4TuVHh%f?Dz#cXIu4I5KEw8HQpd z>fZPPb%}mOU9vx{p3&ys2ti%iC~I@n&DahDF?lrCUmcFJ4aTFM=PYc6ui#j`ggQ|l z)=wu+LLE08we)wPW?F{T(8bAk1iNADF?@euI_kJ%sD9ob!}@FFpW2Equ_pPq7=?eJ zMp}>ctd3Er6Sl!dn2Ndwitu*)2Ts5Qe?_fO0I$J%7=b#zwKd+_%R10H!g{wg3%xoppMp*_8`be#)IgS? z_OHRZxEXcAL#RvhA!=Y1r~!YCTA9nJng4|9=TB7sp*$K|iCU=R>rG(&)vys25!lu? z=!qIgUu=lUr~`8C{sPp%ictf22z7ip>O`wi?KfJtquM=hJ%~E*n-f_7pπipK(Y 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 N>#~pu_*(9N>c6EM4YdFO diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index 46700505ba..ab761254ae 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -1,5 +1,5 @@ # Translation of django.po to japanese. -# Copyright (C) 2005,2006 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2005,2006,2007 makoto tsuyuki # This file is distributed under the same license as the PACKAGE package. # makoto tsuyuki , 2005,2006,2007. # @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-15 23:43+0900\n" +"POT-Creation-Date: 2007-03-26 22:51+0900\n" "PO-Revision-Date: 2006-05-18 00:28+0900\n" "Last-Translator: makoto tsuyuki \n" "Language-Team: Japanese \n" @@ -92,70 +92,82 @@ msgid "Japanese" msgstr "日本語" #: conf/global_settings.py:58 +msgid "Kannada" +msgstr "カンナダ語" + +#: conf/global_settings.py:59 msgid "Latvian" msgstr "ラトビア語" -#: conf/global_settings.py:59 +#: conf/global_settings.py:60 msgid "Macedonian" msgstr "マケドニア語" -#: conf/global_settings.py:60 +#: conf/global_settings.py:61 msgid "Dutch" msgstr "オランダ語" -#: conf/global_settings.py:61 +#: conf/global_settings.py:62 msgid "Norwegian" msgstr "ノルウェー語" -#: conf/global_settings.py:62 +#: conf/global_settings.py:63 msgid "Polish" msgstr "ポーランド語" -#: conf/global_settings.py:63 +#: conf/global_settings.py:64 +msgid "Portugese" +msgstr "ポルトガル語" + +#: conf/global_settings.py:65 msgid "Brazilian" msgstr "ブラジル語" -#: conf/global_settings.py:64 +#: conf/global_settings.py:66 msgid "Romanian" msgstr "ルーマニア語" -#: conf/global_settings.py:65 +#: conf/global_settings.py:67 msgid "Russian" msgstr "ロシア語" -#: conf/global_settings.py:66 +#: conf/global_settings.py:68 msgid "Slovak" msgstr "スロバキア語" -#: conf/global_settings.py:67 +#: conf/global_settings.py:69 msgid "Slovenian" msgstr "スロヴェニア語" -#: conf/global_settings.py:68 +#: conf/global_settings.py:70 msgid "Serbian" msgstr "セルビア語" -#: conf/global_settings.py:69 +#: conf/global_settings.py:71 msgid "Swedish" msgstr "スウェーデン語" -#: conf/global_settings.py:70 +#: conf/global_settings.py:72 msgid "Tamil" msgstr "タミル語" -#: conf/global_settings.py:71 +#: conf/global_settings.py:73 +msgid "Telugu" +msgstr "テルグ語" + +#: conf/global_settings.py:74 msgid "Turkish" msgstr "トルコ語" -#: conf/global_settings.py:72 +#: conf/global_settings.py:75 msgid "Ukrainian" msgstr "ウクライナ語" -#: conf/global_settings.py:73 +#: conf/global_settings.py:76 msgid "Simplified Chinese" msgstr "簡体字中国語" -#: conf/global_settings.py:74 +#: conf/global_settings.py:77 msgid "Traditional Chinese" msgstr "繁体字中国語" @@ -194,17 +206,17 @@ msgid "This year" msgstr "今年" #: contrib/admin/filterspecs.py:143 newforms/widgets.py:170 -#: oldforms/__init__.py:572 +#: oldforms/__init__.py:577 msgid "Yes" msgstr "はい" #: contrib/admin/filterspecs.py:143 newforms/widgets.py:170 -#: oldforms/__init__.py:572 +#: oldforms/__init__.py:577 msgid "No" msgstr "いいえ" #: contrib/admin/filterspecs.py:150 newforms/widgets.py:170 -#: oldforms/__init__.py:572 +#: oldforms/__init__.py:577 msgid "Unknown" msgstr "不明" @@ -568,7 +580,8 @@ msgstr "確認のため、再度パスワードを入力してください。" #: contrib/admin/templates/admin/auth/user/change_password.html:28 #, python-format msgid "Enter a new password for the user %(username)s." -msgstr "%(username)sさんの新しいパスワードを入力してください。" +msgstr "" +"%(username)sさんの新しいパスワードを入力してください。" #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" @@ -602,7 +615,6 @@ msgstr "" msgid "Documentation for this page" msgstr "このページのドキュメント" -# TODO #: contrib/admin/templates/admin_doc/bookmarklets.html:20 msgid "" "Jumps you from any page to the documentation for the view that generates " @@ -769,7 +781,7 @@ msgstr "現在:" msgid "Change:" msgstr "変更:" -#: contrib/admin/templatetags/admin_list.py:238 +#: contrib/admin/templatetags/admin_list.py:247 msgid "All dates" msgstr "いつでも" @@ -850,13 +862,13 @@ msgstr "アプリケーション %r が見つかりません" #: contrib/admin/views/doc.py:171 #, python-format -msgid "Model %r not found in app %r" -msgstr "モデル %r が %r アプリケーションに見つかりません" +msgid "Model %(name)r not found in app %(label)r" +msgstr "モデル %(name)r が %(label)r アプリケーションに見つかりません" #: contrib/admin/views/doc.py:183 #, python-format -msgid "the related `%s.%s` object" -msgstr "`%s.%s` (関連オブジェクト)" +msgid "the related `%(label)s.%(type)s` object" +msgstr "`%(label)s.%(type)s` (関連オブジェクト)" #: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205 #: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224 @@ -865,8 +877,8 @@ msgstr "モデル :" #: contrib/admin/views/doc.py:214 #, python-format -msgid "related `%s.%s` objects" -msgstr "`%s.%s` (関連オブジェクト)" +msgid "related `%(label)s.%(name)s` objects" +msgstr "`%(label)s.%(name)s` (関連オブジェクト)" #: contrib/admin/views/doc.py:219 #, python-format @@ -984,7 +996,7 @@ msgid "Added %s." msgstr "%s を追加しました。" #: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337 -#: contrib/admin/views/main.py:339 db/models/manipulators.py:306 +#: contrib/admin/views/main.py:339 db/models/manipulators.py:308 msgid "and" msgstr "と" @@ -1018,41 +1030,41 @@ msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます msgid "Change %s" msgstr "%s を変更" -#: contrib/admin/views/main.py:473 +#: contrib/admin/views/main.py:476 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s" -#: contrib/admin/views/main.py:478 +#: contrib/admin/views/main.py:481 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "%(name)s に %(fieldname)s が一つ以上あります:" -#: contrib/admin/views/main.py:511 +#: contrib/admin/views/main.py:514 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" を削除しました。" -#: contrib/admin/views/main.py:514 +#: contrib/admin/views/main.py:517 msgid "Are you sure?" msgstr "よろしいですか？" -#: contrib/admin/views/main.py:536 +#: contrib/admin/views/main.py:539 #, python-format msgid "Change history: %s" msgstr "変更履歴: %s" -#: contrib/admin/views/main.py:570 +#: contrib/admin/views/main.py:573 #, python-format msgid "Select %s" msgstr "%s を選択" -#: contrib/admin/views/main.py:570 +#: contrib/admin/views/main.py:573 #, python-format msgid "Select %s to change" msgstr "変更する %s を選択" -#: contrib/admin/views/main.py:758 +#: contrib/admin/views/main.py:768 msgid "Database error" msgstr "データベースエラー" @@ -1147,8 +1159,8 @@ msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." msgstr "" -"'[algo]$[salt]$[hexdigest]'形式か、" -"パスワード変更フォームを使ってください。" +"'[algo]$[salt]$[hexdigest]'形式か、パスワード変更フォー" +"ムを使ってください。" #: contrib/auth/models.py:95 msgid "staff status" @@ -1517,15 +1529,15 @@ msgstr "コメント ID が不正です" msgid "No voting for yourself" msgstr "自分には投票できません。" -#: contrib/contenttypes/models.py:26 +#: contrib/contenttypes/models.py:36 msgid "python model class name" msgstr "Python モデルクラス名" -#: contrib/contenttypes/models.py:29 +#: contrib/contenttypes/models.py:39 msgid "content type" msgstr "コンテンツタイプ" -#: contrib/contenttypes/models.py:30 +#: contrib/contenttypes/models.py:40 msgid "content types" msgstr "コンテンツタイプ" @@ -1575,7 +1587,281 @@ msgstr "フラットページ" msgid "flat pages" msgstr "フラットページ" -#: contrib/localflavor/usa/forms.py:13 +#: contrib/humanize/templatetags/humanize.py:17 +msgid "th" +msgstr "番目" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "st" +msgstr "番目" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "nd" +msgstr "番目" + +#: contrib/humanize/templatetags/humanize.py:17 +msgid "rd" +msgstr "番目" + +#: contrib/humanize/templatetags/humanize.py:47 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f 百万" +msgstr[1] "%(value).1f 百万" + +#: contrib/humanize/templatetags/humanize.py:50 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f 十億" +msgstr[1] "%(value).1f 十億" + +#: contrib/humanize/templatetags/humanize.py:53 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f 兆" +msgstr[1] "%(value).1f 兆" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "one" +msgstr "1" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "two" +msgstr "2" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "three" +msgstr "3" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "four" +msgstr "4" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "five" +msgstr "5" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "six" +msgstr "6" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "seven" +msgstr "7" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "eight" +msgstr "8" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "nine" +msgstr "9" + +#: contrib/localflavor/fr/forms.py:17 +#, fuzzy +msgid "Enter a zip code in the format XXXXX." +msgstr "XXXXXの形式でZipコードを入力してください。" + +#: contrib/localflavor/jp/forms.py:21 +msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." +msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。" + +#: contrib/localflavor/jp/jp_prefectures.py:4 +msgid "Hokkaido" +msgstr "北海道" + +#: contrib/localflavor/jp/jp_prefectures.py:5 +msgid "Aomori" +msgstr "青森県" + +#: contrib/localflavor/jp/jp_prefectures.py:6 +msgid "Iwate" +msgstr "岩手県" + +#: contrib/localflavor/jp/jp_prefectures.py:7 +msgid "Miyagi" +msgstr "宮城県" + +#: contrib/localflavor/jp/jp_prefectures.py:8 +msgid "Akita" +msgstr "秋田県" + +#: contrib/localflavor/jp/jp_prefectures.py:9 +msgid "Yamagata" +msgstr "山形県" + +#: contrib/localflavor/jp/jp_prefectures.py:10 +msgid "Fukushima" +msgstr "福島県" + +#: contrib/localflavor/jp/jp_prefectures.py:11 +msgid "Ibaraki" +msgstr "茨城県" + +#: contrib/localflavor/jp/jp_prefectures.py:12 +msgid "Tochigi" +msgstr "栃木県" + +#: contrib/localflavor/jp/jp_prefectures.py:13 +msgid "Gunma" +msgstr "群馬県" + +#: contrib/localflavor/jp/jp_prefectures.py:14 +msgid "Saitama" +msgstr "埼玉県" + +#: contrib/localflavor/jp/jp_prefectures.py:15 +msgid "Chiba" +msgstr "千葉県" + +#: contrib/localflavor/jp/jp_prefectures.py:16 +msgid "Tokyo" +msgstr "東京都" + +#: contrib/localflavor/jp/jp_prefectures.py:17 +msgid "Kanagawa" +msgstr "神奈川県" + +#: contrib/localflavor/jp/jp_prefectures.py:18 +msgid "Yamanashi" +msgstr "山梨県" + +#: contrib/localflavor/jp/jp_prefectures.py:19 +msgid "Nagano" +msgstr "長野県" + +#: contrib/localflavor/jp/jp_prefectures.py:20 +msgid "Niigata" +msgstr "新潟県" + +#: contrib/localflavor/jp/jp_prefectures.py:21 +msgid "Toyama" +msgstr "富山県" + +#: contrib/localflavor/jp/jp_prefectures.py:22 +msgid "Ishikawa" +msgstr "石川県" + +#: contrib/localflavor/jp/jp_prefectures.py:23 +msgid "Fukui" +msgstr "福井県" + +#: contrib/localflavor/jp/jp_prefectures.py:24 +msgid "Gifu" +msgstr "岐阜県" + +#: contrib/localflavor/jp/jp_prefectures.py:25 +msgid "Shizuoka" +msgstr "静岡県" + +#: contrib/localflavor/jp/jp_prefectures.py:26 +msgid "Aichi" +msgstr "愛知県" + +#: contrib/localflavor/jp/jp_prefectures.py:27 +msgid "Mie" +msgstr "三重県" + +#: contrib/localflavor/jp/jp_prefectures.py:28 +msgid "Shiga" +msgstr "滋賀県" + +#: contrib/localflavor/jp/jp_prefectures.py:29 +msgid "Kyoto" +msgstr "京都府" + +#: contrib/localflavor/jp/jp_prefectures.py:30 +msgid "Osaka" +msgstr "大阪府" + +#: contrib/localflavor/jp/jp_prefectures.py:31 +msgid "Hyogo" +msgstr "兵庫県" + +#: contrib/localflavor/jp/jp_prefectures.py:32 +msgid "Nara" +msgstr "奈良県" + +#: contrib/localflavor/jp/jp_prefectures.py:33 +msgid "Wakayama" +msgstr "和歌山県" + +#: contrib/localflavor/jp/jp_prefectures.py:34 +msgid "Tottori" +msgstr "鳥取県" + +#: contrib/localflavor/jp/jp_prefectures.py:35 +msgid "Shimane" +msgstr "島根県" + +#: contrib/localflavor/jp/jp_prefectures.py:36 +msgid "Okayama" +msgstr "岡山県" + +#: contrib/localflavor/jp/jp_prefectures.py:37 +msgid "Hiroshima" +msgstr "広島県" + +#: contrib/localflavor/jp/jp_prefectures.py:38 +msgid "Yamaguchi" +msgstr "山口県" + +#: contrib/localflavor/jp/jp_prefectures.py:39 +msgid "Tokushima" +msgstr "徳島県" + +#: contrib/localflavor/jp/jp_prefectures.py:40 +msgid "Kagawa" +msgstr "香川県" + +#: contrib/localflavor/jp/jp_prefectures.py:41 +msgid "Ehime" +msgstr "愛媛県" + +#: contrib/localflavor/jp/jp_prefectures.py:42 +msgid "Kochi" +msgstr "高知県" + +#: contrib/localflavor/jp/jp_prefectures.py:43 +msgid "Fukuoka" +msgstr "福岡県" + +#: contrib/localflavor/jp/jp_prefectures.py:44 +msgid "Saga" +msgstr "佐賀県" + +#: contrib/localflavor/jp/jp_prefectures.py:45 +msgid "Nagasaki" +msgstr "長崎県" + +#: contrib/localflavor/jp/jp_prefectures.py:46 +msgid "Kumamoto" +msgstr "熊本県" + +#: contrib/localflavor/jp/jp_prefectures.py:47 +msgid "Oita" +msgstr "大分県" + +#: contrib/localflavor/jp/jp_prefectures.py:48 +msgid "Miyazaki" +msgstr "宮崎県" + +#: contrib/localflavor/jp/jp_prefectures.py:49 +msgid "Kagoshima" +msgstr "鹿児島県" + +#: contrib/localflavor/jp/jp_prefectures.py:50 +msgid "Okinawa" +msgstr "沖縄県" + +#: contrib/localflavor/uk/forms.py:18 +msgid "Enter a postcode. A space is required between the two postcode parts." +msgstr "ポスタルコードを入力してください。コードとコードの間は半角のスペースで区切ってください。" + +#: contrib/localflavor/usa/forms.py:17 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。" @@ -1607,23 +1893,23 @@ msgstr "リダイレクト" msgid "redirects" msgstr "リダイレクト" -#: contrib/sessions/models.py:51 +#: contrib/sessions/models.py:68 msgid "session key" msgstr "セッションキー" -#: contrib/sessions/models.py:52 +#: contrib/sessions/models.py:69 msgid "session data" msgstr "セッションデータ" -#: contrib/sessions/models.py:53 +#: contrib/sessions/models.py:70 msgid "expire date" msgstr "有効期限" -#: contrib/sessions/models.py:57 +#: contrib/sessions/models.py:74 msgid "session" msgstr "セッション" -#: contrib/sessions/models.py:58 +#: contrib/sessions/models.py:75 msgid "sessions" msgstr "セッション" @@ -1704,31 +1990,31 @@ msgstr "1900年以降を指定してください。" #: core/validators.py:143 #, python-format -msgid "Invalid date: %s." +msgid "Invalid date: %s" msgstr "無効な日付: %s" -#: core/validators.py:147 db/models/fields/__init__.py:454 +#: core/validators.py:148 db/models/fields/__init__.py:457 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "YYYY-MM-DD形式で日付を入力してください。" -#: core/validators.py:152 +#: core/validators.py:153 msgid "Enter a valid time in HH:MM format." msgstr "HH:MM形式で時刻を入力してください。" -#: core/validators.py:156 db/models/fields/__init__.py:521 +#: core/validators.py:157 db/models/fields/__init__.py:526 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "YYYY-MM-DD HH:MM形式で日時を入力してください。" -#: core/validators.py:161 newforms/fields.py:269 +#: core/validators.py:162 newforms/fields.py:269 msgid "Enter a valid e-mail address." msgstr "有効なメールアドレスを入力してください。" -#: core/validators.py:173 core/validators.py:442 oldforms/__init__.py:667 +#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "ファイルが取得できませんでした。formのencoding typeを確認してください。" -#: core/validators.py:177 +#: core/validators.py:178 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -1736,26 +2022,26 @@ msgstr "" "画像をアップロードしてください。アップロードした画像は画像でないか、または壊" "れています。" -#: core/validators.py:184 +#: core/validators.py:185 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL ( %s ) は画像ではありません。" -#: core/validators.py:188 +#: core/validators.py:189 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。\"%s\" は無効です。" -#: core/validators.py:196 +#: core/validators.py:197 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL ( %s ) は QuickTime ビデオではありません。" -#: core/validators.py:200 +#: core/validators.py:201 msgid "A valid URL is required." msgstr "正しい URL を入力してください。" -#: core/validators.py:214 +#: core/validators.py:215 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -1764,86 +2050,86 @@ msgstr "" "有効な HTML を入力してください。エラー:\n" "%s" -#: core/validators.py:221 +#: core/validators.py:222 #, python-format msgid "Badly formed XML: %s" msgstr "不正な XML です: %s" -#: core/validators.py:238 +#: core/validators.py:239 #, python-format msgid "Invalid URL: %s" msgstr "無効なURL: %s" -#: core/validators.py:243 core/validators.py:245 +#: core/validators.py:244 core/validators.py:246 #, python-format msgid "The URL %s is a broken link." msgstr "URL ( %s ) はリンクが壊れています。" -#: core/validators.py:251 +#: core/validators.py:252 msgid "Enter a valid U.S. state abbreviation." msgstr "正しい米州略称を入力してください。" -#: core/validators.py:265 +#: core/validators.py:266 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "言葉使いに気を付けて！ %s という言葉は使えません。" msgstr[1] "言葉使いに気を付けて！ %s という言葉は使えません。" -#: core/validators.py:272 +#: core/validators.py:273 #, python-format msgid "This field must match the '%s' field." msgstr "このフィールドは '%s' フィールドと一致せねばなりません。" -#: core/validators.py:291 +#: core/validators.py:292 msgid "Please enter something for at least one field." msgstr "少なくとも一つのフィールドに何か入力してください。" -#: core/validators.py:300 core/validators.py:311 +#: core/validators.py:301 core/validators.py:312 msgid "Please enter both fields or leave them both empty." msgstr "両方のフィールドに入力するか、両方とも未入力にしてください。" -#: core/validators.py:318 +#: core/validators.py:320 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" "%(field)s を %(value)s にするのなら、このフィールドに必ず入力してください。" -#: core/validators.py:330 +#: core/validators.py:333 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" "%(field)s を %(value)s にしないのなら、このフィールドに必ず入力してください。" -#: core/validators.py:349 +#: core/validators.py:352 msgid "Duplicate values are not allowed." msgstr "重複する値は認められません。" -#: core/validators.py:364 +#: core/validators.py:367 #, python-format -msgid "This value must be between %s and %s." -msgstr "この値は %s から %s の間でなければなりません。" +msgid "This value must be between %(lower)s and %(upper)s." +msgstr "この値は %(lower)s から %(upper)s の間でなければなりません。" -#: core/validators.py:366 +#: core/validators.py:369 #, python-format msgid "This value must be at least %s." msgstr "この値は %s 以上でなければなりません。" -#: core/validators.py:368 +#: core/validators.py:371 #, python-format msgid "This value must be no more than %s." msgstr "この値は %s より小さくなければなりません。" -#: core/validators.py:404 +#: core/validators.py:407 #, python-format msgid "This value must be a power of %s." msgstr "この値は %s の累乗でなければなりません。" -#: core/validators.py:415 +#: core/validators.py:418 msgid "Please enter a valid decimal number." msgstr "有効な 10 進数を入力してください。" -#: core/validators.py:419 +#: core/validators.py:422 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -1851,7 +2137,7 @@ msgid_plural "" msgstr[0] "全体で %s 文字以下の数字を入力してください。" msgstr[1] "全体で %s 文字以下の数字を入力してください。" -#: core/validators.py:422 +#: core/validators.py:425 #, python-format msgid "" "Please enter a valid decimal number with a whole part of at most %s digit." @@ -1860,7 +2146,7 @@ msgid_plural "" msgstr[0] "整数部は %s 文字以下の数字を入力してください。" msgstr[1] "整数部は %s 文字以下の数字を入力してください。" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -1868,37 +2154,37 @@ msgid_plural "" msgstr[0] "小数部は %s 文字以下の数字を入力してください。" msgstr[1] "小数部は %s 文字以下の数字を入力してください。" -#: core/validators.py:435 +#: core/validators.py:438 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "アップロードするファイルの大きさは %s バイト以上にしてください。" -#: core/validators.py:436 +#: core/validators.py:439 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "アップロードするファイルの大きさは %s 最大バイトまでです。" -#: core/validators.py:453 +#: core/validators.py:456 msgid "The format for this field is wrong." msgstr "フィールドの形式が正しくありません。" -#: core/validators.py:468 +#: core/validators.py:471 msgid "This field is invalid." msgstr "このフィールドは無効です。" -#: core/validators.py:504 +#: core/validators.py:507 #, python-format msgid "Could not retrieve anything from %s." msgstr "%s から何も検索できませんでした。" -#: core/validators.py:507 +#: core/validators.py:510 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "URL %(url)s は無効なコンテンツタイプヘッダ '%(contenttype)s' を返しました。" -#: core/validators.py:540 +#: core/validators.py:543 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -1907,7 +2193,7 @@ msgstr "" "%(line)s 行目から始まる %(tag)s タグを閉じてください (\"%(start)s\" で始まる" "行です)。" -#: core/validators.py:544 +#: core/validators.py:547 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -1916,7 +2202,7 @@ msgstr "" "%(line)s 行目から始まるテキストはこのコンテキストでは使えません。 (\"%(start)" "s\" で始まる行です)。" -#: core/validators.py:549 +#: core/validators.py:552 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -1925,7 +2211,7 @@ msgstr "" "%(line)s 行目の \"%(attr)s\" は無効なアトリビュートです (\"%(start)s\" で始ま" "る行です)。" -#: core/validators.py:554 +#: core/validators.py:557 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -1934,7 +2220,7 @@ msgstr "" "%(line)s 行目の \"<%(tag)s>\" は無効なタグです( \"%(start)s\" で始まる行で" "す)。" -#: core/validators.py:558 +#: core/validators.py:561 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1943,7 +2229,7 @@ msgstr "" "%(line)s 行目のタグは必須アトリビュートが未入力です( \"%(start)s\" で始まる行" "です)。" -#: core/validators.py:563 +#: core/validators.py:566 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1952,7 +2238,7 @@ msgstr "" "%(line)s 行目の \"%(attr)s\" アトリビュートの値が正しくありません (\"%(start)" "s\" で始まる行です) 。" -#: db/models/manipulators.py:305 +#: db/models/manipulators.py:307 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" @@ -1963,29 +2249,33 @@ msgstr "" msgid "%(optname)s with this %(fieldname)s already exists." msgstr "%(fieldname)s に %(optname)s は既に存在します。" -#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273 -#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616 -#: newforms/fields.py:78 newforms/fields.py:373 newforms/fields.py:449 -#: newforms/fields.py:460 oldforms/__init__.py:352 +#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274 +#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621 +#: newforms/fields.py:78 newforms/fields.py:374 newforms/fields.py:450 +#: newforms/fields.py:461 newforms/models.py:177 oldforms/__init__.py:357 msgid "This field is required." msgstr "このフィールドは必須です。" -#: db/models/fields/__init__.py:366 +#: db/models/fields/__init__.py:367 msgid "This value must be an integer." msgstr "値は整数でなければなりません。" -#: db/models/fields/__init__.py:401 +#: db/models/fields/__init__.py:402 msgid "This value must be either True or False." msgstr "値は真: True または偽: False でなければなりません。" -#: db/models/fields/__init__.py:422 +#: db/models/fields/__init__.py:423 msgid "This field cannot be null." msgstr "このフィールドには NULL を指定できません。" -#: db/models/fields/__init__.py:625 +#: db/models/fields/__init__.py:630 msgid "Enter a valid filename." msgstr "正しいファイル名を入力してください。" +#: db/models/fields/__init__.py:751 +msgid "This value must be either None, True or False." +msgstr "値は、空: None、真: True または偽: False でなければなりません。" + #: db/models/fields/related.py:53 #, python-format msgid "Please enter a valid %s." @@ -2054,55 +2344,79 @@ msgstr "URLを正しく入力してください。" msgid "This URL appears to be a broken link." msgstr "このURLはリンクが壊れています。" -#: newforms/fields.py:359 +#: newforms/fields.py:360 newforms/models.py:164 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "正しく選択してください。選択したものは候補にありません。" -#: newforms/fields.py:377 newforms/fields.py:453 +#: newforms/fields.py:378 newforms/fields.py:454 newforms/models.py:181 msgid "Enter a list of values." msgstr "リストを入力してください。" -#: newforms/fields.py:386 +#: newforms/fields.py:387 newforms/models.py:187 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "正しく選択してください。 %s は候補にありません。" -#: oldforms/__init__.py:387 +#: oldforms/__init__.py:392 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "%s 字以下で入力してください。" msgstr[1] "%s 字以下で入力してください。" -#: oldforms/__init__.py:392 +#: oldforms/__init__.py:397 msgid "Line breaks are not allowed here." msgstr "改行はできません。" -#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605 +#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "正しく選択してください。; '%(data)s' は %(choices)s にありません。" -#: oldforms/__init__.py:669 +#: oldforms/__init__.py:674 msgid "The submitted file is empty." msgstr "入力されたファイルは空です。" -#: oldforms/__init__.py:725 +#: oldforms/__init__.py:730 msgid "Enter a whole number between -32,768 and 32,767." msgstr "-32,768 から 32,767 までの整数を入力してください。" -#: oldforms/__init__.py:735 +#: oldforms/__init__.py:740 msgid "Enter a positive number." msgstr "正の数を入力してください。" -#: oldforms/__init__.py:745 +#: oldforms/__init__.py:750 msgid "Enter a whole number between 0 and 32,767." msgstr "0 から 32,767 までの整数を入力してください。" -#: template/defaultfilters.py:436 +#: template/defaultfilters.py:491 msgid "yes,no,maybe" msgstr "はい,いいえ,たぶん" +#: utils/dateformat.py:40 +msgid "p.m." +msgstr "p.m." + +#: utils/dateformat.py:41 +msgid "a.m." +msgstr "a.m." + +#: utils/dateformat.py:46 +msgid "PM" +msgstr "PM" + +#: utils/dateformat.py:47 +msgid "AM" +msgstr "AM" + +#: utils/dateformat.py:95 +msgid "midnight" +msgstr "0時" + +#: utils/dateformat.py:97 +msgid "noon" +msgstr "12時" + #: utils/dates.py:6 msgid "Monday" msgstr "月曜日" diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo index bddecacb108c1580bc2d408c658ad30deadb7451..45a4ff9f67b56a15720d178ff2b181720754aff9 100644 GIT binary patch delta 132 zcmX@YbC73)3u7n?0|Ub{Rt5$jVpt6%*nsp#D7^znO9T1)fwTmWz6}-s0;COq{NGT% z4p0+FpD~oS+B}odl8M(`*T7iU$V|b=*viCk^L^&yj9doKW;QVx8Ue}4n^`9U0Nhm< AbpQYW delta 135 zcmX@ebA)Gu3u7o70|Ub{Rt5$Ty%tJufzrEyv@}rs5RjGt()Xa^-+{CNkpB#KXCjtOY Cq8pL` diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.po b/django/conf/locale/ja/LC_MESSAGES/djangojs.po index 0ec1cadcf5..d35b88aa73 100644 --- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po @@ -1,14 +1,12 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Japanese translation for js. +# Copyright (C) 2005 makoto tsuyuki # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy +# makoto tsuyuki , 2005. msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-06 00:30+0900\n" +"POT-Creation-Date: 2007-03-26 23:41+0900\n" "PO-Revision-Date: 2006-05-08 13:39+0900\n" "Last-Translator: makoto tsuyuki \n" "Language-Team: Japanese \n" @@ -85,7 +83,7 @@ msgstr "時間を選択" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 msgid "Midnight" -msgstr "夜中" +msgstr "0時" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 msgid "6 a.m." @@ -93,7 +91,7 @@ msgstr "午前 6 時" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 msgid "Noon" -msgstr "正午" +msgstr "12時" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo index 29360bb6604884c14eea84441460f6e6b4416bac..318ce767795b33a86c1bac135b59c04e8d80d614 100644 GIT binary patch delta 8297 zcmZwM34D!L{>Sl?kVKRqAtDLcghYg(5_=N+9>gA^v5T!5YlSOPgjS0y%Gj#Z6h-1z z%YWKZw1!p}X0$b>ceI^WM@u`c>8AaEzV|ui<-a_y{_gvn^PGF0bAHcxo}0Gk*85*w z@9(-6TD9D8#5b4-VKeZhJCOH4#76K8P)%7RM#6AfxlxQMl>>} z3dUd!OhC1#p~lO=U}Ib+i-J1#bsEe-jG{gg)p0J?#w8elPof6eh&6F5hT%S}im%%9 zr!a{6Ipjj-ecS#wTfdH>T;JUE6_`2JqGM=`^Tl{18KxP|#dOpP51=M?2J7Gj48c#Z zF@A&9F)Y@Za3j=&8>9NApcd2t!(0^lQP2#>p;kBzwUXKB%K&PCC8!BKhD!N5)CBfo z93De`{|f3tUetnaq0aw~+#M4~B_1=;r4)^)FcJ$VsDY!9xtU~afrC(c!G#*%W82STHR?Yh*KryDWT&AH>amDK zr8os6u_J0i!?6KQ!eDfvo`%)da@0h2p)zdko+YvB8+dwdNwv2Rfm{@Jz% zvuc+v5KTdwB@H!T26n=1^sUsMUuo-WQ4=Uftz;|eRy~9KWB$ZPKl}>yzDRHBI0bcn zGiuYHZAt#saD#>p7(wqG%tc-aW;begpT(8<8Pe5E=k4+!Zp9<`9%=%mt)0!b1NFi> ziu_|P@R5$%kvyp;1FPfMHsrq#g{d@X;3LS-fVqxrP~*o{x?nTxiPLZ(R-iKVJ1Vuo zZJkVnqB2w8+7QF2C!jK!Va-I{%3dxC8mQ2on2SnjF>2rvdwvbF56wo@L{Fmb@omh& zyEqx!vP_M)4fXxKs0kgm^`odg@)}k_*A)siDO^Kc;3n#wAHk?feL8l-TI2xJ%2+IF6Zf$W!$9f<)~Toq&qkgSmnpIhE3B(Agbr&_Dcgox$sW|e2T>_K zZrd-Q2E2?~$Q4v(zC?}lgFRohy)#}l)Bs0ppNmRq-=7O)+4y?t0+&;LslG|=m|!&|og0cxPXTR%r-+${HI*@-2SeKopls89RxHW3Volz^uwIR@UFPkHSdm z`S$!G+wMY5@G;bQPhxG{f?D8y)b%_a$-fH6ZO0SV^Qa5`6{q>}K0sxle`jO5;%MxT z+fh%;SEz|p<7Lqp6HpWAjk+a6P;b1+_Iw%gE;9#R6dF;uhT1%LF#&64I&Z>Or~yi_ z8J43`cM^5aFC+h$8+`CCGRaxah4WG8r=t2VMqOt;s=WgB0&<+saGNsaG7fqGy%Wv z&bzw}>I;2Qw_q$rV4<}Xm5FWG0?*aME7v!tDJW&*xJr~dpjLbw6Y(M{#Xn*^6KpronQ&f?b5G}>`maMRWFIPn zC#)B3`{y{3_Fqu_A0lloePI!Wm+>jAg}nwl6B&W}4Jg7GT!+tL1-8QBL!1?rA-CU@ zqxQgus0;YzI_D!XoO)9X#V)pea4v~fO7dwKhtqAxw@{n$x~<0ybtaIGcW58(-WAf% z#SJxw$ap$_k7F@~JCcB_QQPw%2IIS^OMiq~;!V^Pe??8X-bnr;#4fl552Ef(3U_=m z9>C=oI@(!E`Djizq2UD@l%q?i?RXnoVoV-SJ?5b5&)WJ$RR6>=&Yz)OQ4^VfsaTBB zxF27|v-mKsV0G>A4w4nqGN0)kqEO0SoQbVTpiVr4!`LO?qrtuf&JT6J@w~QZdIY2J z0;b^&WG9=*2~LJ4qUsA!{a#0HlB=kR{tI=_YPi@-T`4rc_BaML;3iZ`&mvpi+(zbL zI!)r)!5ydpg2}61N#UpqwMFf!!5ELFsB!k%`n%Yg`ggYON}S?6AH7jCn}u<>3d?Yx zZEro*Ip5DZ5w!=FpjNgP**<1BYUMv;1$Lk2yjgxgWv(Z)=Mgl!u(P(uEedUENS$uX zA8-Pm#osUs-<;umF^KzfllpknUCCjmDHDg$%`J+Y%`XM@L)_>#_-{_a39W?%P$9p&vQ242dLElh{0HQ zzVmz82y0VM#^%@o)o%*c!%|G)`eq9SrTh)lE%*YJTC>2}#kH-e$dhLJBDc>xi%l?i zp|dyAFn~;KK#j9`k#oUH45fYn)!&OG%>+G4{&k`G6g1P7s1!YoJTc}DvQbU$V*Ygm zU&be~sMz^E^=2~X=;icP`i3OcES}HgQrjfUdNVr3zINrne#K(8+E=2mHK72zG)d9V`fZ@xX3wE&fvJS;q&KIC=#c~$~ z4Y<#G8WX8s#Tcwo>I{^Cfz;Db6Ux989DurYi?BbgL1pv<)VK+cIp6P$%4}cMxIt@wG-bz%l=Ywp!78pp` zHH426ds3@kP3$Ck(cT_EBXsO0vWV%#ZK4fv@8Ay#Q=k6I;z#!y@dh!27)I#5(VNim z457`+;W8(E^1@+&7($01?sba3=RA?J-t`BFv7GZKexckQwK;oWb38@p2p~ETdIDY` zGB}@tyqA2(i+o=3mB@c5PO_;@4b-uj_}o`=Hp;VxnGBJPD)m z2|Px$BkEFbjQ=EFC8`lEX}gIXi2~x@v5Z1P;xuuD_`BBMgw8Xm{O{vD4b3>$nizcF zN&VY{jzQQItJ`{rua(JDZ%l;R`k$@UXnUISB3n<=_muxTL>bY5hS{j2$ieqHn$O9$ z{KLh@{vo=e_!vs1C0-_Uj39c_rsFB1Ic5Dd zJc8(L+pp8!hjL#chjJX&B*KXO)VmYe#D5VwN{MU4XwLVzAztuAig7XJm_F9UEXWD5H-OFB8>??L=q#^u<`>A>u1yF7b_e*QKB% z-NEgk?j8MTo7STRmCZe({oJ1}jc&P1qb7MP_Hz+ks^XZhu!k9W zEB0``qjd0AEcaII@>Z@%c4y~?>w8V~J-${>BmJE3{GZ;jp7T9#a8b{Ty$4n0+5rP5 zS4k|2b!RQ^k{)`+zbqWoT#5{-J^XaRG~xSRNhl|4iVORT1vmOREOmo6sw(l7j6tV`JT!W1{|Z#+hpKvhDv3t#ZGQ delta 8324 zcmb8zd0drM9>?(mB8w;{B8H+~Wl>ylLlG5JToCsSR9sLIaRC>E9F;3rp_N))t*p$- zaLS~xKz&Pd!K_duX)Ws^SoZa`~IEtoaa2}oafw! z<;+9=Cm!;5e;OXJ&2Y@}GbS1%LX9~~-Y`Qly>Rl-r7Xuq7w9pc=l2ci1F%=o83#THBU~;h-m!M{N4mGfw*aQPy#)M%c z#$p^cz>%l{Pe$E%I;!0q)P$Cy23~<7Zjwhxbivc8ne0a23ZObTgc{JVQA>UdHGnhN z7B8W$Z$d#gYL1#vJnDQBA3QaajqR`mHPP+p&L(+=L^HgB@z|7Bx}YC6$81c*rPvXl zK@Fq^)&3l6Z-m4c(;Wxk5-dVZ=nQH?=ddq+jS(0d%k$S}NM`*sq9Ldy%tQ@n3YK6I zY9+p~euL`pTU-7K{V4~;IV%x_YTpRcFv6B6qwbS~={PTr^$#G~ON9oqA2ooNZTW2+ zPWe65k~U+y>L3oaiMpU3MVhUjfa-6WEzd#?G~d=Q#X*!;+VV?o5?0;3hJpAg>T7cz zb)ze&0o}kASiik9!&O+1vK#evT#sGwY1GQSkAe6l>iUbQZ_RboN(FUrCg5&BqOW=@ z?1a5gn`ky_MT$@}T7|(_X3LcrMELqoRaL8(J>4)kQS&F?0{+58?&$keJg`5%3op+ z?r(ybwnm(S>v17g;zgW`C7qoPKSmAgOVrGNKn?5`s^c)$Uo&fu+7pSkJQ&qJ)0QWq zRx}4A^!?8z(acIP6dy#*@JZB*VmJ21SFs&l#rhb@sMRhSb%S`+8?-An#F3~?nuQwJ zLJY$dI0h@wtp*>E=tiHTHqA9u$G5OQhIDgoFbs8mj4e+_4P*vtMsrb*YyonqS&x}` z5cU4}+1ibQ&d*L{{k8kI*otcGN4XZqVoTm8yerHi)GptG_u@XJFVnLJ8y4r{L3|7~ zfJ}CtHr;&G3v4ZN%51|VJdS*$&8?oSe*=;@dda{9&$KbBqaLUR{ZSpIqdLy8=O-Zh z(&V59x&ig9U&cOo6zAhlsQ%_rsp|_-11h!UwWz(~zL!KVl4r3I?nd3<5b9?@Eo$k1 z#v#~}otT2NP%HNY#^Y|((!YmVvA?4>bCYDpRv1V*!J3HN*KPWcG~q;wQ(;D1$72}v zlTj-&4>gm;sE${nmbBc~Z$nMwDbz%sMXgK~s-M^G`5IJzr?7#({~wWPsXjwp@C~Yi z8>l4Top`vfMVTv_6cw z(GD!|<9&dGDM#=!7=>A=Z^?700lbB=cm{Q2|5WEuG(^4VT&VMdQF|ocP12gA)K)x# zF_d@XSo}TeS++=Xe)Z~#TCu69XI+FeF%`(W$-ITS@eio;euJF$5vcogMAc`Y-aGCb z65gi9jZDr|BZD^=Q4PB=-8f9coj4zLK5&RLqoJq)KKh3DfdR-4-p(kc?)J?Eoy1|4s&ia0uv~& zL=9-C^)P00fAg-bh#k(iz>gn5$lKEl8^QC&wKy6(WU%a5f-~_H>W1A$G8nAHDfl|x zg%O$TE8K)yxezvtCbSndp(FSN_ctd=G_pn9r6rc58tlM0Jc3%{)7XvyMvrmYr?Nrx zOedq-7o+;wgj&H})+4t51kR)WEUJAv%jVVvGe};-71$U%jduo;g3*+-uniXD^SBke zW4{T`j20u?!mL8=f!9zsIB(DYjC!=86P?V5Kn$SR$>KSM2&FSG)~8pY?$V()dAGDtif)06Pdp0G~Fqeq00MFYwMTe z{5skiHIP*7g4r02_u}ig3zuRpv+Ii=BCBFTXEMC~B(vC)OE8QD)QL4XncZ>gM{{U+X;cOw^;uNM=1~I6;lZ@JAc{mD7 zP%HX2s^7+UJJ%9?{Vr!S@W!A z)<>;X))Urqj&5_4qz4^E-0O5W9CgF{(S=W;X8wk?#-9Hx_NM-Vt#4Q9yhpmBu3v(h z$U4-3A4Kg1FDBq=jMn!*aD!b+)O#QqwKT)A59XsT*ol64kf=NO#+dL0*5`VzcO zZXc~~XFSUP$loJ(5%syhxr2*e#|y+bqV8Bu@;=d)7-}n<(^lW@j+Fmk>w+j>AUfs;ia0{lBVuelshMu`85m}BwvOrT;%AF8lNbG)VbpR22}#-cWsj!@z((T9uKFXjtkD7lVl z)?-f5_dn5VHW$IfF5)R7kkFxTTA;nI7kLYN z`SUmikD`t(M6xgA{Xo5r*7$3jN_ejxs2>+9G-@~JIs#_ojf+d$snBb&HR zv?Su_dlAzp>-DYUL88W&Ils7c z);K2Fj=EtMQ9^@QTxuI8k{>2-Pvnr-;#J~pLdP=>zP~n=cBhSwWc)LRV+yV$4iI(6 zOzMBBbyz{oJ|dEeS8yzj!VajT2QiaaM7&Dq_{_ogd7RHjh=#OJ(zQfCLVrIrB1RMc zePmLXK&;kt7(+zcM(>bMC7*yzZQVb~XAs?pwSW0)UEwM& zauqMgbLGxkQc&nxnwy{JnqRcsmvC-DZn0~5-qPiHEAk49UAe9m1%>&G^IS!97Us<@ z?&=*7|6b7O1x2N5ndh2YR9H;2F2$>s(qG{`*UG|zWh?Vs8R`E=m%&|!HTL8TxaPOr zGkIWJK1&C-;&adM-x?ViL57Y1?eH?>uJ7>S|kcA>WFu*O&QhRdmb!PjP8ZPm+l zEvw6Y{cZ4Eo*x;YM&8_sp&H(jNdxLv?W?VN#=Cb?kiX}TQ@&vwZ)II!IG!z8F3+E) z?IR1!Y3+G>dY&&ELxagVQ#FeNGmg~rU+3~%p4i3vcysvxeAvXU5>q))TV0{`i7Jieob!2LMx?i(R1@^Byz5Q%n6%oh9y#HuS#yDkSJpQ1 z58KWX(*=+Aeyzzz?s@)g|GlhQCmQ%x&RKBXX^*F@BF4L}BD((n7{sZ{J44m9ZcwKx RJ8;+Ql?k_pmbPKXzW~u&iwgh% diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po index 0057bf97de..b2e450c0a7 100644 --- a/django/conf/locale/te/LC_MESSAGES/django.po +++ b/django/conf/locale/te/LC_MESSAGES/django.po @@ -163,11 +163,11 @@ msgstr "ఫ్లాగ్ తేది " #: contrib/comments/models.py:268 msgid "user flag" -msgstr "యూఙర్ ఫ్లాగ్" +msgstr "యూజర్ ఫ్లాగ్" #: contrib/comments/models.py:269 msgid "user flags" -msgstr "యూఙర్ ఫ్లాగులు" +msgstr "యూజర్ ఫ్లాగులు" #: contrib/comments/models.py:273 #, python-format @@ -193,7 +193,7 @@ msgstr "మొదరేటర్ తీసివేసిన %r" #: contrib/comments/views/karma.py:19 msgid "Anonymous users cannot vote" -msgstr "అపరిచిత యూఙరులు వోటు వేయలేరు" +msgstr "అపరిచిత యూజర్లు వోటు వేయలేరు" #: contrib/comments/views/karma.py:23 msgid "Invalid comment ID" @@ -220,12 +220,12 @@ msgid_plural "" "\n" "%(text)s" msgstr[0] "" -"ఈ వ్యాఖ్యానము చేసిన యూఙర్ %(count)లు కన్న తక్కువ సమర్పించాడు " +"ఈ వ్యాఖ్యానము చేసిన యూజర్ %(count)లు కన్న తక్కువ సమర్పించాడు " "వ్యాఖ్యానము:\n" "\n" "%(text)s" msgstr[1] "" -"ఈ వ్యాఖ్యానము చేసిన యూఙర్ %(count)లు కన్న తక్కువ సమర్పించాడు" +"ఈ వ్యాఖ్యానము చేసిన యూజర్ %(count)లు కన్న తక్కువ సమర్పించాడు" "వ్యాఖ్యానములు:\n" "\n" "%(text)s" @@ -237,7 +237,7 @@ msgid "" "\n" "%(text)s" msgstr "" -"ఈ వ్యాఖ్యానము స్కెచి యూఙర్ చేసాడు :\n" +"ఈ వ్యాఖ్యానము స్కెచి యూజర్ చేసాడు :\n" "\n" "%(text)s" @@ -274,7 +274,7 @@ msgstr "వ్యాఖ్యానము ఫార్మ్ లో 'ప్ర #: contrib/comments/templates/comments/form.html:8 #: contrib/admin/templates/admin/login.html:17 msgid "Username:" -msgstr "యూఙర్ పేరు" +msgstr "యూజర్ పేరు" #: contrib/comments/templates/comments/form.html:6 #: contrib/admin/templates/admin/object_history.html:3 @@ -353,15 +353,15 @@ msgstr "అన్నీ" #: contrib/admin/filterspecs.py:109 msgid "Any date" -msgstr "ఏ రోఙైన" +msgstr "ఏ రోజైన" #: contrib/admin/filterspecs.py:110 msgid "Today" -msgstr "ఈ రోఙు" +msgstr "ఈ రోజు" #: contrib/admin/filterspecs.py:113 msgid "Past 7 days" -msgstr "గత 7 రోఙుల గా" +msgstr "గత 7 రోజుల గా" #: contrib/admin/filterspecs.py:115 msgid "This month" @@ -413,13 +413,13 @@ msgstr "లాగ్ ఎంట్రీలు" #: contrib/admin/templatetags/admin_list.py:230 msgid "All dates" -msgstr "అన్నీ రోఙులు" +msgstr "అన్నీ రోజులు" #: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:59 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." -msgstr "దయచేసి సరైన యూఙర్ పేరు పాస్ వర్డ్ ఇవ్వండి" +msgstr "దయచేసి సరైన యూజర్ పేరు పాస్ వర్డ్ ఇవ్వండి" #: contrib/admin/views/decorators.py:24 #: contrib/admin/templates/admin/login.html:25 @@ -430,22 +430,22 @@ msgstr "లాగ్ ఇన్" msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." -msgstr "దయచేసి మళీ లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ సేస్సన్ ముగిసింది . బాధపడకండి మీ సమర్పన దాచిపెట్టాము" +msgstr "దయచేసి మళ్ళీ లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ సేస్సన్ ముగిసింది . బాధపడకండి మీ సమర్పన దాచిపెట్టాము" #: contrib/admin/views/decorators.py:69 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." -msgstr "మీ బ్రౌఙర్ పై కుకీస్ అంగీకరించబడేటట్లు చేయలేదు . దయ చేసి కుకీస్ ఎనేబల్ చేసి ,మళ్ళీ ట్రై చేయండి" +msgstr "మీ బ్రౌజర్ పై కుకీస్ అంగీకరించేటట్లు చేయలేదు . దయ చేసి కుకీస్ ఎనేబల్ చేసి ,మళ్ళీ ట్రై చేయండి" #: contrib/admin/views/decorators.py:83 msgid "Usernames cannot contain the '@' character." -msgstr "యూఙర్ పేరు లో '@' అక్షరము ఉందకూడడు" +msgstr "యూజర్ పేరు లో '@' అక్షరము ఉందకూడడు" #: contrib/admin/views/decorators.py:85 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "మీ ఈ మెయిల్ అడ్రస్ మీ యూఙర్ పేరు కాదు . '%s' ఇచ్చి చూడండి " +msgstr "మీ ఈ మెయిల్ అడ్రస్ మీ యూజర్ పేరు కాదు . '%s' ఇచ్చి చూడండి " #: contrib/admin/views/main.py:223 msgid "Site administration" @@ -454,7 +454,7 @@ msgstr "సైట్ నిర్వాహన" #: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:17 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\"ఙయప్రదంగా కలపబడ్డడి" +msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి" #: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347 #: contrib/admin/views/auth.py:22 @@ -464,12 +464,12 @@ msgstr "మీరు మళ్ళీ దీనినీ క్రింద మ #: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356 #, python-format msgid "You may add another %s below." -msgstr "మీరు ఇంకొక %s ని క్రింద ఙత చేయొచ్చు" +msgstr "మీరు ఇంకొక %s ని క్రింద జత చేయొచ్చు" #: contrib/admin/views/main.py:289 #, python-format msgid "Add %s" -msgstr "%s ని ఙత చేయండి " +msgstr "%s ని జత చేయండి " #: contrib/admin/views/main.py:335 #, python-format @@ -493,17 +493,17 @@ msgstr "%s తీసివేయబడ్డడి" #: contrib/admin/views/main.py:342 msgid "No fields changed." -msgstr "మార్చబడలేదు" +msgstr "ఫీల్డ్స్ ఏమి మార్చబడలేదు" #: contrib/admin/views/main.py:345 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "%(name)s \"%(obj)s\" ఙయప్రదంగా మార్చబడిండి" +msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి" #: contrib/admin/views/main.py:353 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "%(name)s \"%(obj)s\" ఙయప్రదంగా కలపబడ్డడి .మీరు మళ్ళీ దీనినీ క్రింద మార్చవచ్చు" +msgstr "%(name)s \"%(obj)s\" జయప్రదంగా కలపబడ్డడి .మీరు మళ్ళీ దీనినీ క్రింద మార్చవచ్చు" #: contrib/admin/views/main.py:391 #, python-format @@ -523,7 +523,7 @@ msgstr "ఒకటి కాని ,అంత కన్నఎక్కువ %( #: contrib/admin/views/main.py:511 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)లు \"%(obj)s\"ఙయప్రదంగా తీసివేయబడ్డడి" +msgstr "%(name)లు \"%(obj)s\"జయప్రదంగా తీసివేయబడ్డడి" #: contrib/admin/views/main.py:514 msgid "Are you sure?" @@ -601,7 +601,7 @@ msgstr "" #: contrib/admin/views/doc.py:229 #, python-format msgid "Fields on %s objects" -msgstr "వస్తువు" +msgstr "%s వస్తువులలో ఫీల్డ్స్ " #: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301 #: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309 @@ -682,7 +682,7 @@ msgstr "" #: contrib/admin/views/auth.py:28 msgid "Add user" -msgstr "యూఙర్" +msgstr "యూజర్ ని జత చేయండి" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:5 @@ -742,7 +742,7 @@ msgstr "తేది/వేళ" #: contrib/admin/templates/admin/object_history.html:19 msgid "User" -msgstr "యూఙర్" +msgstr "యూజర్" #: contrib/admin/templates/admin/object_history.html:20 msgid "Action" @@ -760,11 +760,11 @@ msgstr "" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" -msgstr "డ్ఙాంగొ యొక్క నిర్వాహనదారులు" +msgstr "డ్జాంగొ యొక్క నిర్వాహనదారులు" #: contrib/admin/templates/admin/base_site.html:7 msgid "Django administration" -msgstr "డ్ఙాంగొ నిర్వాహన" +msgstr "డ్జాంగొ నిర్వాహన" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -782,16 +782,16 @@ msgstr "సర్వర్ తప్పు (500)" msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." -msgstr "తప్పు ఙరిగిండి . దానిని నిర్వాహనాధికారులు కి ఈ మెయిల్ చేయబడ్డడి,మీ ఓపిక కి ధన్యవాదములు" +msgstr "తప్పు జరిగిండి . దానిని నిర్వాహనాధికారులు కి ఈ మెయిల్ చేయబడ్డడి,మీ ఓపిక కి ధన్యవాదములు" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 msgid "Page not found" -msgstr "పేఙి దొరకలేదు" +msgstr "పేజి దొరకలేదు" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "క్షమించండి మీరు కోరిన పేఙి దొరకలేడు" +msgstr "క్షమించండి మీరు కోరిన పేజి దొరకలేడు" #: contrib/admin/templates/admin/index.html:17 #, python-format @@ -801,12 +801,12 @@ msgstr "మొడల్ లు %(name)లో దొరికే అప్ప్ #: contrib/admin/templates/admin/index.html:18 #, python-format msgid "%(name)s" -msgstr "" +msgstr "%(name)లు" #: contrib/admin/templates/admin/index.html:28 #: contrib/admin/templates/admin/change_form.html:15 msgid "Add" -msgstr "ఙత చేయి" +msgstr "జత చేయి" #: contrib/admin/templates/admin/index.html:34 msgid "Change" @@ -831,7 +831,7 @@ msgstr "ఏమి దొరకలేదు" #: contrib/admin/templates/admin/change_list.html:11 #, python-format msgid "Add %(name)s" -msgstr "%(name)లు ఙత చేయు" +msgstr "%(name)లు జత చేయు" #: contrib/admin/templates/admin/login.html:22 msgid "Have you forgotten your password?" @@ -943,7 +943,7 @@ msgstr "" #: contrib/admin/templates/admin/auth/user/add_form.html:12 msgid "Username" -msgstr "యూఙర్ పేరు" +msgstr "యూజర్ పేరు" #: contrib/admin/templates/admin/auth/user/add_form.html:18 msgid "Password" @@ -967,7 +967,7 @@ msgstr "పాస్ వర్డ్ మార్పు" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "పాస్ వర్డ్ మార్పు ఙయప్రదమైండి " +msgstr "పాస్ వర్డ్ మార్పు జయప్రదమైండి " #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." @@ -1005,7 +1005,7 @@ msgstr "మళ్ళీ లాగ్ ఇన్ అవ్వండి" #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 msgid "Password reset successful" -msgstr "పాస్ వర్డ్ రీసెట్ ఙయప్రదమైండి" +msgstr "పాస్ వర్డ్ రీసెట్ జయప్రదమైండి" #: contrib/admin/templates/registration/password_reset_done.html:12 msgid "" @@ -1051,11 +1051,11 @@ msgstr "మీ కొత్త పాస్ వర్డ్ : %(new_password)s #: contrib/admin/templates/registration/password_reset_email.html:7 msgid "Feel free to change this password by going to this page:" -msgstr "నిస్సందేహము గా ఈ పేఙి క్ కి వెళ్ళి పాస్ వర్డ్ మార్చుకోండి " +msgstr "నిస్సందేహము గా ఈ పేజి క్ కి వెళ్ళి పాస్ వర్డ్ మార్చుకోండి " #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Your username, in case you've forgotten:" -msgstr "మీ యూఙర్ పేరు, ఒక వేళ మర్చిపోయి ఉంటే " +msgstr "మీ యూజర్ పేరు, ఒక వేళ మర్చిపోయి ఉంటే " #: contrib/admin/templates/registration/password_reset_email.html:13 msgid "Thanks for using our site!" @@ -1103,19 +1103,19 @@ msgstr "వస్తువు ఇడి చూడండి" msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." -msgstr "వస్తువు" +msgstr "" #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" -msgstr "వస్తువు" +msgstr "వస్తువు ని మార్చండి (ప్రస్తుత విండొ)" #: contrib/admin/templates/admin_doc/bookmarklets.html:26 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "వస్తువు" +msgstr "" #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "Edit this object (new window)" -msgstr "వస్తువు" +msgstr "వస్తువు ని మార్చండి(కొత్త విండొ) " #: contrib/admin/templates/admin_doc/bookmarklets.html:29 msgid "As above, but opens the admin page in a new window." @@ -1197,7 +1197,7 @@ msgstr "నమొదు చేయటము అవసరం" #: contrib/flatpages/models.py:14 msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "ఇది చెక్ చేసి ఉంటే కేవలం లాగ్గడ్ ఇన్ యూఙర్లు పేఙి చూడలేస్తారు" +msgstr "ఇది చెక్ చేసి ఉంటే కేవలం లాగ్గడ్ ఇన్ యూజర్లు పేజి చూడలేస్తారు" #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1237,7 +1237,7 @@ msgstr "గుంపులు" #: contrib/auth/models.py:90 msgid "username" -msgstr "యూఙర్ పేరు" +msgstr "యూజర్ పేరు" #: contrib/auth/models.py:90 msgid "" @@ -1309,15 +1309,15 @@ msgstr "" #: contrib/auth/models.py:102 msgid "user permissions" -msgstr "యూఙర్ అనుమతులు" +msgstr "యూజర్ అనుమతులు" #: contrib/auth/models.py:105 msgid "user" -msgstr "యూఙర్" +msgstr "యూజర్" #: contrib/auth/models.py:106 msgid "users" -msgstr "యూఙర్లు" +msgstr "యూజర్లు" #: contrib/auth/models.py:111 msgid "Personal info" @@ -1427,7 +1427,7 @@ msgstr "ఆదివారము" #: utils/dates.py:14 msgid "January" -msgstr "ఙాన్వరి " +msgstr "జాన్వరి " #: utils/dates.py:14 msgid "February" @@ -1447,11 +1447,11 @@ msgstr "మే" #: utils/dates.py:14 utils/dates.py:27 msgid "June" -msgstr "ఙూను" +msgstr "జూను" #: utils/dates.py:15 utils/dates.py:27 msgid "July" -msgstr "ఙులై" +msgstr "జులై" #: utils/dates.py:15 msgid "August" @@ -1475,7 +1475,7 @@ msgstr "డిసెంబర్" #: utils/dates.py:19 msgid "jan" -msgstr "ఙాన్" +msgstr "జాన్" #: utils/dates.py:19 msgid "feb" @@ -1495,11 +1495,11 @@ msgstr "మే" #: utils/dates.py:19 msgid "jun" -msgstr "ఙూన్" +msgstr "జూన్" #: utils/dates.py:20 msgid "jul" -msgstr "ఙుల్" +msgstr "జుల్" #: utils/dates.py:20 msgid "aug" @@ -1523,7 +1523,7 @@ msgstr "డిస్" #: utils/dates.py:27 msgid "Jan." -msgstr "ఙాన్" +msgstr "జాన్" #: utils/dates.py:27 msgid "Feb." @@ -1570,8 +1570,8 @@ msgstr[1] "వారాలు" #: utils/timesince.py:15 msgid "day" msgid_plural "days" -msgstr[0] "రోఙు" -msgstr[1] "రోఙులు" +msgstr[0] "రోజు" +msgstr[1] "రోజులు" #: utils/timesince.py:16 msgid "hour" @@ -1615,7 +1615,7 @@ msgstr "బెంగాలి" #: conf/global_settings.py:41 msgid "Czech" -msgstr "క్ఙెఖ్" +msgstr "క్జెఖ్" #: conf/global_settings.py:42 msgid "Welsh" @@ -1627,7 +1627,7 @@ msgstr "డానిశ్" #: conf/global_settings.py:44 msgid "German" -msgstr "ఙెర్మన్" +msgstr "జెర్మన్" #: conf/global_settings.py:45 msgid "Greek" @@ -1643,7 +1643,7 @@ msgstr "స్పానిష్" #: conf/global_settings.py:48 msgid "Argentinean Spanish" -msgstr "అర్ఙంటీనా స్పానిష్" +msgstr "అర్జంటీనా స్పానిష్" #: conf/global_settings.py:49 msgid "Finnish" @@ -1675,7 +1675,7 @@ msgstr "ఇటాలియవ్" #: conf/global_settings.py:56 msgid "Japanese" -msgstr "ఙపనీస్" +msgstr "జపనీస్" #: conf/global_settings.py:57 msgid "Dutch" @@ -1683,11 +1683,11 @@ msgstr "డట్చ్" #: conf/global_settings.py:58 msgid "Norwegian" -msgstr "నార్వీఙియన్" +msgstr "నార్వీజియన్" #: conf/global_settings.py:59 msgid "Brazilian" -msgstr "బ్రఙీలియన్" +msgstr "బ్రజీలియన్" #: conf/global_settings.py:60 msgid "Romanian" @@ -1865,7 +1865,7 @@ msgstr "" #: core/validators.py:242 msgid "Enter a valid U.S. state abbreviation." -msgstr "దయచేసి సరైన అగ్ర రాఙ్య సంక్షేపము చేసిన రాష్ట్రము పేరు ఇవ్వండి" +msgstr "దయచేసి సరైన అగ్ర రాజ్య సంక్షేపము చేసిన రాష్ట్రము పేరు ఇవ్వండి" #: core/validators.py:256 #, python-format @@ -2004,12 +2004,12 @@ msgstr "" #: views/generic/create_update.py:43 #, python-format msgid "The %(verbose_name)s was created successfully." -msgstr "%(verbose_name)లు ఙయప్రదంగా తయారయింది" +msgstr "%(verbose_name)లు జయప్రదంగా తయారయింది" #: views/generic/create_update.py:117 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "%(verbose_name)లు ఙయప్రదంగా @@" +msgstr "%(verbose_name)లు జయప్రదంగా @@" #: views/generic/create_update.py:184 #, python-format diff --git a/django/conf/urls/defaults.py b/django/conf/urls/defaults.py index 17fe603d96..49bc176ef3 100644 --- a/django/conf/urls/defaults.py +++ b/django/conf/urls/defaults.py @@ -1,19 +1,25 @@ from django.core.urlresolvers import RegexURLPattern, RegexURLResolver -__all__ = ['handler404', 'handler500', 'include', 'patterns'] +__all__ = ['handler404', 'handler500', 'include', 'patterns', 'url'] handler404 = 'django.views.defaults.page_not_found' handler500 = 'django.views.defaults.server_error' include = lambda urlconf_module: [urlconf_module] -def patterns(prefix, *tuples): +def patterns(prefix, *args): pattern_list = [] - for t in tuples: - regex, view_or_include = t[:2] - default_kwargs = t[2:] - if type(view_or_include) == list: - pattern_list.append(RegexURLResolver(regex, view_or_include[0], *default_kwargs)) + for t in args: + if isinstance(t, (list, tuple)): + pattern_list.append(url(prefix=prefix, *t)) else: - pattern_list.append(RegexURLPattern(regex, prefix and (prefix + '.' + view_or_include) or view_or_include, *default_kwargs)) + pattern_list.append(t) return pattern_list + +def url(regex, view, kwargs=None, name=None, prefix=''): + if type(view) == list: + # For include(...) processing. + return RegexURLResolver(regex, view[0], kwargs) + else: + return RegexURLPattern(regex, prefix and (prefix + '.' + view) or view, kwargs, name) + diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py index 90a84baaff..fa6c6aa363 100644 --- a/django/contrib/comments/models.py +++ b/django/contrib/comments/models.py @@ -209,7 +209,7 @@ class FreeComment(models.Model): class KarmaScoreManager(models.Manager): def vote(self, user_id, comment_id, score): try: - karma = self.objects.get(comment__pk=comment_id, user__pk=user_id) + karma = self.get(comment__pk=comment_id, user__pk=user_id) except self.model.DoesNotExist: karma = self.model(None, user_id=user_id, comment_id=comment_id, score=score, scored_date=datetime.datetime.now()) karma.save() diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py index a399e7eef1..a16cbcc9bb 100644 --- a/django/contrib/humanize/templatetags/humanize.py +++ b/django/contrib/humanize/templatetags/humanize.py @@ -43,7 +43,7 @@ def intword(value): if value < 1000000: return value if value < 1000000000: - new_value = value / 1000000.0 + new_value = value / 1000000.0 return ngettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value} if value < 1000000000000: new_value = value / 1000000000.0 diff --git a/django/contrib/localflavor/br/__init__.py b/django/contrib/localflavor/br/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/localflavor/br/br_states.py b/django/contrib/localflavor/br/br_states.py new file mode 100644 index 0000000000..c6ce0a1bb7 --- /dev/null +++ b/django/contrib/localflavor/br/br_states.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +""" +A brazilian mapping of state misspellings/abbreviations to normalized +abbreviations, and an alphabetical list of states for use as `choices +in a formfield. + +This exists in this standalone file so that it's only imported into +memory when explicitly needed. +""" + +STATE_CHOICES = ( + ('AC', 'Acre'), + ('AL', 'Alagoas'), + ('AP', u'Amapá'), + ('AM', 'Amazonas'), + ('BA', 'Bahia'), + ('CE', u'Ceará'), + ('DF', 'Distrito Federal'), + ('ES', u'Espírito Santo'), + ('GO', u'Goiás'), + ('MA', u'Maranhão'), + ('MT', 'Mato Grosso'), + ('MS', 'Mato Grosso do Sul'), + ('MG', 'Minas Gerais'), + ('PA', u'Pará'), + ('PB', u'Paraíba'), + ('PR', u'Paraná'), + ('PE', 'Pernambuco'), + ('PI', u'Piauí'), + ('RJ', 'Rio de Janeiro'), + ('RN', 'Rio Grande do Norte'), + ('RS', 'Rio Grande do Sul'), + ('RO', u'Rondônia'), + ('RR', 'Roraima'), + ('SC', 'Santa Catarina'), + ('SP', u'São Paulo'), + ('SE', 'Sergipe'), + ('TO', 'Tocantins'), +) diff --git a/django/contrib/localflavor/br/forms.py b/django/contrib/localflavor/br/forms.py new file mode 100644 index 0000000000..d3ca28f053 --- /dev/null +++ b/django/contrib/localflavor/br/forms.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +""" +BR-specific Form helpers +""" + +from django.newforms import ValidationError +from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.newforms.util import smart_unicode +from django.utils.translation import gettext +import re + +phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$') + +class BRZipCodeField(RegexField): + def __init__(self, *args, **kwargs): + super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$', + max_length=None, min_length=None, + error_message=u'Informe um código postal no formato XXXXX-XXX.', + *args, **kwargs) + +class BRPhoneNumberField(Field): + def clean(self, value): + super(BRPhoneNumberField, self).clean(value) + if value in EMPTY_VALUES: + return u'' + value = re.sub('(\(|\)|\s+)', '', smart_unicode(value)) + m = phone_digits_re.search(value) + if m: + return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3)) + raise ValidationError(u'Números de telefone devem estar no formato XX-XXXX-XXXX.') + +class BRStateSelect(Select): + """ + A Select widget that uses a list of brazilian states/territories + as its choices. + """ + def __init__(self, attrs=None): + from br_states import STATE_CHOICES # relative import + super(BRStateSelect, self).__init__(attrs, choices=STATE_CHOICES) diff --git a/django/contrib/localflavor/fi/__init__.py b/django/contrib/localflavor/fi/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/localflavor/fi/fi_municipalities.py b/django/contrib/localflavor/fi/fi_municipalities.py new file mode 100644 index 0000000000..965a52d327 --- /dev/null +++ b/django/contrib/localflavor/fi/fi_municipalities.py @@ -0,0 +1,427 @@ +# -*- coding: utf-8 -*- +""" +An alphabetical list of Finnish municipalities for use as `choices` in a +formfield. + +This exists in this standalone file so that it's only imported into memory +when explicitly needed. +""" + +MUNICIPALITY_CHOICES = ( + ('akaa', u"Akaa"), + ('alaharma', u"Alahärmä"), + ('alajarvi', u"Alajärvi"), + ('alastaro', u"Alastaro"), + ('alavieska', u"Alavieska"), + ('alavus', u"Alavus"), + ('anjalankoski', u"Anjalankoski"), + ('artjarvi', u"Artjärvi"), + ('asikkala', u"Asikkala"), + ('askainen', u"Askainen"), + ('askola', u"Askola"), + ('aura', u"Aura"), + ('brando', u"Brändö"), + ('dragsfjard', u"Dragsfjärd"), + ('eckero', u"Eckerö"), + ('elimaki', u"Elimäki"), + ('eno', u"Eno"), + ('enonkoski', u"Enonkoski"), + ('enontekio', u"Enontekiö"), + ('espoo', u"Espoo"), + ('eura', u"Eura"), + ('eurajoki', u"Eurajoki"), + ('evijarvi', u"Evijärvi"), + ('finstrom', u"Finström"), + ('forssa', u"Forssa"), + ('foglo', u"Föglö"), + ('geta', u"Geta"), + ('haapajarvi', u"Haapajärvi"), + ('haapavesi', u"Haapavesi"), + ('hailuoto', u"Hailuoto"), + ('halikko', u"Halikko"), + ('halsua', u"Halsua"), + ('hamina', u"Hamina"), + ('hammarland', u"Hammarland"), + ('hankasalmi', u"Hankasalmi"), + ('hanko', u"Hanko"), + ('harjavalta', u"Harjavalta"), + ('hartola', u"Hartola"), + ('hattula', u"Hattula"), + ('hauho', u"Hauho"), + ('haukipudas', u"Haukipudas"), + ('hausjarvi', u"Hausjärvi"), + ('heinola', u"Heinola"), + ('heinavesi', u"Heinävesi"), + ('helsinki', u"Helsinki"), + ('himanka', u"Himanka"), + ('hirvensalmi', u"Hirvensalmi"), + ('hollola', u"Hollola"), + ('honkajoki', u"Honkajoki"), + ('houtskari', u"Houtskari"), + ('huittinen', u"Huittinen"), + ('humppila', u"Humppila"), + ('hyrynsalmi', u"Hyrynsalmi"), + ('hyvinkaa', u"Hyvinkää"), + ('hameenkoski', u"Hämeenkoski"), + ('hameenkyro', u"Hämeenkyrö"), + ('hameenlinna', u"Hämeenlinna"), + ('ii', u"Ii"), + ('iisalmi', u"Iisalmi"), + ('iitti', u"Iitti"), + ('ikaalinen', u"Ikaalinen"), + ('ilmajoki', u"Ilmajoki"), + ('ilomantsi', u"Ilomantsi"), + ('imatra', u"Imatra"), + ('inari', u"Inari"), + ('inio', u"Iniö"), + ('inkoo', u"Inkoo"), + ('isojoki', u"Isojoki"), + ('isokyro', u"Isokyrö"), + ('jaala', u"Jaala"), + ('jalasjarvi', u"Jalasjärvi"), + ('janakkala', u"Janakkala"), + ('joensuu', u"Joensuu"), + ('jokioinen', u"Jokioinen"), + ('jomala', u"Jomala"), + ('joroinen', u"Joroinen"), + ('joutsa', u"Joutsa"), + ('joutseno', u"Joutseno"), + ('juankoski', u"Juankoski"), + ('jurva', u"Jurva"), + ('juuka', u"Juuka"), + ('juupajoki', u"Juupajoki"), + ('juva', u"Juva"), + ('jyvaskyla', u"Jyväskylä"), + ('jyvaskylan_mlk', u"Jyväskylän maalaiskunta"), + ('jamijarvi', u"Jämijärvi"), + ('jamsa', u"Jämsä"), + ('jamsankoski', u"Jämsänkoski"), + ('jarvenpaa', u"Järvenpää"), + ('kaarina', u"Kaarina"), + ('kaavi', u"Kaavi"), + ('kajaani', u"Kajaani"), + ('kalajoki', u"Kalajoki"), + ('kalvola', u"Kalvola"), + ('kangasala', u"Kangasala"), + ('kangasniemi', u"Kangasniemi"), + ('kankaanpaa', u"Kankaanpää"), + ('kannonkoski', u"Kannonkoski"), + ('kannus', u"Kannus"), + ('karijoki', u"Karijoki"), + ('karjaa', u"Karjaa"), + ('karjalohja', u"Karjalohja"), + ('karkkila', u"Karkkila"), + ('karstula', u"Karstula"), + ('karttula', u"Karttula"), + ('karvia', u"Karvia"), + ('kaskinen', u"Kaskinen"), + ('kauhajoki', u"Kauhajoki"), + ('kauhava', u"Kauhava"), + ('kauniainen', u"Kauniainen"), + ('kaustinen', u"Kaustinen"), + ('keitele', u"Keitele"), + ('kemi', u"Kemi"), + ('kemijarvi', u"Kemijärvi"), + ('keminmaa', u"Keminmaa"), + ('kemio', u"Kemiö"), + ('kempele', u"Kempele"), + ('kerava', u"Kerava"), + ('kerimaki', u"Kerimäki"), + ('kestila', u"Kestilä"), + ('kesalahti', u"Kesälahti"), + ('keuruu', u"Keuruu"), + ('kihnio', u"Kihniö"), + ('kiikala', u"Kiikala"), + ('kiikoinen', u"Kiikoinen"), + ('kiiminki', u"Kiiminki"), + ('kinnula', u"Kinnula"), + ('kirkkonummi', u"Kirkkonummi"), + ('kisko', u"Kisko"), + ('kitee', u"Kitee"), + ('kittila', u"Kittilä"), + ('kiukainen', u"Kiukainen"), + ('kiuruvesi', u"Kiuruvesi"), + ('kivijarvi', u"Kivijärvi"), + ('kokemaki', u"Kokemäki"), + ('kokkola', u"Kokkola"), + ('kolari', u"Kolari"), + ('konnevesi', u"Konnevesi"), + ('kontiolahti', u"Kontiolahti"), + ('korpilahti', u"Korpilahti"), + ('korppoo', u"Korppoo"), + ('korsnas', u"Korsnäs"), + ('kortesjarvi', u"Kortesjärvi"), + ('koskitl', u"KoskiTl"), + ('kotka', u"Kotka"), + ('kouvola', u"Kouvola"), + ('kristiinankaupunki', u"Kristiinankaupunki"), + ('kruunupyy', u"Kruunupyy"), + ('kuhmalahti', u"Kuhmalahti"), + ('kuhmo', u"Kuhmo"), + ('kuhmoinen', u"Kuhmoinen"), + ('kumlinge', u"Kumlinge"), + ('kuopio', u"Kuopio"), + ('kuortane', u"Kuortane"), + ('kurikka', u"Kurikka"), + ('kuru', u"Kuru"), + ('kustavi', u"Kustavi"), + ('kuusamo', u"Kuusamo"), + ('kuusankoski', u"Kuusankoski"), + ('kuusjoki', u"Kuusjoki"), + ('kylmakoski', u"Kylmäkoski"), + ('kyyjarvi', u"Kyyjärvi"), + ('kalvia', u"Kälviä"), + ('karkola', u"Kärkölä"), + ('karsamaki', u"Kärsämäki"), + ('kokar', u"Kökar"), + ('koylio', u"Köyliö"), + ('lahti', u"Lahti"), + ('laihia', u"Laihia"), + ('laitila', u"Laitila"), + ('lammi', u"Lammi"), + ('lapinjarvi', u"Lapinjärvi"), + ('lapinlahti', u"Lapinlahti"), + ('lappajarvi', u"Lappajärvi"), + ('lappeenranta', u"Lappeenranta"), + ('lappi', u"Lappi"), + ('lapua', u"Lapua"), + ('laukaa', u"Laukaa"), + ('lavia', u"Lavia"), + ('lehtimaki', u"Lehtimäki"), + ('leivonmaki', u"Leivonmäki"), + ('lemi', u"Lemi"), + ('lemland', u"Lemland"), + ('lempaala', u"Lempäälä"), + ('lemu', u"Lemu"), + ('leppavirta', u"Leppävirta"), + ('lestijarvi', u"Lestijärvi"), + ('lieksa', u"Lieksa"), + ('lieto', u"Lieto"), + ('liljendal', u"Liljendal"), + ('liminka', u"Liminka"), + ('liperi', u"Liperi"), + ('lohja', u"Lohja"), + ('lohtaja', u"Lohtaja"), + ('loimaa', u"Loimaa"), + ('loppi', u"Loppi"), + ('loviisa', u"Loviisa"), + ('luhanka', u"Luhanka"), + ('lumijoki', u"Lumijoki"), + ('lumparland', u"Lumparland"), + ('luoto', u"Luoto"), + ('luumaki', u"Luumäki"), + ('luvia', u"Luvia"), + ('maalahti', u"Maalahti"), + ('maaninka', u"Maaninka"), + ('maarianhamina', u"Maarianhamina"), + ('marttila', u"Marttila"), + ('masku', u"Masku"), + ('mellila', u"Mellilä"), + ('merijarvi', u"Merijärvi"), + ('merikarvia', u"Merikarvia"), + ('merimasku', u"Merimasku"), + ('miehikkala', u"Miehikkälä"), + ('mikkeli', u"Mikkeli"), + ('mouhijarvi', u"Mouhijärvi"), + ('muhos', u"Muhos"), + ('multia', u"Multia"), + ('muonio', u"Muonio"), + ('mustasaari', u"Mustasaari"), + ('muurame', u"Muurame"), + ('muurla', u"Muurla"), + ('mynamaki', u"Mynämäki"), + ('myrskyla', u"Myrskylä"), + ('mantsala', u"Mäntsälä"), + ('mantta', u"Mänttä"), + ('mantyharju', u"Mäntyharju"), + ('naantali', u"Naantali"), + ('nakkila', u"Nakkila"), + ('nastola', u"Nastola"), + ('nauvo', u"Nauvo"), + ('nilsia', u"Nilsiä"), + ('nivala', u"Nivala"), + ('nokia', u"Nokia"), + ('noormarkku', u"Noormarkku"), + ('nousiainen', u"Nousiainen"), + ('nummi-pusula', u"Nummi-Pusula"), + ('nurmes', u"Nurmes"), + ('nurmijarvi', u"Nurmijärvi"), + ('nurmo', u"Nurmo"), + ('narpio', u"Närpiö"), + ('oravainen', u"Oravainen"), + ('orimattila', u"Orimattila"), + ('oripaa', u"Oripää"), + ('orivesi', u"Orivesi"), + ('oulainen', u"Oulainen"), + ('oulu', u"Oulu"), + ('oulunsalo', u"Oulunsalo"), + ('outokumpu', u"Outokumpu"), + ('padasjoki', u"Padasjoki"), + ('paimio', u"Paimio"), + ('paltamo', u"Paltamo"), + ('parainen', u"Parainen"), + ('parikkala', u"Parikkala"), + ('parkano', u"Parkano"), + ('pedersore', u"Pedersöre"), + ('pelkosenniemi', u"Pelkosenniemi"), + ('pello', u"Pello"), + ('perho', u"Perho"), + ('pernaja', u"Pernaja"), + ('pernio', u"Perniö"), + ('pertteli', u"Pertteli"), + ('pertunmaa', u"Pertunmaa"), + ('petajavesi', u"Petäjävesi"), + ('pieksamaki', u"Pieksämäki"), + ('pielavesi', u"Pielavesi"), + ('pietarsaari', u"Pietarsaari"), + ('pihtipudas', u"Pihtipudas"), + ('piikkio', u"Piikkiö"), + ('piippola', u"Piippola"), + ('pirkkala', u"Pirkkala"), + ('pohja', u"Pohja"), + ('polvijarvi', u"Polvijärvi"), + ('pomarkku', u"Pomarkku"), + ('pori', u"Pori"), + ('pornainen', u"Pornainen"), + ('porvoo', u"Porvoo"), + ('posio', u"Posio"), + ('pudasjarvi', u"Pudasjärvi"), + ('pukkila', u"Pukkila"), + ('pulkkila', u"Pulkkila"), + ('punkaharju', u"Punkaharju"), + ('punkalaidun', u"Punkalaidun"), + ('puolanka', u"Puolanka"), + ('puumala', u"Puumala"), + ('pyhtaa', u"Pyhtää"), + ('pyhajoki', u"Pyhäjoki"), + ('pyhajarvi', u"Pyhäjärvi"), + ('pyhanta', u"Pyhäntä"), + ('pyharanta', u"Pyhäranta"), + ('pyhaselka', u"Pyhäselkä"), + ('pylkonmaki', u"Pylkönmäki"), + ('palkane', u"Pälkäne"), + ('poytya', u"Pöytyä"), + ('raahe', u"Raahe"), + ('raisio', u"Raisio"), + ('rantasalmi', u"Rantasalmi"), + ('rantsila', u"Rantsila"), + ('ranua', u"Ranua"), + ('rauma', u"Rauma"), + ('rautalampi', u"Rautalampi"), + ('rautavaara', u"Rautavaara"), + ('rautjarvi', u"Rautjärvi"), + ('reisjarvi', u"Reisjärvi"), + ('renko', u"Renko"), + ('riihimaki', u"Riihimäki"), + ('ristiina', u"Ristiina"), + ('ristijarvi', u"Ristijärvi"), + ('rovaniemi', u"Rovaniemi"), + ('ruokolahti', u"Ruokolahti"), + ('ruotsinpyhtaa', u"Ruotsinpyhtää"), + ('ruovesi', u"Ruovesi"), + ('rusko', u"Rusko"), + ('rymattyla', u"Rymättylä"), + ('raakkyla', u"Rääkkylä"), + ('saarijarvi', u"Saarijärvi"), + ('salla', u"Salla"), + ('salo', u"Salo"), + ('saltvik', u"Saltvik"), + ('sammatti', u"Sammatti"), + ('sauvo', u"Sauvo"), + ('savitaipale', u"Savitaipale"), + ('savonlinna', u"Savonlinna"), + ('savonranta', u"Savonranta"), + ('savukoski', u"Savukoski"), + ('seinajoki', u"Seinäjoki"), + ('sievi', u"Sievi"), + ('siikainen', u"Siikainen"), + ('siikajoki', u"Siikajoki"), + ('siilinjarvi', u"Siilinjärvi"), + ('simo', u"Simo"), + ('sipoo', u"Sipoo"), + ('siuntio', u"Siuntio"), + ('sodankyla', u"Sodankylä"), + ('soini', u"Soini"), + ('somero', u"Somero"), + ('sonkajarvi', u"Sonkajärvi"), + ('sotkamo', u"Sotkamo"), + ('sottunga', u"Sottunga"), + ('sulkava', u"Sulkava"), + ('sund', u"Sund"), + ('suomenniemi', u"Suomenniemi"), + ('suomusjarvi', u"Suomusjärvi"), + ('suomussalmi', u"Suomussalmi"), + ('suonenjoki', u"Suonenjoki"), + ('sysma', u"Sysmä"), + ('sakyla', u"Säkylä"), + ('sarkisalo', u"Särkisalo"), + ('taipalsaari', u"Taipalsaari"), + ('taivalkoski', u"Taivalkoski"), + ('taivassalo', u"Taivassalo"), + ('tammela', u"Tammela"), + ('tammisaari', u"Tammisaari"), + ('tampere', u"Tampere"), + ('tarvasjoki', u"Tarvasjoki"), + ('tervo', u"Tervo"), + ('tervola', u"Tervola"), + ('teuva', u"Teuva"), + ('tohmajarvi', u"Tohmajärvi"), + ('toholampi', u"Toholampi"), + ('toivakka', u"Toivakka"), + ('tornio', u"Tornio"), + ('turku', u"Turku"), + ('tuulos', u"Tuulos"), + ('tuusniemi', u"Tuusniemi"), + ('tuusula', u"Tuusula"), + ('tyrnava', u"Tyrnävä"), + ('toysa', u"Töysä"), + ('ullava', u"Ullava"), + ('ulvila', u"Ulvila"), + ('urjala', u"Urjala"), + ('utajarvi', u"Utajärvi"), + ('utsjoki', u"Utsjoki"), + ('uurainen', u"Uurainen"), + ('uusikaarlepyy', u"Uusikaarlepyy"), + ('uusikaupunki', u"Uusikaupunki"), + ('vaala', u"Vaala"), + ('vaasa', u"Vaasa"), + ('vahto', u"Vahto"), + ('valkeakoski', u"Valkeakoski"), + ('valkeala', u"Valkeala"), + ('valtimo', u"Valtimo"), + ('vammala', u"Vammala"), + ('vampula', u"Vampula"), + ('vantaa', u"Vantaa"), + ('varkaus', u"Varkaus"), + ('varpaisjarvi', u"Varpaisjärvi"), + ('vehmaa', u"Vehmaa"), + ('velkua', u"Velkua"), + ('vesanto', u"Vesanto"), + ('vesilahti', u"Vesilahti"), + ('veteli', u"Veteli"), + ('vierema', u"Vieremä"), + ('vihanti', u"Vihanti"), + ('vihti', u"Vihti"), + ('viitasaari', u"Viitasaari"), + ('vilppula', u"Vilppula"), + ('vimpeli', u"Vimpeli"), + ('virolahti', u"Virolahti"), + ('virrat', u"Virrat"), + ('vardo', u"Vårdö"), + ('vahakyro', u"Vähäkyrö"), + ('vastanfjard', u"Västanfjärd"), + ('voyri-maksamaa', u"Vöyri-Maksamaa"), + ('yliharma', u"Ylihärmä"), + ('yli-ii', u"Yli-Ii"), + ('ylikiiminki', u"Ylikiiminki"), + ('ylistaro', u"Ylistaro"), + ('ylitornio', u"Ylitornio"), + ('ylivieska', u"Ylivieska"), + ('ylamaa', u"Ylämaa"), + ('ylane', u"Yläne"), + ('ylojarvi', u"Ylöjärvi"), + ('ypaja', u"Ypäjä"), + ('aetsa', u"Äetsä"), + ('ahtari', u"Ähtäri"), + ('aanekoski', u"Äänekoski") +) \ No newline at end of file diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py new file mode 100644 index 0000000000..a2b2eed5c2 --- /dev/null +++ b/django/contrib/localflavor/fi/forms.py @@ -0,0 +1,47 @@ +""" +FI-specific Form helpers +""" + +import re +from django.newforms import ValidationError +from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.utils.translation import gettext + +class FIZipCodeField(RegexField): + def __init__(self, *args, **kwargs): + super(FIZipCodeField, self).__init__(r'^\d{5}$', + max_length=None, min_length=None, + error_message=gettext(u'Enter a zip code in the format XXXXX.'), + *args, **kwargs) + +class FIMunicipalitySelect(Select): + """ + A Select widget that uses a list of Finnish municipalities as its choices. + """ + def __init__(self, attrs=None): + from fi_municipalities import MUNICIPALITY_CHOICES # relative import + super(FIMunicipalitySelect, self).__init__(attrs, choices=MUNICIPALITY_CHOICES) + +class FISocialSecurityNumber(Field): + def clean(self, value): + super(FISocialSecurityNumber, self).clean(value) + if value in EMPTY_VALUES: + return u'' + + checkmarks = "0123456789ABCDEFHJKLMNPRSTUVWXY" + result = re.match(r"""^ + (?P([0-2]\d|3[01]) + (0\d|1[012]) + (\d{2})) + [A+-] + (?P(\d{3})) + (?P[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE) + if not result: + raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) + checksum = int(result.groupdict()['date'] + result.groupdict()['serial']) + + if checkmarks[checksum % len(checkmarks)] == result.groupdict()['chechsum'].upper(): + return u'%s' % value.upper() + + raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) + diff --git a/django/contrib/localflavor/it/__init__.py b/django/contrib/localflavor/it/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py new file mode 100644 index 0000000000..6760d91799 --- /dev/null +++ b/django/contrib/localflavor/it/forms.py @@ -0,0 +1,32 @@ +""" +IT-specific Form helpers +""" + +from django.newforms import ValidationError +from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.newforms.util import smart_unicode +from django.utils.translation import gettext +import re + +class ITZipCodeField(RegexField): + def __init__(self, *args, **kwargs): + super(ITZipCodeField, self).__init__(r'^\d{5}$', + max_length=None, min_length=None, + error_message=gettext(u'Enter a zip code in the format XXXXX.'), + *args, **kwargs) + +class ITRegionSelect(Select): + """ + A Select widget that uses a list of IT regions as its choices. + """ + def __init__(self, attrs=None): + from it_region import REGION_CHOICES # relative import + super(ITRegionSelect, self).__init__(attrs, choices=REGION_CHOICES) + +class ITProvinceSelect(Select): + """ + A Select widget that uses a list of IT regions as its choices. + """ + def __init__(self, attrs=None): + from it_province import PROVINCE_CHOICES # relative import + super(ITProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES) diff --git a/django/contrib/localflavor/it/it_province.py b/django/contrib/localflavor/it/it_province.py new file mode 100644 index 0000000000..1867191b31 --- /dev/null +++ b/django/contrib/localflavor/it/it_province.py @@ -0,0 +1,114 @@ +# -*- coding: utf-8 -* + +PROVINCE_CHOICES = ( + ('AG', 'Agrigento'), + ('AL', 'Alessandria'), + ('AN', 'Ancona'), + ('AO', 'Aosta'), + ('AR', 'Arezzo'), + ('AP', 'Ascoli Piceno'), + ('AT', 'Asti'), + ('AV', 'Avellino'), + ('BA', 'Bari'), +# ('BT', 'Barletta-Andria-Trani'), # active starting from 2009 + ('BL', 'Belluno'), + ('BN', 'Benevento'), + ('BG', 'Bergamo'), + ('BI', 'Biella'), + ('BO', 'Bologna'), + ('BZ', 'Bolzano/Bozen'), + ('BS', 'Brescia'), + ('BR', 'Brindisi'), + ('CA', 'Cagliari'), + ('CL', 'Caltanissetta'), + ('CB', 'Campobasso'), + ('CI', 'Carbonia-Iglesias'), + ('CE', 'Caserta'), + ('CT', 'Catania'), + ('CZ', 'Catanzaro'), + ('CH', 'Chieti'), + ('CO', 'Como'), + ('CS', 'Cosenza'), + ('CR', 'Cremona'), + ('KR', 'Crotone'), + ('CN', 'Cuneo'), + ('EN', 'Enna'), +# ('FM', 'Fermo'), # active starting from 2009 + ('FE', 'Ferrara'), + ('FI', 'Firenze'), + ('FG', 'Foggia'), + ('FC', 'Forlì-Cesena'), + ('FR', 'Frosinone'), + ('GE', 'Genova'), + ('GO', 'Gorizia'), + ('GR', 'Grosseto'), + ('IM', 'Imperia'), + ('IS', 'Isernia'), + ('SP', 'La Spezia'), + ('AQ', u'L’Acquila'), + ('LT', 'Latina'), + ('LE', 'Lecce'), + ('LC', 'Lecco'), + ('LI', 'Livorno'), + ('LO', 'Lodi'), + ('LU', 'Lucca'), + ('MC', 'Macerata'), + ('MN', 'Mantova'), + ('MS', 'Massa-Carrara'), + ('MT', 'Matera'), + ('VS', 'Medio Campidano'), + ('ME', 'Messina'), + ('MI', 'Milano'), + ('MO', 'Modena'), +# ('MB', 'Monza e Brianza'), # active starting from 2009 + ('NA', 'Napoli'), + ('NO', 'Novara'), + ('NU', 'Nuoro'), + ('OG', 'Ogliastra'), + ('OT', 'Olbia-Tempio'), + ('OR', 'Oristano'), + ('PD', 'Padova'), + ('PA', 'Palermo'), + ('PR', 'Parma'), + ('PV', 'Pavia'), + ('PG', 'Perugia'), + ('PU', 'Pesaro e Urbino'), + ('PE', 'Pescara'), + ('PC', 'Piacenza'), + ('PI', 'Pisa'), + ('PT', 'Pistoia'), + ('PN', 'Pordenone'), + ('PZ', 'Potenza'), + ('PO', 'Prato'), + ('RG', 'Ragusa'), + ('RA', 'Ravenna'), + ('RC', 'Reggio Calabria'), + ('RE', 'Reggio Emilia'), + ('RI', 'Rieti'), + ('RN', 'Rimini') + ('RM', 'Roma'), + ('RO', 'Rovigo'), + ('SA', 'Salerno'), + ('SS', 'Sassari'), + ('SV', 'Savona'), + ('SI', 'Siena'), + ('SR', 'Siracusa'), + ('SO', 'Sondrio'), + ('TA', 'Taranto'), + ('TE', 'Teramo'), + ('TR', 'Terni'), + ('TO', 'Torino'), + ('TP', 'Trapani'), + ('TN', 'Trento'), + ('TV', 'Treviso'), + ('TS', 'Trieste'), + ('UD', 'Udine'), + ('VA', 'Varese'), + ('VE', 'Venezia'), + ('VB', 'Verbano Cusio Ossola'), + ('VC', 'Vercelli'), + ('VR', 'Verona'), + ('VV', 'Vibo Valentia'), + ('VI', 'Vicenza'), + ('VT', 'Viterbo'), +) diff --git a/django/contrib/localflavor/it/it_region.py b/django/contrib/localflavor/it/it_region.py new file mode 100644 index 0000000000..0700b46ea8 --- /dev/null +++ b/django/contrib/localflavor/it/it_region.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -* + +REGION_CHOICES = ( + ('ABR', 'Abruzzo'), + ('BAS', 'Basilicata'), + ('CAL', 'Calabria'), + ('CAM', 'Campania'), + ('EMR', 'Emilia-Romagna'), + ('FVG', 'Friuli-Venezia Giulia'), + ('LAZ', 'Lazio'), + ('LIG', 'Liguria'), + ('LOM', 'Lombardia'), + ('MAR', 'Marche'), + ('MOL', 'Molise'), + ('PMN', 'Piemonte'), + ('PUG', 'Puglia'), + ('SAR', 'Sardegna'), + ('SIC', 'Sicilia'), + ('TOS', 'Toscana'), + ('TAA', 'Trentino-Alto Adige'), + ('UMB', 'Umbria'), + ('VAO', u'Valle d’Aosta'), + ('VEN', 'Veneto'), +) diff --git a/django/contrib/localflavor/no/__init__.py b/django/contrib/localflavor/no/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/localflavor/no/forms.py b/django/contrib/localflavor/no/forms.py new file mode 100644 index 0000000000..22099005b9 --- /dev/null +++ b/django/contrib/localflavor/no/forms.py @@ -0,0 +1,77 @@ +# -*- coding: iso-8859-1 -*- +""" +Norwegian-specific Form helpers +""" + +import re, datetime +from django.newforms import ValidationError +from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES +from django.utils.translation import gettext + +class NOZipCodeField(RegexField): + def __init__(self, *args, **kwargs): + super(NOZipCodeField, self).__init__(r'^\d{4}$', + max_length=None, min_length=None, + error_message=gettext(u'Enter a zip code in the format XXXX.'), + *args, **kwargs) + +class NOMunicipalitySelect(Select): + """ + A Select widget that uses a list of Norwegian municipalities (fylker) + as its choices. + """ + def __init__(self, attrs=None): + from no_municipalities import MUNICIPALITY_CHOICES + super(NOMunicipalitySelect, self).__init__(attrs, choices=MUNICIPALITY_CHOICES) + +class NOSocialSecurityNumber(Field): + """ + Algorithm is documented at http://no.wikipedia.org/wiki/Personnummer + """ + def clean(self, value): + super(NOSocialSecurityNumber, self).clean(value) + if value in EMPTY_VALUES: + return u'' + + msg = gettext(u'Enter a valid Norwegian social security number.') + if not re.match(r'^\d{11}$', value): + raise ValidationError(msg) + + day = int(value[:2]) + month = int(value[2:4]) + year2 = int(value[4:6]) + + inum = int(value[6:9]) + self.birthday = None + try: + if 000 <= inum < 500: + self.birthday = datetime.date(1900+year2, month, day) + if 500 <= inum < 750 and year2 > 54: + self.birthday = datetime.date(1800+year2, month, day) + if 500 <= inum < 1000 and year2 < 40: + self.birthday = datetime.date(2000+year2, month, day) + if 900 <= inum < 1000 and year2 > 39: + self.birthday = datetime.date(1900+year2, month, day) + except ValueError: + raise ValidationError(msg) + + sexnum = int(value[8]) + if sexnum % 2 == 0: + self.gender = 'F' + else: + self.gender = 'M' + + digits = map(int, list(value)) + weight_1 = [3, 7, 6, 1, 8, 9, 4, 5, 2, 1, 0] + weight_2 = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2, 1] + + def multiply_reduce(aval, bval): + return sum((a * b) for (a, b) in zip(aval, bval)) + + if multiply_reduce(digits, weight_1) % 11 != 0: + raise ValidationError(msg) + if multiply_reduce(digits, weight_2) % 11 != 0: + raise ValidationError(msg) + + return value + diff --git a/django/contrib/localflavor/no/no_municipalities.py b/django/contrib/localflavor/no/no_municipalities.py new file mode 100644 index 0000000000..d66fef514c --- /dev/null +++ b/django/contrib/localflavor/no/no_municipalities.py @@ -0,0 +1,32 @@ +# -*- coding: iso-8859-1 -*- +""" +An alphabetical list of Norwegian municipalities (fylker) fro use as `choices` +in a formfield. + +This exists in this standalone file so that it's on ly imported into memory +when explicitly needed. +""" + +MUNICIPALITY_CHOICES = ( + ('akershus', u'Akershus'), + ('austagder', u'Aust-Agder'), + ('buskerud', u'Buskerud'), + ('finnmark', u'Finnmark'), + ('hedmark', u'Hedmark'), + ('hordaland', u'Hordaland'), + ('janmayen', u'Jan Mayen'), + ('moreogromsdal', u'Mre og Romsdal'), + ('nordtrondelag', u'Nord-Trndelag'), + ('nordland', u'Nordland'), + ('oppland', u'Oppland'), + ('oslo', u'Oslo'), + ('rogaland', u'Rogaland'), + ('sognogfjordane', u'Sogn og Fjordane'), + ('svalbard', u'Svalbard'), + ('sortrondelag', u'Sr-Trndelag'), + ('telemark', u'Telemark'), + ('troms', u'Troms'), + ('vestagder', u'Vest-Agder'), + ('vestfold', u'Vestfold'), + ('ostfold', u'stfold') +) diff --git a/django/contrib/webdesign/__init__.py b/django/contrib/webdesign/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/webdesign/lorem_ipsum.py b/django/contrib/webdesign/lorem_ipsum.py new file mode 100644 index 0000000000..b5a3d3b5db --- /dev/null +++ b/django/contrib/webdesign/lorem_ipsum.py @@ -0,0 +1,66 @@ +""" +Utility functions for generating "lorem ipsum" Latin text. +""" + +import random + +COMMON_P = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' +WORDS = ('exercitationem', 'perferendis', 'perspiciatis', 'laborum', 'eveniet', 'sunt', 'iure', 'nam', 'nobis', 'eum', 'cum', 'officiis', 'excepturi', 'odio', 'consectetur', 'quasi', 'aut', 'quisquam', 'vel', 'eligendi', 'itaque', 'non', 'odit', 'tempore', 'quaerat', 'dignissimos', 'facilis', 'neque', 'nihil', 'expedita', 'vitae', 'vero', 'ipsum', 'nisi', 'animi', 'cumque', 'pariatur', 'velit', 'modi', 'natus', 'iusto', 'eaque', 'sequi', 'illo', 'sed', 'ex', 'et', 'voluptatibus', 'tempora', 'veritatis', 'ratione', 'assumenda', 'incidunt', 'nostrum', 'placeat', 'aliquid', 'fuga', 'provident', 'praesentium', 'rem', 'necessitatibus', 'suscipit', 'adipisci', 'quidem', 'possimus', 'voluptas', 'debitis', 'sint', 'accusantium', 'unde', 'sapiente', 'voluptate', 'qui', 'aspernatur', 'laudantium', 'soluta', 'amet', 'quo', 'aliquam', 'saepe', 'culpa', 'libero', 'ipsa', 'dicta', 'reiciendis', 'nesciunt', 'doloribus', 'autem', 'impedit', 'minima', 'maiores', 'repudiandae', 'ipsam', 'obcaecati', 'ullam', 'enim', 'totam', 'delectus', 'ducimus', 'quis', 'voluptates', 'dolores', 'molestiae', 'harum', 'dolorem', 'quia', 'voluptatem', 'molestias', 'magni', 'distinctio', 'omnis', 'illum', 'dolorum', 'voluptatum', 'ea', 'quas', 'quam', 'corporis', 'quae', 'blanditiis', 'atque', 'deserunt', 'laboriosam', 'earum', 'consequuntur', 'hic', 'cupiditate', 'quibusdam', 'accusamus', 'ut', 'rerum', 'error', 'minus', 'eius', 'ab', 'ad', 'nemo', 'fugit', 'officia', 'at', 'in', 'id', 'quos', 'reprehenderit', 'numquam', 'iste', 'fugiat', 'sit', 'inventore', 'beatae', 'repellendus', 'magnam', 'recusandae', 'quod', 'explicabo', 'doloremque', 'aperiam', 'consequatur', 'asperiores', 'commodi', 'optio', 'dolor', 'labore', 'temporibus', 'repellat', 'veniam', 'architecto', 'est', 'esse', 'mollitia', 'nulla', 'a', 'similique', 'eos', 'alias', 'dolore', 'tenetur', 'deleniti', 'porro', 'facere', 'maxime', 'corrupti') +COMMON_WORDS = ('lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipisicing', 'elit', 'sed', 'do', 'eiusmod', 'tempor', 'incididunt', 'ut', 'labore', 'et', 'dolore', 'magna', 'aliqua') + +def sentence(): + """ + Returns a randomly generated sentence of lorem ipsum text. + + The first word is capitalized, and the sentence ends in either a period or + question mark. Commas are added at random. + """ + # Determine the number of comma-separated sections and number of words in + # each section for this sentence. + sections = [' '.join(random.sample(WORDS, random.randint(3, 12))) for i in range(random.randint(1, 5))] + s = ', '.join(sections) + # Convert to sentence case and add end punctuation. + return '%s%s%s' % (s[0].upper(), s[1:], random.choice('?.')) + +def paragraph(): + """ + Returns a randomly generated paragraph of lorem ipsum text. + + The paragraph consists of between 1 and 4 sentences, inclusive. + """ + return ' '.join([sentence() for i in range(random.randint(1, 4))]) + +def paragraphs(count, common=True): + """ + Returns a list of paragraphs as returned by paragraph(). + + If `common` is True, then the first paragraph will be the standard + 'lorem ipsum' paragraph. Otherwise, the first paragraph will be random + Latin text. Either way, subsequent paragraphs will be random Latin text. + """ + paras = [] + for i in range(count): + if common and i == 0: + paras.append(COMMON_P) + else: + paras.append(paragraph()) + return paras + +def words(count, common=True): + """ + Returns a string of `count` lorem ipsum words separated by a single space. + + If `common` is True, then the first 19 words will be the standard + 'lorem ipsum' words. Otherwise, all words will be selected randomly. + """ + if common: + word_list = list(COMMON_WORDS) + else: + word_list = [] + c = len(word_list) + if count > c: + count = min(count - c, len(WORDS)) + word_list += random.sample(WORDS, count - c) + else: + word_list = word_list[:count] + return ' '.join(word_list) diff --git a/django/contrib/webdesign/templatetags/__init__.py b/django/contrib/webdesign/templatetags/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/webdesign/templatetags/webdesign.py b/django/contrib/webdesign/templatetags/webdesign.py new file mode 100644 index 0000000000..e5117093f8 --- /dev/null +++ b/django/contrib/webdesign/templatetags/webdesign.py @@ -0,0 +1,67 @@ +from django.contrib.webdesign.lorem_ipsum import words, paragraphs +from django import template + +register = template.Library() + +class LoremNode(template.Node): + def __init__(self, count, method, common): + self.count, self.method, self.common = count, method, common + + def render(self, context): + try: + count = int(self.count.resolve(context)) + except (ValueError, TypeError): + count = 1 + if self.method == 'w': + return words(count, common=self.common) + else: + paras = paragraphs(count, common=self.common) + if self.method == 'p': + paras = ['

          %s

          ' % p for p in paras] + return '\n\n'.join(paras) + +#@register.tag +def lorem(parser, token): + """ + Creates random Latin text useful for providing test data in templates. + + Usage format:: + + {% lorem [count] [method] [random] %} + + ``count`` is a number (or variable) containing the number of paragraphs or + words to generate (default is 1). + + ``method`` is either ``w`` for words, ``p`` for HTML paragraphs, ``b`` for + plain-text paragraph blocks (default is ``b``). + + ``random`` is the word ``random``, which if given, does not use the common + paragraph (starting "Lorem ipsum dolor sit amet, consectetuer..."). + + Examples: + * ``{% lorem %}`` will output the common "lorem ipsum" paragraph + * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph + and two random paragraphs each wrapped in HTML ``

          `` tags + * ``{% lorem 2 w random %}`` will output two random latin words + """ + bits = list(token.split_contents()) + tagname = bits[0] + # Random bit + common = bits[-1] != 'random' + if not common: + bits.pop() + # Method bit + if bits[-1] in ('w', 'p', 'b'): + method = bits.pop() + else: + method = 'b' + # Count bit + if len(bits) > 1: + count = bits.pop() + else: + count = '1' + count = parser.compile_filter(count) + if len(bits) != 1: + raise TemplateSyntaxError("Incorrect format for %r tag" % tagname) + return LoremNode(count, method, common) +lorem = register.tag(lorem) diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py index 649dd6942d..619758a0b1 100644 --- a/django/core/servers/fastcgi.py +++ b/django/core/servers/fastcgi.py @@ -1,5 +1,5 @@ """ -FastCGI server that implements the WSGI protocol. +FastCGI (or SCGI, or AJP1.3 ...) server that implements the WSGI protocol. Uses the flup python package: http://www.saddi.com/software/flup/ @@ -18,15 +18,16 @@ __version__ = "0.1" __all__ = ["runfastcgi"] FASTCGI_HELP = r"""runfcgi: - Run this project as a fastcgi application. To do this, the - flup package from http://www.saddi.com/software/flup/ is - required. + Run this project as a fastcgi (or some other protocol supported + by flup) application. To do this, the flup package from + http://www.saddi.com/software/flup/ is required. Usage: django-admin.py runfcgi --settings=yourproject.settings [fcgi settings] manage.py runfcgi [fcgi settings] Optional Fcgi settings: (setting=value) + protocol=PROTOCOL fcgi, scgi, ajp, ... (default fcgi) host=HOSTNAME hostname to listen on.. port=PORTNUM port to listen on. socket=FILE UNIX socket to listen on. @@ -45,8 +46,8 @@ Examples: (for webservers which spawn your processes for you) $ manage.py runfcgi method=threaded - Run a fastcgi server on a TCP host/port - $ manage.py runfcgi method=prefork host=127.0.0.1 port=8025 + Run a scgi server on a TCP host/port + $ manage.py runfcgi protocol=scgi method=prefork host=127.0.0.1 port=8025 Run a fastcgi server on a UNIX domain socket (posix platforms only) $ manage.py runfcgi method=prefork socket=/tmp/fcgi.sock @@ -58,6 +59,7 @@ Examples: """ FASTCGI_OPTIONS = { + 'protocol': 'fcgi', 'host': None, 'port': None, 'socket': None, @@ -100,16 +102,17 @@ def runfastcgi(argset=[], **kwargs): print >> sys.stderr, " installed flup, then make sure you have it in your PYTHONPATH." return False + flup_module = 'server.' + options['protocol'] + if options['method'] in ('prefork', 'fork'): - from flup.server.fcgi_fork import WSGIServer wsgi_opts = { 'maxSpare': int(options["maxspare"]), 'minSpare': int(options["minspare"]), 'maxChildren': int(options["maxchildren"]), 'maxRequests': int(options["maxrequests"]), } + flup_module += '_fork' elif options['method'] in ('thread', 'threaded'): - from flup.server.fcgi import WSGIServer wsgi_opts = { 'maxSpare': int(options["maxspare"]), 'minSpare': int(options["minspare"]), @@ -120,6 +123,12 @@ def runfastcgi(argset=[], **kwargs): wsgi_opts['debug'] = False # Turn off flup tracebacks + try: + WSGIServer = getattr(__import__('flup.' + flup_module, '', '', flup_module), 'WSGIServer') + except: + print "Can't import flup." + flup_module + return False + # Prep up and go from django.core.handlers.wsgi import WSGIHandler diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index 3f1004c4fb..c4cbccabcf 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -88,7 +88,7 @@ class MatchChecker(object): return str(value) # TODO: Unicode? class RegexURLPattern(object): - def __init__(self, regex, callback, default_args=None): + def __init__(self, regex, callback, default_args=None, name=None): # regex is a string representing a regular expression. # callback is either a string like 'foo.views.news.stories.story_detail' # which represents the path to a module and a view function name, or a @@ -100,6 +100,7 @@ class RegexURLPattern(object): self._callback = None self._callback_str = callback self.default_args = default_args or {} + self.name = name def resolve(self, path): match = self.regex.search(path) @@ -205,14 +206,15 @@ class RegexURLResolver(object): try: lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name) except (ImportError, AttributeError): - raise NoReverseMatch + if func_name != '': + raise NoReverseMatch for pattern in self.urlconf_module.urlpatterns: if isinstance(pattern, RegexURLResolver): try: return pattern.reverse_helper(lookup_view, *args, **kwargs) except NoReverseMatch: continue - elif pattern.callback == lookup_view: + elif pattern.callback == lookup_view or pattern.name == lookup_view: try: return pattern.reverse_helper(*args, **kwargs) except NoReverseMatch: diff --git a/django/db/models/base.py b/django/db/models/base.py index ed7f484626..eb95aae4f2 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -22,7 +22,12 @@ class ModelBase(type): "Metaclass for all models" def __new__(cls, name, bases, attrs): # If this isn't a subclass of Model, don't do anything special. - if name == 'Model' or not filter(lambda b: issubclass(b, Model), bases): + try: + if not filter(lambda b: issubclass(b, Model), bases): + return super(ModelBase, cls).__new__(cls, name, bases, attrs) + except NameError: + # 'Model' isn't defined yet, meaning we're looking at Django's own + # Model class, defined below. return super(ModelBase, cls).__new__(cls, name, bases, attrs) # Create the class. diff --git a/django/http/__init__.py b/django/http/__init__.py index 0ae90c4921..ed2c128a16 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -155,6 +155,9 @@ def parse_cookie(cookie): class HttpResponse(object): "A basic HTTP response, with content and dictionary-accessed headers" + + status_code = 200 + def __init__(self, content='', mimetype=None): from django.conf import settings self._charset = settings.DEFAULT_CHARSET @@ -168,7 +171,6 @@ class HttpResponse(object): self._is_string = True self.headers = {'Content-Type': mimetype} self.cookies = SimpleCookie() - self.status_code = 200 def __str__(self): "Full HTTP message, including headers" @@ -254,47 +256,49 @@ class HttpResponse(object): return sum([len(chunk) for chunk in self._container]) class HttpResponseRedirect(HttpResponse): + status_code = 302 + def __init__(self, redirect_to): HttpResponse.__init__(self) self['Location'] = quote(redirect_to, safe=RESERVED_CHARS) - self.status_code = 302 class HttpResponsePermanentRedirect(HttpResponse): + status_code = 301 + def __init__(self, redirect_to): HttpResponse.__init__(self) self['Location'] = quote(redirect_to, safe=RESERVED_CHARS) - self.status_code = 301 class HttpResponseNotModified(HttpResponse): - def __init__(self): - HttpResponse.__init__(self) - self.status_code = 304 + status_code = 304 + +class HttpResponseBadRequest(HttpResponse): + status_code = 400 class HttpResponseNotFound(HttpResponse): - def __init__(self, *args, **kwargs): - HttpResponse.__init__(self, *args, **kwargs) - self.status_code = 404 + status_code = 404 class HttpResponseForbidden(HttpResponse): - def __init__(self, *args, **kwargs): - HttpResponse.__init__(self, *args, **kwargs) - self.status_code = 403 + status_code = 403 class HttpResponseNotAllowed(HttpResponse): + status_code = 405 + def __init__(self, permitted_methods): HttpResponse.__init__(self) self['Allow'] = ', '.join(permitted_methods) - self.status_code = 405 class HttpResponseGone(HttpResponse): + status_code = 410 + def __init__(self, *args, **kwargs): HttpResponse.__init__(self, *args, **kwargs) - self.status_code = 410 class HttpResponseServerError(HttpResponse): + status_code = 500 + def __init__(self, *args, **kwargs): HttpResponse.__init__(self, *args, **kwargs) - self.status_code = 500 def get_host(request): "Gets the HTTP host from the environment or request headers." diff --git a/django/newforms/fields.py b/django/newforms/fields.py index 8e3da03470..72c5047030 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -38,15 +38,16 @@ class Field(object): def __init__(self, required=True, widget=None, label=None, initial=None, help_text=None): # required -- Boolean that specifies whether the field is required. # True by default. - # widget -- A Widget class, or instance of a Widget class, that should be - # used for this Field when displaying it. Each Field has a default - # Widget that it'll use if you don't specify this. In most cases, - # the default widget is TextInput. - # label -- A verbose name for this field, for use in displaying this field in - # a form. By default, Django will use a "pretty" version of the form - # field name, if the Field is part of a Form. - # initial -- A value to use in this Field's initial display. This value is - # *not* used as a fallback if data isn't given. + # widget -- A Widget class, or instance of a Widget class, that should + # be used for this Field when displaying it. Each Field has a + # default Widget that it'll use if you don't specify this. In + # most cases, the default widget is TextInput. + # label -- A verbose name for this field, for use in displaying this + # field in a form. By default, Django will use a "pretty" + # version of the form field name, if the Field is part of a + # Form. + # initial -- A value to use in this Field's initial display. This value + # is *not* used as a fallback if data isn't given. # help_text -- An optional string to use as "help text" for this Field. if label is not None: label = smart_unicode(label) diff --git a/django/newforms/models.py b/django/newforms/models.py index 616c7141e7..a60002b705 100644 --- a/django/newforms/models.py +++ b/django/newforms/models.py @@ -36,13 +36,14 @@ def save_instance(form, instance, commit=True): raise ValueError("The %s could not be changed because the data didn't validate." % opts.object_name) clean_data = form.clean_data for f in opts.fields: - if not f.editable or isinstance(f, models.AutoField): + if not f.editable or isinstance(f, models.AutoField) or not f.name in clean_data: continue setattr(instance, f.name, clean_data[f.name]) if commit: instance.save() for f in opts.many_to_many: - setattr(instance, f.attname, clean_data[f.name]) + if f.name in clean_data: + setattr(instance, f.attname, clean_data[f.name]) # GOTCHA: If many-to-many data is given and commit=False, the many-to-many # data will be lost. This happens because a many-to-many options cannot be # set on an object until after it's saved. Maybe we should raise an diff --git a/django/newforms/util.py b/django/newforms/util.py index 51a8efdde2..f98027c2e3 100644 --- a/django/newforms/util.py +++ b/django/newforms/util.py @@ -1,11 +1,20 @@ from django.conf import settings from django.utils.html import escape +from django.utils.functional import Promise, lazy # Converts a dictionary to a single string with key="value", XML-style with # a leading space. Assumes keys do not need to be XML-escaped. flatatt = lambda attrs: u''.join([u' %s="%s"' % (k, escape(v)) for k, v in attrs.items()]) def smart_unicode(s): + if isinstance(s, Promise): + # The input is something from gettext_lazy or similar. We don't want to + # translate it until render time, so defer the conversion. + return smart_unicode_lazy(s) + else: + return smart_unicode_immediate(s) + +def smart_unicode_immediate(s): if not isinstance(s, basestring): if hasattr(s, '__unicode__'): s = unicode(s) @@ -15,6 +24,8 @@ def smart_unicode(s): s = unicode(s, settings.DEFAULT_CHARSET) return s +smart_unicode_lazy = lazy(smart_unicode_immediate, unicode) + class StrAndUnicode(object): """ A class whose __str__ returns its __unicode__ as a bytestring diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py index 18bba31897..58d8ab1322 100644 --- a/django/newforms/widgets.py +++ b/django/newforms/widgets.py @@ -24,7 +24,10 @@ class Widget(object): is_hidden = False # Determines whether this corresponds to an . def __init__(self, attrs=None): - self.attrs = attrs or {} + if attrs is not None: + self.attrs = attrs.copy() + else: + self.attrs = {} def render(self, name, value, attrs=None): """ diff --git a/django/oldforms/__init__.py b/django/oldforms/__init__.py index 56101984f5..873bd0204a 100644 --- a/django/oldforms/__init__.py +++ b/django/oldforms/__init__.py @@ -923,7 +923,8 @@ class FilePathField(SelectField): for root, dirs, files in os.walk(path): for f in files: if match is None or match_re.search(f): - choices.append((os.path.join(root, f), f)) + f = os.path.join(root, f) + choices.append((f, f.replace(path, "", 1))) else: try: for f in os.listdir(path): diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 30aeca1af1..6a37c163e9 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -140,7 +140,7 @@ class IfChangedNode(Node): else: compare_to = self.nodelist.render(context) except VariableDoesNotExist: - compare_to = None + compare_to = None if compare_to != self._last_seen: firstloop = (self._last_seen == None) @@ -280,24 +280,6 @@ class LoadNode(Node): def render(self, context): return '' -class LoremNode(Node): - def __init__(self, count, method, common): - self.count, self.method, self.common = count, method, common - - def render(self, context): - from django.utils.lorem_ipsum import words, paragraphs - try: - count = int(self.count.resolve(context)) - except (ValueError, TypeError): - count = 1 - if self.method == 'w': - return words(count, common=self.common) - else: - paras = paragraphs(count, common=self.common) - if self.method == 'p': - paras = ['

          %s

          ' % p for p in paras] - return '\n\n'.join(paras) - class NowNode(Node): def __init__(self, format_string): self.format_string = format_string @@ -338,7 +320,7 @@ class URLNode(Node): self.view_name = view_name self.args = args self.kwargs = kwargs - + def render(self, context): from django.core.urlresolvers import reverse, NoReverseMatch args = [arg.resolve(context) for arg in self.args] @@ -786,52 +768,6 @@ def load(parser, token): return LoadNode() load = register.tag(load) -#@register.tag -def lorem(parser, token): - """ - Creates random latin text useful for providing test data in templates. - - Usage format:: - - {% lorem [count] [method] [random] %} - - ``count`` is a number (or variable) containing the number of paragraphs or - words to generate (default is 1). - - ``method`` is either ``w`` for words, ``p`` for HTML paragraphs, ``b`` for - plain-text paragraph blocks (default is ``b``). - - ``random`` is the word ``random``, which if given, does not use the common - paragraph (starting "Lorem ipsum dolor sit amet, consectetuer..."). - - Examples: - * ``{% lorem %}`` will output the common "lorem ipsum" paragraph - * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph - and two random paragraphs each wrapped in HTML ``

          `` tags - * ``{% lorem 2 w random %}`` will output two random latin words - """ - bits = list(token.split_contents()) - tagname = bits[0] - # Random bit - common = bits[-1] != 'random' - if not common: - bits.pop() - # Method bit - if bits[-1] in ('w', 'p', 'b'): - method = bits.pop() - else: - method = 'b' - # Count bit - if len(bits) > 1: - count = bits.pop() - else: - count = '1' - count = parser.compile_filter(count) - if len(bits) != 1: - raise TemplateSyntaxError, "Incorrect format for %r tag" % tagname - return LoremNode(count, method, common) -lorem = register.tag(lorem) - #@register.tag def now(parser, token): """ @@ -916,7 +852,7 @@ regroup = register.tag(regroup) def spaceless(parser, token): """ - Normalize whitespace between HTML tags to a single space. This includes tab + Removes whitespace between HTML tags. This includes tab characters and newlines. Example usage:: @@ -929,7 +865,7 @@ def spaceless(parser, token): This example would return this HTML:: -

          Foo

          +

          Foo

          Only space between *tags* is normalized -- not space between tags and text. In this example, the space around ``Hello`` won't be stripped:: @@ -980,12 +916,12 @@ templatetag = register.tag(templatetag) def url(parser, token): """ - Returns an absolute URL matching given view with its parameters. - + Returns an absolute URL matching given view with its parameters. + This is a way to define links that aren't tied to a particular URL configuration:: - + {% url path.to.some_view arg1,arg2,name1=value1 %} - + The first argument is a path to a view. It can be an absolute python path or just ``app_name.view_name`` without the project name if the view is located inside the project. Other arguments are comma-separated values @@ -994,18 +930,18 @@ def url(parser, token): For example if you have a view ``app_name.client`` taking client's id and the corresponding line in a URLconf looks like this:: - + ('^client/(\d+)/$', 'app_name.client') - + and this app's URLconf is included into the project's URLconf under some path:: - + ('^clients/', include('project_name.app_name.urls')) - + then in a template you can create a link for a certain client like this:: - + {% url app_name.client client.id %} - + The URL will look like ``/clients/client/123/``. """ bits = token.contents.split(' ', 2) diff --git a/django/utils/html.py b/django/utils/html.py index a0d1e82dcf..baa2fb06fc 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -39,8 +39,8 @@ def strip_tags(value): return re.sub(r'<[^>]*?>', '', value) def strip_spaces_between_tags(value): - "Returns the given HTML with spaces between tags normalized to a single space" - return re.sub(r'>\s+<', '> <', value) + "Returns the given HTML with spaces between tags removed" + return re.sub(r'>\s+<', '><', value) def strip_entities(value): "Returns the given HTML with all entities (&something;) stripped" diff --git a/django/utils/text.py b/django/utils/text.py index faf8705fa9..c73ab908f3 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -191,14 +191,15 @@ def smart_split(text): Supports both single and double quotes, and supports escaping quotes with backslashes. In the output, strings will keep their initial and trailing quote marks. + >>> list(smart_split('This is "a person\'s" test.')) ['This', 'is', '"a person\'s"', 'test.'] """ for bit in smart_split_re.finditer(text): bit = bit.group(0) - if bit[0] == '"': + if bit[0] == '"' and bit[-1] == '"': yield '"' + bit[1:-1].replace('\\"', '"').replace('\\\\', '\\') + '"' - elif bit[0] == "'": + elif bit[0] == "'" and bit[-1] == "'": yield "'" + bit[1:-1].replace("\\'", "'").replace("\\\\", "\\") + "'" else: yield bit diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index 276e59f4bd..39ebd6f75a 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -1,8 +1,94 @@ -from django.conf import settings +""" +Internationalization support. +""" +from django.utils.functional import lazy -if settings.USE_I18N: - from trans_real import * -else: - from trans_null import * +__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext', + 'ngettext_lazy', 'string_concat', 'activate', 'deactivate', + 'get_language', 'get_language_bidi', 'get_date_formats', + 'get_partial_date_formats', 'check_for_language', 'to_locale', + 'get_language_from_request', 'install'] + +# Here be dragons, so a short explanation of the logic won't hurt: +# We are trying to solve two problems: (1) access settings, in particular +# settings.USE_I18N, as late as possible, so that modules can be imported +# without having to first configure Django, and (2) if some other code creates +# a reference to one of these functions, don't break that reference when we +# replace the functions with their real counterparts (once we do access the +# settings). + +def delayed_loader(*args, **kwargs): + """ + Replace each real_* function with the corresponding function from either + trans_real or trans_null (e.g. real_gettext is replaced with + trans_real.gettext or trans_null.gettext). This function is run once, the + first time any i18n method is called. It replaces all the i18n methods at + once at that time. + """ + import traceback + from django.conf import settings + if settings.USE_I18N: + import trans_real as trans + else: + import trans_null as trans + caller = traceback.extract_stack(limit=2)[0][2] + g = globals() + for name in __all__: + if hasattr(trans, name): + g['real_%s' % name] = getattr(trans, name) + + # Make the originally requested function call on the way out the door. + return g[caller](*args, **kwargs) + +g = globals() +for name in __all__: + g['real_%s' % name] = delayed_loader +del g, delayed_loader + +def gettext_noop(message): + return real_gettext_noop(message) + +def gettext(message): + return real_gettext(message) + + +def ngettext(singular, plural, number): + return real_ngettext(singular, plural, number) + +def string_concat(*strings): + return real_string_concat(*strings) + +ngettext_lazy = lazy(ngettext, str, unicode) +gettext_lazy = lazy(gettext, str, unicode) +string_concat = lazy(string_concat, str, unicode) + +def activate(language): + return real_activate(language) + +def deactivate(): + return real_deactivate() + +def get_language(): + return real_get_language() + +def get_language_bidi(): + return real_get_language_bidi() + +def get_date_formats(): + return real_get_date_formats() + +def get_partial_date_formats(): + return real_get_partial_date_formats() + +def check_for_language(lang_code): + return real_check_for_language(lang_code) + +def to_locale(language): + return real_to_locale(language) + +def get_language_from_request(request): + return real_get_language_from_request(request) + +def install(): + return real_install() -del settings diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 94df23a8e9..0c8dcd540f 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -3,7 +3,6 @@ import os, re, sys import gettext as gettext_module from cStringIO import StringIO -from django.utils.functional import lazy try: import threading @@ -277,9 +276,6 @@ def ngettext(singular, plural, number): _default = translation(settings.LANGUAGE_CODE) return _default.ngettext(singular, plural, number) -gettext_lazy = lazy(gettext, str) -ngettext_lazy = lazy(ngettext, str) - def check_for_language(lang_code): """ Checks whether there is a global language file for the given language code. @@ -493,4 +489,3 @@ def string_concat(*strings): """ return ''.join([str(el) for el in strings]) -string_concat = lazy(string_concat, str) diff --git a/docs/faq.txt b/docs/faq.txt index 33e8ef01b4..b5150a0967 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -328,8 +328,9 @@ Do I have to use mod_python? Although we recommend mod_python for production use, you don't have to use it, thanks to the fact that Django uses an arrangement called WSGI_. Django can -talk to any WSGI-enabled server. The most common non-mod_python deployment -setup is FastCGI. See `How to use Django with FastCGI`_ for full information. +talk to any WSGI-enabled server. Other non-mod_python deployment setups are +FastCGI, SCGI or AJP. See `How to use Django with FastCGI, SCGI or AJP`_ for +full information. Also, see the `server arrangements wiki page`_ for other deployment strategies. @@ -337,7 +338,7 @@ If you just want to play around and develop things on your local computer, use the development Web server that comes with Django. Things should Just Work. .. _WSGI: http://www.python.org/peps/pep-0333.html -.. _How to use Django with FastCGI: ../fastcgi/ +.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/ .. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements How do I install mod_python on Windows? diff --git a/docs/fastcgi.txt b/docs/fastcgi.txt index 5ecaac8666..119688096f 100644 --- a/docs/fastcgi.txt +++ b/docs/fastcgi.txt @@ -1,11 +1,17 @@ -============================== -How to use Django with FastCGI -============================== +=========================================== +How to use Django with FastCGI, SCGI or AJP +=========================================== Although the `current preferred setup`_ for running Django is Apache_ with -`mod_python`_, many people use shared hosting, on which FastCGI is the only -viable option. In some setups, FastCGI also allows better security -- and, -possibly, better performance -- than mod_python. +`mod_python`_, many people use shared hosting, on which protocols such as +FastCGI, SCGI or AJP are the only viable options. In some setups, these protocols +also allow better security -- and, possibly, better performance -- than mod_python. + +.. admonition:: Note + + This document primarily focuses on FastCGI. Other protocols, such as SCGI + and AJP, are also supported, through the ``flup`` Python package. See the + "Protocols" section below for specifics about SCGI and AJP. Essentially, FastCGI is an efficient way of letting an external application serve pages to a Web server. The Web server delegates the incoming Web requests @@ -74,10 +80,26 @@ your ``manage.py`` is), and then run ``manage.py`` with the ``runfcgi`` option:: If you specify ``help`` as the only option after ``runfcgi``, it'll display a list of all the available options. -You'll need to specify either a ``socket`` or both ``host`` and ``port``. Then, -when you set up your Web server, you'll just need to point it at the host/port +You'll need to specify either a ``socket``, ``protocol`` or both ``host`` and ``port``. +Then, when you set up your Web server, you'll just need to point it at the host/port or socket you specified when starting the FastCGI server. +Protocols +--------- + +Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_ and +`AJP1.3`_ (the Apache JServ Protocol, version 1.3). Select your preferred +protocol by using the ``protocol=`` option with +``./manage.py runfcgi`` -- where ```` may be one of: ``fcgi`` +(the default), ``scgi`` or ``ajp``. For example:: + + ./manage.py runfcgi --protocol=scgi + +.. _flup: http://www.saddi.com/software/flup/ +.. _fastcgi: http://www.fastcgi.com/ +.. _SCGI: http://python.ca/scgi/protocol.txt +.. _AJP1.3: http://tomcat.apache.org/connectors-doc/ajp/ajpv13a.html + Examples -------- diff --git a/docs/forms.txt b/docs/forms.txt index f76f6d27ef..ce1010235f 100644 --- a/docs/forms.txt +++ b/docs/forms.txt @@ -517,10 +517,10 @@ to put punctuation at the end of your validation messages. When are validators called? --------------------------- -After a form has been submitted, Django first checks to see that all the -required fields are present and non-empty. For each field that passes that -test *and if the form submission contained data* for that field, all the -validators for that field are called in turn. The emphasized portion in the +After a form has been submitted, Django validates each field in turn. First, +if the field is required, Django checks that it is present and non-empty. Then, +if that test passes *and the form submission contained data* for that field, all +the validators for that field are called in turn. The emphasized portion in the last sentence is important: if a form field is not submitted (because it contains no data -- which is normal HTML behavior), the validators are not run against the field. diff --git a/docs/generic_views.txt b/docs/generic_views.txt index 7659a428c5..0496a58691 100644 --- a/docs/generic_views.txt +++ b/docs/generic_views.txt @@ -222,7 +222,7 @@ In addition to ``extra_context``, the template's context will be: by ``date_field``. For example, if ``num_latest`` is ``10``, then ``latest`` will be a list of the latest 10 objects in ``queryset``. -.. _RequestContext docs: ../templates_python/#subclassing-context-djangocontext +.. _RequestContext docs: ../templates_python/#subclassing-context-requestcontext ``django.views.generic.date_based.archive_year`` ------------------------------------------------ diff --git a/docs/model-api.txt b/docs/model-api.txt index 155ef63271..a03ed09eb2 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -1307,13 +1307,13 @@ A few special cases to note about ``list_display``: * Usually, elements of ``list_display`` that aren't actual database fields can't be used in sorting (because Django does all the sorting at the database level). - + However, if an element of ``list_display`` represents a certain database field, you can indicate this fact by setting the ``admin_order_field`` attribute of the item. - + For example:: - + class Person(models.Model): first_name = models.CharField(maxlength=50) color_code = models.CharField(maxlength=6) @@ -1325,7 +1325,7 @@ A few special cases to note about ``list_display``: return '%s' % (self.color_code, self.first_name) colored_first_name.allow_tags = True colored_first_name.admin_order_field = 'first_name' - + The above will tell Django to order by the ``first_name`` field when trying to sort by ``colored_first_name`` in the admin. @@ -1758,16 +1758,38 @@ slightly violates the DRY principle: the URL for this object is defined both in the URLConf file and in the model. You can further decouple your models from the URLconf using the ``permalink`` -decorator. This decorator is passed the view function and any parameters you -would use for accessing this instance directly. Django then works out the -correct full URL path using the URLconf. For example:: +decorator. This decorator is passed the view function, a list of positional +parameters and (optionally) a dictionary of named parameters. Django then +works out the correct full URL path using the URLconf, substituting the +parameters you have given into the URL. For example, if your URLconf +contained a line such as:: + + (r'^/people/(\d+)/$', 'people.views.details'), + +...your model could have a ``get_absolute_url`` method that looked like this:: from django.db.models import permalink def get_absolute_url(self): - return ('people.views.details', str(self.id)) + return ('people.views.details', [str(self.id)]) get_absolute_url = permalink(get_absolute_url) +Similarly, if you had a URLconf entry that looked like:: + + (r'/archive/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/$', archive_view) + +...you could reference this using ``permalink()`` as follows:: + + def get_absolute_url(self): + return ('archive_view', (), { + 'year': self.created.year, + 'month': self.created.month, + 'day': self.created.day}) + get_absolute_url = permalink(get_absolute_url) + +Notice that we specify an empty sequence for the second argument in this case, +because we only want to pass keyword arguments, not named arguments. + In this way, you're tying the model's absolute URL to the view that is used to display it, without repeating the URL information anywhere. You can still use the ``get_absolute_url`` method in templates, as before. diff --git a/docs/modpython.txt b/docs/modpython.txt index 2c999753c7..31ec1efe49 100644 --- a/docs/modpython.txt +++ b/docs/modpython.txt @@ -13,14 +13,15 @@ other server arrangements. Django requires Apache 2.x and mod_python 3.x, and you should use Apache's `prefork MPM`_, as opposed to the `worker MPM`_. -You may also be interested in `How to use Django with FastCGI`_. +You may also be interested in `How to use Django with FastCGI, SCGI or AJP`_ +(which also covers SCGI and AJP). .. _Apache: http://httpd.apache.org/ .. _mod_python: http://www.modpython.org/ .. _mod_perl: http://perl.apache.org/ .. _prefork MPM: http://httpd.apache.org/docs/2.2/mod/prefork.html .. _worker MPM: http://httpd.apache.org/docs/2.2/mod/worker.html -.. _How to use Django with FastCGI: ../fastcgi/ +.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/ Basic configuration =================== @@ -37,7 +38,8 @@ Then edit your ``httpd.conf`` file and add the following:: PythonDebug On -...and replace ``mysite.settings`` with the Python path to your settings file. +...and replace ``mysite.settings`` with the Python import path to your Django +project's settings file. This tells Apache: "Use mod_python for any URL at or under '/mysite/', using the Django mod_python handler." It passes the value of ``DJANGO_SETTINGS_MODULE`` @@ -53,6 +55,19 @@ on it, you'll need to tell mod_python:: PythonPath "['/path/to/project'] + sys.path" +.. caution:: + + Is you are using Windows, remember that the path will contain backslashes. + This string is passed through Python's string parser twice, so you need to + escape each backslash **twice**:: + + PythonPath "['c:\\\\path\\\\to\\\\project'] + sys.path" + + or use raw strings:: + + PythonPath "[r'c:\\path\\to\\project'] + sys.path" + + You can also add directives such as ``PythonAutoReload Off`` for performance. See the `mod_python documentation`_ for a full list of options. diff --git a/docs/request_response.txt b/docs/request_response.txt index 2b79903d13..40f06c859f 100644 --- a/docs/request_response.txt +++ b/docs/request_response.txt @@ -416,6 +416,10 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in The constructor doesn't take any arguments. Use this to designate that a page hasn't been modified since the user's last request. +``HttpResponseBadRequest`` + **New in Django development version.** + Acts just like ``HttpResponse`` but uses a 400 status code. + ``HttpResponseNotFound`` Acts just like ``HttpResponse`` but uses a 404 status code. diff --git a/docs/templates.txt b/docs/templates.txt index 36da8dff07..d93ee49ac1 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -625,31 +625,6 @@ Load a custom template tag set. See `Custom tag and filter libraries`_ for more information. -lorem -~~~~~ - -Display random latin text useful for providing sample data in templates. - -Usage format: ``{% lorem [count] [method] [random] %}`` - - =========== ============================================================= - Argument Description - =========== ============================================================= - ``count`` A number (or variable) containing the number of paragraphs or - words to generate (default is 1). - ``method`` Either ``w`` for words, ``p`` for HTML paragraphs or ``b`` - for plain-text paragraph blocks (default is ``b``). - ``random`` The word ``random``, which if given, does not use the common - paragraph ("Lorem ipsum dolor sit amet...") when generating - text. - -Examples: - - * ``{% lorem %}`` will output the common "lorem ipsum" paragraph. - * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph - and two random paragraphs each wrapped in HTML ``

          `` tags. - * ``{% lorem 2 w random %}`` will output two random latin words. - now ~~~ @@ -782,7 +757,7 @@ i.e.:: spaceless ~~~~~~~~~ -Normalizes whitespace between HTML tags to a single space. This includes tab +Removes whitespace between HTML tags. This includes tab characters and newlines. Example usage:: @@ -795,9 +770,9 @@ Example usage:: This example would return this HTML:: -

          Foo

          +

          Foo

          -Only space between *tags* is normalized -- not space between tags and text. In +Only space between *tags* is removed -- not space between tags and text. In this example, the space around ``Hello`` won't be stripped:: {% spaceless %} diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt index 85c87de680..e6e1cb6cbf 100644 --- a/docs/url_dispatch.txt +++ b/docs/url_dispatch.txt @@ -185,10 +185,25 @@ The first argument to ``patterns()`` is a string ``prefix``. See The remaining arguments should be tuples in this format:: - (regular expression, Python callback function [, optional dictionary]) + (regular expression, Python callback function [, optional dictionary [, optional name]]) -...where ``optional dictionary`` is optional. (See -_`Passing extra options to view functions` below.) +...where ``optional dictionary`` and ``optional name`` are optional. (See +`Passing extra options to view functions`_ below.) + +url +--- +**New in development version** + +The ``url()`` function can be used instead of a tuple as an argument to +``patterns()``. This is convenient if you wish to specify a name without the +optional extra arguments dictionary. For example:: + + urlpatterns = patterns('', + url(r'/index/$', index_view, name="main-view"), + ... + ) + +See `Naming URL patterns`_ for why the ``name`` parameter is useful. handler404 ---------- @@ -479,3 +494,44 @@ The style you use is up to you. Note that if you use this technique -- passing objects rather than strings -- the view prefix (as explained in "The view prefix" above) will have no effect. + +Naming URL patterns +=================== + +**New in development version** + +It is fairly common to use the same view function in multiple URL patterns in +your URLConf. This leads to problems when you come to do reverse URL matching, +because the ``permalink()`` decorator and ``{% url %}`` template tag use the +name of the view function to find a match. + +To solve this problem, you can give a name to each of your URL patterns in +order to distinguish them from other patterns using the same views and +parameters. You can then use this name wherever you would otherwise use the +name of the view function. For example, if you URLConf contains:: + + urlpatterns = patterns('', + url(r'/archive/(\d{4})/$', archive, name="full-archive"), + url(r'/archive-summary/(\d{4})/$', archive, {'summary': True}, "arch-summary"), + ) + +...you could refer to either the summary archive view in a template as:: + + {% url arch-summary 1945 %} + +Even though both URL patterns refer to the ``archive`` view here, using the +``name`` parameter to ``url()`` allows you to tell them apart in templates. + +The string used for the URL name can contain any characters you like. You are +not restricted to valid Python names. + +.. note:: + + Make sure that when you name your URLs, you use names that are unlikely to + clash with any other application's choice of names. If you call your URL + pattern *comment* and another application does the same thing, there is no + guarantee which URL will be inserted into your template when you use this + name. Putting a prefix on your URL names, perhaps derived from + the application name, will decrease the chances of collision. Something + like *myapp-comment* is recommended over simply *comment*. + diff --git a/docs/webdesign.txt b/docs/webdesign.txt new file mode 100644 index 0000000000..8e6eae89dd --- /dev/null +++ b/docs/webdesign.txt @@ -0,0 +1,53 @@ +======================== +django.contrib.webdesign +======================== + +The ``django.contrib.webdesign`` package, part of the `"django.contrib" add-ons`_, +provides various Django helpers that are particularly useful to Web *designers* +(as opposed to developers). + +At present, the package contains only a single template tag. If you have ideas +for Web-designer-friendly functionality in Django, please `suggest them`_. + +.. _"django.contrib" add-ons: ../add_ons/ +.. _suggest them: ../contributing/ + +Template tags +============= + +To use these template tags, add ``'django.contrib.webdesign'`` to your +``INSTALLED_APPS`` setting. Once you've done that, use +``{% load webdesign %}`` in a template to give your template access to the tags. + + +lorem +===== + +Displays random "lorem ipsum" Latin text. This is useful for providing sample +data in templates. + +Usage:: + + {% lorem [count] [method] [random] %} + +The ``{% lorem %}`` tag can be used with zero, one, two or three arguments. +The arguments are: + + =========== ============================================================= + Argument Description + =========== ============================================================= + ``count`` A number (or variable) containing the number of paragraphs or + words to generate (default is 1). + ``method`` Either ``w`` for words, ``p`` for HTML paragraphs or ``b`` + for plain-text paragraph blocks (default is ``b``). + ``random`` The word ``random``, which if given, does not use the common + paragraph ("Lorem ipsum dolor sit amet...") when generating + text. + =========== ============================================================= + +Examples: + + * ``{% lorem %}`` will output the common "lorem ipsum" paragraph. + * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph + and two random paragraphs each wrapped in HTML ``

          `` tags. + * ``{% lorem 2 w random %}`` will output two random Latin words. diff --git a/tests/modeltests/invalid_models/models.py b/tests/modeltests/invalid_models/models.py index 2299cd85e6..af54ec3d35 100644 --- a/tests/modeltests/invalid_models/models.py +++ b/tests/modeltests/invalid_models/models.py @@ -97,6 +97,16 @@ class SelfClashM2M(models.Model): m2m_3 = models.ManyToManyField('self', symmetrical=False) m2m_4 = models.ManyToManyField('self', symmetrical=False) +class Model(models.Model): + "But it's valid to call a model Model." + year = models.PositiveIntegerField() #1960 + make = models.CharField(maxlength=10) #Aston Martin + name = models.CharField(maxlength=10) #DB 4 GT + +class Car(models.Model): + colour = models.CharField(maxlength=5) + model = models.ForeignKey(Model) + model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "maxlength" attribute. invalid_models.fielderrors: "floatfield": FloatFields require a "decimal_places" attribute. invalid_models.fielderrors: "floatfield": FloatFields require a "max_digits" attribute. diff --git a/tests/regressiontests/forms/localflavor.py b/tests/regressiontests/forms/localflavor.py new file mode 100644 index 0000000000..f166a24ef0 --- /dev/null +++ b/tests/regressiontests/forms/localflavor.py @@ -0,0 +1,842 @@ +# -*- coding: utf-8 -*- +# Tests for the different contrib/localflavor/ form fields. + +localflavor_tests = r""" +# USZipCodeField ############################################################## + +USZipCodeField validates that the data is either a five-digit U.S. zip code or +a zip+4. +>>> from django.contrib.localflavor.usa.forms import USZipCodeField +>>> f = USZipCodeField() +>>> f.clean('60606') +u'60606' +>>> f.clean(60606) +u'60606' +>>> f.clean('04000') +u'04000' +>>> f.clean('4000') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean('60606-1234') +u'60606-1234' +>>> f.clean('6060-1234') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean('60606-') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = USZipCodeField(required=False) +>>> f.clean('60606') +u'60606' +>>> f.clean(60606) +u'60606' +>>> f.clean('04000') +u'04000' +>>> f.clean('4000') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean('60606-1234') +u'60606-1234' +>>> f.clean('6060-1234') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean('60606-') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# USPhoneNumberField ########################################################## + +USPhoneNumberField validates that the data is a valid U.S. phone number, +including the area code. It's normalized to XXX-XXX-XXXX format. +>>> from django.contrib.localflavor.usa.forms import USPhoneNumberField +>>> f = USPhoneNumberField() +>>> f.clean('312-555-1212') +u'312-555-1212' +>>> f.clean('3125551212') +u'312-555-1212' +>>> f.clean('312 555-1212') +u'312-555-1212' +>>> f.clean('(312) 555-1212') +u'312-555-1212' +>>> f.clean('312 555 1212') +u'312-555-1212' +>>> f.clean('312.555.1212') +u'312-555-1212' +>>> f.clean('312.555-1212') +u'312-555-1212' +>>> f.clean(' (312) 555.1212 ') +u'312-555-1212' +>>> f.clean('555-1212') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] +>>> f.clean('312-55-1212') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = USPhoneNumberField(required=False) +>>> f.clean('312-555-1212') +u'312-555-1212' +>>> f.clean('3125551212') +u'312-555-1212' +>>> f.clean('312 555-1212') +u'312-555-1212' +>>> f.clean('(312) 555-1212') +u'312-555-1212' +>>> f.clean('312 555 1212') +u'312-555-1212' +>>> f.clean('312.555.1212') +u'312-555-1212' +>>> f.clean('312.555-1212') +u'312-555-1212' +>>> f.clean(' (312) 555.1212 ') +u'312-555-1212' +>>> f.clean('555-1212') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] +>>> f.clean('312-55-1212') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# USStateField ################################################################ + +USStateField validates that the data is either an abbreviation or name of a +U.S. state. +>>> from django.contrib.localflavor.usa.forms import USStateField +>>> f = USStateField() +>>> f.clean('il') +u'IL' +>>> f.clean('IL') +u'IL' +>>> f.clean('illinois') +u'IL' +>>> f.clean(' illinois ') +u'IL' +>>> f.clean(60606) +Traceback (most recent call last): +... +ValidationError: [u'Enter a U.S. state or territory.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = USStateField(required=False) +>>> f.clean('il') +u'IL' +>>> f.clean('IL') +u'IL' +>>> f.clean('illinois') +u'IL' +>>> f.clean(' illinois ') +u'IL' +>>> f.clean(60606) +Traceback (most recent call last): +... +ValidationError: [u'Enter a U.S. state or territory.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# USStateSelect ############################################################### + +USStateSelect is a Select widget that uses a list of U.S. states/territories +as its choices. +>>> from django.contrib.localflavor.usa.forms import USStateSelect +>>> w = USStateSelect() +>>> print w.render('state', 'IL') + + +# UKPostcodeField ############################################################# + +UKPostcodeField validates that the data is a valid UK postcode. +>>> from django.contrib.localflavor.uk.forms import UKPostcodeField +>>> f = UKPostcodeField() +>>> f.clean('BT32 4PX') +u'BT32 4PX' +>>> f.clean('GIR 0AA') +u'GIR 0AA' +>>> f.clean('BT324PX') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean('1NV 4L1D') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = UKPostcodeField(required=False) +>>> f.clean('BT32 4PX') +u'BT32 4PX' +>>> f.clean('GIR 0AA') +u'GIR 0AA' +>>> f.clean('1NV 4L1D') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean('BT324PX') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# FRZipCodeField ############################################################# + +FRZipCodeField validates that the data is a valid FR zipcode. +>>> from django.contrib.localflavor.fr.forms import FRZipCodeField +>>> f = FRZipCodeField() +>>> f.clean('75001') +u'75001' +>>> f.clean('93200') +u'93200' +>>> f.clean('2A200') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean('980001') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = FRZipCodeField(required=False) +>>> f.clean('75001') +u'75001' +>>> f.clean('93200') +u'93200' +>>> f.clean('2A200') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean('980001') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + + +# FRPhoneNumberField ########################################################## + +FRPhoneNumberField validates that the data is a valid french phone number. +It's normalized to 0X XX XX XX XX format. Dots are valid too. +>>> from django.contrib.localflavor.fr.forms import FRPhoneNumberField +>>> f = FRPhoneNumberField() +>>> f.clean('01 55 44 58 64') +u'01 55 44 58 64' +>>> f.clean('0155445864') +u'01 55 44 58 64' +>>> f.clean('01 5544 5864') +u'01 55 44 58 64' +>>> f.clean('01 55.44.58.64') +u'01 55 44 58 64' +>>> f.clean('01.55.44.58.64') +u'01 55 44 58 64' +>>> f.clean('01,55,44,58,64') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] +>>> f.clean('555 015 544') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = FRPhoneNumberField(required=False) +>>> f.clean('01 55 44 58 64') +u'01 55 44 58 64' +>>> f.clean('0155445864') +u'01 55 44 58 64' +>>> f.clean('01 5544 5864') +u'01 55 44 58 64' +>>> f.clean('01 55.44.58.64') +u'01 55 44 58 64' +>>> f.clean('01.55.44.58.64') +u'01 55 44 58 64' +>>> f.clean('01,55,44,58,64') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] +>>> f.clean('555 015 544') +Traceback (most recent call last): +... +ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# FRDepartmentSelect ############################################################### + +FRDepartmentSelect is a Select widget that uses a list of french departments +including DOM TOM +>>> from django.contrib.localflavor.fr.forms import FRDepartmentSelect +>>> w = FRDepartmentSelect() +>>> print w.render('dep', 'Paris') + + +# JPPostalCodeField ############################################################### + +A form field that validates its input is a Japanese postcode. + +Accepts 7 digits(with/out hyphen). +>>> from django.contrib.localflavor.jp.forms import JPPostalCodeField +>>> f = JPPostalCodeField() +>>> f.clean('251-0032') +u'2510032' +>>> f.clean('2510032') +u'2510032' +>>> f.clean('2510-032') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] +>>> f.clean('251a0032') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] +>>> f.clean('a51-0032') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] +>>> f.clean('25100321') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = JPPostalCodeField(required=False) +>>> f.clean('251-0032') +u'2510032' +>>> f.clean('2510032') +u'2510032' +>>> f.clean('2510-032') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] +>>> f.clean('') +u'' +>>> f.clean(None) +u'' + +# JPPrefectureSelect ############################################################### + +A Select widget that uses a list of Japanese prefectures as its choices. +>>> from django.contrib.localflavor.jp.forms import JPPrefectureSelect +>>> w = JPPrefectureSelect() +>>> print w.render('prefecture', 'kanagawa') + + +# ITZipCodeField ############################################################# + +>>> from django.contrib.localflavor.it.forms import ITZipCodeField +>>> f = ITZipCodeField() +>>> f.clean('00100') +u'00100' +>>> f.clean(' 00100') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] + +# ITRegionSelect ############################################################# + +>>> from django.contrib.localflavor.it.forms import ITRegionSelect +>>> w = ITRegionSelect() +>>> w.render('regions', 'PMN') +u'' + +# FIZipCodeField ############################################################# + +FIZipCodeField validates that the data is a valid FI zipcode. +>>> from django.contrib.localflavor.fi.forms import FIZipCodeField +>>> f = FIZipCodeField() +>>> f.clean('20540') +u'20540' +>>> f.clean('20101') +u'20101' +>>> f.clean('20s40') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean('205401') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = FIZipCodeField(required=False) +>>> f.clean('20540') +u'20540' +>>> f.clean('20101') +u'20101' +>>> f.clean('20s40') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean('205401') +Traceback (most recent call last): +... +ValidationError: [u'Enter a zip code in the format XXXXX.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# FIMunicipalitySelect ############################################################### + +A Select widget that uses a list of Finnish municipalities as its choices. +>>> from django.contrib.localflavor.fi.forms import FIMunicipalitySelect +>>> w = FIMunicipalitySelect() +>>> unicode(w.render('municipalities', 'turku')) +u'' + +# FISocialSecurityNumber +############################################################## + +>>> from django.contrib.localflavor.fi.forms import FISocialSecurityNumber +>>> f = FISocialSecurityNumber() +>>> f.clean('010101-0101') +u'010101-0101' +>>> f.clean('010101+0101') +u'010101+0101' +>>> f.clean('010101A0101') +u'010101A0101' +>>> f.clean('101010-0102') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid Finnish social security number.'] +>>> f.clean('10a010-0101') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid Finnish social security number.'] +>>> f.clean('101010-0\xe401') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid Finnish social security number.'] +>>> f.clean('101010b0101') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid Finnish social security number.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f = FISocialSecurityNumber(required=False) +>>> f.clean('010101-0101') +u'010101-0101' +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + +# BRZipCodeField ############################################################ +>>> from django.contrib.localflavor.br.forms import BRZipCodeField +>>> f = BRZipCodeField() +>>> f.clean('12345-123') +u'12345-123' +>>> f.clean('12345_123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('1234-123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('abcde-abc') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('12345-') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('-123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = BRZipCodeField(required=False) +>>> f.clean(None) +u'' +>>> f.clean('') +u'' +>>> f.clean('-123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('12345-') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('abcde-abc') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('1234-123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('12345_123') +Traceback (most recent call last): +... +ValidationError: [u'Informe um c\xf3digo postal no formato XXXXX-XXX.'] +>>> f.clean('12345-123') +u'12345-123' + +# BRPhoneNumberField ######################################################### + +>>> from django.contrib.localflavor.br.forms import BRPhoneNumberField +>>> f = BRPhoneNumberField() +>>> f.clean('41-3562-3464') +u'41-3562-3464' +>>> f.clean('4135623464') +u'41-3562-3464' +>>> f.clean('41 3562-3464') +u'41-3562-3464' +>>> f.clean('41 3562 3464') +u'41-3562-3464' +>>> f.clean('(41) 3562 3464') +u'41-3562-3464' +>>> f.clean('41.3562.3464') +u'41-3562-3464' +>>> f.clean('41.3562-3464') +u'41-3562-3464' +>>> f.clean(' (41) 3562.3464') +u'41-3562-3464' +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = BRPhoneNumberField(required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' +>>> f.clean(' (41) 3562.3464') +u'41-3562-3464' +>>> f.clean('41.3562-3464') +u'41-3562-3464' +>>> f.clean('(41) 3562 3464') +u'41-3562-3464' +>>> f.clean('4135623464') +u'41-3562-3464' +>>> f.clean('41 3562-3464') +u'41-3562-3464' + +# BRStateSelect ############################################################## + +>>> from django.contrib.localflavor.br.forms import BRStateSelect +>>> w = BRStateSelect() +>>> w.render('states', 'PR') +u'' +""" diff --git a/tests/regressiontests/forms/regressions.py b/tests/regressiontests/forms/regressions.py new file mode 100644 index 0000000000..02b38ec58d --- /dev/null +++ b/tests/regressiontests/forms/regressions.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Tests to prevent against recurrences of earlier bugs. + +regression_tests = r""" +It should be possible to re-use attribute dictionaries (#3810) +>>> from django.newforms import * +>>> extra_attrs = {'class': 'special'} +>>> class TestForm(Form): +... f1 = CharField(max_length=10, widget=TextInput(attrs=extra_attrs)) +... f2 = CharField(widget=TextInput(attrs=extra_attrs)) +>>> TestForm(auto_id=False).as_p() +u'

          F1:

          \n

          F2:

          ' + +####################### +# Tests for form i18n # +####################### +There were some problems with form translations in #3600 + +>>> from django.utils.translation import gettext_lazy, activate, deactivate +>>> class SomeForm(Form): +... username = CharField(max_length=10, label=gettext_lazy('Username')) +>>> f = SomeForm() +>>> print f.as_p() +

          +>>> activate('de') +>>> print f.as_p() +

          +>>> deactivate() +""" diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py index f805a221aa..8ecc9f0205 100644 --- a/tests/regressiontests/forms/tests.py +++ b/tests/regressiontests/forms/tests.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -r""" +from localflavor import localflavor_tests +from regressions import regression_tests + +form_tests = r""" >>> from django.newforms import * >>> import datetime >>> import re @@ -3268,617 +3271,6 @@ True -# USZipCodeField ############################################################## - -USZipCodeField validates that the data is either a five-digit U.S. zip code or -a zip+4. ->>> from django.contrib.localflavor.usa.forms import USZipCodeField ->>> f = USZipCodeField() ->>> f.clean('60606') -u'60606' ->>> f.clean(60606) -u'60606' ->>> f.clean('04000') -u'04000' ->>> f.clean('4000') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean('60606-1234') -u'60606-1234' ->>> f.clean('6060-1234') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean('60606-') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = USZipCodeField(required=False) ->>> f.clean('60606') -u'60606' ->>> f.clean(60606) -u'60606' ->>> f.clean('04000') -u'04000' ->>> f.clean('4000') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean('60606-1234') -u'60606-1234' ->>> f.clean('6060-1234') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean('60606-') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - -# USPhoneNumberField ########################################################## - -USPhoneNumberField validates that the data is a valid U.S. phone number, -including the area code. It's normalized to XXX-XXX-XXXX format. ->>> from django.contrib.localflavor.usa.forms import USPhoneNumberField ->>> f = USPhoneNumberField() ->>> f.clean('312-555-1212') -u'312-555-1212' ->>> f.clean('3125551212') -u'312-555-1212' ->>> f.clean('312 555-1212') -u'312-555-1212' ->>> f.clean('(312) 555-1212') -u'312-555-1212' ->>> f.clean('312 555 1212') -u'312-555-1212' ->>> f.clean('312.555.1212') -u'312-555-1212' ->>> f.clean('312.555-1212') -u'312-555-1212' ->>> f.clean(' (312) 555.1212 ') -u'312-555-1212' ->>> f.clean('555-1212') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] ->>> f.clean('312-55-1212') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = USPhoneNumberField(required=False) ->>> f.clean('312-555-1212') -u'312-555-1212' ->>> f.clean('3125551212') -u'312-555-1212' ->>> f.clean('312 555-1212') -u'312-555-1212' ->>> f.clean('(312) 555-1212') -u'312-555-1212' ->>> f.clean('312 555 1212') -u'312-555-1212' ->>> f.clean('312.555.1212') -u'312-555-1212' ->>> f.clean('312.555-1212') -u'312-555-1212' ->>> f.clean(' (312) 555.1212 ') -u'312-555-1212' ->>> f.clean('555-1212') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] ->>> f.clean('312-55-1212') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in XXX-XXX-XXXX format.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - -# USStateField ################################################################ - -USStateField validates that the data is either an abbreviation or name of a -U.S. state. ->>> from django.contrib.localflavor.usa.forms import USStateField ->>> f = USStateField() ->>> f.clean('il') -u'IL' ->>> f.clean('IL') -u'IL' ->>> f.clean('illinois') -u'IL' ->>> f.clean(' illinois ') -u'IL' ->>> f.clean(60606) -Traceback (most recent call last): -... -ValidationError: [u'Enter a U.S. state or territory.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = USStateField(required=False) ->>> f.clean('il') -u'IL' ->>> f.clean('IL') -u'IL' ->>> f.clean('illinois') -u'IL' ->>> f.clean(' illinois ') -u'IL' ->>> f.clean(60606) -Traceback (most recent call last): -... -ValidationError: [u'Enter a U.S. state or territory.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - -# USStateSelect ############################################################### - -USStateSelect is a Select widget that uses a list of U.S. states/territories -as its choices. ->>> from django.contrib.localflavor.usa.forms import USStateSelect ->>> w = USStateSelect() ->>> print w.render('state', 'IL') - - -# UKPostcodeField ############################################################# - -UKPostcodeField validates that the data is a valid UK postcode. ->>> from django.contrib.localflavor.uk.forms import UKPostcodeField ->>> f = UKPostcodeField() ->>> f.clean('BT32 4PX') -u'BT32 4PX' ->>> f.clean('GIR 0AA') -u'GIR 0AA' ->>> f.clean('BT324PX') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] ->>> f.clean('1NV 4L1D') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = UKPostcodeField(required=False) ->>> f.clean('BT32 4PX') -u'BT32 4PX' ->>> f.clean('GIR 0AA') -u'GIR 0AA' ->>> f.clean('1NV 4L1D') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] ->>> f.clean('BT324PX') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - -# FRZipCodeField ############################################################# - -FRZipCodeField validates that the data is a valid FR zipcode. ->>> from django.contrib.localflavor.fr.forms import FRZipCodeField ->>> f = FRZipCodeField() ->>> f.clean('75001') -u'75001' ->>> f.clean('93200') -u'93200' ->>> f.clean('2A200') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX.'] ->>> f.clean('980001') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = FRZipCodeField(required=False) ->>> f.clean('75001') -u'75001' ->>> f.clean('93200') -u'93200' ->>> f.clean('2A200') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX.'] ->>> f.clean('980001') -Traceback (most recent call last): -... -ValidationError: [u'Enter a zip code in the format XXXXX.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - - -# FRPhoneNumberField ########################################################## - -FRPhoneNumberField validates that the data is a valid french phone number. -It's normalized to 0X XX XX XX XX format. Dots are valid too. ->>> from django.contrib.localflavor.fr.forms import FRPhoneNumberField ->>> f = FRPhoneNumberField() ->>> f.clean('01 55 44 58 64') -u'01 55 44 58 64' ->>> f.clean('0155445864') -u'01 55 44 58 64' ->>> f.clean('01 5544 5864') -u'01 55 44 58 64' ->>> f.clean('01 55.44.58.64') -u'01 55 44 58 64' ->>> f.clean('01.55.44.58.64') -u'01 55 44 58 64' ->>> f.clean('01,55,44,58,64') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] ->>> f.clean('555 015 544') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = FRPhoneNumberField(required=False) ->>> f.clean('01 55 44 58 64') -u'01 55 44 58 64' ->>> f.clean('0155445864') -u'01 55 44 58 64' ->>> f.clean('01 5544 5864') -u'01 55 44 58 64' ->>> f.clean('01 55.44.58.64') -u'01 55 44 58 64' ->>> f.clean('01.55.44.58.64') -u'01 55 44 58 64' ->>> f.clean('01,55,44,58,64') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] ->>> f.clean('555 015 544') -Traceback (most recent call last): -... -ValidationError: [u'Phone numbers must be in 0X XX XX XX XX format.'] ->>> f.clean(None) -u'' ->>> f.clean('') -u'' - -# FRDepartmentSelect ############################################################### - -FRDepartmentSelect is a Select widget that uses a list of french departments -including DOM TOM ->>> from django.contrib.localflavor.fr.forms import FRDepartmentSelect ->>> w = FRDepartmentSelect() ->>> print w.render('dep', 'Paris') - - -# JPPostalCodeField ############################################################### - -A form field that validates its input is a Japanese postcode. - -Accepts 7 digits(with/out hyphen). ->>> from django.contrib.localflavor.jp.forms import JPPostalCodeField ->>> f = JPPostalCodeField() ->>> f.clean('251-0032') -u'2510032' ->>> f.clean('2510032') -u'2510032' ->>> f.clean('2510-032') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] ->>> f.clean('251a0032') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] ->>> f.clean('a51-0032') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] ->>> f.clean('25100321') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] ->>> f.clean('') -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] - ->>> f = JPPostalCodeField(required=False) ->>> f.clean('251-0032') -u'2510032' ->>> f.clean('2510032') -u'2510032' ->>> f.clean('2510-032') -Traceback (most recent call last): -... -ValidationError: [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'] ->>> f.clean('') -u'' ->>> f.clean(None) -u'' - -# JPPrefectureSelect ############################################################### - -A Select widget that uses a list of Japanese prefectures as its choices. ->>> from django.contrib.localflavor.jp.forms import JPPrefectureSelect ->>> w = JPPrefectureSelect() ->>> print w.render('prefecture', 'kanagawa') - - - ################################# # Tests of underlying functions # ################################# @@ -3903,6 +3295,12 @@ u'1' u'foo' """ +__test__ = { + 'form_tests': form_tests, + 'localflavor': localflavor_tests, + 'regressions': regression_tests, +} + if __name__ == "__main__": import doctest doctest.testmod() diff --git a/tests/regressiontests/humanize/tests.py b/tests/regressiontests/humanize/tests.py index e342d7ded8..eca65f7575 100644 --- a/tests/regressiontests/humanize/tests.py +++ b/tests/regressiontests/humanize/tests.py @@ -27,8 +27,10 @@ should've produced %s""" % (method, rendered, result_list[index])) self.humanize_tester(test_list, result_list, 'ordinal') def test_intcomma(self): - test_list = ('100','1000','10123','10311','1000000') - result_list = ('100', '1,000', '10,123', '10,311', '1,000,000') + test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25, + '100', '1000', '10123', '10311', '1000000', '1234567.1234567') + result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25', + '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567') self.humanize_tester(test_list, result_list, 'intcomma') diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index fab577d4df..b544207be8 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -149,7 +149,7 @@ class Templates(unittest.TestCase): # Dictionary lookup wins out when there is a string and int version of the key. 'list-index07': ("{{ var.1 }}", {"var": {'1': "hello", 1: "world"}}, "hello"), - + # Basic filter usage 'basic-syntax21': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"), @@ -522,8 +522,8 @@ class Templates(unittest.TestCase): ### I18N ################################################################## # {% spaceless %} tag - 'spaceless01': ("{% spaceless %} text {% endspaceless %}", {}, " text "), - 'spaceless02': ("{% spaceless %} \n text \n {% endspaceless %}", {}, " text "), + 'spaceless01': ("{% spaceless %} text {% endspaceless %}", {}, " text "), + 'spaceless02': ("{% spaceless %} \n text \n {% endspaceless %}", {}, " text "), 'spaceless03': ("{% spaceless %}text{% endspaceless %}", {}, "text"), # simple translation of a string delimited by ' @@ -654,11 +654,6 @@ class Templates(unittest.TestCase): 'with01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key':50}}, '50'), 'with02': ('{{ key }}{% with dict.key as key %}{{ key }}-{{ dict.key }}-{{ key }}{% endwith %}{{ key }}', {'dict': {'key':50}}, ('50-50-50', 'INVALID50-50-50INVALID')), - ### LOREM TAG ###################################################### - 'lorem01': ('{% lorem %}', {}, 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'), - 'lorem02': ('{% lorem p %}', {}, '

          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          '), - 'lorem03': ('{% lorem 6 w %}', {}, 'lorem ipsum dolor sit amet consectetur'), - ### NOW TAG ######################################################## # Simple case 'now01' : ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)), @@ -697,11 +692,12 @@ class Templates(unittest.TestCase): 'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'), 'url02' : ('{% url regressiontests.templates.views.client_action client.id,action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'), 'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'), + 'url04' : ('{% url named-client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'), # Failures - 'url04' : ('{% url %}', {}, template.TemplateSyntaxError), - 'url05' : ('{% url no_such_view %}', {}, ''), - 'url06' : ('{% url regressiontests.templates.views.client no_such_param="value" %}', {}, ''), + 'url-fail01' : ('{% url %}', {}, template.TemplateSyntaxError), + 'url-fail02' : ('{% url no_such_view %}', {}, ''), + 'url-fail03' : ('{% url regressiontests.templates.views.client no_such_param="value" %}', {}, ''), } # Register our custom template loader. diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index dc5b36b08b..eaa9fd5d9f 100644 --- a/tests/regressiontests/templates/urls.py +++ b/tests/regressiontests/templates/urls.py @@ -7,4 +7,5 @@ urlpatterns = patterns('', (r'^$', views.index), (r'^client/(\d+)/$', views.client), (r'^client/(\d+)/(?P[^/]+)/$', views.client_action), + url(r'^named-client/(\d+)/$', views.client, name="named-client"), ) diff --git a/tests/regressiontests/text/__init__.py b/tests/regressiontests/text/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/text/models.py b/tests/regressiontests/text/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/text/tests.py b/tests/regressiontests/text/tests.py new file mode 100644 index 0000000000..f758ecaf90 --- /dev/null +++ b/tests/regressiontests/text/tests.py @@ -0,0 +1,17 @@ +""" +# Tests for stuff in django.utils.text. + +>>> from django.utils.text import * + +### smart_split ########################################################### +>>> list(smart_split(r'''This is "a person" test.''')) +['This', 'is', '"a person"', 'test.'] +>>> print list(smart_split(r'''This is "a person's" test.'''))[2] +"a person's" +>>> print list(smart_split(r'''This is "a person\\"s" test.'''))[2] +"a person"s" +>>> list(smart_split('''"a 'one''')) +['"a', "'one"] +>>> print list(smart_split(r'''all friends' tests'''))[1] +friends' +"""