Ticket #13473: ticket13473.patch

django/conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -5 +5 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: Grupo de Localização para o Português <django-l10n-portuguese@googlegroups.com>\n"
-"POT-Creation-Date: 2010-03-19 17:38-0300\n"
+"POT-Creation-Date: 2010-05-26 00:42-0300\n"
 "PO-Revision-Date: 2010-03-19 17:58-0300\n"
 "Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Grupo de Localização para o Português <django-l10n-portuguese@googlegroups.com>\n"
@@ -59 +59 @@
 msgstr "Inglês"
 
 #: conf/global_settings.py:55
+#, fuzzy
+msgid "British English"
+msgstr "Inglês"
+
+#: conf/global_settings.py:56
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Argentinean Spanish"
 msgstr "Espanhol Argentino"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Basque"
 msgstr "Basco"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Frisian"
 msgstr "Frísia"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
 msgid "Irish"
 msgstr "Irlandês"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Galician"
 msgstr "Galiciano"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
+#, fuzzy
+msgid "Indonesian"
+msgstr "Macedônio"
+
+#: conf/global_settings.py:71
 msgid "Icelandic"
 msgstr "Islandês"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
 msgid "Japanese"
 msgstr "Japonês"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
 msgid "Kannada"
 msgstr "Canarês"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
 msgid "Korean"
 msgstr "Coreano"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
 msgid "Latvian"
 msgstr "Letão"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
+#, fuzzy
+msgid "Mongolian"
+msgstr "Monaghan"
+
+#: conf/global_settings.py:82
 msgid "Dutch"
 msgstr "Neerlandês"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:83
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:84
+#, fuzzy
+msgid "Norwegian Bokmal"
+msgstr "Norueguês"
+
+#: conf/global_settings.py:85
+#, fuzzy
+msgid "Norwegian Nynorsk"
+msgstr "Norueguês"
+
+#: conf/global_settings.py:86
 msgid "Polish"
 msgstr "Polonês"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Portuguese"
 msgstr "Português"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Romanian"
 msgstr "Romeno"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:93
 msgid "Albanian"
 msgstr "Albanesa"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:94
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:95
 msgid "Serbian Latin"
 msgstr "Sérvio Latino"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:96
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:97
 msgid "Tamil"
 msgstr "Tâmil"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:98
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:99
 msgid "Thai"
 msgstr "Tailandês"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:100
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:101
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:102
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:103
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:104
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: contrib/admin/actions.py:52
+#: contrib/admin/actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Removido %(count)d %(items)s com sucesso."
 
-#: contrib/admin/actions.py:59 contrib/admin/options.py:1101
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1125
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: contrib/admin/actions.py:77
+#: contrib/admin/actions.py:73
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Remover %(verbose_name_plural)s selecionados"
@@ -286 +311 @@
 msgid "This year"
 msgstr "Este ano"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:466
 msgid "Yes"
 msgstr "Sim"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:466
 msgid "No"
 msgstr "Não"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:470
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:466
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: contrib/admin/helpers.py:19
+#: contrib/admin/helpers.py:20
 msgid "Action:"
 msgstr "Ação:"
 
@@ -330 +355 @@
 msgid "log entries"
 msgstr "entradas de log"
 
-#: contrib/admin/options.py:139 contrib/admin/options.py:154
+#: contrib/admin/options.py:138 contrib/admin/options.py:153
 msgid "None"
 msgstr "Nenhum"
 
-#: contrib/admin/options.py:558
+#: contrib/admin/options.py:559
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado %s."
 
-#: contrib/admin/options.py:558 contrib/admin/options.py:568
-#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:840
-#: forms/models.py:556
+#: contrib/admin/options.py:559 contrib/admin/options.py:569
+#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
+#: forms/models.py:568
 msgid "and"
 msgstr "e"
 
-#: contrib/admin/options.py:563
+#: contrib/admin/options.py:564
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Adicionado %(name)s \"%(object)s\""
 
-#: contrib/admin/options.py:567
+#: contrib/admin/options.py:568
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificado %(list)s para %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:572
+#: contrib/admin/options.py:573
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Deletado %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:576
+#: contrib/admin/options.py:577
 msgid "No fields changed."
 msgstr "Nenhum campo modificado."
 
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:643
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\": adicionado com sucesso."
 
-#: contrib/admin/options.py:646 contrib/admin/options.py:679
+#: contrib/admin/options.py:647 contrib/admin/options.py:680
 msgid "You may edit it again below."
 msgstr "Você pode editar novamente abaixo."
 
-#: contrib/admin/options.py:656 contrib/admin/options.py:689
+#: contrib/admin/options.py:657 contrib/admin/options.py:690
 #, python-format
 msgid "You may add another %s below."
 msgstr "Você pode adicionar outro %s abaixo."
 
-#: contrib/admin/options.py:677
+#: contrib/admin/options.py:678
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\": modificado com sucesso."
 
-#: contrib/admin/options.py:685
+#: contrib/admin/options.py:686
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -391 +416 @@
 "%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente "
 "abaixo."
 
-#: contrib/admin/options.py:743
+#: contrib/admin/options.py:740 contrib/admin/options.py:997
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -399 +424 @@
 "Os itens devem ser selecionados a fim de executar ações sobre eles. Nenhum "
 "item foi modificado."
 
-#: contrib/admin/options.py:761
+#: contrib/admin/options.py:759
 msgid "No action selected."
 msgstr "Nenhuma ação selecionada."
 
-#: contrib/admin/options.py:841
+#: contrib/admin/options.py:840
 #, python-format
 msgid "Add %s"
 msgstr "Adicionar %s"
 
-#: contrib/admin/options.py:867 contrib/admin/options.py:1081
+#: contrib/admin/options.py:866 contrib/admin/options.py:1105
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objeto %(name)s com chave primária %(key)r não existe."
 
-#: contrib/admin/options.py:932
+#: contrib/admin/options.py:931
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
@@ -422 +447 @@
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
-#: contrib/admin/options.py:1013
+#: contrib/admin/options.py:1039
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s modificado com sucesso."
 msgstr[1] "%(count)s %(name)s modificados com sucesso."
 
-#: contrib/admin/options.py:1040
-#, python-format
-msgid "of %(count)d selected"
-msgid_plural "of %(count)d selected"
-msgstr[0] "de %(count)d selecionado"
-msgstr[1] "de %(count)d selecionados"
-
-#: contrib/admin/options.py:1042
+#: contrib/admin/options.py:1066
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s selecionado"
 msgstr[1] "Todos %(total_count)s selecionados"
 
-#: contrib/admin/options.py:1094
+#: contrib/admin/options.py:1071
+#, fuzzy, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "de %(count)d selecionado"
+
+#: contrib/admin/options.py:1118
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\": excluído com sucesso."
 
-#: contrib/admin/options.py:1131
+#: contrib/admin/options.py:1155
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de modificações: %s"
 
-#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:14
 #: contrib/auth/forms.py:81
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
@@ -462 +485 @@
 "Por favor, entre com um usuário e senha corretos. Note que ambos os campos "
 "diferenciam maiúsculas e minúsculas."
 
-#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:307 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor acesse novamente, pois sua sessão expirou."
 
-#: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -474 +497 @@
 "Parece que seu navegador não está configurado para aceitar cookies. Por "
 "favor habilite os cookies, recarregue esta página, e tente novamente."
 
-#: contrib/admin/sites.py:334 contrib/admin/sites.py:340
+#: contrib/admin/sites.py:330 contrib/admin/sites.py:336
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Nomes de usuário não podem conter o caractere '@'."
 
-#: contrib/admin/sites.py:337 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:333 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'"
 
-#: contrib/admin/sites.py:393
+#: contrib/admin/sites.py:389
 msgid "Site administration"
 msgstr "Administração do Site"
 
-#: contrib/admin/sites.py:407 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:403 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Acessar"
 
-#: contrib/admin/sites.py:452
+#: contrib/admin/sites.py:448
 #, python-format
 msgid "%s administration"
 msgstr "Administração de %s"
@@ -534 +557 @@
 
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:54
+#: contrib/admin/templates/admin/base.html:55
 #: contrib/admin/templates/admin/change_form.html:18
-#: contrib/admin/templates/admin/change_list.html:39
+#: contrib/admin/templates/admin/change_list.html:42
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6
 #: contrib/admin/templates/admin/invalid_setup.html:4
@@ -581 +604 @@
 msgid "Go"
 msgstr "Ir"
 
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
 msgid "Click here to select the objects across all pages"
 msgstr "Clique aqui para selecionar os objetos de todas as páginas"
 
