Permalink
Browse files

newforms-admin: Merged from trunk up to [5625]. This includes the Uni…

…code

merge, however, not all of admin/ (and none of admindocs/) has been ported and
checked yet.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 7ed1a91 commit 1e747f98af99a23c5aff7b460d5b845c3a9e2013 @malcolmt malcolmt committed Jul 7, 2007
Showing with 7,793 additions and 4,596 deletions.
  1. +10 −0 AUTHORS
  2. +1 −1 django/bin/make-messages.py
  3. +4 −0 django/conf/global_settings.py
  4. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  5. +4 −4 django/conf/locale/ca/LC_MESSAGES/django.po
  6. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  7. +2,181 −1,503 django/conf/locale/es/LC_MESSAGES/django.po
  8. BIN django/conf/locale/sl/LC_MESSAGES/django.mo
  9. +2,485 −1,447 django/conf/locale/sl/LC_MESSAGES/django.po
  10. BIN django/conf/locale/sl/LC_MESSAGES/djangojs.mo
  11. +38 −29 django/conf/locale/sl/LC_MESSAGES/djangojs.po
  12. +8 −6 django/contrib/admin/filterspecs.py
  13. +101 −0 django/contrib/admin/media/js/urlify.js
  14. +5 −4 django/contrib/admin/models.py
  15. +12 −10 django/contrib/admin/options.py
  16. +3 −3 django/contrib/admin/sites.py
  17. +1 −1 django/contrib/admin/templates/admin/filter.html
  18. +18 −15 django/contrib/admin/templatetags/admin_list.py
  19. +4 −3 django/contrib/admin/templatetags/admin_modify.py
  20. +1 −0 django/contrib/admin/views/auth.py
  21. +2 −2 django/contrib/admin/views/decorators.py
  22. +26 −18 django/contrib/admin/views/main.py
  23. +1 −0 django/contrib/admin/widgets.py
  24. +1 −1 django/contrib/auth/forms.py
  25. +2 −2 django/contrib/auth/management.py
  26. +20 −15 django/contrib/auth/models.py
  27. +1 −0 django/contrib/auth/views.py
  28. +2 −2 django/contrib/comments/feeds.py
  29. +1 −1 django/contrib/comments/models.py
  30. +5 −4 django/contrib/comments/views/comments.py
  31. +1 −0 django/contrib/comments/views/karma.py
  32. +2 −2 django/contrib/contenttypes/generic.py
  33. +2 −1 django/contrib/contenttypes/management.py
  34. +7 −6 django/contrib/contenttypes/models.py
  35. +18 −14 django/contrib/databrowse/datastructures.py
  36. +5 −4 django/contrib/databrowse/plugins/calendars.py
  37. +7 −5 django/contrib/databrowse/plugins/fieldchoices.py
  38. +1 −1 django/contrib/databrowse/sites.py
  39. +1 −1 django/contrib/databrowse/templates/databrowse/fieldchoice_list.html
  40. +3 −3 django/contrib/flatpages/models.py
  41. +9 −9 django/contrib/humanize/templatetags/humanize.py
  42. +6 −6 django/contrib/localflavor/au/forms.py
  43. +10 −10 django/contrib/localflavor/br/forms.py
  44. +1 −1 django/contrib/localflavor/ch/ch_states.py
  45. +3 −3 django/contrib/localflavor/ch/forms.py
  46. +8 −7 django/contrib/localflavor/cl/forms.py
  47. +1 −1 django/contrib/localflavor/de/de_states.py
  48. +6 −6 django/contrib/localflavor/de/forms.py
  49. +6 −6 django/contrib/localflavor/fi/forms.py
  50. +4 −4 django/contrib/localflavor/fr/forms.py
  51. +5 −4 django/contrib/localflavor/is_/forms.py
  52. +7 −7 django/contrib/localflavor/it/forms.py
  53. +1 −1 django/contrib/localflavor/it/it_province.py
  54. +15 −11 django/contrib/localflavor/it/util.py
  55. +3 −3 django/contrib/localflavor/jp/forms.py
  56. +48 −48 django/contrib/localflavor/jp/jp_prefectures.py
  57. +6 −6 django/contrib/localflavor/no/forms.py
  58. +5 −5 django/contrib/localflavor/no/no_municipalities.py
  59. +2 −2 django/contrib/localflavor/uk/forms.py
  60. +10 −10 django/contrib/localflavor/us/forms.py
  61. +8 −7 django/contrib/markup/templatetags/markup.py
  62. +3 −2 django/contrib/redirects/models.py
  63. +1 −1 django/contrib/sessions/models.py
  64. +2 −1 django/contrib/sitemaps/views.py
  65. +2 −2 django/contrib/sites/models.py
  66. +8 −5 django/contrib/syndication/feeds.py
  67. +39 −7 django/contrib/webdesign/lorem_ipsum.py
  68. +1 −1 django/contrib/webdesign/templatetags/webdesign.py
  69. +2 −2 django/contrib/webdesign/tests.py
  70. +3 −3 django/core/handlers/modpython.py
  71. +5 −5 django/core/handlers/wsgi.py
  72. +36 −7 django/core/mail.py
  73. +3 −3 django/core/management.py
  74. +8 −8 django/core/serializers/__init__.py
  75. +3 −2 django/core/serializers/base.py
  76. +22 −27 django/core/serializers/python.py
  77. +2 −2 django/core/serializers/pyyaml.py
  78. +42 −40 django/core/serializers/xml_serializer.py
  79. +17 −10 django/core/urlresolvers.py
  80. +61 −58 django/core/validators.py
  81. +1 −1 django/db/backends/mysql/base.py
  82. +16 −2 django/db/backends/mysql_old/base.py
  83. +49 −15 django/db/backends/oracle/base.py
  84. +5 −5 django/db/backends/oracle/creation.py
  85. +35 −15 django/db/backends/postgresql/base.py
  86. +4 −0 django/db/backends/postgresql_psycopg2/base.py
  87. +6 −13 django/db/backends/sqlite3/base.py
  88. +13 −6 django/db/backends/util.py
  89. +6 −3 django/db/models/base.py
  90. +28 −27 django/db/models/fields/__init__.py
  91. +4 −3 django/db/models/fields/related.py
  92. +4 −2 django/db/models/manipulators.py
  93. +19 −3 django/db/models/options.py
  94. +2 −1 django/db/models/query.py
  95. +82 −16 django/http/__init__.py
  96. +36 −36 django/newforms/fields.py
  97. +8 −8 django/newforms/forms.py
  98. +8 −6 django/newforms/models.py
  99. +9 −9 django/newforms/util.py
  100. +20 −20 django/newforms/widgets.py
  101. +91 −81 django/oldforms/__init__.py
  102. +21 −20 django/template/__init__.py
  103. +67 −72 django/template/defaultfilters.py
  104. +4 −3 django/template/defaulttags.py
  105. +1 −1 django/template/loaders/app_directories.py
  106. +1 −1 django/template/loaders/eggs.py
  107. +1 −1 django/template/loaders/filesystem.py
  108. +4 −4 django/templatetags/i18n.py
  109. +18 −15 django/test/client.py
  110. +7 −7 django/test/testcases.py
  111. +2 −2 django/test/utils.py
  112. +2 −1 django/utils/cache.py
  113. +28 −26 django/utils/dateformat.py
  114. +5 −1 django/utils/dates.py
  115. +24 −1 django/utils/decorators.py
  116. +68 −16 django/utils/encoding.py
  117. +29 −21 django/utils/feedgenerator.py
  118. +54 −1 django/utils/functional.py
  119. +25 −16 django/utils/html.py
  120. +35 −0 django/utils/http.py
  121. +1 −1 django/utils/stopwords.py
  122. +34 −20 django/utils/text.py
  123. +10 −10 django/utils/timesince.py
  124. +18 −5 django/utils/translation/__init__.py
  125. +9 −2 django/utils/translation/trans_null.py
  126. +63 −32 django/utils/translation/trans_real.py
  127. +10 −3 django/utils/tzinfo.py
  128. +13 −1 django/views/debug.py
  129. +4 −4 django/views/generic/create_update.py
  130. +23 −22 docs/contributing.txt
  131. +3 −3 docs/db-api.txt
  132. +1 −1 docs/forms.txt
  133. +128 −48 docs/i18n.txt
  134. +40 −10 docs/model-api.txt
  135. +1 −1 docs/newforms.txt
  136. +2 −2 docs/overview.txt
  137. +19 −0 docs/settings.txt
  138. +10 −0 docs/templates.txt
  139. +3 −2 docs/templates_python.txt
  140. +24 −7 docs/tutorial01.txt
  141. +364 −0 docs/unicode.txt
  142. +9 −2 tests/modeltests/basic/models.py
  143. +3 −3 tests/modeltests/choices/models.py
  144. +9 −9 tests/modeltests/custom_columns/models.py
  145. +4 −4 tests/modeltests/custom_managers/models.py
  146. +1 −1 tests/modeltests/custom_methods/models.py
  147. +5 −5 tests/modeltests/custom_pk/models.py
  148. +1 −1 tests/modeltests/field_defaults/models.py
  149. +10 −10 tests/modeltests/fixtures/models.py
  150. +8 −8 tests/modeltests/generic_relations/models.py
  151. +2 −2 tests/modeltests/get_latest/models.py
  152. +2 −2 tests/modeltests/get_object_or_404/models.py
  153. +2 −2 tests/modeltests/get_or_create/models.py
  154. +16 −16 tests/modeltests/lookup/models.py
  155. +2 −2 tests/modeltests/m2m_and_m2o/models.py
  156. +5 −5 tests/modeltests/m2m_intermediary/models.py
  157. +2 −2 tests/modeltests/m2m_multiple/models.py
  158. +1 −1 tests/modeltests/m2m_recursive/models.py
  159. +1 −1 tests/modeltests/m2o_recursive/models.py
  160. +1 −1 tests/modeltests/m2o_recursive2/models.py
  161. +8 −8 tests/modeltests/manipulators/models.py
  162. +2 −2 tests/modeltests/many_to_many/models.py
  163. +10 −5 tests/modeltests/many_to_one/models.py
  164. +2 −2 tests/modeltests/many_to_one_null/models.py
  165. +8 −8 tests/modeltests/model_forms/models.py
  166. +6 −6 tests/modeltests/model_inheritance/models.py
  167. +6 −6 tests/modeltests/one_to_one/models.py
  168. +2 −2 tests/modeltests/or_lookups/models.py
  169. +1 −1 tests/modeltests/ordering/models.py
  170. +1 −1 tests/modeltests/pagination/models.py
  171. +1 −1 tests/modeltests/reserved_names/models.py
  172. +3 −3 tests/modeltests/reverse_lookup/models.py
  173. +2 −2 tests/modeltests/save_delete_hooks/models.py
  174. +8 −8 tests/modeltests/select_related/models.py
  175. +5 −5 tests/modeltests/serializers/models.py
  176. +29 −7 tests/modeltests/str/models.py
  177. +7 −3 tests/modeltests/test_client/models.py
  178. +1 −1 tests/modeltests/test_client/views.py
  179. +3 −3 tests/modeltests/transactions/models.py
  180. +7 −7 tests/modeltests/validation/models.py
  181. +23 −23 tests/regressiontests/dateformat/tests.py
  182. +230 −216 tests/regressiontests/defaultfilters/tests.py
  183. +3 −3 tests/regressiontests/fixtures_regress/models.py
  184. +7 −7 tests/regressiontests/forms/localflavor.py
  185. +44 −5 tests/regressiontests/forms/regressions.py
  186. +1 −1 tests/regressiontests/forms/tests.py
  187. +43 −33 tests/regressiontests/httpwrappers/tests.py
  188. +5 −5 tests/regressiontests/humanize/tests.py
  189. 0 tests/regressiontests/i18n/__init__.py
  190. 0 tests/regressiontests/i18n/models.py
  191. +33 −0 tests/regressiontests/i18n/tests.py
  192. 0 tests/regressiontests/model_regress/__init__.py
  193. +34 −0 tests/regressiontests/model_regress/models.py
  194. +4 −4 tests/regressiontests/null_queries/models.py
  195. +6 −6 tests/regressiontests/one_to_one_regress/models.py
  196. +3 −0 tests/regressiontests/serializers_regress/tests.py
  197. +27 −11 tests/regressiontests/string_lookup/models.py
  198. +14 −7 tests/regressiontests/templates/tests.py
  199. +33 −0 tests/regressiontests/templates/unicode.py
  200. +2 −0 tests/regressiontests/templates/urls.py
  201. +14 −4 tests/regressiontests/test_client_regress/models.py
  202. +1 −1 tests/regressiontests/test_client_regress/urls.py
  203. +13 −1 tests/regressiontests/test_client_regress/views.py
  204. +26 −5 tests/regressiontests/text/tests.py
  205. +1 −0 tests/runtests.py
