Permalink
Browse files

[soc2009/model-validation] Merget to trunk at r12009

  • Loading branch information...
1 parent 695de8c commit f911df19a455246198b0c8c81ab96bf2abec04f8 @HonzaKral HonzaKral committed Dec 28, 2009
Showing with 9,755 additions and 5,902 deletions.
  1. +14 −2 AUTHORS
  2. +1 −1 README
  3. +1 −1 django/conf/__init__.py
  4. +92 −3 django/conf/global_settings.py
  5. 0 {tests/regressiontests/auth_backends → django/conf/locale}/__init__.py
  6. 0 tests/regressiontests/auth_backends/models.py → django/conf/locale/ar/__init__.py
  7. +18 −0 django/conf/locale/ar/formats.py
  8. 0 django/conf/locale/bg/__init__.py
  9. +18 −0 django/conf/locale/bg/formats.py
  10. 0 django/conf/locale/bn/__init__.py
  11. +18 −0 django/conf/locale/bn/formats.py
  12. 0 django/conf/locale/ca/__init__.py
  13. +30 −0 django/conf/locale/ca/formats.py
  14. 0 django/conf/locale/cs/__init__.py
  15. +32 −0 django/conf/locale/cs/formats.py
  16. 0 django/conf/locale/cy/__init__.py
  17. +18 −0 django/conf/locale/cy/formats.py
  18. 0 django/conf/locale/da/__init__.py
  19. +26 −0 django/conf/locale/da/formats.py
  20. 0 django/conf/locale/de/__init__.py
  21. +32 −0 django/conf/locale/de/formats.py
  22. 0 django/conf/locale/el/__init__.py
  23. +18 −0 django/conf/locale/el/formats.py
  24. 0 django/conf/locale/en/__init__.py
  25. +38 −0 django/conf/locale/en/formats.py
  26. 0 django/conf/locale/es/__init__.py
  27. +30 −0 django/conf/locale/es/formats.py
  28. 0 django/conf/locale/es_AR/__init__.py
  29. +29 −0 django/conf/locale/es_AR/formats.py
  30. 0 django/conf/locale/et/__init__.py
  31. +18 −0 django/conf/locale/et/formats.py
  32. 0 django/conf/locale/eu/__init__.py
  33. +18 −0 django/conf/locale/eu/formats.py
  34. 0 django/conf/locale/fa/__init__.py
  35. +18 −0 django/conf/locale/fa/formats.py
  36. 0 django/conf/locale/fi/__init__.py
  37. +18 −0 django/conf/locale/fi/formats.py
  38. 0 django/conf/locale/fr/__init__.py
  39. +18 −0 django/conf/locale/fr/formats.py
  40. BIN django/conf/locale/ga/LC_MESSAGES/django.mo
  41. +1,628 −1,347 django/conf/locale/ga/LC_MESSAGES/django.po
  42. BIN django/conf/locale/ga/LC_MESSAGES/djangojs.mo
  43. +31 −24 django/conf/locale/ga/LC_MESSAGES/djangojs.po
  44. 0 django/conf/locale/ga/__init__.py
  45. +18 −0 django/conf/locale/ga/formats.py
  46. 0 django/conf/locale/gl/__init__.py
  47. +18 −0 django/conf/locale/gl/formats.py
  48. BIN django/conf/locale/he/LC_MESSAGES/django.mo
  49. +622 −476 django/conf/locale/he/LC_MESSAGES/django.po
  50. BIN django/conf/locale/he/LC_MESSAGES/djangojs.mo
  51. +8 −5 django/conf/locale/he/LC_MESSAGES/djangojs.po
  52. 0 django/conf/locale/he/__init__.py
  53. +18 −0 django/conf/locale/he/formats.py
  54. 0 django/conf/locale/hi/__init__.py
  55. +18 −0 django/conf/locale/hi/formats.py
  56. 0 django/conf/locale/hr/__init__.py
  57. +18 −0 django/conf/locale/hr/formats.py
  58. 0 django/conf/locale/hu/__init__.py
  59. +18 −0 django/conf/locale/hu/formats.py
  60. 0 django/conf/locale/is/__init__.py
  61. +18 −0 django/conf/locale/is/formats.py
  62. BIN django/conf/locale/it/LC_MESSAGES/django.mo
  63. +457 −301 django/conf/locale/it/LC_MESSAGES/django.po
  64. BIN django/conf/locale/it/LC_MESSAGES/djangojs.mo
  65. +8 −5 django/conf/locale/it/LC_MESSAGES/djangojs.po
  66. 0 django/conf/locale/it/__init__.py
  67. +18 −0 django/conf/locale/it/formats.py
  68. 0 django/conf/locale/ja/__init__.py
  69. +18 −0 django/conf/locale/ja/formats.py
  70. 0 django/conf/locale/ka/__init__.py
  71. +42 −0 django/conf/locale/ka/formats.py
  72. 0 django/conf/locale/km/__init__.py
  73. +18 −0 django/conf/locale/km/formats.py
  74. 0 django/conf/locale/kn/__init__.py
  75. +18 −0 django/conf/locale/kn/formats.py
  76. 0 django/conf/locale/ko/__init__.py
  77. +44 −0 django/conf/locale/ko/formats.py
  78. 0 django/conf/locale/lt/__init__.py
  79. +18 −0 django/conf/locale/lt/formats.py
  80. 0 django/conf/locale/lv/__init__.py
  81. +18 −0 django/conf/locale/lv/formats.py
  82. 0 django/conf/locale/mk/__init__.py
  83. +18 −0 django/conf/locale/mk/formats.py
  84. 0 django/conf/locale/nl/__init__.py
  85. +48 −0 django/conf/locale/nl/formats.py
  86. 0 django/conf/locale/no/__init__.py
  87. +34 −0 django/conf/locale/no/formats.py
  88. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  89. +614 −81 django/conf/locale/pl/LC_MESSAGES/django.po
  90. 0 django/conf/locale/pl/__init__.py
  91. +18 −0 django/conf/locale/pl/formats.py
  92. 0 django/conf/locale/pt/__init__.py
  93. +18 −0 django/conf/locale/pt/formats.py
  94. 0 django/conf/locale/pt_BR/__init__.py
  95. +35 −0 django/conf/locale/pt_BR/formats.py
  96. 0 django/conf/locale/ro/__init__.py
  97. +18 −0 django/conf/locale/ro/formats.py
  98. 0 django/conf/locale/ru/__init__.py
  99. +18 −0 django/conf/locale/ru/formats.py
  100. 0 django/conf/locale/sk/__init__.py
  101. +18 −0 django/conf/locale/sk/formats.py
  102. 0 django/conf/locale/sl/__init__.py
  103. +18 −0 django/conf/locale/sl/formats.py
  104. 0 django/conf/locale/sr/__init__.py
  105. +44 −0 django/conf/locale/sr/formats.py
  106. 0 django/conf/locale/sr_Latn/__init__.py
  107. +44 −0 django/conf/locale/sr_Latn/formats.py
  108. 0 django/conf/locale/sv/__init__.py
  109. +18 −0 django/conf/locale/sv/formats.py
  110. 0 django/conf/locale/ta/__init__.py
  111. +18 −0 django/conf/locale/ta/formats.py
  112. 0 django/conf/locale/te/__init__.py
  113. +18 −0 django/conf/locale/te/formats.py
  114. 0 django/conf/locale/th/__init__.py
  115. +18 −0 django/conf/locale/th/formats.py
  116. 0 django/conf/locale/tr/__init__.py
  117. +18 −0 django/conf/locale/tr/formats.py
  118. BIN django/conf/locale/uk/LC_MESSAGES/django.mo
  119. +1 −1 django/conf/locale/uk/LC_MESSAGES/django.po
  120. 0 django/conf/locale/uk/__init__.py
  121. +18 −0 django/conf/locale/uk/formats.py
  122. 0 django/conf/locale/zh_CN/__init__.py
  123. +18 −0 django/conf/locale/zh_CN/formats.py
  124. 0 django/conf/locale/zh_TW/__init__.py
  125. +18 −0 django/conf/locale/zh_TW/formats.py
  126. +15 −9 django/conf/project_template/settings.py
  127. +113 −23 django/contrib/admin/helpers.py
  128. +1 −1 django/contrib/admin/media/css/base.css
  129. +3 −2 django/contrib/admin/media/js/calendar.js
  130. +78 −31 django/contrib/admin/options.py
  131. +10 −6 django/contrib/admin/templates/admin/edit_inline/tabular.html
  132. +26 −17 django/contrib/admin/templates/admin/includes/fieldset.html
  133. +1 −1 django/contrib/admin/templates/admin/object_history.html
  134. +34 −100 django/contrib/admin/templatetags/admin_list.py
  135. +74 −1 django/contrib/admin/util.py
  136. +21 −6 django/contrib/admin/validation.py
  137. +2 −1 django/contrib/admin/views/template.py
  138. +6 −5 django/contrib/admin/widgets.py
  139. +1 −0 django/contrib/admindocs/models.py
  140. +30 −0 django/contrib/admindocs/tests/__init__.py
  141. +7 −0 django/contrib/admindocs/tests/fields.py
  142. +5 −36 django/contrib/admindocs/views.py
  143. +7 −0 django/contrib/auth/__init__.py
  144. +5 −3 django/contrib/auth/admin.py
  145. +2 −0 django/contrib/auth/backends.py
  146. +67 −26 django/contrib/auth/models.py
  147. +1 −0 django/contrib/auth/tests/__init__.py
  148. +149 −0 django/contrib/auth/tests/auth_backends.py
  149. +10 −8 django/contrib/comments/forms.py
  150. +4 −4 django/contrib/comments/models.py
  151. +2 −2 django/contrib/comments/views/comments.py
  152. +25 −23 django/contrib/contenttypes/generic.py
  153. +5 −4 django/contrib/contenttypes/management.py
  154. +19 −9 django/contrib/contenttypes/models.py
  155. +1 −1 django/contrib/contenttypes/views.py
  156. +4 −6 django/contrib/databrowse/datastructures.py
  157. +0 −20 django/contrib/gis/db/backend/__init__.py
  158. +0 −26 django/contrib/gis/db/backend/base.py
  159. +0 −13 django/contrib/gis/db/backend/mysql/__init__.py
  160. +0 −5 django/contrib/gis/db/backend/mysql/creation.py
  161. +0 −53 django/contrib/gis/db/backend/mysql/field.py
  162. +0 −59 django/contrib/gis/db/backend/mysql/query.py
  163. +0 −35 django/contrib/gis/db/backend/oracle/__init__.py
  164. +0 −5 django/contrib/gis/db/backend/oracle/adaptor.py
  165. +0 −5 django/contrib/gis/db/backend/oracle/creation.py
  166. +0 −102 django/contrib/gis/db/backend/oracle/field.py
  167. +0 −154 django/contrib/gis/db/backend/oracle/query.py
  168. +0 −51 django/contrib/gis/db/backend/postgis/__init__.py
  169. +0 −231 django/contrib/gis/db/backend/postgis/creation.py
  170. +0 −95 django/contrib/gis/db/backend/postgis/field.py
  171. +0 −54 django/contrib/gis/db/backend/postgis/management.py
  172. +0 −313 django/contrib/gis/db/backend/postgis/query.py
  173. +0 −60 django/contrib/gis/db/backend/spatialite/__init__.py
  174. +0 −61 django/contrib/gis/db/backend/spatialite/creation.py
  175. +0 −82 django/contrib/gis/db/backend/spatialite/field.py
  176. +0 −160 django/contrib/gis/db/backend/spatialite/query.py
  177. 0 django/contrib/gis/db/backends/__init__.py
  178. +1 −1 django/contrib/gis/db/{backend/adaptor.py → backends/adapter.py}
  179. +327 −0 django/contrib/gis/db/backends/base.py
  180. 0 django/contrib/gis/db/backends/mysql/__init__.py
  181. +11 −0 django/contrib/gis/db/backends/mysql/base.py
  182. +18 −0 django/contrib/gis/db/backends/mysql/creation.py
  183. +64 −0 django/contrib/gis/db/backends/mysql/operations.py
  184. 0 django/contrib/gis/db/backends/oracle/__init__.py
  185. +5 −0 django/contrib/gis/db/backends/oracle/adapter.py
  186. +10 −0 django/contrib/gis/db/backends/oracle/base.py
  187. +44 −0 django/contrib/gis/db/backends/oracle/compiler.py
  188. +42 −0 django/contrib/gis/db/backends/oracle/creation.py
  189. +9 −4 django/contrib/gis/db/{backend → backends}/oracle/models.py
  190. +289 −0 django/contrib/gis/db/backends/oracle/operations.py
  191. 0 django/contrib/gis/db/backends/postgis/__init__.py
  192. +3 −4 django/contrib/gis/db/{backend/postgis/adaptor.py → backends/postgis/adapter.py}
  193. +10 −0 django/contrib/gis/db/backends/postgis/base.py
  194. +60 −0 django/contrib/gis/db/backends/postgis/creation.py
  195. +3 −2 django/contrib/gis/db/{backend → backends}/postgis/models.py
  196. +584 −0 django/contrib/gis/db/backends/postgis/operations.py
  197. 0 django/contrib/gis/db/backends/spatialite/__init__.py
  198. +2 −2 django/contrib/gis/db/{backend/spatialite/adaptor.py → backends/spatialite/adapter.py}
  199. +73 −0 django/contrib/gis/db/backends/spatialite/base.py
  200. +5 −0 django/contrib/gis/db/backends/spatialite/client.py
  201. +97 −0 django/contrib/gis/db/backends/spatialite/creation.py
  202. +4 −3 django/contrib/gis/db/{backend → backends}/spatialite/models.py
  203. +329 −0 django/contrib/gis/db/backends/spatialite/operations.py
  204. +24 −23 django/contrib/gis/db/{backend → backends}/util.py
  205. +5 −22 django/contrib/gis/db/models/aggregates.py
  206. +317 −0 django/contrib/gis/db/models/fields.py
  207. +0 −278 django/contrib/gis/db/models/fields/__init__.py
  208. +1 −5 django/contrib/gis/db/models/manager.py
  209. +86 −65 django/contrib/gis/db/models/query.py
  210. +30 −95 django/contrib/gis/db/models/sql/aggregates.py
  211. +276 −0 django/contrib/gis/db/models/sql/compiler.py
  212. +1 −3 django/contrib/gis/db/models/sql/conversion.py
  213. +49 −94 django/contrib/gis/db/models/sql/query.py
  214. +0 −39 django/contrib/gis/db/models/sql/subqueries.py
  215. +37 −84 django/contrib/gis/db/models/sql/where.py
  216. +1 −1 django/contrib/gis/gdal/base.py
  217. +2 −0 django/contrib/gis/gdal/prototypes/errcheck.py
  218. 0 django/contrib/gis/geometry/__init__.py
  219. +21 −0 django/contrib/gis/geometry/backend/__init__.py
  220. +3 −0 django/contrib/gis/geometry/backend/geos.py
  221. +5 −3 django/contrib/gis/geos/libgeos.py
  222. +17 −12 django/contrib/gis/geos/prototypes/errcheck.py
  223. +1 −1 django/contrib/gis/geos/tests/test_geos.py
  224. +3 −1 django/contrib/gis/geos/tests/test_geos_mutation.py
  225. +28 −22 django/contrib/gis/measure.py
  226. +0 −233 django/contrib/gis/models.py
  227. +13 −11 django/contrib/gis/sitemaps/views.py
  228. +29 −85 django/contrib/gis/tests/__init__.py
  229. +36 −11 django/contrib/gis/tests/distapp/tests.py
  230. +97 −0 django/contrib/gis/tests/geoapp/fixtures/initial_data.json
  231. +0 −8 django/contrib/gis/tests/geoapp/sql/city.mysql.sql
  232. +0 −8 django/contrib/gis/tests/geoapp/sql/city.oracle.sql
  233. +0 −8 django/contrib/gis/tests/geoapp/sql/city.postgresql_psycopg2.sql
  234. +0 −8 django/contrib/gis/tests/geoapp/sql/city.sqlite3.sql
  235. +0 −1 django/contrib/gis/tests/geoapp/sql/co.wkt
  236. +0 −4 django/contrib/gis/tests/geoapp/sql/country.mysql.sql
  237. +0 −4 django/contrib/gis/tests/geoapp/sql/country.postgresql_psycopg2.sql
  238. +0 −4 django/contrib/gis/tests/geoapp/sql/country.sqlite3.sql
  239. +0 −1 django/contrib/gis/tests/geoapp/sql/ks.wkt
  240. +0 −1 django/contrib/gis/tests/geoapp/sql/nz.wkt
  241. +0 −5 django/contrib/gis/tests/geoapp/sql/state.mysql.sql
  242. +0 −5 django/contrib/gis/tests/geoapp/sql/state.postgresql_psycopg2.sql
  243. +0 −5 django/contrib/gis/tests/geoapp/sql/state.sqlite3.sql
  244. +0 −1 django/contrib/gis/tests/geoapp/sql/tx.wkt
  245. +0 −1 django/contrib/gis/tests/geoapp/test_regress.py
  246. +120 −142 django/contrib/gis/tests/geoapp/tests.py
  247. +0 −186 django/contrib/gis/tests/geoapp/tests_mysql.py
  248. 0 django/contrib/gis/tests/geogapp/__init__.py
  249. +98 −0 django/contrib/gis/tests/geogapp/fixtures/initial_data.json
  250. +20 −0 django/contrib/gis/tests/geogapp/models.py
  251. +74 −0 django/contrib/gis/tests/geogapp/tests.py
  252. +15 −11 django/contrib/gis/tests/layermap/tests.py
  253. +0 −1 django/contrib/gis/tests/layermap/tests_mysql.py
  254. +11 −11 django/contrib/gis/tests/relatedapp/tests.py
  255. +0 −1 django/contrib/gis/tests/relatedapp/tests_mysql.py
  256. +4 −1 django/contrib/gis/tests/test_measure.py
  257. +10 −8 django/contrib/gis/tests/test_spatialrefsys.py
  258. +9 −7 django/contrib/gis/tests/utils.py
  259. +75 −189 django/contrib/gis/utils/layermapping.py
  260. +9 −2 django/contrib/localflavor/ca/forms.py
  261. 0 django/contrib/localflavor/se/__init__.py
  262. +157 −0 django/contrib/localflavor/se/forms.py
  263. +36 −0 django/contrib/localflavor/se/se_counties.py
  264. +84 −0 django/contrib/localflavor/se/utils.py
  265. +17 −19 django/contrib/localflavor/us/models.py
  266. +2 −0 django/contrib/messages/__init__.py
  267. +84 −0 django/contrib/messages/api.py
  268. +13 −0 django/contrib/messages/constants.py
  269. +8 −0 django/contrib/messages/context_processors.py
  270. +26 −0 django/contrib/messages/middleware.py
  271. +1 −0 django/contrib/messages/models.py
  272. +31 −0 django/contrib/messages/storage/__init__.py
  273. +181 −0 django/contrib/messages/storage/base.py
  274. +142 −0 django/contrib/messages/storage/cookie.py
  275. +59 −0 django/contrib/messages/storage/fallback.py