-#: contrib/admin/templates/admin/actions.html:10
+#: contrib/admin/templates/admin/actions.html:11
 #, python-format
 msgid "Select all %(total_count)s %(module_name)s"
 msgstr "Selecionar todos %(total_count)s %(module_name)s"
 
-#: contrib/admin/templates/admin/actions.html:12
+#: contrib/admin/templates/admin/actions.html:13
 msgid "Clear selection"
 msgstr "Limpar seleção"
 
@@ -600 +623 @@
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:27
+#: contrib/admin/templates/admin/base.html:28
 msgid "Welcome,"
 msgstr "Bem vindo,"
 
-#: contrib/admin/templates/admin/base.html:32
+#: contrib/admin/templates/admin/base.html:33
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:4
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentação"
 
-#: contrib/admin/templates/admin/base.html:40
+#: contrib/admin/templates/admin/base.html:41
 #: contrib/admin/templates/admin/auth/user/change_password.html:15
 #: contrib/admin/templates/admin/auth/user/change_password.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -619 +642 @@
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: contrib/admin/templates/admin/base.html:47
+#: contrib/admin/templates/admin/base.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Log out"
@@ -650 +673 @@
 msgstr "Ver no site"
 
 #: contrib/admin/templates/admin/change_form.html:39
-#: contrib/admin/templates/admin/change_list.html:68
+#: contrib/admin/templates/admin/change_list.html:71
 #: contrib/admin/templates/admin/auth/user/change_password.html:24
 #: contrib/admin/templates/registration/password_change_form.html:15
 msgid "Please correct the error below."
@@ -658 +681 @@
 msgstr[0] "Por favor, corrija o erro abaixo."
 msgstr[1] "Por favor, corrija os erros abaixo."
 
-#: contrib/admin/templates/admin/change_list.html:60
+#: contrib/admin/templates/admin/change_list.html:63
 #, python-format
 msgid "Add %(name)s"
 msgstr "Adicionar %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:79
+#: contrib/admin/templates/admin/change_list.html:82
 msgid "Filter"
 msgstr "Filtro"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:297
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:302
 msgid "Delete"
 msgstr "Apagar"
 
@@ -859 +882 @@
 msgid "Enter the same password as above, for verification."
 msgstr "Informe a mesma senha digitada acima, para verificação."
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:53
-#: contrib/admin/templates/admin/edit_inline/tabular.html:99
+#: contrib/admin/templates/admin/edit_inline/stacked.html:64
+#: contrib/admin/templates/admin/edit_inline/tabular.html:110
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Adicionar outro %(verbose_name)s"
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:56
-#: contrib/admin/templates/admin/edit_inline/tabular.html:102
+#: contrib/admin/templates/admin/edit_inline/stacked.html:67
+#: contrib/admin/templates/admin/edit_inline/tabular.html:113
 #: contrib/comments/templates/comments/delete.html:12
 msgid "Remove"
 msgstr "Remover"
@@ -1031 +1054 @@
 msgid "Reset my password"
 msgstr "Reinicializar minha senha"
 
-#: contrib/admin/templatetags/admin_list.py:240
+#: contrib/admin/templatetags/admin_list.py:257
 msgid "All dates"
 msgstr "Todas as datas"
 
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Selecione %s"
 
-#: contrib/admin/views/main.py:70
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Selecione %s para modificar"
@@ -1210 +1233 @@
 
 #: contrib/auth/forms.py:15 contrib/auth/forms.py:49
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Obrigatório. 30 caracteres ou menos. Somente letras, dígitos e @/./+/-/_."
+msgstr ""
+"Obrigatório. 30 caracteres ou menos. Somente letras, dígitos e @/./+/-/_."
 
 #: contrib/auth/forms.py:16 contrib/auth/forms.py:50
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Este valor deve conter apenas letras, números e os caracteres @/./+/-/_."
+msgstr ""
+"Este valor deve conter apenas letras, números e os caracteres @/./+/-/_."
 
 #: contrib/auth/forms.py:18
 msgid "Password confirmation"
@@ -1299 +1324 @@
 #: contrib/auth/models.py:196
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/_"
+msgstr ""
+"Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/"
+"_"
 
 #: contrib/auth/models.py:197
 msgid "first name"
@@ -1393 +1420 @@
 msgid "Logged out"
 msgstr "Sessão encerrada"
 
-#: contrib/auth/management/commands/createsuperuser.py:23
-#: core/validators.py:120 forms/fields.py:416
+#: contrib/auth/management/commands/createsuperuser.py:24
+#: core/validators.py:120 forms/fields.py:427
 msgid "Enter a valid e-mail address."
 msgstr "Informe um endereço de email válido."
 
@@ -1462 +1489 @@
 msgstr "Endereço de e-mail"
 
 #: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
-#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1121
+#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
 msgid "URL"
 msgstr "URL"
 
@@ -1513 +1540 @@
 msgid "date/time submitted"
 msgstr "data/hora de envio"
 
-#: contrib/comments/models.py:60 db/models/fields/__init__.py:916
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
 msgid "IP address"
 msgstr "Endereço IP"
 
@@ -1759 +1786 @@
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:269
+#: contrib/gis/db/models/fields.py:270
 msgid "Point"
 msgstr "Ponto"
 
-#: contrib/gis/db/models/fields.py:273
+#: contrib/gis/db/models/fields.py:274
 msgid "Line string"
 msgstr "Linha string"
 
-#: contrib/gis/db/models/fields.py:277
+#: contrib/gis/db/models/fields.py:278
 msgid "Polygon"
 msgstr "Polígono"
 
-#: contrib/gis/db/models/fields.py:281
+#: contrib/gis/db/models/fields.py:282
 msgid "Multi-point"
 msgstr "Multiponto"
 
-#: contrib/gis/db/models/fields.py:285
+#: contrib/gis/db/models/fields.py:286
 msgid "Multi-line string"
 msgstr "Multilinha string"
 
-#: contrib/gis/db/models/fields.py:289
+#: contrib/gis/db/models/fields.py:290
 msgid "Multi polygon"
 msgstr "Multipolígono"
 
-#: contrib/gis/db/models/fields.py:293
+#: contrib/gis/db/models/fields.py:294
 msgid "Geometry collection"
 msgstr "Coleção geométrica"
 
@@ -1896 +1923 @@
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
 msgstr "Informe um código postal no formato NNNN ou ANNNNAAA."
 
-#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:97
-#: contrib/localflavor/br/forms.py:136 contrib/localflavor/pe/forms.py:24
-#: contrib/localflavor/pe/forms.py:52
+#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:88
+#: contrib/localflavor/pe/forms.py:24 contrib/localflavor/pe/forms.py:52
 msgid "This field requires only numbers."
 msgstr "Este campo requer somente números."
 
@@ -1964 +1990 @@
 msgid "Enter a 4 digit post code."
 msgstr "Informe um código postal de 4 dígitos."
 
-#: contrib/localflavor/br/forms.py:22
+#: contrib/localflavor/br/br_cpfcnpj.py:34
+msgid "Invalid CNPJ number."
+msgstr "Número de CNPJ inválido."
+
+#: contrib/localflavor/br/br_cpfcnpj.py:35
+msgid "CNPJ requires at most 14 digits or 18 characters."
+msgstr "Este campo requer no máximo 14 dígitos ou 18 caracteres."
+
+#: contrib/localflavor/br/br_cpfcnpj.py:36
+msgid "CNPJ requires only numbers, allow '.', '/' and '-' for long format."
+msgstr "Este campo aceita somente números e os caracteres '.', '/' e '-'."
+
+#: contrib/localflavor/br/br_cpfcnpj.py:201 contrib/localflavor/br/forms.py:86
+msgid "Invalid CPF number."
+msgstr "Número de CPF inválido."
+
+#: contrib/localflavor/br/br_cpfcnpj.py:202
+msgid "CPF requires at most 11 digits or 14 characters."
+msgstr "Este campo requer no máximo 11 dígitos ou 14 caracteres."
+
+#: contrib/localflavor/br/br_cpfcnpj.py:203
+msgid "CPF requires only numbers, allow '.' and '-' for long format."
+msgstr "Este campo aceita somente números e os caracteres '.' e '-'."
+
+#: contrib/localflavor/br/forms.py:18
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr "Informe um código postal no formato XXXXX-XXX."
 
-#: contrib/localflavor/br/forms.py:31
+#: contrib/localflavor/br/forms.py:27
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
 msgstr "Números de telefone devem estar no formato XX-XXXX-XXXX."
 
