Code

Ticket #6693: datetime-i18n.2.diff

File datetime-i18n.2.diff, 30.7 KB (added by Petr Marhoun <petr.marhoun@…>, 6 years ago)
Line 
1=== modified file 'django/conf/global_settings.py'
2--- django/conf/global_settings.py      2008-02-29 18:38:44 +0000
3+++ django/conf/global_settings.py      2008-03-01 22:49:13 +0000
4@@ -226,25 +226,25 @@
5 
6 # Default formatting for date objects. See all available format strings here:
7 # http://www.djangoproject.com/documentation/templates/#now
8-DATE_FORMAT = 'N j, Y'
9+DATE_FORMAT = gettext_noop('N j, Y')
10 
11 # Default formatting for datetime objects. See all available format strings here:
12 # http://www.djangoproject.com/documentation/templates/#now
13-DATETIME_FORMAT = 'N j, Y, P'
14+DATETIME_FORMAT = gettext_noop('N j, Y, P')
15 
16 # Default formatting for time objects. See all available format strings here:
17 # http://www.djangoproject.com/documentation/templates/#now
18-TIME_FORMAT = 'P'
19+TIME_FORMAT = gettext_noop('P')
20 
21 # Default formatting for date objects when only the year and month are relevant.
22 # See all available format strings here:
23 # http://www.djangoproject.com/documentation/templates/#now
24-YEAR_MONTH_FORMAT = 'F Y'
25+YEAR_MONTH_FORMAT = gettext_noop('F Y')
26 
27 # Default formatting for date objects when only the month and day are relevant.
28 # See all available format strings here:
29 # http://www.djangoproject.com/documentation/templates/#now
30-MONTH_DAY_FORMAT = 'F j'
31+MONTH_DAY_FORMAT = gettext_noop('F j')
32 
33 # Do you want to manage transactions manually?
34 # Hint: you really don't!
35
36=== modified file 'django/conf/locale/ar/LC_MESSAGES/django.po'
37--- django/conf/locale/ar/LC_MESSAGES/django.po 2006-07-10 14:14:00 +0000
38+++ django/conf/locale/ar/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
39@@ -1987,3 +1987,18 @@
40 msgid "MONTH_DAY_FORMAT"
41 msgstr ""
42 
43+
44+msgid "N j, Y"
45+msgstr "N j, Y"
46+
47+msgid "N j, Y, P"
48+msgstr "N j, Y, P"
49+
50+msgid "P"
51+msgstr "P"
52+
53+msgid "F Y"
54+msgstr "F Y"
55+
56+msgid "F j"
57+msgstr "F j"
58
59=== modified file 'django/conf/locale/bg/LC_MESSAGES/django.po'
60--- django/conf/locale/bg/LC_MESSAGES/django.po 2007-05-14 08:12:03 +0000
61+++ django/conf/locale/bg/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
62@@ -2668,3 +2668,18 @@
63 "starts with \"%(start)s\".)"
64 msgstr "Атрибутът \"%(attr)s\" на ред %(line)s има невалидна стойност. (Редът започва с \"%(start)s\".)"
65 
66+
67+msgid "N j, Y"
68+msgstr "j N, Y"
69+
70+msgid "N j, Y, P"
71+msgstr "j N, Y, P"
72+
73+msgid "P"
74+msgstr "P"
75+
76+msgid "F Y"
77+msgstr "F Y"
78+
79+msgid "F j"
80+msgstr "j F"
81
82=== modified file 'django/conf/locale/bn/LC_MESSAGES/django.po'
83--- django/conf/locale/bn/LC_MESSAGES/django.po 2006-05-16 08:07:45 +0000
84+++ django/conf/locale/bn/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
85@@ -1991,3 +1991,18 @@
86 #, fuzzy
87 #~ msgid "count"
88 #~ msgstr "অভ্যন্তরস্থ বস্তু"
89+
90+msgid "N j, Y"
91+msgstr "N j, Y"
92+
93+msgid "N j, Y, P"
94+msgstr "N j, Y, P"
95+
96+msgid "P"
97+msgstr "P"
98+
99+msgid "F Y"
100+msgstr "F Y"
101+
102+msgid "F j"
103+msgstr "F j"
104
105=== modified file 'django/conf/locale/ca/LC_MESSAGES/django.po'
106--- django/conf/locale/ca/LC_MESSAGES/django.po 2008-02-03 04:18:40 +0000
107+++ django/conf/locale/ca/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
108@@ -4234,3 +4234,18 @@
109 #~ "Introdueixi un codi postal. És necessari un espai entre les dues parts "
110 #~ "del codi postal."
111 
112+
113+msgid "N j, Y"
114+msgstr "F j, Y"
115+
116+msgid "N j, Y, P"
117+msgstr "F j, Y, H:i"
118+
119+msgid "P"
120+msgstr "H:i"
121+
122+msgid "F Y"
123+msgstr "j de/d' F del Y"
124+
125+msgid "F j"
126+msgstr "j de/d' F del Y"
127
128=== modified file 'django/conf/locale/cs/LC_MESSAGES/django.po'
129--- django/conf/locale/cs/LC_MESSAGES/django.po 2007-06-24 11:48:41 +0000
130+++ django/conf/locale/cs/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
131@@ -3032,3 +3032,18 @@
132 #: utils/translation/trans_real.py:377
133 msgid "MONTH_DAY_FORMAT"
134 msgstr "j. F"
135+
136+msgid "N j, Y"
137+msgstr "j. n. Y"
138+
139+msgid "N j, Y, P"
140+msgstr "j. n. Y, H:i"
141+
142+msgid "P"
143+msgstr "H:i"
144+
145+msgid "F Y"
146+msgstr "F Y"
147+
148+msgid "F j"
149+msgstr "j. F"
150
151=== modified file 'django/conf/locale/cy/LC_MESSAGES/django.po'
152--- django/conf/locale/cy/LC_MESSAGES/django.po 2008-02-05 23:56:08 +0000
153+++ django/conf/locale/cy/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
154@@ -1989,3 +1989,18 @@
155 #, fuzzy
156 #~ msgid "count"
157 #~ msgstr "cynnwys"
158+
159+msgid "N j, Y"
160+msgstr "N j, Y"
161+
162+msgid "N j, Y, P"
163+msgstr "N j, Y, P"
164+
165+msgid "P"
166+msgstr "P"
167+
168+msgid "F Y"
169+msgstr "F Y"
170+
171+msgid "F j"
172+msgstr "F j"
173
174=== modified file 'django/conf/locale/da/LC_MESSAGES/django.po'
175--- django/conf/locale/da/LC_MESSAGES/django.po 2006-09-25 13:48:41 +0000
176+++ django/conf/locale/da/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
177@@ -1925,3 +1925,18 @@
178 msgid "yes,no,maybe"
179 msgstr "ja,nej,måske"
180 
181+
182+msgid "N j, Y"
183+msgstr "N j, Y"
184+
185+msgid "N j, Y, P"
186+msgstr "N j, Y, P"
187+
188+msgid "P"
189+msgstr "P"
190+
191+msgid "F Y"
192+msgstr "F Y"
193+
194+msgid "F j"
195+msgstr "F j"
196
197=== modified file 'django/conf/locale/de/LC_MESSAGES/django.po'
198--- django/conf/locale/de/LC_MESSAGES/django.po 2008-02-03 04:26:00 +0000
199+++ django/conf/locale/de/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
200@@ -2836,3 +2836,18 @@
201 #, python-format
202 msgid "The %(verbose_name)s was deleted."
203 msgstr "%(verbose_name)s wurde gelöscht"
204+
205+msgid "N j, Y"
206+msgstr "j. N Y"
207+
208+msgid "N j, Y, P"
209+msgstr "j. N Y, H:i"
210+
211+msgid "P"
212+msgstr "H:i"
213+
214+msgid "F Y"
215+msgstr "F Y"
216+
217+msgid "F j"
218+msgstr "j. F"
219
220=== modified file 'django/conf/locale/el/LC_MESSAGES/django.po'
221--- django/conf/locale/el/LC_MESSAGES/django.po 2007-09-13 19:28:24 +0000
222+++ django/conf/locale/el/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
223@@ -2766,3 +2766,18 @@
224 "starts with \"%(start)s\".)"
225 msgstr "χαρακτηριστικό ενεργό τιμή Γραμμή με έναρξη"
226 
227+
228+msgid "N j, Y"
229+msgstr "j N Y"
230+
231+msgid "N j, Y, P"
232+msgstr "j N Y, P"
233+
234+msgid "P"
235+msgstr "P"
236+
237+msgid "F Y"
238+msgstr "F Y"
239+
240+msgid "F j"
241+msgstr "j F"
242
243=== modified file 'django/conf/locale/en/LC_MESSAGES/django.po'
244--- django/conf/locale/en/LC_MESSAGES/django.po 2007-11-29 16:59:35 +0000
245+++ django/conf/locale/en/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
246@@ -3766,3 +3766,18 @@
247 #, python-format
248 msgid "The %(verbose_name)s was deleted."
249 msgstr ""
250+
251+msgid "N j, Y"
252+msgstr "N j, Y"
253+
254+msgid "N j, Y, P"
255+msgstr "N j, Y, P"
256+
257+msgid "P"
258+msgstr "P"
259+
260+msgid "F Y"
261+msgstr "F Y"
262+
263+msgid "F j"
264+msgstr "F j"
265
266=== modified file 'django/conf/locale/es/LC_MESSAGES/django.po'
267--- django/conf/locale/es/LC_MESSAGES/django.po 2007-10-27 04:26:44 +0000
268+++ django/conf/locale/es/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
269@@ -3767,3 +3767,18 @@
270 msgid "The %(verbose_name)s was deleted."
271 msgstr "El %(verbose_name)s ha sido eliminado."
272 
273+
274+msgid "N j, Y"
275+msgstr "j N Y"
276+
277+msgid "N j, Y, P"
278+msgstr "j N Y P"
279+
280+msgid "P"
281+msgstr "P"
282+
283+msgid "F Y"
284+msgstr "F Y"
285+
286+msgid "F j"
287+msgstr "j \\de F"
288
289=== modified file 'django/conf/locale/es_AR/LC_MESSAGES/django.po'
290--- django/conf/locale/es_AR/LC_MESSAGES/django.po      2008-02-03 04:36:49 +0000
291+++ django/conf/locale/es_AR/LC_MESSAGES/django.po      2008-03-01 22:49:37 +0000
292@@ -4446,3 +4446,18 @@
293 
294 #~ msgid "packages"
295 #~ msgstr "paquetes"
296+
297+msgid "N j, Y"
298+msgstr "j N Y"
299+
300+msgid "N j, Y, P"
301+msgstr "j N Y P"
302+
303+msgid "P"
304+msgstr "P"
305+
306+msgid "F Y"
307+msgstr "F Y"
308+
309+msgid "F j"
310+msgstr "j \\de F"
311
312=== modified file 'django/conf/locale/eu/LC_MESSAGES/django.po'
313--- django/conf/locale/eu/LC_MESSAGES/django.po 2008-02-15 11:29:27 +0000
314+++ django/conf/locale/eu/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
315@@ -4246,3 +4246,18 @@
316 msgid "The %(verbose_name)s was deleted."
317 msgstr "%(verbose_name)s ezabatua izan da."
318 
319+
320+msgid "N j, Y"
321+msgstr "N j, Y"
322+
323+msgid "N j, Y, P"
324+msgstr "N j, Y, P"
325+
326+msgid "P"
327+msgstr "P"
328+
329+msgid "F Y"
330+msgstr "F Y"
331+
332+msgid "F j"
333+msgstr "F j"
334
335=== modified file 'django/conf/locale/fa/LC_MESSAGES/django.po'
336--- django/conf/locale/fa/LC_MESSAGES/django.po 2008-02-03 04:29:38 +0000
337+++ django/conf/locale/fa/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
338@@ -4234,3 +4234,18 @@
339 
340 #~ msgid "%d milliseconds"
341 #~ msgstr "%d میلی‌ثانیه"
342+
343+msgid "N j, Y"
344+msgstr "N j, Y"
345+
346+msgid "N j, Y, P"
347+msgstr "N j, Y, P"
348+
349+msgid "P"
350+msgstr "P"
351+
352+msgid "F Y"
353+msgstr "F Y"
354+
355+msgid "F j"
356+msgstr "F j"
357
358=== modified file 'django/conf/locale/fi/LC_MESSAGES/django.po'
359--- django/conf/locale/fi/LC_MESSAGES/django.po 2007-09-15 04:54:17 +0000
360+++ django/conf/locale/fi/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
361@@ -3577,3 +3577,18 @@
362 #: oldforms/__init__.py:764
363 msgid "Enter a whole number between 0 and 32,767."
364 msgstr "Syötä kokonaisluku väliltä 0 ja 32767."
365+
366+msgid "N j, Y"
367+msgstr "j.n.Y"
368+
369+msgid "N j, Y, P"
370+msgstr "j.n.Y G:i"
371+
372+msgid "P"
373+msgstr "G:i"
374+
375+msgid "F Y"
376+msgstr "N Y"
377+
378+msgid "F j"
379+msgstr "N j, Y"
380
381=== modified file 'django/conf/locale/fr/LC_MESSAGES/django.po'
382--- django/conf/locale/fr/LC_MESSAGES/django.po 2007-08-11 05:47:44 +0000
383+++ django/conf/locale/fr/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
384@@ -3083,3 +3083,18 @@
385 
386 #~ msgid "Messages"
387 #~ msgstr "Messages"
388+
389+msgid "N j, Y"
390+msgstr "j F Y"
391+
392+msgid "N j, Y, P"
393+msgstr "j F Y, G:i"
394+
395+msgid "P"
396+msgstr "G:i:s"
397+
398+msgid "F Y"
399+msgstr "F Y"
400+
401+msgid "F j"
402+msgstr "j F"
403
404=== modified file 'django/conf/locale/ga/LC_MESSAGES/django.po'
405--- django/conf/locale/ga/LC_MESSAGES/django.po 2008-02-03 04:22:11 +0000
406+++ django/conf/locale/ga/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
407@@ -4202,3 +4202,18 @@
408 msgid "The %(verbose_name)s was deleted."
409 msgstr ""
410 
411+
412+msgid "N j, Y"
413+msgstr "N j, Y"
414+
415+msgid "N j, Y, P"
416+msgstr "N j, Y, P"
417+
418+msgid "P"
419+msgstr "P"
420+
421+msgid "F Y"
422+msgstr "F Y"
423+
424+msgid "F j"
425+msgstr "F j"
426
427=== modified file 'django/conf/locale/gl/LC_MESSAGES/django.po'
428--- django/conf/locale/gl/LC_MESSAGES/django.po 2007-06-24 11:56:42 +0000
429+++ django/conf/locale/gl/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
430@@ -3026,3 +3026,18 @@
431 
432 #~ msgid "packages"
433 #~ msgstr "paquetes"
434+
435+msgid "N j, Y"
436+msgstr "d-m-Y"
437+
438+msgid "N j, Y, P"
439+msgstr "d-m-Y H:i"
440+
441+msgid "P"
442+msgstr "H:i"
443+
444+msgid "F Y"
445+msgstr "m Y"
446+
447+msgid "F j"
448+msgstr "d m"
449
450=== modified file 'django/conf/locale/he/LC_MESSAGES/django.po'
451--- django/conf/locale/he/LC_MESSAGES/django.po 2007-11-11 04:39:35 +0000
452+++ django/conf/locale/he/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
453@@ -3872,3 +3872,18 @@
454 msgid "The %(verbose_name)s was deleted."
455 msgstr "ה-%(verbose_name)s נמחק."
456 
457+
458+msgid "N j, Y"
459+msgstr "d.m.Y"
460+
461+msgid "N j, Y, P"
462+msgstr "d.m.y H:i:s"
463+
464+msgid "P"
465+msgstr "H:i:s"
466+
467+msgid "F Y"
468+msgstr "d.m.Y"
469+
470+msgid "F j"
471+msgstr "d.m.Y"
472
473=== modified file 'django/conf/locale/hr/LC_MESSAGES/django.po'
474--- django/conf/locale/hr/LC_MESSAGES/django.po 2008-01-09 11:42:58 +0000
475+++ django/conf/locale/hr/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
476@@ -4344,3 +4344,18 @@
477 #, python-format
478 msgid "The %(verbose_name)s was deleted."
479 msgstr "%(verbose_name)s je izbrisano"
480+
481+msgid "N j, Y"
482+msgstr "N j, Y"
483+
484+msgid "N j, Y, P"
485+msgstr "N j, Y, P"
486+
487+msgid "P"
488+msgstr "P"
489+
490+msgid "F Y"
491+msgstr "F Y"
492+
493+msgid "F j"
494+msgstr "F j"
495
496=== modified file 'django/conf/locale/hu/LC_MESSAGES/django.po'
497--- django/conf/locale/hu/LC_MESSAGES/django.po 2007-09-13 19:39:10 +0000
498+++ django/conf/locale/hu/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
499@@ -3495,3 +3495,18 @@
500 msgid "%.1f GB"
501 msgstr "%.1f GB"
502 
503+
504+msgid "N j, Y"
505+msgstr "Y. F j."
506+
507+msgid "N j, Y, P"
508+msgstr "Y. F j., H:i"
509+
510+msgid "P"
511+msgstr "H:i"
512+
513+msgid "F Y"
514+msgstr "Y. F j."
515+
516+msgid "F j"
517+msgstr "Y. F j."
518
519=== modified file 'django/conf/locale/is/LC_MESSAGES/django.po'
520--- django/conf/locale/is/LC_MESSAGES/django.po 2008-02-03 04:16:02 +0000
521+++ django/conf/locale/is/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
522@@ -4264,3 +4264,18 @@
523 #~ msgid "count"
524 #~ msgstr "innihald"
525 
526+
527+msgid "N j, Y"
528+msgstr "j. N Y"
529+
530+msgid "N j, Y, P"
531+msgstr "j. N Y, H:i"
532+
533+msgid "P"
534+msgstr "H:i"
535+
536+msgid "F Y"
537+msgstr "j. N Y"
538+
539+msgid "F j"
540+msgstr "j. N Y"
541
542=== modified file 'django/conf/locale/it/LC_MESSAGES/django.po'
543--- django/conf/locale/it/LC_MESSAGES/django.po 2008-02-03 04:10:01 +0000
544+++ django/conf/locale/it/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
545@@ -4355,3 +4355,18 @@
546 msgid "The %(verbose_name)s was deleted."
547 msgstr "%(verbose_name)s è stato cancellato."
548 
549+
550+msgid "N j, Y"
551+msgstr "j F Y"
552+
553+msgid "N j, Y, P"
554+msgstr "j F Y, H:i"
555+
556+msgid "P"
557+msgstr "H:i"
558+
559+msgid "F Y"
560+msgstr "Y F"
561+
562+msgid "F j"
563+msgstr "F j"
564
565=== modified file 'django/conf/locale/ja/LC_MESSAGES/django.po'
566--- django/conf/locale/ja/LC_MESSAGES/django.po 2008-01-09 11:42:28 +0000
567+++ django/conf/locale/ja/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
568@@ -4321,3 +4321,18 @@
569 #, python-format
570 msgid "The %(verbose_name)s was deleted."
571 msgstr " %(verbose_name)s を削除しました。"
572+
573+msgid "N j, Y"
574+msgstr "Y/m/d"
575+
576+msgid "N j, Y, P"
577+msgstr "Y/m/d H:i"
578+
579+msgid "P"
580+msgstr "H:i"
581+
582+msgid "F Y"
583+msgstr "Y/m/d"
584+
585+msgid "F j"
586+msgstr "m/d"
587
588=== modified file 'django/conf/locale/ka/LC_MESSAGES/django.po'
589--- django/conf/locale/ka/LC_MESSAGES/django.po 2008-02-29 16:45:36 +0000
590+++ django/conf/locale/ka/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
591@@ -4511,3 +4511,18 @@
592 #, python-format
593 msgid "The %(verbose_name)s was deleted."
594 msgstr "%(verbose_name)s წაიშალა."
595+
596+msgid "N j, Y"
597+msgstr "d.m.Y"
598+
599+msgid "N j, Y, P"
600+msgstr "d.m.Y H:i"
601+
602+msgid "P"
603+msgstr "H:i"
604+
605+msgid "F Y"
606+msgstr "d.m.Y"
607+
608+msgid "F j"
609+msgstr "d.m.Y"
610
611=== modified file 'django/conf/locale/km/LC_MESSAGES/django.po'
612--- django/conf/locale/km/LC_MESSAGES/django.po 2007-09-13 19:51:26 +0000
613+++ django/conf/locale/km/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
614@@ -2506,3 +2506,18 @@
615 msgid "End date"
616 msgstr "បញ្ជប់នៅ"
617 
618+
619+msgid "N j, Y"
620+msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y"
621+
622+msgid "N j, Y, P"
623+msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y ម៉ោង P"
624+
625+msgid "P"
626+msgstr "ម៉ោង P"
627+
628+msgid "F Y"
629+msgstr "ខែ F ឆ្នាំ Y"
630+
631+msgid "F j"
632+msgstr "ថ្ងៃទី​​ j ខែ F"
633
634=== modified file 'django/conf/locale/kn/LC_MESSAGES/django.po'
635--- django/conf/locale/kn/LC_MESSAGES/django.po 2008-02-05 23:56:08 +0000
636+++ django/conf/locale/kn/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
637@@ -2534,3 +2534,18 @@
638 msgid "yes,no,maybe"
639 msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
640 
641+
642+msgid "N j, Y"
643+msgstr "N j, Y"
644+
645+msgid "N j, Y, P"
646+msgstr "N j, Y, P"
647+
648+msgid "P"
649+msgstr "P"
650+
651+msgid "F Y"
652+msgstr "F Y"
653+
654+msgid "F j"
655+msgstr "F j"
656
657=== modified file 'django/conf/locale/ko/LC_MESSAGES/django.po'
658--- django/conf/locale/ko/LC_MESSAGES/django.po 2007-09-13 19:27:50 +0000
659+++ django/conf/locale/ko/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
660@@ -2795,3 +2795,18 @@
661 #: oldforms/__init__.py:750
662 msgid "Enter a whole number between 0 and 32,767."
663 msgstr "0 ~ 32,767 사이의 정수를 입력하세요."
664+
665+msgid "N j, Y"
666+msgstr "N j, Y"
667+
668+msgid "N j, Y, P"
669+msgstr "N j, Y, P"
670+
671+msgid "P"
672+msgstr "P"
673+
674+msgid "F Y"
675+msgstr "F Y"
676+
677+msgid "F j"
678+msgstr "F j"
679
680=== modified file 'django/conf/locale/lv/LC_MESSAGES/django.po'
681--- django/conf/locale/lv/LC_MESSAGES/django.po 2007-05-09 13:41:48 +0000
682+++ django/conf/locale/lv/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
683@@ -2863,3 +2863,18 @@
684 msgid "%.1f GB"
685 msgstr "%.1f GB"
686 
687+
688+msgid "N j, Y"
689+msgstr "N j, Y"
690+
691+msgid "N j, Y, P"
692+msgstr "N j, Y, P"
693+
694+msgid "P"
695+msgstr "P"
696+
697+msgid "F Y"
698+msgstr "F Y"
699+
700+msgid "F j"
701+msgstr "F j"
702
703=== modified file 'django/conf/locale/mk/LC_MESSAGES/django.po'
704--- django/conf/locale/mk/LC_MESSAGES/django.po 2007-04-09 13:18:23 +0000
705+++ django/conf/locale/mk/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
706@@ -2753,3 +2753,18 @@
707 msgid "Select a valid choice. %s is not one of the available choices."
708 msgstr "Внесете правилно. %s не е еден од достапните вредности."
709 
710+
711+msgid "N j, Y"
712+msgstr "j M Y"
713+
714+msgid "N j, Y, P"
715+msgstr "j M Y, P"
716+
717+msgid "P"
718+msgstr "P"
719+
720+msgid "F Y"
721+msgstr "F Y"
722+
723+msgid "F j"
724+msgstr "F j"
725
726=== modified file 'django/conf/locale/nl/LC_MESSAGES/django.po'
727--- django/conf/locale/nl/LC_MESSAGES/django.po 2008-02-29 16:46:04 +0000
728+++ django/conf/locale/nl/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
729@@ -4240,3 +4240,18 @@
730 #~ msgid "Use '[algo]$[salt]$[hexdigest]'"
731 #~ msgstr "Gebruik '[algo]$[salt]$[hexdigest]'"
732 
733+
734+msgid "N j, Y"
735+msgstr "j-n-Y"
736+
737+msgid "N j, Y, P"
738+msgstr "j-n-Y H:i"
739+
740+msgid "P"
741+msgstr "H:i"
742+
743+msgid "F Y"
744+msgstr "F Y"
745+
746+msgid "F j"
747+msgstr "j F"
748
749=== modified file 'django/conf/locale/no/LC_MESSAGES/django.po'
750--- django/conf/locale/no/LC_MESSAGES/django.po 2007-09-13 19:52:26 +0000
751+++ django/conf/locale/no/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
752@@ -2585,3 +2585,18 @@
753 msgid "This URL appears to be a broken link."
754 msgstr "Denne URL'en fører til en side som ikke eksisterer."
755 
756+
757+msgid "N j, Y"
758+msgstr "j. M Y"
759+
760+msgid "N j, Y, P"
761+msgstr "h:i, j. M Y"
762+
763+msgid "P"
764+msgstr "h:i"
765+
766+msgid "F Y"
767+msgstr "Y M"
768+
769+msgid "F j"
770+msgstr "j. M"
771
772=== modified file 'django/conf/locale/pl/LC_MESSAGES/django.po'
773--- django/conf/locale/pl/LC_MESSAGES/django.po 2008-02-29 20:23:48 +0000
774+++ django/conf/locale/pl/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
775@@ -4405,3 +4405,18 @@
776 
777 #~ msgid "%d milliseconds"
778 #~ msgstr "%d milisekund"
779+
780+msgid "N j, Y"
781+msgstr "Y-m-d"
782+
783+msgid "N j, Y, P"
784+msgstr "Y-m-d H:i:s"
785+
786+msgid "P"
787+msgstr "H:i:s"
788+
789+msgid "F Y"
790+msgstr "Y-m"
791+
792+msgid "F j"
793+msgstr "m-d"
794
795=== modified file 'django/conf/locale/pt/LC_MESSAGES/django.po'
796--- django/conf/locale/pt/LC_MESSAGES/django.po 2008-02-05 23:56:08 +0000
797+++ django/conf/locale/pt/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
798@@ -2126,3 +2126,18 @@
799 #: template/defaultfilters.py:401
800 msgid "yes,no,maybe"
801 msgstr "sim,não,talvez"
802+
803+msgid "N j, Y"
804+msgstr "N j, Y"
805+
806+msgid "N j, Y, P"
807+msgstr "N j, Y, P"
808+
809+msgid "P"
810+msgstr "P"
811+
812+msgid "F Y"
813+msgstr "F Y"
814+
815+msgid "F j"
816+msgstr "F j"
817
818=== modified file 'django/conf/locale/pt_BR/LC_MESSAGES/django.po'
819--- django/conf/locale/pt_BR/LC_MESSAGES/django.po      2007-04-05 01:55:55 +0000
820+++ django/conf/locale/pt_BR/LC_MESSAGES/django.po      2008-03-01 22:49:37 +0000
821@@ -2696,3 +2696,18 @@
822 #, fuzzy
823 #~ msgid "count"
824 #~ msgstr "contagem"
825+
826+msgid "N j, Y"
827+msgstr "N j, Y"
828+
829+msgid "N j, Y, P"
830+msgstr "N j, Y, P"
831+
832+msgid "P"
833+msgstr "P"
834+
835+msgid "F Y"
836+msgstr "F Y"
837+
838+msgid "F j"
839+msgstr "F j"
840
841=== modified file 'django/conf/locale/ro/LC_MESSAGES/django.po'
842--- django/conf/locale/ro/LC_MESSAGES/django.po 2007-06-28 06:56:00 +0000
843+++ django/conf/locale/ro/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
844@@ -1991,3 +1991,18 @@
845 #, fuzzy
846 #~ msgid "count"
847 #~ msgstr "conţinut"
848+
849+msgid "N j, Y"
850+msgstr "N j, Y"
851+
852+msgid "N j, Y, P"
853+msgstr "N j, Y, P"
854+
855+msgid "P"
856+msgstr "P"
857+
858+msgid "F Y"
859+msgstr "F Y"
860+
861+msgid "F j"
862+msgstr "F j"
863
864=== modified file 'django/conf/locale/ru/LC_MESSAGES/django.po'
865--- django/conf/locale/ru/LC_MESSAGES/django.po 2007-05-19 17:57:43 +0000
866+++ django/conf/locale/ru/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
867@@ -3023,3 +3023,18 @@
868 
869 #~ msgid "Use '[algo]$[salt]$[hexdigest]'"
870 #~ msgstr "Используйте '[algo]$[salt]$[hexdigest]'"
871+
872+msgid "N j, Y"
873+msgstr "d.m.Y"
874+
875+msgid "N j, Y, P"
876+msgstr "d.m.Y H:i"
877+
878+msgid "P"
879+msgstr "H:i"
880+
881+msgid "F Y"
882+msgstr "d.m.Y"
883+
884+msgid "F j"
885+msgstr "d.m.Y"
886
887=== modified file 'django/conf/locale/sk/LC_MESSAGES/django.po'
888--- django/conf/locale/sk/LC_MESSAGES/django.po 2007-08-11 06:54:58 +0000
889+++ django/conf/locale/sk/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
890@@ -3383,3 +3383,18 @@
891 
892 #~ msgid "AnonymousUser"
893 #~ msgstr "Neregistrovaný užívateľ"
894+
895+msgid "N j, Y"
896+msgstr "N j, Y"
897+
898+msgid "N j, Y, P"
899+msgstr "N j, Y, P"
900+
901+msgid "P"
902+msgstr "P"
903+
904+msgid "F Y"
905+msgstr "F Y"
906+
907+msgid "F j"
908+msgstr "F j"
909
910=== modified file 'django/conf/locale/sl/LC_MESSAGES/django.po'
911--- django/conf/locale/sl/LC_MESSAGES/django.po 2007-07-06 08:35:25 +0000
912+++ django/conf/locale/sl/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
913@@ -2965,3 +2965,18 @@
914 #~ msgid "Slovene"
915 #~ msgstr "Slovensko"
916 
917+
918+msgid "N j, Y"
919+msgstr "N j, Y"
920+
921+msgid "N j, Y, P"
922+msgstr "N j, Y, P"
923+
924+msgid "P"
925+msgstr "P"
926+
927+msgid "F Y"
928+msgstr "F Y"
929+
930+msgid "F j"
931+msgstr "F j"
932
933=== modified file 'django/conf/locale/sr/LC_MESSAGES/django.po'
934--- django/conf/locale/sr/LC_MESSAGES/django.po 2007-02-26 08:26:58 +0000
935+++ django/conf/locale/sr/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
936@@ -1914,3 +1914,18 @@
937 #~ msgid "count"
938 #~ msgstr "sadržaj"
939 
940+
941+msgid "N j, Y"
942+msgstr "D, d.m.Y."
943+
944+msgid "N j, Y, P"
945+msgstr "d.m.Y. H:i:s"
946+
947+msgid "P"
948+msgstr "H:i:s"
949+
950+msgid "F Y"
951+msgstr "F Y"
952+
953+msgid "F j"
954+msgstr "F j"
955
956=== modified file 'django/conf/locale/sv/LC_MESSAGES/django.po'
957--- django/conf/locale/sv/LC_MESSAGES/django.po 2008-02-03 04:32:32 +0000
958+++ django/conf/locale/sv/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
959@@ -4432,3 +4432,18 @@
960 #, python-format
961 msgid "The %(verbose_name)s was deleted."
962 msgstr "%(verbose_name)s togs bort."
963+
964+msgid "N j, Y"
965+msgstr "Y-m-d"
966+
967+msgid "N j, Y, P"
968+msgstr "Y-m-d H:i"
969+
970+msgid "P"
971+msgstr "H:i"
972+
973+msgid "F Y"
974+msgstr "F Y"
975+
976+msgid "F j"
977+msgstr "j F"
978
979=== modified file 'django/conf/locale/ta/LC_MESSAGES/django.po'
980--- django/conf/locale/ta/LC_MESSAGES/django.po 2007-03-20 23:50:14 +0000
981+++ django/conf/locale/ta/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
982@@ -2134,3 +2134,18 @@
983 msgid "yes,no,maybe"
984 msgstr "ஆம், இல்லை, இருக்கலாம்"
985 
986+
987+msgid "N j, Y"
988+msgstr "தேதி_முறை"
989+
990+msgid "N j, Y, P"
991+msgstr "தேதிநேரம்_முறை"
992+
993+msgid "P"
994+msgstr "நேரம்_முறை"
995+
996+msgid "F Y"
997+msgstr "வருடம்_மாதம்_முறை"
998+
999+msgid "F j"
1000+msgstr "மாதம்_நாள்_முறை"
1001
1002=== modified file 'django/conf/locale/te/LC_MESSAGES/django.po'
1003--- django/conf/locale/te/LC_MESSAGES/django.po 2007-09-14 12:39:03 +0000
1004+++ django/conf/locale/te/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
1005@@ -2107,3 +2107,18 @@
1006 msgid "yes,no,maybe"
1007 msgstr "అవును, కాదు , ఏమొ"
1008 
1009+
1010+msgid "N j, Y"
1011+msgstr "N j, Y"
1012+
1013+msgid "N j, Y, P"
1014+msgstr "N j, Y, P"
1015+
1016+msgid "P"
1017+msgstr "P"
1018+
1019+msgid "F Y"
1020+msgstr "F Y"
1021+
1022+msgid "F j"
1023+msgstr "F j"
1024
1025=== modified file 'django/conf/locale/tr/LC_MESSAGES/django.po'
1026--- django/conf/locale/tr/LC_MESSAGES/django.po 2008-01-09 11:41:35 +0000
1027+++ django/conf/locale/tr/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
1028@@ -2466,3 +2466,18 @@
1029 
1030 #~ msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
1031 #~ msgstr "<a href=\"/password_reset/\">Şifrenizi mi unuttunuz?</a>"
1032+
1033+msgid "N j, Y"
1034+msgstr "N j, Y"
1035+
1036+msgid "N j, Y, P"
1037+msgstr "N j, Y, P"
1038+
1039+msgid "P"
1040+msgstr "P"
1041+
1042+msgid "F Y"
1043+msgstr "F Y"
1044+
1045+msgid "F j"
1046+msgstr "F j"
1047
1048=== modified file 'django/conf/locale/uk/LC_MESSAGES/django.po'
1049--- django/conf/locale/uk/LC_MESSAGES/django.po 2006-05-16 08:07:45 +0000
1050+++ django/conf/locale/uk/LC_MESSAGES/django.po 2008-03-01 22:49:37 +0000
1051@@ -1968,3 +1968,18 @@
1052 
1053 #~ msgid "packages"
1054 #~ msgstr "пакунки"
1055+
1056+msgid "N j, Y"
1057+msgstr "N j, Y"
1058+
1059+msgid "N j, Y, P"
1060+msgstr "N j, Y, P"
1061+
1062+msgid "P"
1063+msgstr "P"
1064+
1065+msgid "F Y"
1066+msgstr "F Y"
1067+
1068+msgid "F j"
1069+msgstr "F j"
1070
1071=== modified file 'django/conf/locale/zh_CN/LC_MESSAGES/django.po'
1072--- django/conf/locale/zh_CN/LC_MESSAGES/django.po      2007-07-16 04:47:52 +0000
1073+++ django/conf/locale/zh_CN/LC_MESSAGES/django.po      2008-03-01 22:49:37 +0000
1074@@ -2635,3 +2635,18 @@
1075 msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
1076 msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
1077 
1078+
1079+msgid "N j, Y"
1080+msgstr "N j, Y"
1081+
1082+msgid "N j, Y, P"
1083+msgstr "N j, Y, P"
1084+
1085+msgid "P"
1086+msgstr "P"
1087+
1088+msgid "F Y"
1089+msgstr "F Y"
1090+
1091+msgid "F j"
1092+msgstr "F j"
1093
1094=== modified file 'django/conf/locale/zh_TW/LC_MESSAGES/django.po'
1095--- django/conf/locale/zh_TW/LC_MESSAGES/django.po      2007-11-11 04:38:53 +0000
1096+++ django/conf/locale/zh_TW/LC_MESSAGES/django.po      2008-03-01 22:49:37 +0000
1097@@ -2688,3 +2688,18 @@
1098 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
1099 "starts with \"%(start)s\".)"
1100 msgstr "第 \"%(line)s\" 的 \"%(attr)s\" 屬性是無效的值 (行開始於 \"%(start)s\")。"
1101+
1102+msgid "N j, Y"
1103+msgstr "N j, Y"
1104+
1105+msgid "N j, Y, P"
1106+msgstr "N j, Y, P"
1107+
1108+msgid "P"
1109+msgstr "P"
1110+
1111+msgid "F Y"
1112+msgstr "F Y"
1113+
1114+msgid "F j"
1115+msgstr "F j"
1116
1117=== modified file 'django/contrib/admin/templatetags/admin_list.py'
1118--- django/contrib/admin/templatetags/admin_list.py     2007-12-04 19:17:25 +0000
1119+++ django/contrib/admin/templatetags/admin_list.py     2008-03-01 22:49:13 +0000
1120@@ -7,7 +7,7 @@
1121 from django.utils.html import escape, conditional_escape
1122 from django.utils.text import capfirst
1123 from django.utils.safestring import mark_safe
1124-from django.utils.translation import get_date_formats, get_partial_date_formats, ugettext as _
1125+from django.utils.translation import ugettext as _
1126 from django.utils.encoding import smart_unicode, smart_str, force_unicode
1127 from django.template import Library
1128 import datetime
1129@@ -161,13 +161,12 @@
1130             # Dates and times are special: They're formatted in a certain way.
1131             elif isinstance(f, models.DateField) or isinstance(f, models.TimeField):
1132                 if field_val:
1133-                    (date_format, datetime_format, time_format) = get_date_formats()
1134                     if isinstance(f, models.DateTimeField):
1135-                        result_repr = capfirst(dateformat.format(field_val, datetime_format))
1136+                        result_repr = capfirst(dateformat.format(field_val, _(settings.DATETIME_FORMAT)))
1137                     elif isinstance(f, models.TimeField):
1138-                        result_repr = capfirst(dateformat.time_format(field_val, time_format))
1139+                        result_repr = capfirst(dateformat.time_format(field_val, _(settings.TIME_FORMAT)))
1140                     else:
1141-                        result_repr = capfirst(dateformat.format(field_val, date_format))
1142+                        result_repr = capfirst(dateformat.format(field_val, _(settings.DATE_FORMAT)))
1143                 else:
1144                     result_repr = EMPTY_CHANGELIST_VALUE
1145                 row_class = ' class="nowrap"'
1146@@ -221,7 +220,6 @@
1147         year_lookup = cl.params.get(year_field)
1148         month_lookup = cl.params.get(month_field)
1149         day_lookup = cl.params.get(day_field)
1150-        year_month_format, month_day_format = get_partial_date_formats()
1151 
1152         link = lambda d: mark_safe(cl.get_query_string(d, [field_generic]))
1153 
1154@@ -231,9 +229,9 @@
1155                 'show': True,
1156                 'back': {
1157                     'link': link({year_field: year_lookup, month_field: month_lookup}),
1158-                    'title': dateformat.format(day, year_month_format)
1159+                    'title': dateformat.format(day, _(settings.YEAR_MONTH_FORMAT))
1160                 },
1161-                'choices': [{'title': dateformat.format(day, month_day_format)}]
1162+                'choices': [{'title': dateformat.format(day, _(settings.MONTH_DAY_FORMAT))}]
1163             }
1164         elif year_lookup and month_lookup:
1165             days = cl.query_set.filter(**{year_field: year_lookup, month_field: month_lookup}).dates(field_name, 'day')
1166@@ -245,7 +243,7 @@
1167                 },
1168                 'choices': [{
1169                     'link': link({year_field: year_lookup, month_field: month_lookup, day_field: day.day}),
1170-                    'title': dateformat.format(day, month_day_format)
1171+                    'title': dateformat.format(day, _(settings.MONTH_DAY_FORMAT))
1172                 } for day in days]
1173             }
1174         elif year_lookup:
1175@@ -258,7 +256,7 @@
1176                 },
1177                 'choices': [{
1178                     'link': link({year_field: year_lookup, month_field: month.month}),
1179-                    'title': dateformat.format(month, year_month_format)
1180+                    'title': dateformat.format(month, _(settings.YEAR_MONTH_FORMAT))
1181                 } for month in months]
1182             }
1183         else:
1184
1185=== modified file 'django/contrib/databrowse/datastructures.py'
1186--- django/contrib/databrowse/datastructures.py 2008-02-03 01:52:45 +0000
1187+++ django/contrib/databrowse/datastructures.py 2008-03-01 22:49:13 +0000
1188@@ -3,10 +3,11 @@
1189 convenience functionality and permalink functions for the databrowse app.
1190 """
1191 
1192+from django.conf import settings
1193 from django.db import models
1194 from django.utils import dateformat
1195 from django.utils.text import capfirst
1196-from django.utils.translation import get_date_formats
1197+from django.utils.translation import ugettext as _
1198 from django.utils.encoding import smart_unicode, smart_str, iri_to_uri
1199 from django.utils.safestring import mark_safe
1200 from django.db.models.query import QuerySet
1201@@ -156,13 +157,12 @@
1202             objs = dict(self.field.choices).get(self.raw_value, EMPTY_VALUE)
1203         elif isinstance(self.field, models.DateField) or isinstance(self.field, models.TimeField):
1204             if self.raw_value:
1205-                date_format, datetime_format, time_format = get_date_formats()
1206                 if isinstance(self.field, models.DateTimeField):
1207-                    objs = capfirst(dateformat.format(self.raw_value, datetime_format))
1208+                    objs = capfirst(dateformat.format(self.raw_value, _(settings.DATETIME_FORMAT)))
1209                 elif isinstance(self.field, models.TimeField):
1210-                    objs = capfirst(dateformat.time_format(self.raw_value, time_format))
1211+                    objs = capfirst(dateformat.time_format(self.raw_value, _(settings.TIME_FORMAT)))
1212                 else:
1213-                    objs = capfirst(dateformat.format(self.raw_value, date_format))
1214+                    objs = capfirst(dateformat.format(self.raw_value, _(settings.DATE_FORMAT)))
1215             else:
1216                 objs = EMPTY_VALUE
1217         elif isinstance(self.field, models.BooleanField) or isinstance(self.field, models.NullBooleanField):
1218
1219=== modified file 'django/contrib/databrowse/plugins/calendars.py'
1220--- django/contrib/databrowse/plugins/calendars.py      2008-02-19 00:08:08 +0000
1221+++ django/contrib/databrowse/plugins/calendars.py      2008-03-01 22:49:13 +0000
1222@@ -4,7 +4,6 @@
1223 from django.contrib.databrowse.sites import DatabrowsePlugin
1224 from django.shortcuts import render_to_response
1225 from django.utils.text import capfirst
1226-from django.utils.translation import get_date_formats
1227 from django.utils.encoding import force_unicode
1228 from django.utils.safestring import mark_safe
1229 from django.views.generic import date_based
1230
1231=== modified file 'django/template/defaultfilters.py'
1232--- django/template/defaultfilters.py   2008-02-25 06:02:35 +0000
1233+++ django/template/defaultfilters.py   2008-03-01 22:49:13 +0000
1234@@ -620,7 +620,7 @@
1235     if not value:
1236         return u''
1237     if arg is None:
1238-        arg = settings.DATE_FORMAT
1239+        arg = ugettext(settings.DATE_FORMAT)
1240     return format(value, arg)
1241 date.is_safe = False
1242 
1243@@ -630,7 +630,7 @@
1244     if value in (None, u''):
1245         return u''
1246     if arg is None:
1247-        arg = settings.TIME_FORMAT
1248+        arg = ugettext(settings.TIME_FORMAT)
1249     return time_format(value, arg)
1250 time.is_safe = False
1251 
1252