Skip to content
Browse files

Update Django to 1.2.3

  • Loading branch information...
1 parent 987dc55 commit d18fc40e662ec19ccff2b8b47f132759d17ad303 Andreas Knab committed Oct 16, 2010
Showing with 84,789 additions and 21,963 deletions.
  1. +1 −1 django/__init__.py
  2. +8 −8 django/conf/__init__.py
  3. +128 −8 django/conf/global_settings.py
  4. 0 django/conf/locale/__init__.py
  5. BIN django/conf/locale/ar/LC_MESSAGES/django.mo
  6. +1,428 −668 django/conf/locale/ar/LC_MESSAGES/django.po
  7. 0 django/conf/locale/ar/__init__.py
  8. +18 −0 django/conf/locale/ar/formats.py
  9. 0 django/conf/locale/bg/__init__.py
  10. +18 −0 django/conf/locale/bg/formats.py
  11. 0 django/conf/locale/bn/__init__.py
  12. +18 −0 django/conf/locale/bn/formats.py
  13. BIN django/conf/locale/bs/LC_MESSAGES/django.mo
  14. +4,381 −1,037 django/conf/locale/bs/LC_MESSAGES/django.po
  15. 0 django/conf/locale/bs/__init__.py
  16. +18 −0 django/conf/locale/bs/formats.py
  17. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  18. +105 −88 django/conf/locale/ca/LC_MESSAGES/django.po
  19. 0 django/conf/locale/ca/__init__.py
  20. +30 −0 django/conf/locale/ca/formats.py
  21. BIN django/conf/locale/cs/LC_MESSAGES/django.mo
  22. +1,411 −696 django/conf/locale/cs/LC_MESSAGES/django.po
  23. BIN django/conf/locale/cs/LC_MESSAGES/djangojs.mo
  24. +71 −32 django/conf/locale/cs/LC_MESSAGES/djangojs.po
  25. 0 django/conf/locale/cs/__init__.py
  26. +32 −0 django/conf/locale/cs/formats.py
  27. 0 django/conf/locale/cy/__init__.py
  28. +18 −0 django/conf/locale/cy/formats.py
  29. BIN django/conf/locale/da/LC_MESSAGES/django.mo
  30. +1,308 −632 django/conf/locale/da/LC_MESSAGES/django.po
  31. BIN django/conf/locale/da/LC_MESSAGES/djangojs.mo
  32. +68 −31 django/conf/locale/da/LC_MESSAGES/djangojs.po
  33. 0 django/conf/locale/da/__init__.py
  34. +26 −0 django/conf/locale/da/formats.py
  35. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  36. +1,361 −609 django/conf/locale/de/LC_MESSAGES/django.po
  37. BIN django/conf/locale/de/LC_MESSAGES/djangojs.mo
  38. +70 −29 django/conf/locale/de/LC_MESSAGES/djangojs.po
  39. 0 django/conf/locale/de/__init__.py
  40. +32 −0 django/conf/locale/de/formats.py
  41. 0 django/conf/locale/el/__init__.py
  42. +18 −0 django/conf/locale/el/formats.py
  43. BIN django/conf/locale/en/LC_MESSAGES/django.mo
  44. +1,605 −554 django/conf/locale/en/LC_MESSAGES/django.po
  45. BIN django/conf/locale/en/LC_MESSAGES/djangojs.mo
  46. +60 −29 django/conf/locale/en/LC_MESSAGES/djangojs.po
  47. 0 django/conf/locale/en/__init__.py
  48. +38 −0 django/conf/locale/en/formats.py
  49. BIN django/conf/locale/en_GB/LC_MESSAGES/django.mo
  50. +4,996 −0 django/conf/locale/en_GB/LC_MESSAGES/django.po
  51. BIN django/conf/locale/en_GB/LC_MESSAGES/djangojs.mo
  52. +114 −0 django/conf/locale/en_GB/LC_MESSAGES/djangojs.po
  53. 0 django/conf/locale/en_GB/__init__.py
  54. +39 −0 django/conf/locale/en_GB/formats.py
  55. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  56. +1,279 −575 django/conf/locale/es/LC_MESSAGES/django.po
  57. 0 django/conf/locale/es/__init__.py
  58. +30 −0 django/conf/locale/es/formats.py
  59. BIN django/conf/locale/es_AR/LC_MESSAGES/django.mo
  60. +1,314 −597 django/conf/locale/es_AR/LC_MESSAGES/django.po
  61. BIN django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
  62. +62 −48 django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
  63. 0 django/conf/locale/es_AR/__init__.py
  64. +29 −0 django/conf/locale/es_AR/formats.py
  65. 0 django/conf/locale/et/__init__.py
  66. +18 −0 django/conf/locale/et/formats.py
  67. 0 django/conf/locale/eu/__init__.py
  68. +18 −0 django/conf/locale/eu/formats.py
  69. 0 django/conf/locale/fa/__init__.py
  70. +18 −0 django/conf/locale/fa/formats.py
  71. BIN django/conf/locale/fi/LC_MESSAGES/django.mo
  72. +1,414 −682 django/conf/locale/fi/LC_MESSAGES/django.po
  73. BIN django/conf/locale/fi/LC_MESSAGES/djangojs.mo
  74. +68 −30 django/conf/locale/fi/LC_MESSAGES/djangojs.po
  75. 0 django/conf/locale/fi/__init__.py
  76. +18 −0 django/conf/locale/fi/formats.py
  77. BIN django/conf/locale/fr/LC_MESSAGES/django.mo
  78. +1,300 −578 django/conf/locale/fr/LC_MESSAGES/django.po
  79. BIN django/conf/locale/fr/LC_MESSAGES/djangojs.mo
  80. +78 −34 django/conf/locale/fr/LC_MESSAGES/djangojs.po
  81. 0 django/conf/locale/fr/__init__.py
  82. +36 −0 django/conf/locale/fr/formats.py
  83. 0 django/conf/locale/fy_NL/__init__.py
  84. +18 −0 django/conf/locale/fy_NL/formats.py
  85. BIN django/conf/locale/ga/LC_MESSAGES/django.mo
  86. +2,480 −1,701 django/conf/locale/ga/LC_MESSAGES/django.po
  87. BIN django/conf/locale/ga/LC_MESSAGES/djangojs.mo
  88. +86 −46 django/conf/locale/ga/LC_MESSAGES/djangojs.po
  89. 0 django/conf/locale/ga/__init__.py
  90. +18 −0 django/conf/locale/ga/formats.py
  91. 0 django/conf/locale/gl/__init__.py
  92. +18 −0 django/conf/locale/gl/formats.py
  93. BIN django/conf/locale/he/LC_MESSAGES/django.mo
  94. +1,622 −861 django/conf/locale/he/LC_MESSAGES/django.po
  95. BIN django/conf/locale/he/LC_MESSAGES/djangojs.mo
  96. +77 −38 django/conf/locale/he/LC_MESSAGES/djangojs.po
  97. 0 django/conf/locale/he/__init__.py
  98. +18 −0 django/conf/locale/he/formats.py
  99. 0 django/conf/locale/hi/__init__.py
  100. +18 −0 django/conf/locale/hi/formats.py
  101. BIN django/conf/locale/hr/LC_MESSAGES/django.mo
  102. +1,372 −990 django/conf/locale/hr/LC_MESSAGES/django.po
  103. 0 django/conf/locale/hr/__init__.py
  104. +42 −0 django/conf/locale/hr/formats.py
  105. 0 django/conf/locale/hu/__init__.py
  106. +18 −0 django/conf/locale/hu/formats.py
  107. BIN django/conf/locale/id/LC_MESSAGES/django.mo
  108. +5,127 −0 django/conf/locale/id/LC_MESSAGES/django.po
  109. BIN django/conf/locale/id/LC_MESSAGES/djangojs.mo
  110. +157 −0 django/conf/locale/id/LC_MESSAGES/djangojs.po
  111. 0 django/conf/locale/id/__init__.py
  112. +43 −0 django/conf/locale/id/formats.py
  113. 0 django/conf/locale/is/__init__.py
  114. +18 −0 django/conf/locale/is/formats.py
  115. BIN django/conf/locale/it/LC_MESSAGES/django.mo
  116. +1,161 −527 django/conf/locale/it/LC_MESSAGES/django.po
  117. BIN django/conf/locale/it/LC_MESSAGES/djangojs.mo
  118. +9 −5 django/conf/locale/it/LC_MESSAGES/djangojs.po
  119. 0 django/conf/locale/it/__init__.py
  120. +41 −0 django/conf/locale/it/formats.py
  121. BIN django/conf/locale/ja/LC_MESSAGES/django.mo
  122. +1,309 −584 django/conf/locale/ja/LC_MESSAGES/django.po
  123. BIN django/conf/locale/ja/LC_MESSAGES/djangojs.mo
  124. +62 −31 django/conf/locale/ja/LC_MESSAGES/djangojs.po
  125. 0 django/conf/locale/ja/__init__.py
  126. +18 −0 django/conf/locale/ja/formats.py
  127. 0 django/conf/locale/ka/__init__.py
  128. +42 −0 django/conf/locale/ka/formats.py
  129. 0 django/conf/locale/km/__init__.py
  130. +18 −0 django/conf/locale/km/formats.py
  131. 0 django/conf/locale/kn/__init__.py
  132. +18 −0 django/conf/locale/kn/formats.py
  133. BIN django/conf/locale/ko/LC_MESSAGES/django.mo
  134. +1,348 −604 django/conf/locale/ko/LC_MESSAGES/django.po
  135. BIN django/conf/locale/ko/LC_MESSAGES/djangojs.mo
  136. +67 −30 django/conf/locale/ko/LC_MESSAGES/djangojs.po
  137. 0 django/conf/locale/ko/__init__.py
  138. +44 −0 django/conf/locale/ko/formats.py
  139. 0 django/conf/locale/lt/__init__.py
  140. +18 −0 django/conf/locale/lt/formats.py
  141. BIN django/conf/locale/lv/LC_MESSAGES/django.mo
  142. +1,898 −829 django/conf/locale/lv/LC_MESSAGES/django.po
  143. BIN django/conf/locale/lv/LC_MESSAGES/djangojs.mo
  144. +90 −46 django/conf/locale/lv/LC_MESSAGES/djangojs.po
  145. 0 django/conf/locale/lv/__init__.py
  146. +36 −0 django/conf/locale/lv/formats.py
  147. BIN django/conf/locale/mk/LC_MESSAGES/django.mo
  148. +1,257 −559 django/conf/locale/mk/LC_MESSAGES/django.po
  149. BIN django/conf/locale/mk/LC_MESSAGES/djangojs.mo
  150. +46 −39 django/conf/locale/mk/LC_MESSAGES/djangojs.po
  151. 0 django/conf/locale/mk/__init__.py
  152. +18 −0 django/conf/locale/mk/formats.py
  153. BIN django/conf/locale/ml/LC_MESSAGES/django.mo
  154. +5,044 −0 django/conf/locale/ml/LC_MESSAGES/django.po
  155. BIN django/conf/locale/ml/LC_MESSAGES/djangojs.mo
  156. +156 −0 django/conf/locale/ml/LC_MESSAGES/djangojs.po
  157. 0 django/conf/locale/ml/__init__.py
  158. +38 −0 django/conf/locale/ml/formats.py
  159. BIN django/conf/locale/mn/LC_MESSAGES/django.mo
  160. +5,243 −0 django/conf/locale/mn/LC_MESSAGES/django.po
  161. BIN django/conf/locale/mn/LC_MESSAGES/djangojs.mo
  162. +149 −0 django/conf/locale/mn/LC_MESSAGES/djangojs.po
  163. 0 django/conf/locale/mn/__init__.py
  164. +18 −0 django/conf/locale/mn/formats.py
  165. BIN django/conf/locale/nb/LC_MESSAGES/django.mo
  166. +5,132 −0 django/conf/locale/nb/LC_MESSAGES/django.po
  167. BIN django/conf/locale/nb/LC_MESSAGES/djangojs.mo
  168. +119 −0 django/conf/locale/nb/LC_MESSAGES/djangojs.po
  169. 0 django/conf/locale/nb/__init__.py
  170. +34 −0 django/conf/locale/nb/formats.py
  171. 0 django/conf/locale/nl/__init__.py
  172. +48 −0 django/conf/locale/nl/formats.py
  173. BIN django/conf/locale/nn/LC_MESSAGES/django.mo
  174. +5,150 −0 django/conf/locale/nn/LC_MESSAGES/django.po
  175. BIN django/conf/locale/nn/LC_MESSAGES/djangojs.mo
  176. +155 −0 django/conf/locale/nn/LC_MESSAGES/djangojs.po
  177. 0 django/conf/locale/nn/__init__.py
  178. +34 −0 django/conf/locale/nn/formats.py
  179. BIN django/conf/locale/no/LC_MESSAGES/django.mo
  180. +1,333 −610 django/conf/locale/no/LC_MESSAGES/django.po
  181. BIN django/conf/locale/no/LC_MESSAGES/djangojs.mo
  182. +32 −30 django/conf/locale/no/LC_MESSAGES/djangojs.po
  183. 0 django/conf/locale/no/__init__.py
  184. +34 −0 django/conf/locale/no/formats.py
  185. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  186. +1,194 −533 django/conf/locale/pl/LC_MESSAGES/django.po
  187. 0 django/conf/locale/pl/__init__.py
  188. +32 −0 django/conf/locale/pl/formats.py
  189. BIN django/conf/locale/pt/LC_MESSAGES/django.mo
  190. +1,292 −927 django/conf/locale/pt/LC_MESSAGES/django.po
  191. BIN django/conf/locale/pt/LC_MESSAGES/djangojs.mo
  192. +37 −29 django/conf/locale/pt/LC_MESSAGES/djangojs.po
  193. 0 django/conf/locale/pt/__init__.py
  194. +35 −0 django/conf/locale/pt/formats.py
  195. BIN django/conf/locale/pt_BR/LC_MESSAGES/django.mo
  196. +1,295 −617 django/conf/locale/pt_BR/LC_MESSAGES/django.po
  197. 0 django/conf/locale/pt_BR/__init__.py
  198. +35 −0 django/conf/locale/pt_BR/formats.py
  199. 0 django/conf/locale/ro/__init__.py
  200. +18 −0 django/conf/locale/ro/formats.py
  201. BIN django/conf/locale/ru/LC_MESSAGES/django.mo
  202. +1,543 −933 django/conf/locale/ru/LC_MESSAGES/django.po
  203. BIN django/conf/locale/ru/LC_MESSAGES/djangojs.mo
  204. +59 −31 django/conf/locale/ru/LC_MESSAGES/djangojs.po
  205. 0 django/conf/locale/ru/__init__.py
  206. +35 −0 django/conf/locale/ru/formats.py
  207. BIN django/conf/locale/sk/LC_MESSAGES/django.mo
  208. +1,706 −848 django/conf/locale/sk/LC_MESSAGES/django.po
  209. BIN django/conf/locale/sk/LC_MESSAGES/djangojs.mo
  210. +73 −35 django/conf/locale/sk/LC_MESSAGES/djangojs.po
  211. 0 django/conf/locale/sk/__init__.py
  212. +32 −0 django/conf/locale/sk/formats.py
  213. BIN django/conf/locale/sl/LC_MESSAGES/django.mo
  214. +1,544 −713 django/conf/locale/sl/LC_MESSAGES/django.po
  215. BIN django/conf/locale/sl/LC_MESSAGES/djangojs.mo
  216. +93 −48 django/conf/locale/sl/LC_MESSAGES/djangojs.po
  217. 0 django/conf/locale/sl/__init__.py
  218. +18 −0 django/conf/locale/sl/formats.py
  219. 0 django/conf/locale/sq/__init__.py
  220. +18 −0 django/conf/locale/sq/formats.py
  221. BIN django/conf/locale/sr/LC_MESSAGES/django.mo
  222. +1,374 −658 django/conf/locale/sr/LC_MESSAGES/django.po
  223. BIN django/conf/locale/sr/LC_MESSAGES/djangojs.mo
  224. +73 −49 django/conf/locale/sr/LC_MESSAGES/djangojs.po
  225. 0 django/conf/locale/sr/__init__.py
  226. +44 −0 django/conf/locale/sr/formats.py
  227. BIN django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
  228. +1,487 −886 django/conf/locale/sr_Latn/LC_MESSAGES/django.po
  229. BIN django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
  230. +62 −29 django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
  231. 0 django/conf/locale/sr_Latn/__init__.py
  232. +44 −0 django/conf/locale/sr_Latn/formats.py
  233. BIN django/conf/locale/sv/LC_MESSAGES/django.mo
  234. +34 −34 django/conf/locale/sv/LC_MESSAGES/django.po
  235. 0 django/conf/locale/sv/__init__.py
  236. +35 −0 django/conf/locale/sv/formats.py
  237. 0 django/conf/locale/ta/__init__.py
  238. +18 −0 django/conf/locale/ta/formats.py
  239. 0 django/conf/locale/te/__init__.py
  240. +18 −0 django/conf/locale/te/formats.py
  241. 0 django/conf/locale/th/__init__.py
  242. +18 −0 django/conf/locale/th/formats.py
  243. BIN django/conf/locale/tr/LC_MESSAGES/django.mo
  244. +1,960 −797 django/conf/locale/tr/LC_MESSAGES/django.po
  245. BIN django/conf/locale/tr/LC_MESSAGES/djangojs.mo
  246. +50 −40 django/conf/locale/tr/LC_MESSAGES/djangojs.po
  247. 0 django/conf/locale/tr/__init__.py
  248. +32 −0 django/conf/locale/tr/formats.py
  249. 0 django/conf/locale/uk/__init__.py
  250. +18 −0 django/conf/locale/uk/formats.py
  251. BIN django/conf/locale/vi/LC_MESSAGES/django.mo
  252. +5,058 −0 django/conf/locale/vi/LC_MESSAGES/django.po
  253. BIN django/conf/locale/vi/LC_MESSAGES/djangojs.mo
  254. +115 −0 django/conf/locale/vi/LC_MESSAGES/djangojs.po
  255. 0 django/conf/locale/vi/__init__.py
  256. +18 −0 django/conf/locale/vi/formats.py
  257. 0 django/conf/locale/zh_CN/__init__.py
  258. +18 −0 django/conf/locale/zh_CN/formats.py
  259. 0 django/conf/locale/zh_TW/__init__.py
  260. +18 −0 django/conf/locale/zh_TW/formats.py
  261. +26 −9 django/conf/project_template/settings.py
  262. +1 −2 django/conf/project_template/urls.py
  263. +18 −40 django/contrib/admin/__init__.py
  264. +3 −15 django/contrib/admin/actions.py
  265. +135 −25 django/contrib/admin/helpers.py
  266. +15 −2 django/contrib/admin/media/css/base.css
  267. +17 −0 django/contrib/admin/media/css/changelists.css
  268. +33 −6 django/contrib/admin/media/css/forms.css
  269. +6 −0 django/contrib/admin/media/css/ie.css
  270. +12 −1 django/contrib/admin/media/css/rtl.css
  271. +2 −2 django/contrib/admin/media/css/widgets.css
  272. +20 −0 django/contrib/admin/media/js/LICENSE-JQUERY.txt
  273. +4 −0 django/contrib/admin/media/js/SelectFilter2.js
  274. +139 −39 django/contrib/admin/media/js/actions.js
  275. +7 −0 django/contrib/admin/media/js/actions.min.js
  276. +0 −85 django/contrib/admin/media/js/admin/CollapsedFieldsets.js
  277. +48 −29 django/contrib/admin/media/js/admin/DateTimeShortcuts.js
  278. +16 −3 django/contrib/admin/media/js/calendar.js
  279. +27 −0 django/contrib/admin/media/js/collapse.js
  280. +2 −0 django/contrib/admin/media/js/collapse.min.js
  281. +47 −0 django/contrib/admin/media/js/compress.py
  282. +47 −2 django/contrib/admin/media/js/core.js
  283. +148 −0 django/contrib/admin/media/js/inlines.js
  284. +6 −0 django/contrib/admin/media/js/inlines.min.js
  285. +4 −0 django/contrib/admin/media/js/jquery.init.js