-#: contrib/localflavor/br/forms.py:59
+#: contrib/localflavor/br/forms.py:55
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
@@ -1980 +2030 @@
 "Selecione um estado brasileiro válido. O estado escolhido não é um dos "
 "estados disponíveis."
 
-#: contrib/localflavor/br/forms.py:95
-msgid "Invalid CPF number."
-msgstr "Número de CPF inválido."
-
-#: contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:87
 msgid "This field requires at most 11 digits or 14 characters."
 msgstr "Este campo requer no máximo 11 dígitos ou 14 caracteres."
 
-#: contrib/localflavor/br/forms.py:135
-msgid "Invalid CNPJ number."
-msgstr "Número de CNPJ inválido."
-
-#: contrib/localflavor/br/forms.py:137
-msgid "This field requires at least 14 digits"
-msgstr "Este campo requer ao menos 14 dígitos"
-
 #: contrib/localflavor/ca/forms.py:25
 msgid "Enter a postal code in the format XXX XXX."
 msgstr "Informe um código postal no formato XXX XXX."
@@ -4452 +4490 @@
 msgid "Enter a valid value."
 msgstr "Informe um valor válido."
 
-#: core/validators.py:87 forms/fields.py:517
+#: core/validators.py:87 forms/fields.py:528
 msgid "Enter a valid URL."
 msgstr "Informe uma URL válida."
 
-#: core/validators.py:89 forms/fields.py:518
+#: core/validators.py:89 forms/fields.py:529
 msgid "This URL appears to be a broken link."
 msgstr "A URL %s aparenta ser um link quebrado."
 
-#: core/validators.py:123 forms/fields.py:861
+#: core/validators.py:123 forms/fields.py:877
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Insira um \"slug\" válido consistindo de letras, números, sublinhados (_) ou "
 "hífens."
 
-#: core/validators.py:126 forms/fields.py:854
+#: core/validators.py:126 forms/fields.py:870
 msgid "Enter a valid IPv4 address."
 msgstr "Informe um endereço IPv4 válido."
 
-#: core/validators.py:129 db/models/fields/__init__.py:598
+#: core/validators.py:129 db/models/fields/__init__.py:572
 msgid "Enter only digits separated by commas."
 msgstr "Informe apenas dígitos separados por vírgulas."
 
@@ -4480 +4518 @@
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Certifique-se de que o valor é %(limit_value)s (ele é %(show_value)s)."
 
-#: core/validators.py:153 forms/fields.py:196 forms/fields.py:246
+#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr "Certifique-se que este valor seja menor ou igual a %(limit_value)s."
 
-#: core/validators.py:158 forms/fields.py:197 forms/fields.py:247
+#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr "Certifique-se que este valor seja maior ou igual a %(limit_value)s."
@@ -4508 +4546 @@
 "Certifique-se de que o valor tenha no máximo %(limit_value)d caracteres (ele "
 "possui %(show_value)d)."
 
-#: db/models/base.py:818
+#: db/models/base.py:823
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
 
-#: db/models/base.py:833 db/models/base.py:841
+#: db/models/base.py:838 db/models/base.py:846
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s com este %(field_label)s já existe."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:63
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "O valor %r não é uma escolha válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:64
 msgid "This field cannot be null."
 msgstr "Este campo não pode ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:65
 msgid "This field cannot be blank."
 msgstr "Este campo não pode estar em branco."
 
-#: db/models/fields/__init__.py:69
+#: db/models/fields/__init__.py:70
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo do tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:477 db/models/fields/__init__.py:878
-#: db/models/fields/__init__.py:981 db/models/fields/__init__.py:992
-#: db/models/fields/__init__.py:1019
+#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
+#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
+#: db/models/fields/__init__.py:999
 msgid "Integer"
 msgstr "Inteiro"
 
-#: db/models/fields/__init__.py:481 db/models/fields/__init__.py:876
+#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
 msgid "This value must be an integer."
 msgstr "Este valor deve ser um inteiro."
 
-#: db/models/fields/__init__.py:516
+#: db/models/fields/__init__.py:490
 msgid "This value must be either True or False."
 msgstr "Este valor deve ser True ou False."
 
-#: db/models/fields/__init__.py:518
+#: db/models/fields/__init__.py:492
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadeiro ou Falso)"
 
-#: db/models/fields/__init__.py:565 db/models/fields/__init__.py:1002
+#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (até %(max_length)s)"
 
-#: db/models/fields/__init__.py:593
+#: db/models/fields/__init__.py:567
 msgid "Comma-separated integers"
 msgstr "Inteiros separados por vírgula"
 
-#: db/models/fields/__init__.py:607
+#: db/models/fields/__init__.py:581
 msgid "Date (without time)"
 msgstr "Data (sem hora)"
 
-#: db/models/fields/__init__.py:611
+#: db/models/fields/__init__.py:585
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Informe uma data válida no formato AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:612
+#: db/models/fields/__init__.py:586
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Data inválida: %s"
 
-#: db/models/fields/__init__.py:693
+#: db/models/fields/__init__.py:667
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr ""
 "Informe uma data/hora válida no formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:695
+#: db/models/fields/__init__.py:669
 msgid "Date (with time)"
 msgstr "Data e hora"
 
-#: db/models/fields/__init__.py:761
+#: db/models/fields/__init__.py:735
 msgid "This value must be a decimal number."
 msgstr "Este valor deve ser um número decimal."
 
-#: db/models/fields/__init__.py:763
+#: db/models/fields/__init__.py:737
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:818
+#: db/models/fields/__init__.py:792
 msgid "E-mail address"
 msgstr "Endereço de e-mail"
 
-#: db/models/fields/__init__.py:825 db/models/fields/files.py:220
+#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
 #: db/models/fields/files.py:331
 msgid "File path"
 msgstr "Caminho de arquivo"
 
-#: db/models/fields/__init__.py:848
+#: db/models/fields/__init__.py:822
 msgid "This value must be a float."
 msgstr "Este valor deve ser um ponto flutuante."
 
-#: db/models/fields/__init__.py:850
+#: db/models/fields/__init__.py:824
 msgid "Floating point number"
 msgstr "Número de ponto flutuante"
 
-#: db/models/fields/__init__.py:903
+#: db/models/fields/__init__.py:883
 msgid "Big (8 byte) integer"
 msgstr "Inteiro grande (8 byte)"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:912
 msgid "This value must be either None, True or False."
 msgstr "Este valor deve ser None, True ou False."
 
-#: db/models/fields/__init__.py:934
+#: db/models/fields/__init__.py:914
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadeiro, Falso ou Nada)"
 
-#: db/models/fields/__init__.py:1025
+#: db/models/fields/__init__.py:1005
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1041
+#: db/models/fields/__init__.py:1021
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1045
+#: db/models/fields/__init__.py:1025
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Informe uma hora válida no formato HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1129
+#: db/models/fields/__init__.py:1109
 msgid "XML text"
 msgstr "Texto XML"
 
-#: db/models/fields/related.py:755
+#: db/models/fields/related.py:799
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s com chave primária %(pk)r não existe."
 
-#: db/models/fields/related.py:757
+#: db/models/fields/related.py:801
 msgid "Foreign Key (type determined by related field)"
 msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
 
-#: db/models/fields/related.py:879
+#: db/models/fields/related.py:918
 msgid "One-to-one relationship"
 msgstr "Relacionamento um-para-um"
 
-#: db/models/fields/related.py:939
+#: db/models/fields/related.py:980
 msgid "Many-to-many relationship"
 msgstr "Relacionamento muitos-para-muitos"
 
-#: db/models/fields/related.py:959
+#: db/models/fields/related.py:1000
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mantenha pressionado \"Control\" (ou \"Command\" no Mac) para selecionar "
 "mais de uma opção."
 
-#: db/models/fields/related.py:1020
+#: db/models/fields/related.py:1061
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -4677 +4715 @@
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: forms/fields.py:195
+#: forms/fields.py:203
 msgid "Enter a whole number."
 msgstr "Informe um número inteiro."
 
-#: forms/fields.py:225 forms/fields.py:245
+#: forms/fields.py:234 forms/fields.py:255
 msgid "Enter a number."
 msgstr "Informe um número."
 
-#: forms/fields.py:248
+#: forms/fields.py:258
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Certifique-se de que não tenha mais de %s dígitos no total."
 
-#: forms/fields.py:249
+#: forms/fields.py:259
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Certifique-se de que não tenha mais de %s casa decimais."
 