Sorry, we could not display the entire diff because too many files (556) changed.
View
16 AUTHORS
@@ -55,11 +55,13 @@ answer newbie questions, and generally made Django that much better:
Niran Babalola <niran@niran.org>
Morten Bagai <m@bagai.com>
Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
+ Randy Barlow <randy@electronsweatshop.com>
Scott Barr <scott@divisionbyzero.com.au>
Jiri Barton
Ned Batchelder <http://www.nedbatchelder.com/>
batiste@dosimple.ch
Batman
+ Chris Beaven <http://smileychris.tactful.co.nz/>
Brian Beck <http://blog.brianbeck.com/>
Shannon -jj Behrens <http://jjinux.blogspot.com/>
Esdras Beleza <linux@esdrasbeleza.com>
@@ -135,7 +137,7 @@ answer newbie questions, and generally made Django that much better:
Andrew Durdin <adurdin@gmail.com>
dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
- J. Clifford Dyer <jcd@unc.edu>
+ J. Clifford Dyer <jcd@sdf.lonestar.org>
Clint Ecker
Nick Efford <nick@efford.org>
eibaan@gmail.com
@@ -171,6 +173,7 @@ answer newbie questions, and generally made Django that much better:
Alex Gaynor <alex.gaynor@gmail.com>
Andy Gayton <andy-django@thecablelounge.com>
Idan Gazit
+ geber@datacollect.com
Baishampayan Ghose
Dimitris Glezos <dimitris@glezos.com>
glin@seznam.cz
@@ -243,6 +246,7 @@ answer newbie questions, and generally made Django that much better:
Cameron Knight (ckknight)
Nena Kojadin <nena@kiberpipa.org>
Igor Kolar <ike@email.si>
+ Tomáš Kopeček <permonik@m6.cz>
Gasper Koren
Martin Kosír <martin@martinkosir.net>
Arthur Koziel <http://arthurkoziel.com>
@@ -267,6 +271,7 @@ answer newbie questions, and generally made Django that much better:
Finn Gruwier Larsen <finn@gruwier.dk>
Lau Bech Lauritzen
Rune Rønde Laursen <runerl@skjoldhoej.dk>
+ Mark Lavin <markdlavin@gmail.com>
Eugene Lazutkin <http://lazutkin.com/blog/>
lcordier@point45.com
Jeong-Min Lee <falsetru@gmail.com>
@@ -285,6 +290,7 @@ answer newbie questions, and generally made Django that much better:
Martin Mahner <http://www.mahner.org/>
Matt McClanahan <http://mmcc.cx/>
Frantisek Malina <vizualbod@vizualbod.com>
+ Mike Malone <mjmalone@gmail.com>
Martin Maney <http://www.chipy.org/Martin_Maney>
masonsimon+django@gmail.com
Manuzhai
@@ -300,6 +306,8 @@ answer newbie questions, and generally made Django that much better:
Jason McBrayer <http://www.carcosa.net/jason/>
Kevin McConnell <kevin.mcconnell@gmail.com>
mccutchen@gmail.com
+ Paul McLanahan <paul@mclanahan.net>
+ Tobias McNulty <http://www.caktusgroup.com/blog>
Christian Metts
michael.mcewan@gmail.com
michal@plovarna.cz
@@ -321,6 +329,7 @@ answer newbie questions, and generally made Django that much better:
Gopal Narayanan <gopastro@gmail.com>
Fraser Nevett <mail@nevett.org>
Sam Newman <http://www.magpiebrain.com/>
+ Filip Noetzel <http://filip.noetzel.co.uk/>
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
Neal Norwitz <nnorwitz@google.com>
Todd O'Bryan <toddobryan@mac.com>
@@ -331,6 +340,7 @@ answer newbie questions, and generally made Django that much better:
Carlos Eduardo de Paula <carlosedp@gmail.com>
pavithran s <pavithran.s@gmail.com>
Barry Pederson <bp@barryp.org>
+ Andreas Pelme <andreas@pelme.se>
permonik@mesias.brnonet.cz
peter@mymart.com
pgross@thoughtworks.com
@@ -379,8 +389,10 @@ answer newbie questions, and generally made Django that much better:
Vinay Sajip <vinay_sajip@yahoo.co.uk>
Kadesarin Sanjek
Massimo Scamarcia <massimo.scamarcia@gmail.com>
+ Paulo Scardine <paulo@scardine.com.br>
David Schein
Bernd Schlapsi
+ schwank@gmail.com
scott@staplefish.com
Ilya Semenov <semenov@inetss.com>
serbaut@gmail.com
@@ -392,7 +404,7 @@ answer newbie questions, and generally made Django that much better:
Jozko Skrablin <jozko.skrablin@gmail.com>
Ben Slavin <benjamin.slavin@gmail.com>
sloonz <simon.lipp@insa-lyon.fr>
- SmileyChris <smileychris@gmail.com>
+ Paul Smith <blinkylights23@gmail.com>
Warren Smith <warren@wandrsmith.net>
smurf@smurf.noris.de
Vsevolod Solovyov
View
2 README
@@ -27,7 +27,7 @@ http://code.djangoproject.com/newticket
To get more help:
* Join the #django channel on irc.freenode.net. Lots of helpful people
- hang out there. Read the archives at http://oebfare.com/logger/django/.
+ hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
* Join the django-users mailing list, or read the archives, at
http://groups.google.com/group/django-users.
View
2 django/conf/__init__.py
@@ -127,7 +127,7 @@ def __getattr__(self, name):
return getattr(self.default_settings, name)
def __dir__(self):
- return dir(self) + dir(self.default_settings)
+ return self.__dict__.keys() + dir(self.default_settings)
# For Python < 2.6:
__members__ = property(lambda self: self.__dir__())
View
95 django/conf/global_settings.py
@@ -103,6 +103,10 @@
LOCALE_PATHS = ()
LANGUAGE_COOKIE_NAME = 'django_language'
+# If you set this to True, Django will format dates, numbers and calendars
+# according to user current locale
+USE_L10N = False
+
# Not-necessarily-technical managers of the site. They get broken link
# notifications and other various e-mails.
MANAGERS = ADMINS
@@ -131,6 +135,9 @@
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
DATABASE_OPTIONS = {} # Set to empty dictionary for default.
+DATABASES = {
+}
+
# The email backend to use. For possible shortcuts see django.core.mail.
# The default is to use the SMTP backend.
# Third-party backends can be specified by providing a Python path
@@ -158,9 +165,9 @@
# See the comments in django/core/template/loader.py for interface
# documentation.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-# 'django.template.loaders.eggs.load_template_source',
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+# 'django.template.loaders.eggs.Loader',
)
# List of processors used by RequestContext to populate the context.
@@ -172,6 +179,7 @@
'django.core.context_processors.i18n',
'django.core.context_processors.media',
# 'django.core.context_processors.request',
+ 'django.contrib.messages.context_processors.messages',
)
# Output to use in template system for invalid (e.g. misspelled) variables.
@@ -261,6 +269,12 @@
# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.
FILE_UPLOAD_PERMISSIONS = None
+# Python module path where user will place custom format definition.
+# The directory where this setting is pointing should contain subdirectories
+# named as the locales, containing a formats.py file
+# (i.e. "myproject.locale" for myproject/locale/en/formats.py etc. use)
+FORMAT_MODULE_PATH = None
+
# Default formatting for date objects. See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
DATE_FORMAT = 'N j, Y'
@@ -283,6 +297,70 @@
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
MONTH_DAY_FORMAT = 'F j'
+# Default shortformatting for date objects. See all available format strings here:
+# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
+SHORT_DATE_FORMAT = 'm/d/Y'
+
+# Default short formatting for datetime objects.
+# See all available format strings here:
+# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
+SHORT_DATETIME_FORMAT = 'm/d/Y P'
+
+# Default formats to be used when parsing dates from input boxes, in order
+# See all available format string here:
+# http://docs.python.org/library/datetime.html#strftime-behavior
+# * Note that these format strings are different from the ones to display dates
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+)
+
+# Default formats to be used when parsing times from input boxes, in order
+# See all available format string here:
+# http://docs.python.org/library/datetime.html#strftime-behavior
+# * Note that these format strings are different from the ones to display dates
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+
+# Default formats to be used when parsing dates and times from input boxes,
+# in order
+# See all available format string here:
+# http://docs.python.org/library/datetime.html#strftime-behavior
+# * Note that these format strings are different from the ones to display dates
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
+ '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
+ '%m/%d/%y %H:%M', # '10/25/06 14:30'
+ '%m/%d/%y', # '10/25/06'
+)
+
+# First day of week, to be used on calendars
+# 0 means Sunday, 1 means Monday...
+FIRST_DAY_OF_WEEK = 0
+
+# Decimal separator symbol
+DECIMAL_SEPARATOR = '.'
+
+# Boolean that sets whether to add thousand separator when formatting numbers
+USE_THOUSAND_SEPARATOR = False
+
+# Number of digits that will be togheter, when spliting them by THOUSAND_SEPARATOR
+# 0 means no grouping, 3 means splitting by thousands...
+NUMBER_GROUPING = 0
+
+# Thousand separator symbol
+THOUSAND_SEPARATOR = ','
+
# Do you want to manage transactions manually?
# Hint: you really don't!
TRANSACTIONS_MANAGED = False
@@ -308,6 +386,7 @@
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
# 'django.middleware.http.ConditionalGetMiddleware',
# 'django.middleware.gzip.GZipMiddleware',
)
@@ -393,6 +472,16 @@
CSRF_COOKIE_NAME = 'csrftoken'
CSRF_COOKIE_DOMAIN = None
+############
+# MESSAGES #
+############
+
+# Class to use as messges backend
+MESSAGE_STORAGE = 'django.contrib.messages.storage.user_messages.LegacyFallbackStorage'
+
+# Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
+# django.contrib.messages to avoid imports in this settings file.
+
###########
# TESTING #
###########
View
0 ...regressiontests/auth_backends/__init__.py → django/conf/locale/__init__.py
File renamed without changes.
View
0 ...s/regressiontests/auth_backends/models.py → django/conf/locale/ar/__init__.py
File renamed without changes.
View
18 django/conf/locale/ar/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F، Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT =
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'd‏/m‏/Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+# NUMBER_GROUPING =
View
0 django/conf/locale/bg/__init__.py
No changes.
View
18 django/conf/locale/bg/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'd F Y'
+TIME_FORMAT = 'H:i:s'
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+# NUMBER_GROUPING =
View
0 django/conf/locale/bn/__init__.py
No changes.
View
18 django/conf/locale/bn/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F, Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT =
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j M, Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+# NUMBER_GROUPING =
View
0 django/conf/locale/ca/__init__.py
No changes.
View
30 django/conf/locale/ca/formats.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j \de F \de Y'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = 'j \de F \de Y \\a \le\s G:i'
+YEAR_MONTH_FORMAT = 'F \de\l Y'
+MONTH_DAY_FORMAT = 'j \de F'
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ # '31/12/2009', '31/12/09'
+ '%d/%m/%Y', '%d/%m/%y'
+)
+TIME_INPUT_FORMATS = (
+ # '14:30:59', '14:30'
+ '%H:%M:%S', '%H:%M'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d/%m/%Y %H:%M:%S',
+ '%d/%m/%Y %H:%M',
+ '%d/%m/%y %H:%M:%S',
+ '%d/%m/%y %H:%M',
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+NUMBER_GROUPING = 3
+
View
0 django/conf/locale/cs/__init__.py
No changes.
View
32 django/conf/locale/cs/formats.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = 'j. F Y G:i:s'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j. F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06'
+ '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25'
+ '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
+ '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
+ '%d.%m.%Y', # '25.10.2006'
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+NUMBER_GROUPING = 3
View
0 django/conf/locale/cy/__init__.py
No changes.
View
18 django/conf/locale/cy/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'd F Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+# MONTH_DAY_FORMAT =
+SHORT_DATE_FORMAT = 'j M Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+# DECIMAL_SEPARATOR =
+# THOUSAND_SEPARATOR =
+# NUMBER_GROUPING =
View
0 django/conf/locale/da/__init__.py
No changes.
View
26 django/conf/locale/da/formats.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'H:i'
+DATETIME_FORMAT = 'j. F Y H:i'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j. F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+FIRST_DAY_OF_WEEK = 1
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', # '25.10.2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
+ '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+NUMBER_GROUPING = 3
View
0 django/conf/locale/de/__init__.py
No changes.
View
32 django/conf/locale/de/formats.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j. F Y H:i:s'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j. F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06'
+ '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25'
+ '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
+ '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
+ '%d.%m.%Y', # '25.10.2006'
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+NUMBER_GROUPING = 3
View
0 django/conf/locale/el/__init__.py
No changes.
View
18 django/conf/locale/el/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'd F Y'
+TIME_FORMAT = 'g:i:s A'
+# DATETIME_FORMAT =
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'd M Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+# NUMBER_GROUPING =
View
0 django/conf/locale/en/__init__.py
No changes.
View
38 django/conf/locale/en/formats.py
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'N j, Y'
+TIME_FORMAT = 'P'
+DATETIME_FORMAT = 'N j, Y, P'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'F j'
+SHORT_DATE_FORMAT = 'm/d/Y'
+SHORT_DATETIME_FORMAT = 'm/d/Y P'
+FIRST_DAY_OF_WEEK = 0 # Sunday
+DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+ '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
+ '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
+ '%m/%d/%y %H:%M', # '10/25/06 14:30'
+ '%m/%d/%y', # '10/25/06'
+)
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3
+
View
0 django/conf/locale/es/__init__.py
No changes.
View
30 django/conf/locale/es/formats.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j \de F \de Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j \de F \de Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = 'F \de Y'
+MONTH_DAY_FORMAT = 'j \de F'
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
+FIRST_DAY_OF_WEEK = 1 # Monday
+DATE_INPUT_FORMATS = (
+ # '31/12/2009', '31/12/09'
+ '%d/%m/%Y', '%d/%m/%y'
+)
+TIME_INPUT_FORMATS = (
+ # '14:30:59', '14:30'
+ '%H:%M:%S', '%H:%M'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d/%m/%Y %H:%M:%S',
+ '%d/%m/%Y %H:%M',
+ '%d/%m/%y %H:%M:%S',
+ '%d/%m/%y %H:%M',
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+NUMBER_GROUPING = 3
+
View
0 django/conf/locale/es_AR/__init__.py
No changes.
View
29 django/conf/locale/es_AR/formats.py
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j \de F \de Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j \de F \de Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = 'F \de Y'
+MONTH_DAY_FORMAT = 'j \de F'
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
+FIRST_DAY_OF_WEEK = 0 # 0: Sunday, 1: Monday
+DATE_INPUT_FORMATS = (
+ '%d/%m/%Y', # '31/12/2009'
+ '%d/%m/%y', # '31/12/09'
+)
+TIME_INPUT_FORMATS = (
+ '%H:%M:%S', # '14:30:59'
+ '%H:%M', # '14:30'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d/%m/%Y %H:%M:%S',
+ '%d/%m/%Y %H:%M',
+ '%d/%m/%y %H:%M:%S',
+ '%d/%m/%y %H:%M',
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+NUMBER_GROUPING = 3
View
0 django/conf/locale/et/__init__.py
No changes.
View
18 django/conf/locale/et/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F Y'
+TIME_FORMAT = 'G:i:s'
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+# NUMBER_GROUPING =
View
0 django/conf/locale/eu/__init__.py
No changes.
View
18 django/conf/locale/eu/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'Yeko M\re\n d\a'
+TIME_FORMAT = 'H:i:s'
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+# MONTH_DAY_FORMAT =
+SHORT_DATE_FORMAT = 'Y M j'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+# NUMBER_GROUPING =
View
0 django/conf/locale/fa/__init__.py
No changes.
View
18 django/conf/locale/fa/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F Y'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = 'j F Y، ساعت G:i:s'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'Y/n/j'
+SHORT_DATETIME_FORMAT = 'Y/n/j،‏ G:i:s'
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+# NUMBER_GROUPING =
View
0 django/conf/locale/fi/__init__.py
No changes.
View
18 django/conf/locale/fi/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j. F Y'
+TIME_FORMAT = 'G.i.s'
+# DATETIME_FORMAT =
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j. F'
+SHORT_DATE_FORMAT = 'j.n.Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+# NUMBER_GROUPING =
View
0 django/conf/locale/fr/__init__.py
No changes.
View
18 django/conf/locale/fr/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = 'j F Y H:i:s'
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j M Y'
+SHORT_DATETIME_FORMAT = 'j M Y H:i:s'
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = ' '
+# NUMBER_GROUPING =
View
BIN django/conf/locale/ga/LC_MESSAGES/django.mo
Binary file not shown.
View
2,975 django/conf/locale/ga/LC_MESSAGES/django.po
1,628 additions, 1,347 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN django/conf/locale/ga/LC_MESSAGES/djangojs.mo
Binary file not shown.
View
55 django/conf/locale/ga/LC_MESSAGES/djangojs.po
@@ -7,27 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-14 12:33+0100\n"
+"POT-Creation-Date: 2009-12-22 20:42+0100\n"
"PO-Revision-Date: 2008-01-23 11:04+0100\n"
"Last-Translator: Michael Thornhill <michael@maithu.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/media/js/calendar.js:24
-#: contrib/admin/media/js/dateparse.js:32
-msgid "January February March April May June July August September October November December"
-msgstr "Eanair Feabhra Márta Aibreán Bealtaine Meitheamh Iúil Lúnasa Mean Fómhair Deireadh Fómhair Nollaig"
-
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-msgstr "D L M C D A S"
-
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Domhnaigh Luain Máirt Céadaoin Déardaoin Aoine Sathairn"
-
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
@@ -58,6 +45,36 @@ msgstr "Roghnaigh do rogha agus cniog"
msgid "Clear all"
msgstr "Glan iomlán"
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Eanair Feabhra Márta Aibreán Bealtaine Meitheamh Iúil Lúnasa Mean Fómhair "
+"Deireadh Fómhair Nollaig"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "D L M C D A S"
+
+#: contrib/admin/media/js/calendar.js:26
+msgid "FIRST_DAY_OF_WEEK"
+msgstr ""
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Domhnaigh Luain Máirt Céadaoin Déardaoin Aoine Sathairn"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Taispeán"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Folaigh"
+
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
@@ -104,13 +121,3 @@ msgstr "Inné"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
msgstr "Amárach"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
-msgid "Show"
-msgstr "Taispeán"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
-msgid "Hide"
-msgstr "Folaigh"
-
View
0 django/conf/locale/ga/__init__.py
No changes.
View
18 django/conf/locale/ga/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j F Y'
+TIME_FORMAT = 'H:i:s'
+# DATETIME_FORMAT =
+# YEAR_MONTH_FORMAT =
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j M Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+# NUMBER_GROUPING =
View
0 django/conf/locale/gl/__init__.py
No changes.
View
18 django/conf/locale/gl/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'd F Y'
+TIME_FORMAT = 'H:i:s'
+# DATETIME_FORMAT =
+YEAR_MONTH_FORMAT = 'F Y'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'j M, Y'
+# SHORT_DATETIME_FORMAT =
+# FIRST_DAY_OF_WEEK =
+# DATE_INPUT_FORMATS =
+# TIME_INPUT_FORMATS =
+# DATETIME_INPUT_FORMATS =
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '.'
+# NUMBER_GROUPING =
View
BIN django/conf/locale/he/LC_MESSAGES/django.mo
Binary file not shown.
View
1,098 django/conf/locale/he/LC_MESSAGES/django.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-08 08:21-0500\n"
-"PO-Revision-Date: 2009-05-08 15:31+0100\n"
+"POT-Creation-Date: 2009-12-22 20:39+0100\n"
+"PO-Revision-Date: 2009-12-05 01:08-0500\n"
"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -224,8 +224,7 @@ msgstr "סינית מסורתית"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "%(count)d %(items)s היו נמחקו בהצלחה."
-#: contrib/admin/actions.py:67
-#: contrib/admin/options.py:1025
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1057
msgid "Are you sure?"
msgstr "האם את/ה בטוח/ה ?"
@@ -243,10 +242,8 @@ msgstr ""
"<h3>ע\"י %s:</h3>\n"
"<ul>\n"
-#: contrib/admin/filterspecs.py:75
-#: contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147
-#: contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
msgid "All"
msgstr "הכל"
@@ -270,18 +267,15 @@ msgstr "החודש"
msgid "This year"
msgstr "השנה"
-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:434
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:431
msgid "Yes"
msgstr "כן"
-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:434
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:431
msgid "No"
msgstr "לא"
-#: contrib/admin/filterspecs.py:154
-#: forms/widgets.py:434
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:431
msgid "Unknown"
msgstr "לא ידוע"
@@ -317,148 +311,153 @@ msgstr "רישום יומן"
msgid "log entries"
msgstr "רישומי יומן"
-#: contrib/admin/options.py:133
-#: contrib/admin/options.py:147
+#: contrib/admin/options.py:136 contrib/admin/options.py:151
msgid "None"
msgstr "ללא"
-#: contrib/admin/options.py:519
+#: contrib/admin/options.py:532
#, python-format
msgid "Changed %s."
msgstr "%s שונה."
-#: contrib/admin/options.py:519
-#: contrib/admin/options.py:529
-#: contrib/comments/templates/comments/preview.html:16
-#: forms/models.py:388
-#: forms/models.py:587
+#: contrib/admin/options.py:532 contrib/admin/options.py:542
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:385
+#: forms/models.py:598
msgid "and"
msgstr "ו"
-#: contrib/admin/options.py:524
+#: contrib/admin/options.py:537
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "התווסף %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:541
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "שונה %(list)s עבור %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:533
+#: contrib/admin/options.py:546
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "נמחק %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:537
+#: contrib/admin/options.py:550
msgid "No fields changed."
msgstr "אף שדה לא השתנה."
-#: contrib/admin/options.py:598
-#: contrib/auth/admin.py:67
+#: contrib/admin/options.py:612 contrib/auth/admin.py:68
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה."
-#: contrib/admin/options.py:602
-#: contrib/admin/options.py:635
-#: contrib/auth/admin.py:75
+#: contrib/admin/options.py:616 contrib/admin/options.py:649
+#: contrib/auth/admin.py:77
msgid "You may edit it again below."
msgstr "ניתן לערוך שוב מתחת"
-#: contrib/admin/options.py:612
-#: contrib/admin/options.py:645
+#: contrib/admin/options.py:626 contrib/admin/options.py:659
#, python-format
msgid "You may add another %s below."
msgstr "ניתן להוסיף %s נוסף מתחת."
-#: contrib/admin/options.py:633
+#: contrib/admin/options.py:647
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
-#: contrib/admin/options.py:641
+#: contrib/admin/options.py:655
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת."
-#: contrib/admin/options.py:772
+#: contrib/admin/options.py:706
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: contrib/admin/options.py:720
+msgid "No action selected."
+msgstr ""
+
+#: contrib/admin/options.py:796
#, python-format
msgid "Add %s"
msgstr "הוספת %s"
-#: contrib/admin/options.py:803
-#: contrib/admin/options.py:1003
+#: contrib/admin/options.py:828 contrib/admin/options.py:1035
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים."
-#: contrib/admin/options.py:860
+#: contrib/admin/options.py:889
#, python-format
msgid "Change %s"
msgstr "שינוי %s"
-#: contrib/admin/options.py:904
+#: contrib/admin/options.py:934
msgid "Database error"
msgstr "שגיאת בסיס נתונים"
-#: contrib/admin/options.py:940
+#: contrib/admin/options.py:970
#, 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 בהצלחה."
msgstr[1] "שינוי %(count)s %(name)s בהצלחה."
-#: contrib/admin/options.py:1018
+#: contrib/admin/options.py:1050
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה."
-#: contrib/admin/options.py:1054
+#: contrib/admin/options.py:1087
#, python-format
msgid "Change history: %s"
msgstr "היסטוריית שינוי: %s"
-#: contrib/admin/sites.py:20
-#: contrib/admin/views/decorators.py:14
+#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."
-#: contrib/admin/sites.py:278
-#: contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "עליך להתחבר שנית כי פג הזמן המוקצב לך."
-#: contrib/admin/sites.py:285
-#: 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."
-msgstr "נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף ולנסות שוב."
+#: contrib/admin/sites.py:299 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."
+msgstr ""
+"נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף "
+"ולנסות שוב."
-#: contrib/admin/sites.py:301
-#: contrib/admin/sites.py:307
+#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "שם משתמש אינו יכול להכיל את התו '@'."
-#: contrib/admin/sites.py:304
-#: contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה/י '%s' במקום."
-#: contrib/admin/sites.py:360
+#: contrib/admin/sites.py:374
msgid "Site administration"
msgstr "ניהול אתר"
-#: contrib/admin/sites.py:373
-#: contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:388 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 "כניסה"
-#: contrib/admin/sites.py:417
+#: contrib/admin/sites.py:433
#, python-format
msgid "%s administration"
msgstr "ניהול %s"
@@ -473,27 +472,27 @@ msgstr "אחד או יותר %(fieldname)s ב%(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "אחד או יותר %(fieldname)s ב%(name)s:"
-#: contrib/admin/widgets.py:71
+#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "תאריך:"
-#: contrib/admin/widgets.py:71
+#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "שעה:"
-#: contrib/admin/widgets.py:95
+#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "הנוכחי:"
-#: contrib/admin/widgets.py:95
+#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "שינוי:"
-#: contrib/admin/widgets.py:124
+#: contrib/admin/widgets.py:126
msgid "Lookup"
msgstr "חפש"
-#: contrib/admin/widgets.py:236
+#: contrib/admin/widgets.py:238
msgid "Add Another"
msgstr "הוסף עוד אחת"
@@ -508,7 +507,7 @@ msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:31
+#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@@ -540,8 +539,11 @@ msgid "Server Error <em>(500)</em>"
msgstr "שגיאת שרת <em>(500)</em>"
#: 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 "התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך."
+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 ""
+"התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך."
#: contrib/admin/templates/admin/actions.html:4
msgid "Run the selected action"
@@ -557,26 +559,26 @@ msgstr "בצע"
msgid "%(name)s"
msgstr "%(name)s"
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "שלום,"
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "תיעוד"
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr "שינוי סיסמה"
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@@ -602,7 +604,7 @@ msgstr "היסטוריה"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:27
+#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "צפיה באתר"
@@ -624,20 +626,28 @@ msgid "Filter"
msgstr "סינון"
#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4
-#: forms/formsets.py:275
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
msgid "Delete"
msgstr "מחיקה"
#: contrib/admin/templates/admin/delete_confirmation.html:16
#, 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 "מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:"
+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 ""
+"מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, "
+"אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:"
#: contrib/admin/templates/admin/delete_confirmation.html:23
#, 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 "האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים הקשורים הבאים יימחקו:"
+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 ""
+"האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים "
+"הקשורים הבאים יימחקו:"
#: contrib/admin/templates/admin/delete_confirmation.html:28
#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
@@ -650,13 +660,22 @@ msgstr "מחק כמה פריטים"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
#, python-format
-msgid "Deleting the %(object_name)s would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "מחיקת %(object_name)s מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:"
+msgid ""
+"Deleting the %(object_name)s would result in deleting related objects, but "
+"your account doesn't have permission to delete the following types of "
+"objects:"
+msgstr ""
+"מחיקת %(object_name)s מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין "
+"הרשאות למחיקת סוגי האובייקטים הבאים:"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
#, python-format
-msgid "Are you sure you want to delete the selected %(object_name)s objects? All of the following objects and it's related items will be deleted:"
-msgstr "האם אתה בטוח שאתה רוצה למחוק את פריטי ה %(object_name)s שנבחרו. כל הפריטים הבאים והחומר הנלווה אליהם יימחקו."
+msgid ""
+"Are you sure you want to delete the selected %(object_name)s objects? All of "
+"the following objects and their related items will be deleted:"
+msgstr ""
+"האם אתה בטוח שאתה רוצה למחוק את פריטי ה %(object_name)s שנבחרו. כל הפריטים "
+"הבאים והחומר הנלווה אליהם יימחקו."
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@@ -693,8 +712,13 @@ msgid "Unknown content"
msgstr "תוכן לא ידוע"
#: contrib/admin/templates/admin/invalid_setup.html:7
-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 "משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים."
+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 ""
+"משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים "
+"המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים."
#: contrib/admin/templates/admin/login.html:19
msgid "Username:"
@@ -713,23 +737,25 @@ msgid "User"
msgstr "משתמש"
#: contrib/admin/templates/admin/object_history.html:24
-#: contrib/comments/templates/comments/moderation_queue.html:33
msgid "Action"
msgstr "פעולה"
-#: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
-msgid "DATETIME_FORMAT"
-msgstr "d.m.‏Y H:i:s"
-
#: contrib/admin/templates/admin/object_history.html:38
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו."
#: contrib/admin/templates/admin/pagination.html:10
msgid "Show all"
msgstr "הצג הכל"
+#: contrib/admin/templates/admin/pagination.html:11
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "שמירה"
+
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "חיפוש"
@@ -746,10 +772,6 @@ msgstr[1] "%(counter)s תוצאות"
msgid "%(full_result_count)s total"
msgstr "%(full_result_count)s סה\"כ"
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Save"
-msgstr "שמירה"
-
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "שמירה כחדש"
@@ -763,21 +785,21 @@ msgid "Save and continue editing"
msgstr "שמירה והמשך עריכה"
#: 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 "ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות עבור המשתמש."
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות "
+"עבור המשתמש."
#: contrib/admin/templates/admin/auth/user/add_form.html:13
-#: contrib/auth/forms.py:14
-#: contrib/auth/forms.py:47
-#: contrib/auth/forms.py:59
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
msgid "Username"
msgstr "שם משתמש"
#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:60
-#: contrib/auth/forms.py:185
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
msgid "Password"
msgstr "סיסמה"
@@ -826,8 +848,12 @@ msgid "Your password was changed."
msgstr "סיסמתך שונתה."
#: 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 "נא להזין את סיסמתך הישנה, למען האבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי."
+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 ""
+"נא להזין את סיסמתך הישנה, למען האבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי "
+"שנוכל לוודא שהקלדת אותה כראוי."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -875,25 +901,34 @@ msgid "Enter new password"
msgstr "הזנת סיסמה חדשה"
#: contrib/admin/templates/registration/password_reset_confirm.html:14
-msgid "Please enter your new password twice so we can verify you typed it in correctly."
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
msgstr "נא להזין את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי."
#: contrib/admin/templates/registration/password_reset_confirm.html:26
msgid "Password reset unsuccessful"
msgstr "איפוס הסיסמה נכשל"
#: contrib/admin/templates/registration/password_reset_confirm.html:28
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr "הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה חדש."
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset."
+msgstr ""
+"הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה "
+"חדש."
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
msgstr "הסיסמה אופסה בהצלחה"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "שלחנו הוראות לקביעת הסיסמה אל כתובת הדוא\"ל שהזנת. ההודעה אמורה להתקבל בקרוב."
+msgid ""
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+"שלחנו הוראות לקביעת הסיסמה אל כתובת הדוא\"ל שהזנת. ההודעה אמורה להתקבל בקרוב."
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
@@ -922,8 +957,12 @@ msgid "The %(site_name)s team"
msgstr "צוות %(site_name)s"
#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one."
-msgstr "שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת סיסמה חדשה."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"instructions for setting a new one."
+msgstr ""
+"שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת "
+"סיסמה חדשה."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -933,7 +972,7 @@ msgstr "כתובת דוא\"ל:"
msgid "Reset my password"
msgstr "אפס את סיסמתי"
-#: contrib/admin/templatetags/admin_list.py:299
+#: contrib/admin/templatetags/admin_list.py:302
msgid "All dates"
msgstr "כל התאריכים"
@@ -947,166 +986,71 @@ msgstr "בחירת %s"
msgid "Select %s to change"
msgstr "בחירת %s לשינוי"
-#: contrib/admin/views/template.py:37
-#: contrib/sites/models.py:38
+#: contrib/admin/views/template.py:38 contrib/sites/models.py:38
msgid "site"
msgstr "אתר"
-#: contrib/admin/views/template.py:39
+#: contrib/admin/views/template.py:40
msgid "template"
msgstr "תבנית"
-#: contrib/admindocs/views.py:58
-#: contrib/admindocs/views.py:60
-#: contrib/admindocs/views.py:62
+#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
+#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "תג:"
-#: contrib/admindocs/views.py:91
-#: contrib/admindocs/views.py:93
-#: contrib/admindocs/views.py:95
+#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
+#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "סינון:"
-#: contrib/admindocs/views.py:155
-#: contrib/admindocs/views.py:157
-#: contrib/admindocs/views.py:159
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "ה-view:"
-#: contrib/admindocs/views.py:187
+#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "יישום %r לא נמצא"
-#: contrib/admindocs/views.py:194
+#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "מודל %(model_name)r לא נמצא ביישום %(app_label)r"
-#: contrib/admindocs/views.py:206
+#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "אוביקטי `%(app_label)s.%(data_type)s` קשורים"
-#: contrib/admindocs/views.py:206
-#: contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:242
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "מודל:"
-#: contrib/admindocs/views.py:237
+#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "אובייקטי `%(app_label)s.%(object_name)s` קשורים"
-#: contrib/admindocs/views.py:242
+#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "כל %s"
-#: contrib/admindocs/views.py:247
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format