Sorry, we could not display the entire diff because too many files (790) changed.
View
2 django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 1, 2, 'alpha', 0)
+VERSION = (1, 2, 3, 'final', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
View
16 django/conf/__init__.py
@@ -46,7 +46,7 @@ def configure(self, default_settings=global_settings, **options):
argument must support attribute access (__getattr__)).
"""
if self._wrapped != None:
- raise RuntimeError, 'Settings already configured.'
+ raise RuntimeError('Settings already configured.')
holder = UserSettingsHolder(default_settings)
for name, value in options.items():
setattr(holder, name, value)
@@ -72,7 +72,7 @@ def __init__(self, settings_module):
try:
mod = importlib.import_module(self.SETTINGS_MODULE)
except ImportError, e:
- raise ImportError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
+ raise ImportError("Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e))
# Settings that should be converted into tuples if they're mistakenly entered
# as strings.
@@ -102,15 +102,12 @@ def __init__(self, settings_module):
new_installed_apps.append(app)
self.INSTALLED_APPS = new_installed_apps
- if hasattr(time, 'tzset'):
+ if hasattr(time, 'tzset') and getattr(self, 'TIME_ZONE'):
# Move the time zone info into os.environ. See ticket #2315 for why
# we don't do this unconditionally (breaks Windows).
os.environ['TZ'] = self.TIME_ZONE
time.tzset()
- def get_all_members(self):
- return dir(self)
-
class UserSettingsHolder(object):
"""
Holder for user configured settings.
@@ -129,8 +126,11 @@ def __init__(self, default_settings):
def __getattr__(self, name):
return getattr(self.default_settings, name)
- def get_all_members(self):
- return dir(self) + dir(self.default_settings)
+ def __dir__(self):
+ return self.__dict__.keys() + dir(self.default_settings)
+
+ # For Python < 2.6:
+ __members__ = property(lambda self: self.__dir__())
settings = LazySettings()
View
136 django/conf/global_settings.py
@@ -44,16 +44,17 @@
('ar', gettext_noop('Arabic')),
('bg', gettext_noop('Bulgarian')),
('bn', gettext_noop('Bengali')),
- ('bn', gettext_noop('Bosnian')),
+ ('bs', gettext_noop('Bosnian')),
('ca', gettext_noop('Catalan')),
('cs', gettext_noop('Czech')),
('cy', gettext_noop('Welsh')),
('da', gettext_noop('Danish')),
('de', gettext_noop('German')),
('el', gettext_noop('Greek')),
('en', gettext_noop('English')),
+ ('en-gb', gettext_noop('British English')),
('es', gettext_noop('Spanish')),
- ('es-ar', gettext_noop('Argentinean Spanish')),
+ ('es-ar', gettext_noop('Argentinian Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@@ -66,6 +67,7 @@
('hi', gettext_noop('Hindi')),
('hr', gettext_noop('Croatian')),
('hu', gettext_noop('Hungarian')),
+ ('id', gettext_noop('Indonesian')),
('is', gettext_noop('Icelandic')),
('it', gettext_noop('Italian')),
('ja', gettext_noop('Japanese')),
@@ -76,8 +78,12 @@
('lt', gettext_noop('Lithuanian')),
('lv', gettext_noop('Latvian')),
('mk', gettext_noop('Macedonian')),
+ ('ml', gettext_noop('Malayalam')),
+ ('mn', gettext_noop('Mongolian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
+ ('nb', gettext_noop('Norwegian Bokmal')),
+ ('nn', gettext_noop('Norwegian Nynorsk')),
('pl', gettext_noop('Polish')),
('pt', gettext_noop('Portuguese')),
('pt-br', gettext_noop('Brazilian Portuguese')),
@@ -94,6 +100,7 @@
('th', gettext_noop('Thai')),
('tr', gettext_noop('Turkish')),
('uk', gettext_noop('Ukrainian')),
+ ('vi', gettext_noop('Vietnamese')),
('zh-cn', gettext_noop('Simplified Chinese')),
('zh-tw', gettext_noop('Traditional Chinese')),
)
@@ -107,6 +114,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
@@ -127,6 +138,7 @@
SEND_BROKEN_LINK_EMAILS = False
# Database connection info.
+# Legacy format
DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
@@ -135,6 +147,19 @@
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
DATABASE_OPTIONS = {} # Set to empty dictionary for default.
+# New format
+DATABASES = {
+}
+
+# Classes used to implement db routing behaviour
+DATABASE_ROUTERS = []
+
+# 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
+# to a module that defines an EmailBackend class.
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+
# Host for sending e-mail.
EMAIL_HOST = 'localhost'
@@ -156,20 +181,21 @@
# 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.
# Each one should be a callable that takes the request object as its
# only parameter and returns a dictionary to add to the context.
TEMPLATE_CONTEXT_PROCESSORS = (
- 'django.core.context_processors.auth',
+ 'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'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.
@@ -259,6 +285,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'
@@ -281,6 +313,70 @@
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
MONTH_DAY_FORMAT = 'F j'
+# Default short formatting 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
@@ -304,7 +400,9 @@
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'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',
)
@@ -378,12 +476,34 @@
# The number of days a password reset link is valid for
PASSWORD_RESET_TIMEOUT_DAYS = 3
+########
+# CSRF #
+########
+
+# Dotted path to callable to be used as view when a request is
+# rejected by the CSRF middleware.
+CSRF_FAILURE_VIEW = 'django.views.csrf.csrf_failure'
+
+# Name and domain for CSRF cookie.
+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 #
###########
-# The name of the method to use to invoke the test suite
-TEST_RUNNER = 'django.test.simple.run_tests'
+# The name of the class to use to run the test suite
+TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'
# The name of the database to use for testing purposes.
# If None, a name of 'test_' + DATABASE_NAME will be assumed
View
0 django/conf/locale/__init__.py
No changes.
View
BIN django/conf/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
View
2,096 django/conf/locale/ar/LC_MESSAGES/django.po
1,428 additions, 668 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
0 django/conf/locale/ar/__init__.py
No 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
BIN django/conf/locale/bs/LC_MESSAGES/django.mo
Binary file not shown.
View
5,418 django/conf/locale/bs/LC_MESSAGES/django.po
4,381 additions, 1,037 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
0 django/conf/locale/bs/__init__.py
No changes.
View
18 django/conf/locale/bs/formats.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+
+DATE_FORMAT = 'j. N Y.'
+TIME_FORMAT = 'G:i'
+DATETIME_FORMAT = 'j. N. Y. G:i T'
+YEAR_MONTH_FORMAT = 'F Y.'
+MONTH_DAY_FORMAT = 'j. F'
+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
BIN django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
View
193 django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-30 11:39+0100\n"
+"POT-Creation-Date: 2009-11-30 11:19+0100\n"
"PO-Revision-Date: 2009-03-24 13:28+0100\n"
"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -223,7 +223,7 @@ msgstr "xinès tradicional"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
+#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
msgid "Are you sure?"
msgstr "Esteu segurs?"
@@ -310,105 +310,105 @@ msgstr "entrada del registre"
msgid "log entries"
msgstr "entrades del registre"
-#: contrib/admin/options.py:133 contrib/admin/options.py:147
+#: contrib/admin/options.py:134 contrib/admin/options.py:148
msgid "None"
msgstr "cap"
-#: contrib/admin/options.py:519
+#: contrib/admin/options.py:521
#, python-format
msgid "Changed %s."
msgstr "Modificat %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:600
+#: contrib/admin/options.py:521 contrib/admin/options.py:531
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:384
+#: forms/models.py:596
msgid "and"
msgstr "i"
-#: contrib/admin/options.py:524
+#: contrib/admin/options.py:526
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Afegit %(name)s \"%(object)s\""
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:530
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:533
+#: contrib/admin/options.py:535
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Eliminat %(name)s \"%(object)s\"."
-#: contrib/admin/options.py:537
+#: contrib/admin/options.py:539
msgid "No fields changed."
msgstr "Cap camp canviat."
-#: contrib/admin/options.py:599 contrib/auth/admin.py:67
+#: contrib/admin/options.py:601 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
-#: contrib/admin/options.py:603 contrib/admin/options.py:636
+#: contrib/admin/options.py:605 contrib/admin/options.py:638
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Podeu editar-lo de nou a baix."
-#: contrib/admin/options.py:613 contrib/admin/options.py:646
+#: contrib/admin/options.py:615 contrib/admin/options.py:648
#, python-format
msgid "You may add another %s below."
msgstr "Podeu afegir un altre %s a baix."
-#: contrib/admin/options.py:634
+#: contrib/admin/options.py:636
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:644
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
"abaix."
-#: contrib/admin/options.py:773
+#: contrib/admin/options.py:777
#, python-format
msgid "Add %s"
msgstr "Afegir %s"
-#: contrib/admin/options.py:804 contrib/admin/options.py:1005
+#: contrib/admin/options.py:809 contrib/admin/options.py:1011
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
-#: contrib/admin/options.py:861
+#: contrib/admin/options.py:866
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/options.py:905
+#: contrib/admin/options.py:910
msgid "Database error"
msgstr "Error de base de dades"
-#: contrib/admin/options.py:941
+#: contrib/admin/options.py:946
#, 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 s'ha modificat amb èxit."
msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
-#: contrib/admin/options.py:1020
+#: contrib/admin/options.py:1026
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
-#: contrib/admin/options.py:1057
+#: contrib/admin/options.py:1063
#, python-format
msgid "Change history: %s"
msgstr "Modificar històric: %s"
-#: contrib/admin/sites.py:21 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-"
@@ -417,11 +417,11 @@ msgstr ""
"Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
"compte que tots dos camps son sensibles a majúscules i minúscules."
-#: contrib/admin/sites.py:288 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 "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
-#: contrib/admin/sites.py:295 contrib/admin/views/decorators.py:47
+#: 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."
@@ -430,29 +430,29 @@ msgstr ""
"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
"aquesta pàgina i proveu-ho de nou. "
-#: contrib/admin/sites.py:311 contrib/admin/sites.py:317
+#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-#: contrib/admin/sites.py:314 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 ""
"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
"cas."
-#: contrib/admin/sites.py:370
+#: contrib/admin/sites.py:374
msgid "Site administration"
msgstr "Lloc administratiu"
-#: contrib/admin/sites.py:384 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 "Iniciar sessió"
-#: contrib/admin/sites.py:429
+#: contrib/admin/sites.py:433
#, python-format
msgid "%s administration"
msgstr "Administració de %s"
@@ -736,7 +736,6 @@ msgid "User"
msgstr "Usuari"
#: contrib/admin/templates/admin/object_history.html:24
-#: contrib/comments/templates/comments/moderation_queue.html:33
msgid "Action"
msgstr "Acció"
@@ -1132,7 +1131,6 @@ msgid "Time"
msgstr "Hora"
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
-#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
@@ -1438,22 +1436,54 @@ msgstr "usuaris"
msgid "message"
msgstr "missatge"
-#: contrib/auth/views.py:56
+#: contrib/auth/views.py:60
msgid "Logged out"
msgstr "Sessió finalitzada"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Introduïu una adreça de correu vàlida."
-#: contrib/comments/admin.py:11
+#: contrib/comments/admin.py:12
msgid "Content"
msgstr "contingut"
-#: contrib/comments/admin.py:14
+#: contrib/comments/admin.py:15
msgid "Metadata"
msgstr "metadades"
+# Context problem... waitting for comments from django-i18n
+#: contrib/comments/admin.py:39
+msgid "flagged"
+msgstr "marcat"
+
+#: contrib/comments/admin.py:40
+msgid "Flag selected comments"
+msgstr "Marcar els comentaris seleccionats"
+
+#: contrib/comments/admin.py:43
+msgid "approved"
+msgstr "aprovat"
+
+#: contrib/comments/admin.py:44
+msgid "Approve selected comments"
+msgstr "Aprovar els comentaris seleccionats"
+
+#: contrib/comments/admin.py:47
+msgid "removed"
+msgstr "eliminat"
+
+#: contrib/comments/admin.py:48
+msgid "Remove selected comments"
+msgstr "Eliminar els comentaris seleccionats"
+
+#: contrib/comments/admin.py:60
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "1 comentari ha estat %(action)s satisfactòriament."
+msgstr[1] "%(count)s comentaris han estat %(action)s satisfactòriament."
+
#: contrib/comments/feeds.py:13
#, python-format
msgid "%(site_name)s comments"
@@ -1465,7 +1495,6 @@ msgid "Latest comments on %(site_name)s"
msgstr "Últims comentaris a %(site_name)s."
#: contrib/comments/forms.py:93
-#: contrib/comments/templates/comments/moderation_queue.html:34
msgid "Name"
msgstr "nom"
@@ -1474,7 +1503,6 @@ msgid "Email address"
msgstr "Adreça de correu electrònic"
#: contrib/comments/forms.py:96
-#: contrib/comments/templates/comments/moderation_queue.html:35
msgid "Comment"
msgstr "Comentari"
@@ -1606,7 +1634,6 @@ msgid "Really make this comment public?"
msgstr "Realment vol fer aquest comentari públic?"
#: contrib/comments/templates/comments/approve.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:49
msgid "Approve"
msgstr "Aprovar"
@@ -1631,7 +1658,6 @@ msgid "Really remove this comment?"
msgstr "Realment vol eliminar aquest comentari?"
#: contrib/comments/templates/comments/delete.html:12
-#: contrib/comments/templates/comments/moderation_queue.html:53
msgid "Remove"
msgstr "Eliminar"
@@ -1666,39 +1692,6 @@ msgstr "Publicar"
msgid "Preview"
msgstr "Vista prèvia"
-#: contrib/comments/templates/comments/moderation_queue.html:4
-#: contrib/comments/templates/comments/moderation_queue.html:19
-msgid "Comment moderation queue"
-msgstr "Cua de moderació de comentaris"
-
-#: contrib/comments/templates/comments/moderation_queue.html:26
-msgid "No comments to moderate"
-msgstr "No hi ha comentaris per a moderar"
-
-#: contrib/comments/templates/comments/moderation_queue.html:36
-msgid "Email"
-msgstr "Correu electrònic"
-
-#: contrib/comments/templates/comments/moderation_queue.html:38
-msgid "Authenticated?"
-msgstr "Autentificat?"
-
-#: contrib/comments/templates/comments/moderation_queue.html:39
-msgid "IP Address"
-msgstr "Adreça IP"
-
-#: contrib/comments/templates/comments/moderation_queue.html:40
-msgid "Date posted"
-msgstr "Data d'enviament"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "yes"
-msgstr "si"
-
-#: contrib/comments/templates/comments/moderation_queue.html:63
-msgid "no"
-msgstr "no"
-
#: contrib/comments/templates/comments/posted.html:4
msgid "Thanks for commenting"
msgstr "Gràcies per comentar"
@@ -1793,7 +1786,7 @@ msgstr "pàgina estàtica"
msgid "flat pages"
msgstr "pàgines estàtiques"
-#: contrib/formtools/wizard.py:130
+#: contrib/formtools/wizard.py:132
msgid ""
"We apologize, but your form has expired. Please continue filling out the "
"form from this page."
@@ -2617,7 +2610,7 @@ msgstr "Introduïu un número vàlid de la seguretat social finlandesa."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "El número de telèfon ha de estar en el format 0X XX XX XX XX."
+msgstr "Els números de telèfon han de estar en el format 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
@@ -3948,14 +3941,14 @@ msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Introduïu una hora vàlida en el format HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/related.py:816
+#: db/models/fields/related.py:869
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\" -o \"Command\" en un Mac- per seleccionar més "
"d'un valor."
-#: db/models/fields/related.py:894
+#: db/models/fields/related.py:930
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -4076,7 +4069,7 @@ msgstr "Aquesta URL sembla ser un enllaç trencat."
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:1003
+#: forms/fields.py:703 forms/fields.py:764 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
@@ -4095,29 +4088,29 @@ msgstr ""
msgid "Order"
msgstr "Ordre"
-#: forms/models.py:367
+#: forms/models.py:363
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
-#: forms/models.py:381 forms/models.py:389
+#: forms/models.py:377 forms/models.py:385
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
-#: forms/models.py:594
+#: forms/models.py:590
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
-#: forms/models.py:598
+#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
"única."
-#: forms/models.py:604
+#: forms/models.py:600
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4126,27 +4119,27 @@ msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
"ser única per a la cerca %(lookup)s en %(date_field)s."
-#: forms/models.py:612
+#: forms/models.py:608
msgid "Please correct the duplicate values below."
msgstr "Si us plau, corregiu els valors duplicats a baix."
-#: forms/models.py:867
+#: forms/models.py:863
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clau forànea en línea no coincideix amb la clau primària de la instància "
"del pare"
-#: forms/models.py:930
+#: forms/models.py:926
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Escolli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
-#: forms/models.py:1004
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escolliu una opció vàlida; %s' no és una de les opcions vàlides."
-#: forms/models.py:1006
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no és un valor vàlid per a una clau primària."
@@ -4466,6 +4459,30 @@ msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
msgid "The %(verbose_name)s was deleted."
msgstr "El %(verbose_name)s s'ha eliminat."
+#~ msgid "Comment moderation queue"
+#~ msgstr "Cua de moderació de comentaris"
+
+#~ msgid "No comments to moderate"
+#~ msgstr "No hi ha comentaris per a moderar"
+
+#~ msgid "Email"
+#~ msgstr "Correu electrònic"
+
+#~ msgid "Authenticated?"
+#~ msgstr "Autentificat?"
+
+#~ msgid "IP Address"
+#~ msgstr "Adreça IP"
+
+#~ msgid "Date posted"
+#~ msgstr "Data d'enviament"
+
+#~ msgid "yes"
+#~ msgstr "si"
+
+#~ msgid "no"
+#~ msgstr "no"
+
#, fuzzy
#~ msgid "verbose_name"
#~ msgid_plural "verbose_name_plural"
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 = r'j \de F \de Y'
+TIME_FORMAT = 'G:i:s'
+DATETIME_FORMAT = r'j \de F \de Y \a \le\s G:i'
+YEAR_MONTH_FORMAT = r'F \de\l Y'
+MONTH_DAY_FORMAT = r'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
BIN django/conf/locale/cs/LC_MESSAGES/django.mo
Binary file not shown.
View
2,107 django/conf/locale/cs/LC_MESSAGES/django.po
1,411 additions, 696 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN django/conf/locale/cs/LC_MESSAGES/djangojs.mo
Binary file not shown.
View
103 django/conf/locale/cs/LC_MESSAGES/djangojs.po
@@ -2,49 +2,87 @@
# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the DJANGO package.
# Radek Svarz <translate@svarz.cz>, 2005,
-# Vláďa Macek <macek@sandbox.cz>, 2009.
+# Vlada Macek <macek@sandbox.cz>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-20 12:52+0200\n"
-"PO-Revision-Date: 2009-10-12 11:25+0200\n"
+"POT-Creation-Date: 2010-08-06 18:35+0200\n"
+"PO-Revision-Date: 2010-08-06 18:34+0100\n"
+"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>1 && n<5 ? 1 : 2;\n"
-#: contrib/admin/media/js/SelectFilter2.js:33
+#: contrib/admin/media/js/SelectFilter2.js:37
#, perl-format
msgid "Available %s"
msgstr "Dostupné položky: %s"
-#: contrib/admin/media/js/SelectFilter2.js:41
+#: contrib/admin/media/js/SelectFilter2.js:45
msgid "Choose all"
msgstr "Vybrat vše"
-#: contrib/admin/media/js/SelectFilter2.js:46
+#: contrib/admin/media/js/SelectFilter2.js:50
msgid "Add"
msgstr "Přidat"
-#: contrib/admin/media/js/SelectFilter2.js:48
+#: contrib/admin/media/js/SelectFilter2.js:52
msgid "Remove"
msgstr "Odebrat"
-#: contrib/admin/media/js/SelectFilter2.js:53
+#: contrib/admin/media/js/SelectFilter2.js:57
#, perl-format
msgid "Chosen %s"
msgstr "Vybrané položky: %s"
-#: contrib/admin/media/js/SelectFilter2.js:54
+#: contrib/admin/media/js/SelectFilter2.js:58
msgid "Select your choice(s) and click "
msgstr "Vyberte si a klikněte "
-#: contrib/admin/media/js/SelectFilter2.js:59
+#: contrib/admin/media/js/SelectFilter2.js:63
msgid "Clear all"
-msgstr "Vymazat vše"
+msgstr "Odebrat vše"
+
+#: contrib/admin/media/js/actions.js:18
+#: contrib/admin/media/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "Vybrána je %(sel)s položka z celkem %(cnt)s."
+msgstr[1] "Vybrány jsou %(sel)s položky z celkem %(cnt)s."
+msgstr[2] "Vybraných je %(sel)s položek z celkem %(cnt)s."
+
+#: contrib/admin/media/js/actions.js:109
+#: contrib/admin/media/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"V jednotlivých polích jsou neuložené změny, které budou ztraceny, pokud "
+"operaci provedete."
+
+#: contrib/admin/media/js/actions.js:121
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Byla vybrána operace, ale dosud nedošlo k uložení změn jednotlivých polí. "
+"Uložíte klepnutím na tlačítko OK. Pak bude třeba operaci spustit znovu."
+
+#: contrib/admin/media/js/actions.js:123
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Byla vybrána operace a jednotlivá pole nejsou změněná. Patrně hledáte "
+"tlačítko Provést spíše než Uložit."
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
@@ -59,62 +97,63 @@ msgstr ""
msgid "S M T W T F S"
msgstr "n p ú s č p s"
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
+#: contrib/admin/media/js/collapse.min.js:1
msgid "Show"
msgstr "Zobrazit"
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+#: contrib/admin/media/js/collapse.js:16
+#: contrib/admin/media/js/collapse.min.js:1
msgid "Hide"
msgstr "Skrýt"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:49
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Now"
msgstr "Nyní"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:53
msgid "Clock"
msgstr "Hodiny"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
msgid "Choose a time"
msgstr "Vyberte čas"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
msgid "Midnight"
msgstr "Půlnoc"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86
msgid "6 a.m."
msgstr "6h ráno"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
msgid "Noon"
msgstr "Poledne"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:188
msgid "Cancel"
msgstr "Storno"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:182
msgid "Today"
msgstr "Dnes"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:137
msgid "Calendar"
msgstr "Kalendář"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
msgid "Yesterday"
msgstr "Včera"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
msgid "Tomorrow"
msgstr "Zítra"
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
BIN django/conf/locale/da/LC_MESSAGES/django.mo
Binary file not shown.
View
1,940 django/conf/locale/da/LC_MESSAGES/django.po
1,308 additions, 632 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN django/conf/locale/da/LC_MESSAGES/djangojs.mo
Binary file not shown.
View
99 django/conf/locale/da/LC_MESSAGES/djangojs.po
@@ -6,44 +6,80 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-09 20:20+0200\n"
-"PO-Revision-Date: 2008-08-13 22:00+0200\n"
-"Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n"
+"POT-Creation-Date: 2010-08-07 11:57+0200\n"
+"PO-Revision-Date: 2010-08-07 22:00+0200\n"
+"Last-Translator: Finn Gruwier Larsen<finngruwierlarsen@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/media/js/SelectFilter2.js:33
+#: contrib/admin/media/js/SelectFilter2.js:37
#, perl-format
msgid "Available %s"
msgstr "Tilgængelige %s"
-#: contrib/admin/media/js/SelectFilter2.js:41
+#: contrib/admin/media/js/SelectFilter2.js:45
msgid "Choose all"
msgstr "Vælg alle"
-#: contrib/admin/media/js/SelectFilter2.js:46
+#: contrib/admin/media/js/SelectFilter2.js:50
msgid "Add"
msgstr "Tilføj"
-#: contrib/admin/media/js/SelectFilter2.js:48
+#: contrib/admin/media/js/SelectFilter2.js:52
msgid "Remove"
msgstr "Fjern"
-#: contrib/admin/media/js/SelectFilter2.js:53
+#: contrib/admin/media/js/SelectFilter2.js:57
#, perl-format
msgid "Chosen %s"
msgstr "Valgte %s"
-#: contrib/admin/media/js/SelectFilter2.js:54
+#: contrib/admin/media/js/SelectFilter2.js:58
msgid "Select your choice(s) and click "
msgstr "Foretag dit/dine valg og klik "
-#: contrib/admin/media/js/SelectFilter2.js:59
+#: contrib/admin/media/js/SelectFilter2.js:63
msgid "Clear all"
msgstr "Fravælg alle"
+#: contrib/admin/media/js/actions.js:18
+#: contrib/admin/media/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(sel)s af %(cnt)s valgt"
+msgstr[1] "%(sel)s af %(cnt)s valgt"
+
+#: contrib/admin/media/js/actions.js:109
+#: contrib/admin/media/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Du har ugemte ændringer af et eller flere redigerbare felter. Hvis du "
+"udfører en handling fra drop-down-menuen, vil du miste disse ændringer."
+
+#: contrib/admin/media/js/actions.js:121
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Du har valgt en handling, men du har ikke gemt dine ændringer til et eller "
+"flere felter. Klik venligst OK for at gemme og vælg dernæst handlingen igen."
+
+#: contrib/admin/media/js/actions.js:123
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Du har valgt en handling, og du har ikke udført nogen ændringer på felter. "
+"Det, du søger er formentlig Udfør-knappen i stedet for Gem-knappen."
+
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
msgid ""
@@ -57,62 +93,63 @@ msgstr ""
msgid "S M T W T F S"
msgstr "S M T O T F L"
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Søndag Mandag Tirsdag Onsdag Torsdag Fredag Lørdag"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
+#: contrib/admin/media/js/collapse.min.js:1
msgid "Show"
msgstr "Vis"
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+#: contrib/admin/media/js/collapse.js:16
+#: contrib/admin/media/js/collapse.min.js:1
msgid "Hide"
msgstr "Skjul"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Søndag Mandag Tirsdag Onsdag Torsdag Fredag Lørdag"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:49
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Now"
msgstr "Nu"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:53
msgid "Clock"
msgstr "Ur"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
msgid "Choose a time"
msgstr "Vælg et tidspunkt"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
msgid "Midnight"
msgstr "Midnat"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86
msgid "6 a.m."
msgstr "6 morgen"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
msgid "Noon"
msgstr "Middag"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:188
msgid "Cancel"
msgstr "Annuller"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:182
msgid "Today"
msgstr "I dag"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:137
msgid "Calendar"
msgstr "Kalender"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
msgid "Yesterday"
msgstr "I går"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
msgid "Tomorrow"
msgstr "I morgen"
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
BIN django/conf/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
View
1,970 django/conf/locale/de/LC_MESSAGES/django.po
1,361 additions, 609 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN django/conf/locale/de/LC_MESSAGES/djangojs.mo
Binary file not shown.
View
99 django/conf/locale/de/LC_MESSAGES/djangojs.po
@@ -7,44 +7,84 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 14:38+0200\n"
+"POT-Creation-Date: 2010-05-05 00:38+0200\n"
"PO-Revision-Date: 2008-06-23 21:02+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: contrib/admin/media/js/SelectFilter2.js:33
+#: contrib/admin/media/js/SelectFilter2.js:37
#, perl-format
msgid "Available %s"
msgstr "Verfügbare %s"
-#: contrib/admin/media/js/SelectFilter2.js:41
+#: contrib/admin/media/js/SelectFilter2.js:45
msgid "Choose all"
msgstr "Alles auswählen"
-#: contrib/admin/media/js/SelectFilter2.js:46
+#: contrib/admin/media/js/SelectFilter2.js:50
msgid "Add"
msgstr "Hinzufügen"
-#: contrib/admin/media/js/SelectFilter2.js:48
+#: contrib/admin/media/js/SelectFilter2.js:52
msgid "Remove"
msgstr "Entfernen"
-#: contrib/admin/media/js/SelectFilter2.js:53
+#: contrib/admin/media/js/SelectFilter2.js:57
#, perl-format
msgid "Chosen %s"
msgstr "Ausgewählte %s"
-#: contrib/admin/media/js/SelectFilter2.js:54
+#: contrib/admin/media/js/SelectFilter2.js:58
msgid "Select your choice(s) and click "
msgstr "Auswahl treffen und Klick auf"
-#: contrib/admin/media/js/SelectFilter2.js:59
+#: contrib/admin/media/js/SelectFilter2.js:63
msgid "Clear all"
msgstr "Alles abwählen"
+#: contrib/admin/media/js/actions.js:18
+#: contrib/admin/media/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(sel)s von %(cnt)s ausgewählt"
+msgstr[1] "%(sel)s von %(cnt)s ausgewählt"
+
+#: contrib/admin/media/js/actions.js:109
+#: contrib/admin/media/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Sie haben Änderungen an editierbaren Feldern vorgenommen und nicht "
+"gespeichert. Wollen Sie die Aktion trotzdem ausführen und Ihre Änderungen "
+"verwerfen?"
+
+#: contrib/admin/media/js/actions.js:121
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Sie haben eine Aktion ausgewählt, aber ihre vorgenommenen Änderungen nicht "
+"gespeichert. Klicken Sie OK, um dennoch zu speichern. Danach müssen Sie die "
+"Aktion erneut ausführen."
+
+#: contrib/admin/media/js/actions.js:123
+#: contrib/admin/media/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Sie haben eine Aktion ausgewählt, aber keine Änderungen an editierbaren "
+"Feldern vorgenommen. Sie wollten wahrscheinlich auf 'Ausführen' und nicht "
+"auf 'Speichern' klicken."
+
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
msgid ""
@@ -58,62 +98,63 @@ msgstr ""
msgid "S M T W T F S"
msgstr "S M D M D F S"
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
+#: contrib/admin/media/js/collapse.min.js:1