-#: forms/fields.py:250
+#: forms/fields.py:260
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Certifique-se de que não tenha mais de %s dígitos antes do ponto decimal."
 
-#: forms/fields.py:311 forms/fields.py:826
+#: forms/fields.py:322 forms/fields.py:837
 msgid "Enter a valid date."
 msgstr "Informe uma data válida."
 
-#: forms/fields.py:339 forms/fields.py:827
+#: forms/fields.py:350 forms/fields.py:838
 msgid "Enter a valid time."
 msgstr "Informe uma hora válida."
 
-#: forms/fields.py:365
+#: forms/fields.py:376
 msgid "Enter a valid date/time."
 msgstr "Informe uma data/hora válida."
 
-#: forms/fields.py:423
+#: forms/fields.py:434
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nenhum arquivo enviado. Verifique o tipo de codificação do formulário."
 
-#: forms/fields.py:424
+#: forms/fields.py:435
 msgid "No file was submitted."
 msgstr "Não foi enviado nenhum arquivo."
 
-#: forms/fields.py:425
+#: forms/fields.py:436
 msgid "The submitted file is empty."
 msgstr "O arquivo enviado está vazio."
 
-#: forms/fields.py:426
+#: forms/fields.py:437
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -4733 +4771 @@
 "Certifique-se de que o arquivo tenha no máximo %(max)d caracteres (ele "
 "possui %(length)d)."
 
-#: forms/fields.py:461
+#: forms/fields.py:472
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -4741 +4779 @@
 "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está "
 "corrompido."
 
-#: forms/fields.py:584 forms/fields.py:659
+#: forms/fields.py:595 forms/fields.py:670
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Faça uma escolha válida. %(value)s não está disponível."
 
-#: forms/fields.py:660 forms/fields.py:722 forms/models.py:989
+#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Informe uma lista de valores."
 
-#: forms/formsets.py:293 forms/formsets.py:295
+#: forms/formsets.py:298 forms/formsets.py:300
 msgid "Order"
 msgstr "Ordem"
 
-#: forms/models.py:550
+#: forms/models.py:562
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor, corrija o valor duplicado para %(field)s."
 
-#: forms/models.py:554
+#: forms/models.py:566
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Por favor, corrija o valor duplicado para %(field)s, o qual deve ser único"
 
-#: forms/models.py:560
+#: forms/models.py:572
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4774 +4812 @@
 "Por favor corrija os dados duplicados em %(field_name)s que deverá ser único "
 "para o %(lookup)s em %(date_field)s."
 
-#: forms/models.py:568
+#: forms/models.py:580
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija os valores duplicados abaixo."
 
-#: forms/models.py:842
+#: forms/models.py:855
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "A chave estrangeira no inline não coincide com a chave primária na instância "
 "pai."
 
-#: forms/models.py:908
+#: forms/models.py:921
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Faça uma escolha válida. Sua escolha não é uma das disponíveis."
 
-#: forms/models.py:990
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Faça uma escolha válida. %s não está disponível."
 
-#: forms/models.py:992
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" não é um valor válido para uma chave primária."
 
-#: template/defaultfilters.py:781
+#: template/defaultfilters.py:776
 msgid "yes,no,maybe"
 msgstr "sim,não,talvez"
 
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:807
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:811
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:817
+#: template/defaultfilters.py:812
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -5082 +5120 @@
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:512
+#: utils/translation/trans_real.py:519
 msgid "DATE_FORMAT"
 msgstr "j \\de N \\de Y"
 
-#: utils/translation/trans_real.py:513
+#: utils/translation/trans_real.py:520
 msgid "DATETIME_FORMAT"
 msgstr "j \\de N \\de Y à\\s H:i"
 
-#: utils/translation/trans_real.py:514
+#: utils/translation/trans_real.py:521
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:535
+#: utils/translation/trans_real.py:542
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F \\de Y"
 
-#: utils/translation/trans_real.py:536
+#: utils/translation/trans_real.py:543
 msgid "MONTH_DAY_FORMAT"
 msgstr "j \\de F"
 
@@ -5117 +5155 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s: excluído."
 
+#~ msgid "This field requires at least 14 digits"
+#~ msgstr "Este campo requer ao menos 14 dígitos"