View
@@ -44,6 +44,7 @@ answer newbie questions, and generally made Django that much better:
alang@bright-green.com
Marty Alchin <gulopine@gamemusic.org>
Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
+ AgarFu <heaven@croasanaso.sytes.net>
Andreas
andy@jadedplanet.net
Fabrice Aneche <akh@nobugware.com>
@@ -60,9 +61,11 @@ answer newbie questions, and generally made Django that much better:
Ben <afternoon@uk2.net>
Paul Bissex <http://e-scribe.com/>
Simon Blanchard
+ boobsd@gmail.com
Andrew Brehaut <http://brehaut.net/blog>
brut.alll@gmail.com
Jonathan Buchanan <jonathan.buchanan@gmail.com>
+ Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
Antonio Cavedoni <http://cavedoni.com/>
C8E
Chris Chamberlin <dja@cdc.msbx.net>
@@ -106,13 +109,16 @@ answer newbie questions, and generally made Django that much better:
Eric Floehr <eric@intellovations.com>
Jorge Gajon <gajon@gajon.org>
gandalf@owca.info
+ Marc Garcia <marc.garcia@accopensys.com>
Baishampayan Ghose
glin@seznam.cz
martin.glueck@gmail.com
GomoX <gomo@datafull.com>
+ Mario Gonzalez <gonzalemario @t gmail.com>
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
+ Thomas Güttler <hv@tbz-pariv.de>
Brian Harring <ferringb@gmail.com>
Brant Harris
Hawkeye
@@ -141,12 +147,15 @@ answer newbie questions, and generally made Django that much better:
Sune Kirkeby <http://ibofobi.dk/>
Bastian Kleineidam <calvin@debian.org>
Cameron Knight (ckknight)
+ Nena Kojadin <nena@kiberpipa.org>
+ Igor Kolar <ike@email.si>
Gasper Koren
Martin Kosír <martin@martinkosir.net>
Meir Kriheli <http://mksoft.co.il/>
Bruce Kroeze <http://coderseye.com/>
Joseph Kocherhans
konrad@gwu.edu
+ kurtiss@meetro.com
lakin.wecker@gmail.com
Nick Lane <nick.lane.au@gmail.com>
Stuart Langridge <http://www.kryogenix.org/>
@@ -214,6 +223,7 @@ answer newbie questions, and generally made Django that much better:
scott@staplefish.com
serbaut@gmail.com
Pete Shinners <pete@shinners.org>
+ Jozko Skrablin <jozko.skrablin@gmail.com>
SmileyChris <smileychris@gmail.com>
smurf@smurf.noris.de
sopel
@@ -103,7 +103,7 @@ def make_messages():
open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src))
thefile = '%s.py' % file
if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
- cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
+ cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
(stdin, stdout, stderr) = os.popen3(cmd, 'b')
msgs = stdout.read()
@@ -97,6 +97,9 @@
DEFAULT_CONTENT_TYPE = 'text/html'
DEFAULT_CHARSET = 'utf-8'
+# Encoding of files read from disk (template and initial SQL files).
+FILE_CHARSET = 'utf-8'
+
# E-mail address that error messages come from.
SERVER_EMAIL = 'root@localhost'
@@ -280,6 +283,7 @@
# possible values.
CACHE_BACKEND = 'simple://'
CACHE_MIDDLEWARE_KEY_PREFIX = ''
+CACHE_MIDDLEWARE_SECONDS = 600
####################
# COMMENTS #
Binary file not shown.
@@ -237,7 +237,7 @@ msgstr "Coreà"
#: conf/global_settings.py:61
msgid "Kannada"
-msgstr ""
+msgstr "Canès"
#: conf/global_settings.py:62
msgid "Latvian"
@@ -1230,7 +1230,7 @@ msgstr "Pot editar-lo de nou abaix."
#: contrib/admin/views/auth.py:30
msgid "Add user"
-msgstr "Agregar usuari"
+msgstr "Afegir usuari"
#: contrib/admin/views/auth.py:57
msgid "Password changed successfully."
@@ -1248,12 +1248,12 @@ msgstr "Lloc administratiu"
#: contrib/admin/views/main.py:276 contrib/admin/views/main.py:361
#, python-format
msgid "You may add another %s below."
-msgstr "Pot agregar un altre %s abaix."
+msgstr "Pot afegir un altre %s a baix."
#: contrib/admin/views/main.py:294
#, python-format
msgid "Add %s"
-msgstr "Agregar %s"
+msgstr "Afegir %s"
#: contrib/admin/views/main.py:340
#, python-format
Binary file not shown.
Oops, something went wrong. Retry.

0 comments on commit 1e747f9

Please sign in to comment.