new file django/contrib/localflavor/br/br_cpfcnpj.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+
+import re, math
+from random import randint
+from django.db import models
+from django import forms
+from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext as _
+
+# -------------------------------------------------
+# Based in http://www.python.org.br/wiki/VerificadorDeCnpj
+# 
+class CNPJ(object):
+    """
+    This class that represents a CNPJ number.
+    CNPJ is National Registry of Corporations in Brazil.
+    A CPF number is compounded by XX.XXX.XXX/XXXX-VD where:
+      - First 8 digits is company id
+      - The 4 digits after '/' is number of filial of company
+      - Last two digits are verification digits
+
+    >>> x=CNPJGenerator()
+    >>> x
+    '58364950000770'
+    >>> CNPJ(x)
+    CNPJ('58364950000770')
+    >>> CNPJ(x).single
+    u'58364950000770'
+    >>> str(CNPJ(x))
+    '58.364.950/0007-70'
+    """
+
+    error_messages = {
+        'invalid': _(u"Invalid CNPJ number."),
+        'max_digits': _(u"CNPJ requires at most 14 digits or 18 characters."),
+        'digits_only': _(u"CNPJ requires only numbers, allow '.', '/' and '-' for long format."),
+    }
+    
+    def __init__(self, cnpj):
+        
+        # transform list or int or long in a string
+        if type(cnpj) in (int,long):
+            cnpj = u"%s" % cnpj
+        if type(cnpj) in (list,tuple):
+            cnpj= u''.join([str(x) for x in cnpj])
+
+        try:
+            basestring
+        except:
+            basestring = (str, unicode)
+        # only numbers = 14, numbers with '.', '/' and '-' = 18
+        if len(cnpj) not in (14,18):
+            raise ValueError(self.error_messages['max_digits'])
+
+        if isinstance(cnpj, basestring):
+            # remove characters
+            cnpj = cnpj.replace(".", "")
+            cnpj = cnpj.replace("-", "")
+            cnpj = cnpj.replace("/", "")
+
+            # and check if is digit
+            if not cnpj.isdigit():
+                raise ValueError(self.error_messages['digits_only'])
+
+        # turn into a list of integers
+        self.cnpj = map(int, cnpj)
+
+        # validate number and validation digits
+        if not self.is_valid:
+            raise ValueError(self.error_messages['invalid'])
+
+    def __getitem__(self, index):
+        """
+        Returns digit at index in CNPJ
+
+        >>> a = CNPJ('11222333000181')
+        >>> a[9] == '0'
+        True
+        >>> a[10] == '0'
+        True
+        >>> a[9] == 0
+        False
+        >>> a[10] == 0
+        False
+
+        """
+        return str(self.cnpj[index])
+
+    def __repr__(self):
+        return "CNPJ('%s')" % ''.join([str(x) for x in self.cnpj])
+
+    def __eq__(self, other):
+        """
+        >>> a = CNPJ('11222333000181')
+        >>> b = CNPJ('11.222.333/0001-81')
+        >>> c = CNPJ([1, 1, 2, 2, 2, 3, 3, 3, 0, 0, 0, 1, 8, 2])
+        >>> a == b
+        True
+        >>> a != c
+        True
+        >>> b != c
+        True
+        """
+        if isinstance(other, CNPJ):
+            return self.cnpj == other.cnpj
+        return False
+
+    def __unicode__(self): 
+        """
+        Return CNPJ in long format, with '.', '/' and '.'. For simple format
+        use CNPJ(...).single property/method
+
+        >>> a = CNPJ('11222333000181')
+        >>> str(a)
+        u'11.222.333/0001-81'
+
+        """
+        d = ((2, "."), (6, "."), (10, "/"), (15, "-"))
+        s = map(str, self.cnpj)
+        
+        for i, v in d:
+            s.insert(i, v)
+        
+        r = ''.join(s)
+        
+        return r
+    
+    def __str__(self):
+        return self.__unicode__()
+
+    def __len__(self):
+        return len(self.cnpj)
+
+    @property
+    def is_valid(self):
+        """
+        Validates CNPJ with first 8 digits + filial digits and validation
+        digits.
+        This method is used in __init__ to validate number.
+        """
+
+        # get company id + filial id (first 12 digits)
+        cnpj = self.cnpj[:12]
+        
+        # and following rules we stabilish some weight to multiply
+        def weightlist(s=12):
+            x = (range(2,10)*2)[:s]
+            x.reverse()
+            return x
+        
+        # while cnpj isn't complete
+        while len(cnpj) < 14:
+
+            # run trought numbers (x) mutiplying by weight (y) and then get
+            # sum of rest of division by 11 as interger
+            # (we have more than 9 digits so isn't simple as make calcs for CPF)
+            r = int(sum([x*y for (x, y) in zip(cnpj, weightlist(len(cnpj)))]) % 11)
+
+            # if digit is smaller than 2, turns 0
+            if r < 2:
+                f = 0
+            else:
+                f = 11 - r
+
+            # append digit to cnpj
+            cnpj.append(f)
+
+        # if created number is same as original number, cnpj is valid
+        return bool(cnpj == self.cnpj)
+
+    @property
+    def single(self):
+        """ returns single cnpj number (without '.', '/' and '-') """
+        return u''.join([str(x) for x in self.cnpj])
+
+# Based in http://www.python.org.br/wiki/VerificadorDeCpf
+class CPF(object):
+    """
+    This class represents a CPF number
+    A CPF number is compounded by XXX.XXX.XXX-VD. The two last digits are
+    verification digits.
+    
+    More information:
+    http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas
+
+    >>> a = CPF(95524361503)
+    >>> b = CPF('95524361503')
+    >>> c = CPF('955.243.615-03')
+    >>> d = CPF([9, 5, 5, 2, 4, 3, 6, 1, 5, 0, 3])
+    >>> e = CPF(['9', '5', '5', '2', '4', '3', '6', '1', '5', '0', '3'])
+    >>>
+    >>> a == b, a == c, a == d, a == e
+    (True, True, True, True)
+
+    """
+    
+    # cpfs with same number in all digits isn't valid
+    invalid_cpfs=map(lambda x: [x for i in range(11)],xrange(1,9))
+
+    error_messages = {
+        'invalid': _(u"Invalid CPF number."),
+        'max_digits': _(u"CPF requires at most 11 digits or 14 characters."),
+        'digits_only': _(u"CPF requires only numbers, allow '.' and '-' for long format."),
+    }
+    
+    def __init__(self, cpf):
+
+        # transform list or int or long in a string
+        if type(cpf) in (int,long):
+            cpf = u"%s" % cpf
+        if type(cpf) in (list,tuple):
+            cpf= u''.join([str(x) for x in cpf])
+
+        try:
+            basestring
+        except:
+            basestring = (str, unicode)
+        
+        # only numbers = 11, numbers + '.' and '_' = 14
+        if len(cpf) not in (11,14):
+            # need to be xxxxxxxxxxx or xxx.xxx.xxx-xx
+            raise ValueError(self.error_messages['max_digits'])
+
+        if isinstance(cpf, basestring):
+            # remove characters
+            cpf = cpf.replace(".", "")
+            cpf = cpf.replace("-", "")
+            # and check if is digit
+            if not cpf.isdigit():
+                raise ValueError(self.error_messages['digits_only'])
+        
+        # turn into a list of integers
+        self.cpf = map(int, cpf)
+
+        # validate number and validation digits
+        if not self.is_valid:
+            raise ValueError(self.error_messages['invalid'])
+
+    def __getitem__(self, index):
+        """
+        Returns digit at index in CPF
+
+        >>> a = CPF('95524361503')
+        >>> a[9] == '0'
+        True
+        >>> a[10] == '3'
+        True
+        >>> a[9] == 0
+        False
+        >>> a[10] == 3
+        False
+
+        """
+        return str(self.cpf[index])
+
+    def __repr__(self):
+        return "CPF('%s')" % ''.join([str(x) for x in self.cpf])
+
+    def __eq__(self, other):
+        """
+        >>> a = CPF('95524361503')
+        >>> b = CPF('955.243.615-03')
+        >>> c = CPF('123.456.789-00')
+        >>> a == b
+        True
+        >>> a != c
+        True
+        >>> b != c
+        True
+        """
+        if isinstance(other, CPF):
+            return self.cpf == other.cpf
+        return False
+    
+    def __unicode__(self):
+        """
+        Return CPF in long format, with '.' and '-'. For simple format use
+        CPF(..).single property/method
+
+        >>> a = CPF('95524361503')
+        >>> str(a)
+        u'955.243.615-03'
+        """
+        
+        d = ((3, "."), (7, "."), (11, "-"))
+        s = map(str, self.cpf)
+
+        for i, v in d:
+            s.insert(i, v)
+        
+        r = ''.join(s)
+        
+        return r
+
+    def __str__(self):
+        return self.__unicode__()
+
+    def __len__(self):
+        return len(self.cpf)
+    
+    @property
+    def is_valid(self):
+        """
+        Validates CPF number with 9 digits + validation digits.
+        This method is used to __init__ to validate number.
+        """
+        # check if cpf isn't in invalid_cpfs list
+        if self.cpf in self.invalid_cpfs: return False
+
+        # get first nine digits to calculate two verification digits
+        cpf = self.cpf[:9]
+        # while cpf isn't complete (this runs two loops)
+        while len(cpf) < 11:
+
+            # run trought numbers multiplying number (v) by weight (len(cpf)+1-i)
+            # and then get sum rest of division by 11 as integer
+            r = int(sum(map(lambda(i,v):math.floor((len(cpf)+1-i)*v),enumerate(cpf))) % 11)
+
+            # if digit is smaller than 2, turns 0
+            if r < 2:
+                f = 0
+            else:
+                f = 11 -r
+            
+            # append to cpf list
+            cpf.append(f)
+
+        # if created number is same as original number, cpf is valid
+        return bool(cpf == self.cpf)
+
+    def __nonzero__(self):
+        return self.is_valid
+    
+    @property
+    def single(self):
+        """ returns single cpf number (without '.' and '-') """
+        return u''.join([str(x) for x in self.cpf])
+
+def get_digits(randns,d1weight,d2weight):
+    """
+    return a tuple with cpf or cnpj digits. we use same method to get
+    digits based on numbers and weights
+    """
+
+    # GET FIRST CHECK DIGIT
+
+    # multiply by weightlist for first digit
+    d1ns = [randns[i]*m for i,m in enumerate(d1weight)]
+
+    # get sum
+    d1sum = sum(d1ns)
+    
+    # get firts digit. if first digit >= 10, transform in 0
+    d1 = int(round(d1sum - (math.floor(d1sum/11)*11)))
+    if d1 < 2:
+        d1 = 0
+    else:
+        d1 = 11 - d1
+
+    # GET SECOND CHECK DIGIT
+
+    # multipy by weightlist for second digit, but add first digit in list
+    d2ns = (lambda: [(randns+[d1])[i]*m for i,m in enumerate(d2weight)])()
+
+    # get sum
+    d2sum = sum(d2ns)
+    
+    # get second digit. if second digit >= 10, transform in 0
+    d2 = int(round(d2sum - (math.floor(d2sum/11)*11)))
+    if d2 < 2:
+        d2 = 0
+    else:
+        d2 = 11 - d2
+
+    return d1,d2
+
+def CPFGenerator(amount=1,cpfn=None):
+    """ generate valid cpf for tests """
+
+    # randnumbers are created from 0 to 9, and multiplicated by these list for
+    # fist digit
+    d1weight = range(2,11) # [2,3,...,10]
+    d1weight.reverse()
+    
+    # for second digit same as for first digit, but with d1
+    d2weight = range(2,12) # [2,3,...,11]
+    d2weight.reverse()
+
+    # create how many cpfs amount says then add to set cpfs 
+    cpfs=set()
+
+    while len(cpfs) < amount:
+        # get some rand numbers
+        if not cpfn:
+            randns = [randint(0,9) for x in range(9)]
+        else:
+            randns = cpfn
+        
+        d1,d2 = get_digits(randns,d1weight,d2weight)
+
+        # transform cpf in a string
+        cpf = ("%s"*11) % tuple(randns+[d1,d2])
+        
+        # if not exist, add in cpfs
+        if not cpf in cpfs:
+            cpfs.add(cpf)
+
+    cpfs = list(cpfs)
+    if len(cpfs) != 1:
+        return cpfs
+    else:
+        return cpfs[0]
+
+def CNPJGenerator(amount=1,cnpjn=None):
+    """ generate valid cnpj for tests """
+
+    d1weight = [5,4,3,2,9,8,7,6,5,4,3,2]
+    d2weight = [6] + d1weight
+    
+    cnpjs=set()
+
+    while len(cnpjs) < amount:
+
+        if not cnpjn:
+            randns = [randint(0,9) for x in range(8)] + [0,0,0,randint(0,9)]
+        else:
+            randns = cnpjn
+
+        d1,d2 = get_digits(randns,d1weight,d2weight)
+
+        # transform cnpj in a string
+        cnpj = ("%s"*14) % tuple(randns+[d1,d2])
+        
+        # if not exist, add in cnpjs
+        if not cnpj in cnpjs:
+            cnpjs.add(cnpj)
+
+    cnpjs = list(cnpjs)
+    if len(cnpjs) != 1:
+        return cnpjs
+    else:
+        return cnpjs[0]
+
+

django/contrib/localflavor/br/forms.py

@@ -8 +8 @@
 from django.forms.fields import Field, RegexField, CharField, Select
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.localflavor.br.br_cpfcnpj import CPF,CNPJ
 import re
 
 phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')
@@ -73 +74 @@
             raise ValidationError(self.error_messages['invalid'])
         return value
 
-def DV_maker(v):
-    if v >= 2:
-        return 11 - v
-    return 0
-
 class BRCPFField(CharField):
     """
     This field validate a CPF number or a CPF string. A CPF number is
@@ -93 +89 @@
     }
 
     def __init__(self, *args, **kwargs):
-        super(BRCPFField, self).__init__(max_length=14, min_length=11, *args, **kwargs)
+        kwargs['max_length'] = 14
+        kwargs['min_length'] = 11
+        super(BRCPFField, self).__init__(*args, **kwargs)
 
     def clean(self, value):
         """
@@ -101 +99 @@
         11-digit number.
         """
         value = super(BRCPFField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return u''
-        orig_value = value[:]
-        if not value.isdigit():
-            value = re.sub("[-\.]", "", value)
+        if not self.required and value in EMPTY_VALUES:
+            return value
+
         try:
-            int(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['digits_only'])
-        if len(value) != 11:
-            raise ValidationError(self.error_messages['max_digits'])
-        orig_dv = value[-2:]
-
-        new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(10, 1, -1))])
-        new_1dv = DV_maker(new_1dv % 11)
-        value = value[:-2] + str(new_1dv) + value[-1]
-        new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(range(11, 1, -1))])
-        new_2dv = DV_maker(new_2dv % 11)
-        value = value[:-1] + str(new_2dv)
-        if value[-2:] != orig_dv:
-            raise ValidationError(self.error_messages['invalid'])
+            cpf = CPF(value)
+        except ValueError,err:
+            # CPF class already raise internal erros if cpf isn't valid
+            raise ValidationError,err
 
-        return orig_value
+        return value
 
-class BRCNPJField(Field):
-    default_error_messages = {
-        'invalid': _("Invalid CNPJ number."),
-        'digits_only': _("This field requires only numbers."),
-        'max_digits': _("This field requires at least 14 digits"),
-    }
+class BRCNPJField(CharField):
+    """
+    This field validate a CNPJ number or a CNPJ string. A CNPJ number is
+    compounded by XX.XXX.XXX/XXXX-VD. The two last digits are check digits.
+    """
+
+    def __init__(self,*args,**kwargs):
+        kwargs['max_length'] = 18
+        kwargs['min_length'] = 14
+        super(BRCNPJField,self).__init__(*args,**kwargs)
 
     def clean(self, value):
         """
@@ -138 +127 @@
         group of 14 characters.
         """
         value = super(BRCNPJField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return u''
-        orig_value = value[:]
-        if not value.isdigit():
-            value = re.sub("[-/\.]", "", value)
+        if not self.required and value in EMPTY_VALUES:
+            return value
+
         try:
-            int(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['digits_only'])
-        if len(value) != 14:
-            raise ValidationError(self.error_messages['max_digits'])
-        orig_dv = value[-2:]
-
-        new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(5, 1, -1) + range(9, 1, -1))])
-        new_1dv = DV_maker(new_1dv % 11)
-        value = value[:-2] + str(new_1dv) + value[-1]
-        new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(range(6, 1, -1) + range(9, 1, -1))])
-        new_2dv = DV_maker(new_2dv % 11)
-        value = value[:-1] + str(new_2dv)
-        if value[-2:] != orig_dv:
-            raise ValidationError(self.error_messages['invalid'])
+            cnpj = CNPJ(value)
+        except ValueError,err:
+            # CNPJ class already raise internal errors if CNPJ isn't valid
+            raise ValidationError,err
 
-        return orig_value
+        return value

new file django/contrib/localflavor/br/models.py

@@ +1 @@
+from django.db import models
+from django.contrib.localflavor.br.br_cpfcnpj import CPF,CNPJ
+from django.contrib.localflavor.br import forms
+
+EMPTY_VALUES=(None,'')
+
+class BRCPFField(models.CharField):
+    """ CPF Model field """
+    description = "The Brazilian CPF Field"
+
+    __metaclass__ = models.SubfieldBase
+
+    def __init__(self,*args,**kwargs):
+        self.longformat = kwargs.pop('longformat',False)
+        kwargs['max_length'] = 14 if self.longformat else 11
+        super(BRCPFField,self).__init__(*args,**kwargs)
+
+    def get_internal_type(self):
+        return "CharField"
+
+    def formfield(self,**kwargs):
+        defaults = {'form_class': forms.BRCPFField}
+        defaults.update(kwargs)
+        return super(BRCPFField,self).formfield(**defaults)
+
+    def to_python(self,value):
+        """ convert string from base to a CPF instance """
+        if isinstance(value,CPF) or value in EMPTY_VALUES:
+            return value
+        try:
+            return CPF(value)
+        except TypeError:
+            return None
+
+    def get_prep_value(self,value):
+        value = self.to_python(value)
+        if not value:
+            return ''
+        if self.longformat:
+            return value.__unicode__
+        else:
+            return value.single
+
+class BRCNPJField(models.CharField):
+    """ CNPJ Model field """
+    description = "The Brazilian CNPJ Field"
+
+    __metaclass__ = models.SubfieldBase
+
+    def __init__(self,*args,**kwargs):
+        self.longformat = kwargs.pop('longformat',False)
+        kwargs['max_length'] = 18 if self.longformat else 14
+        super(BRCNPJField,self).__init__(*args,**kwargs)
+
+    def get_internal_type(self):
+        return "CharField"
+
+    def formfield(self,**kwargs):
+        defaults = {'form_class': forms.BRCNPJField}
+        defaults.update(kwargs)
+        return super(BRCNPJField,self).formfield(**defaults)
+
+    def to_python(self,value):
+        """ convert string from base to a CNPJ instance """
+        if isinstance(value,CNPJ) or value in EMPTY_VALUES:
+            return value
+        try:
+            return CNPJ(value)
+        except TypeError:
+            return None
+
+    def get_prep_value(self,value):
+        value = self.to_python(value)
+        if not value:
+            return ''
+        if self.longformat:
+            return value.__unicode__
+        else:
+            return value.single

tests/regressiontests/forms/localflavor/br.py

@@ -64 +64 @@
 >>> f.clean('12345-123')
 u'12345-123'
 
-# BRCNPJField ############################################################
-
->>> from django.contrib.localflavor.br.forms import BRCNPJField
->>> f = BRCNPJField(required=True)
->>> f.clean('')
-Traceback (most recent call last):
-...
-ValidationError: [u'This field is required.']
->>> f.clean('12-345-678/9012-10')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CNPJ number.']
->>> f.clean('12.345.678/9012-10')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CNPJ number.']
->>> f.clean('12345678/9012-10')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CNPJ number.']
->>> f.clean('64.132.916/0001-88')
-'64.132.916/0001-88'
->>> f.clean('64-132-916/0001-88')
-'64-132-916/0001-88'
->>> f.clean('64132916/0001-88')
-'64132916/0001-88'
->>> f.clean('64.132.916/0001-XX')
-Traceback (most recent call last):
-...
-ValidationError: [u'This field requires only numbers.']
->>> f = BRCNPJField(required=False)
->>> f.clean('')
-u''
-
-# BRCPFField #################################################################
-
->>> from django.contrib.localflavor.br.forms import BRCPFField
->>> f = BRCPFField()
->>> 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.clean('489.294.654-54')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CPF number.']
->>> f.clean('295.669.575-98')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CPF number.']
->>> f.clean('539.315.127-22')
-Traceback (most recent call last):
-...
-ValidationError: [u'Invalid CPF number.']
->>> f.clean('663.256.017-26')
-u'663.256.017-26'
->>> f.clean('66325601726')
-u'66325601726'
->>> f.clean('375.788.573-20')
-u'375.788.573-20'
->>> f.clean('84828509895')
-u'84828509895'
->>> f.clean('375.788.573-XX')
-Traceback (most recent call last):
-...
-ValidationError: [u'This field requires only numbers.']
->>> f.clean('375.788.573-000')
-Traceback (most recent call last):
-...
-ValidationError: [u'Ensure this value has at most 14 characters (it has 15).']
->>> f.clean('123.456.78')
-Traceback (most recent call last):
-...
-ValidationError: [u'Ensure this value has at least 11 characters (it has 10).']
->>> f.clean('123456789555')
-Traceback (most recent call last):
-...
-ValidationError: [u'This field requires at most 11 digits or 14 characters.']
->>> f = BRCPFField(required=False)
->>> f.clean('')
-u''
->>> f.clean(None)
-u''
-
 # BRPhoneNumberField #########################################################
 
 >>> from django.contrib.localflavor.br.forms import BRPhoneNumberField

deleted file tests/regressiontests/localflavor/forms.py

@@ -1 @@
-from django.forms import ModelForm
-from models import Place
-
-class PlaceForm(ModelForm):
-    """docstring for PlaceForm"""
-    class Meta:
-        model = Place

deleted file tests/regressiontests/localflavor/models.py

@@ -1 @@
-from django.db import models
-from django.contrib.localflavor.us.models import USStateField
-
-class Place(models.Model):
-    state = USStateField(blank=True)
-    state_req = USStateField()
-    state_default = USStateField(default="CA", blank=True)
-    name = models.CharField(max_length=20)

deleted file tests/regressiontests/localflavor/tests.py

@@ -1 @@
-from django.test import TestCase
-from models import Place
-from forms import PlaceForm
-
-class USLocalflavorTests(TestCase):
-    def setUp(self):
-        self.form = PlaceForm({'state':'GA', 'state_req':'NC', 'name':'impossible'})
-        
-    def test_get_display_methods(self):
-        """Test that the get_*_display() methods are added to the model instances."""
-        place = self.form.save()
-        self.assertEqual(place.get_state_display(), 'Georgia')
-        self.assertEqual(place.get_state_req_display(), 'North Carolina')
-    
-    def test_required(self):
-        """Test that required USStateFields throw appropriate errors."""
-        form = PlaceForm({'state':'GA', 'name':'Place in GA'})
-        self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors['state_req'], [u'This field is required.'])
-    
-    def test_field_blank_option(self):
-        """Test that the empty option is there."""
-        state_select_html = """\
-<select name="state" id="id_state">
-<option value="">---------</option>
-<option value="AL">Alabama</option>
-<option value="AK">Alaska</option>
-<option value="AS">American Samoa</option>
-<option value="AZ">Arizona</option>
-<option value="AR">Arkansas</option>
-<option value="CA">California</option>
-<option value="CO">Colorado</option>
-<option value="CT">Connecticut</option>
-<option value="DE">Delaware</option>
-<option value="DC">District of Columbia</option>
-<option value="FL">Florida</option>
-<option value="GA" selected="selected">Georgia</option>
-<option value="GU">Guam</option>
-<option value="HI">Hawaii</option>
-<option value="ID">Idaho</option>
-<option value="IL">Illinois</option>
-<option value="IN">Indiana</option>
-<option value="IA">Iowa</option>
-<option value="KS">Kansas</option>
-<option value="KY">Kentucky</option>
-<option value="LA">Louisiana</option>
-<option value="ME">Maine</option>
-<option value="MD">Maryland</option>
-<option value="MA">Massachusetts</option>
-<option value="MI">Michigan</option>
-<option value="MN">Minnesota</option>
-<option value="MS">Mississippi</option>
-<option value="MO">Missouri</option>
-<option value="MT">Montana</option>
-<option value="NE">Nebraska</option>
-<option value="NV">Nevada</option>
-<option value="NH">New Hampshire</option>
-<option value="NJ">New Jersey</option>
-<option value="NM">New Mexico</option>
-<option value="NY">New York</option>
-<option value="NC">North Carolina</option>
-<option value="ND">North Dakota</option>
-<option value="MP">Northern Mariana Islands</option>
-<option value="OH">Ohio</option>
-<option value="OK">Oklahoma</option>
-<option value="OR">Oregon</option>
-<option value="PA">Pennsylvania</option>
-<option value="PR">Puerto Rico</option>
-<option value="RI">Rhode Island</option>
-<option value="SC">South Carolina</option>
-<option value="SD">South Dakota</option>
-<option value="TN">Tennessee</option>
-<option value="TX">Texas</option>
-<option value="UT">Utah</option>
-<option value="VT">Vermont</option>
-<option value="VI">Virgin Islands</option>
-<option value="VA">Virginia</option>
-<option value="WA">Washington</option>
-<option value="WV">West Virginia</option>
-<option value="WI">Wisconsin</option>
-<option value="WY">Wyoming</option>
-</select>"""
-        self.assertEqual(str(self.form['state']), state_select_html)

new file tests/regressiontests/localflavor_regress/br/forms.py

@@ +1 @@
+from django import forms
+from models import BRCPFCNPJ
+
+class BRCPFCNPJForm(forms.ModelForm):
+
+    class Meta:
+        model = BRCPFCNPJ

new file tests/regressiontests/localflavor_regress/br/models.py

@@ +1 @@
+from django.db import models
+from django.contrib.localflavor.br.models import BRCPFField, BRCNPJField
+
+class BRCPFCNPJ(models.Model):
+
+    cpf = BRCPFField()
+    cnpj = BRCNPJField()
+
+    def __unicode__(self):
+        return u"%s ,  %s" % (self.cpf,self.cnpj)
+
+    class Meta:
+        app_label = 'localflavor_regress'
+
+class BRCPFCNPJ2(models.Model):
+
+    cpf = BRCPFField(blank=True)
+    cnpj = BRCNPJField(blank=True)
+
+    def __unicode__(self):
+        return u"%s ,  %s" % (self.cpf,self.cnpj)
+
+    class Meta:
+        app_label = 'localflavor_regress'

new file tests/regressiontests/localflavor_regress/br/tests.py

@@ +1 @@
+from django.test import TestCase
+from django import forms
+from django.contrib.localflavor.br.br_cpfcnpj import CPF, CNPJ, CPFGenerator,\
+    CNPJGenerator
+from django.contrib.localflavor.br import forms as brforms
+from models import BRCPFCNPJ, BRCPFCNPJ2
+from forms import BRCPFCNPJForm
+
+from random import choice
+
+class BRCPFCNPJTests(TestCase):
+
+    @property
+    def randomcpf(self):
+        return CPFGenerator()
+
+    @property
+    def randomcnpj(self):
+        return CNPJGenerator()
+
+    def test_cpf_type(self):
+        """ make tests on cpf class """
+        cpf = '43502207046'
+
+        # test wrong size
+        try:
+            CPF(cpf[:-1])
+        except ValueError,err:
+            self.assertEqual(err.args,(CPF.error_messages['max_digits'],))
+
+        # test digits only
+        try:
+            CPF(cpf.replace('0','a'))
+        except ValueError,err:
+            self.assertEqual(err.args,(CPF.error_messages['digits_only'],))
+
+        # test invalid cpf
+        try:
+            CPF(cpf[:-1]+'5')
+        except ValueError,err:
+            self.assertEqual(err.args,(CPF.error_messages['invalid'],))
+
+        # test valid cpf
+        try:
+            cpfn = CPF(cpf)
+        except ValueError,err:
+            self.fail(str(err))
+    
+    def test_cnpj_type(self):
+        """ make tests on cnpj type """
+        cnpj = '59430995000173'
+
+        # test wrong size
+        try:
+            CNPJ(cnpj[:-1])
+        except ValueError,err:
+            self.assertEqual(err.args,(CNPJ.error_messages['max_digits'],))
+
+        # test digits only
+        try:
+            CNPJ(cnpj.replace('0','a'))
+        except ValueError,err:
+            self.assertEqual(err.args,(CNPJ.error_messages['digits_only'],))
+
+        # test invalid cnpj
+        try:
+            CNPJ(cnpj[:-1]+'5')
+        except ValueError,err:
+            self.assertEqual(err.args,(CNPJ.error_messages['invalid'],))
+
+        # test valid cnpj
+        try:
+            cnpjn = CNPJ(cnpj)
+        except ValueError,err:
+            self.fail(str(err))
+
+    def test_cpf_generator(self):
+        # create 100 CPFS with generator
+        for i in xrange(100):
+            try:
+                CPF(self.randomcpf)
+            except ValueError,err:
+                self.fail(str(err))
+
+    def test_cnpj_generator(self):
+        # create 100 CNPJS with generator
+        for i in xrange(100):
+            try:
+                CNPJ(self.randomcnpj)
+            except ValueError,err:
+                self.fail(str(err))
+
+    def test_cpfcnpj_form_and_model(self):
+        # inserts 100 register on cpfcnpj model with form
+        for i in xrange(100):
+            cpf = self.randomcpf
+            cnpj = self.randomcnpj
+
+            # just choice over full number cpf/cnpj, normal string or with
+            # additional characters, so we test with that various formats on
+            # form input
+            cpf_to_form = choice([cpf,str(CPF(cpf)),CPF(cpf).single])
+            cnpj_to_form = choice([cnpj,str(CNPJ(cnpj)),CNPJ(cnpj).single])
+            
+            f = BRCPFCNPJForm(data={'cpf':cpf_to_form,'cnpj':cnpj_to_form})
+
+            if f.is_valid():
+                f.save()
+            else:
+                # show any errors
+                self.fail(u"\n".join(["\n%s: %s" % (k.upper(),u', '.join(v)) for k,v in f.errors.items()]))
+                break
+
+            try:
+                inst = BRCPFCNPJ.objects.get(cpf=cpf,cnpj=cnpj)
+            except BRCPFCNPJ.DoesNotExist:
+                self.fail("Failed on get saved cpf/cnpj with form")
+                break
+            else:
+                # check if numbers are equal
+                self.assertEqual(cpf,inst.cpf.single)
+                self.assertEqual(cnpj,inst.cnpj.single)
+
+
+    def test_cpfcnpj_simpleform(self):
+        """ test single form with blank value and normal value """
+
+        class Form1(forms.Form):
+            cpf = brforms.BRCPFField(required=False)
+            def save(self):
+                return self.cleaned_data
+        class Form2(forms.Form):
+            cnpj = brforms.BRCNPJField(required=False)
+            def save(self):
+                return self.cleaned_data
+
+
+        cpf = CPFGenerator()
+        cnpj = CNPJGenerator()
+
+        """ with cpf """
+        f = Form1(data={'cpf':cpf})
+        self.assertEqual(f.is_valid(),True)
+        self.assertEqual({'cpf':cpf},f.save())
+        """ without cpf """
+        f = Form1(data={'cpf':''})
+        self.assertEqual(f.is_valid(),True)
+        self.assertEqual({'cpf':''},f.save())
+
+
+        """ with cnpj """
+        f = Form2(data={'cnpj':cnpj})
+        self.assertEqual(f.is_valid(),True)
+        self.assertEqual({'cnpj':cnpj},f.save())
+        """ without cnpj """
+        f = Form2(data={'cnpj':''})
+        self.assertEqual(f.is_valid(),True)
+        self.assertEqual({'cnpj':''},f.save())
+
+    def test_cpfcnpj_blank_model_form(self):
+        """ test blank=True for models and forms """
+
+        class Form1(forms.ModelForm):
+
+            class Meta:
+                model = BRCPFCNPJ2
+
+        f = Form1(data={'cpf':'','cnpj':''})
+        self.assertEqual(f.is_valid(),True)
+        self.assertEqual({'cnpj':'','cpf':''},f.cleaned_data)
+        f.save()
+        m = BRCPFCNPJ2.objects.get(pk=1)
+        self.assertEqual(m.cpf,'')
+        self.assertEqual(m.cnpj,'')
+
+

new file tests/regressiontests/localflavor_regress/tests.py

@@ +1 @@
+import unittest
+from django.test import TestCase
+
+# just import your tests here
+from us.tests import *
+from br.tests import *
+
+# Get every subclass of TestCase and add to suite
+# Now script check for every imported class, if is a subclass of TestCase add
+# to testlist, and then suite create a TestSuite with these clases.
+testlist=[]
+for i in locals().values():
+    try:
+        if issubclass(i,TestCase) and i is not TestCase:
+            testlist.append(unittest.TestLoader().loadTestsFromTestCase(i))
+    except TypeError:
+        pass
+
+def suite():
+    return unittest.TestSuite(list(testlist))
+

new file tests/regressiontests/localflavor_regress/us/forms.py

@@ +1 @@
+from django.forms import ModelForm
+from models import USPlace
+
+class USPlaceForm(ModelForm):
+    """docstring for PlaceForm"""
+    class Meta:
+        model = USPlace

new file tests/regressiontests/localflavor_regress/us/models.py

@@ +1 @@
+from django.db import models
+from django.contrib.localflavor.us.models import USStateField
+
+# When creating models you need to remember to add a app_label as
+# 'localflavor_regress', so your model can be found
+
+class USPlace(models.Model):
+    state = USStateField(blank=True)
+    state_req = USStateField()
+    state_default = USStateField(default="CA", blank=True)
+    name = models.CharField(max_length=20)
+    class Meta:
+        app_label = 'localflavor_regress'

new file tests/regressiontests/localflavor_regress/us/tests.py

@@ +1 @@
+from django.test import TestCase
+from forms import USPlaceForm
+
+class USLocalflavorTests(TestCase):
+    def setUp(self):
+        self.form = USPlaceForm({'state':'GA', 'state_req':'NC', 'name':'impossible'})
+        
+    def test_get_display_methods(self):
+        """Test that the get_*_display() methods are added to the model instances."""
+        place = self.form.save()
+        self.assertEqual(place.get_state_display(), 'Georgia')
+        self.assertEqual(place.get_state_req_display(), 'North Carolina')
+    
+    def test_required(self):
+        """Test that required USStateFields throw appropriate errors."""
+        form = USPlaceForm({'state':'GA', 'name':'Place in GA'})
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['state_req'], [u'This field is required.'])
+    
+    def test_field_blank_option(self):
+        """Test that the empty option is there."""
+        state_select_html = """\
+<select name="state" id="id_state">
+<option value="">---------</option>
+<option value="AL">Alabama</option>
+<option value="AK">Alaska</option>
+<option value="AS">American Samoa</option>
+<option value="AZ">Arizona</option>
+<option value="AR">Arkansas</option>
+<option value="CA">California</option>
+<option value="CO">Colorado</option>
+<option value="CT">Connecticut</option>
+<option value="DE">Delaware</option>
+<option value="DC">District of Columbia</option>
+<option value="FL">Florida</option>
+<option value="GA" selected="selected">Georgia</option>
+<option value="GU">Guam</option>
+<option value="HI">Hawaii</option>
+<option value="ID">Idaho</option>
+<option value="IL">Illinois</option>
+<option value="IN">Indiana</option>
+<option value="IA">Iowa</option>
+<option value="KS">Kansas</option>
+<option value="KY">Kentucky</option>
+<option value="LA">Louisiana</option>
+<option value="ME">Maine</option>
+<option value="MD">Maryland</option>
+<option value="MA">Massachusetts</option>
+<option value="MI">Michigan</option>
+<option value="MN">Minnesota</option>
+<option value="MS">Mississippi</option>
+<option value="MO">Missouri</option>
+<option value="MT">Montana</option>
+<option value="NE">Nebraska</option>
+<option value="NV">Nevada</option>
+<option value="NH">New Hampshire</option>
+<option value="NJ">New Jersey</option>
+<option value="NM">New Mexico</option>
+<option value="NY">New York</option>
+<option value="NC">North Carolina</option>
+<option value="ND">North Dakota</option>
+<option value="MP">Northern Mariana Islands</option>
+<option value="OH">Ohio</option>
+<option value="OK">Oklahoma</option>
+<option value="OR">Oregon</option>
+<option value="PA">Pennsylvania</option>
+<option value="PR">Puerto Rico</option>
+<option value="RI">Rhode Island</option>
+<option value="SC">South Carolina</option>
+<option value="SD">South Dakota</option>
+<option value="TN">Tennessee</option>
+<option value="TX">Texas</option>
+<option value="UT">Utah</option>
+<option value="VT">Vermont</option>
+<option value="VI">Virgin Islands</option>
+<option value="VA">Virginia</option>
+<option value="WA">Washington</option>
+<option value="WV">West Virginia</option>
+<option value="WI">Wisconsin</option>
+<option value="WY">Wyoming</option>
+</select>"""
+        self.assertEqual(str(self.form['state']), state_select_html)