Code

Navigation

← Previous Changeset
Next Changeset →

Changeset 979

Timestamp:

10/20/05 09:15:30 (3 years ago)

Author:

hugo

Message:

i18n: merged to [978] from trunk

Files:

django/branches/i18n/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (5 diffs)
django/branches/i18n/django/contrib/admin/media/js/calendar.js (modified) (2 diffs)
django/branches/i18n/django/contrib/admin/media/js/urlify.js (modified) (1 diff)
django/branches/i18n/django/core/meta/fields.py (modified) (1 diff)
django/branches/i18n/django/core/validators.py (modified) (2 diffs)
django/branches/i18n/django/utils/dateformat.py (modified) (9 diffs)
django/branches/i18n/docs/model-api.txt (modified) (3 diffs)
django/branches/i18n/docs/templates.txt (modified) (2 diffs)
django/branches/i18n/setup.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

django/branches/i18n/django/contrib/admin/media/js/admin/DateTimeShortcuts.js

r956	r979
78	78
79	79	quickElement('h2', clock_box, 'Choose a time');
80		time_list = quickElement('ul', clock_box, '', 'class', 'timelist');
	80	time_list = quickElement('ul', clock_box, '');
	81	time_list.className = 'timelist';
81	82	quickElement("a", quickElement("li", time_list, ""), "Now", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());")
82	83	quickElement("a", quickElement("li", time_list, ""), "Midnight", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');")
…	…
84	85	quickElement("a", quickElement("li", time_list, ""), "Noon", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');")
85	86
86		cancel_p = quickElement('p', clock_box, '', 'class', 'calendar-cancel');
	87	cancel_p = quickElement('p', clock_box, '');
	88	cancel_p.className = 'calendar-cancel';
87	89	quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');');
88	90	},
…	…
148	150	// next-prev links
149	151	var cal_nav = quickElement('div', cal_box, '');
150		quickElement('a', cal_nav, '<', 'class', 'calendarnav-previous', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');');
151		quickElement('a', cal_nav, '>', 'class', 'calendarnav-next', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');');
	152	var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');');
	153	cal_nav_prev.className = 'calendarnav-previous';
	154	var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');');
	155	cal_nav_next.className = 'calendarnav-next';
152	156	cal_box.appendChild(cal_nav);
153	157
…	…
159	163
160	164	// calendar shortcuts
161		var shortcuts = quickElement('div', cal_box, '', 'class', 'calendar-shortcuts');
	165	var shortcuts = quickElement('div', cal_box, '');
	166	shortcuts.className = 'calendar-shortcuts';
162	167	quickElement('a', shortcuts, 'Yesterday', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);');
163	168	shortcuts.appendChild(document.createTextNode('\240\|\240'));
…	…
167	172
168	173	// cancel bar
169		var cancel_p = quickElement('p', cal_box, '', 'class', 'calendar-cancel');
	174	var cancel_p = quickElement('p', cal_box, '');
	175	cancel_p.className = 'calendar-cancel';
170	176	quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');');
171	177	},

django/branches/i18n/django/contrib/admin/media/js/calendar.js

r956	r979
66	66	tableRow = quickElement('tr', tableBody);
67	67	for (var i = 0; i < startingPos; i++) {
68		quickElement('td', tableRow, ' ', 'bgcolor','#f3f3f3');
	68	var _cell = quickElement('td', tableRow, ' ');
	69	_cell.style.backgroundColor = '#f3f3f3';
69	70	}
70	71
…	…
82	83	// Draw blanks after end of month (optional, but makes for valid code)
83	84	while (tableRow.childNodes.length < 7) {
84		quickElement('td', tableRow, ' ', 'bgcolor','#f3f3f3');
	85	var _cell = quickElement('td', tableRow, ' ');
	86	_cell.style.backgroundColor = '#f3f3f3';
85	87	}
86	88

django/branches/i18n/django/contrib/admin/media/js/urlify.js

r956	r979
1	1	function URLify(s, num_chars) {
2	2	// changes, e.g., "Petty theft" to "petty_theft"
3
4	3	// remove all these words from the string before urlifying
5		removelist = ["a", "an", "as", "at", "before", "but", "by", "for", "from",
6		"is", "in", "into", "like", "of", "off", "on", "onto", "per",
7		"since", "than", "the", "this", "that", "to", "up", "via",
	4	removelist = ["a", "an", "as", "at", "before", "but", "by", "for", "from",
	5	"is", "in", "into", "like", "of", "off", "on", "onto", "per",
	6	"since", "than", "the", "this", "that", "to", "up", "via",
8	7	"with"];
9	8	r = new RegExp('\\b(' + removelist.join('\|') + ')\\b', 'gi');
10	9	s = s.replace(r, '');
11		s = s.replace(/[^\w\s~~]/g, '');~~ // remove unneeded chars
	10	s = s.replace(/[^\w\s-]/g, ''); // remove unneeded chars
12	11	s = s.replace(/^\s+\|\s+$/g, ''); // trim leading/trailing spaces
13	12	s = s.replace(/\s+/g, '_'); // convert spaces to underscores

django/branches/i18n/django/core/meta/fields.py

r912	r979
514	514	def __init__(self, args, *kwargs):
515	515	kwargs['maxlength'] = 50
516		kwargs.setdefault('validator_list', []).append(validators.is~~AlphaNumeric~~)
	516	kwargs.setdefault('validator_list', []).append(validators.isSlug)
517	517	# Set db_index=True unless it's been set manually.
518	518	if not kwargs.has_key('db_index'):

django/branches/i18n/django/core/validators.py

r908	r979
22	22	ip4_re = re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
23	23	phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
	24	slug_re = re.compile(r'^[-\w]+$')
24	25	url_re = re.compile(r'^http://\S+$')
25	26
…	…
60	61	if not alnumurl_re.search(field_data):
61	62	raise ValidationError, _("This value must contain only letters, numbers, underscores and slashes.")
	63
	64	def isSlug(field_data, all_data):
	65	if not slug_re.search(field_data):
	66	raise ValidationError, "This value must contain only letters, numbers, underscores or hyphens."
62	67
63	68	def isLowerCase(field_data, all_data):

django/branches/i18n/django/utils/dateformat.py

r313	r979
12	12	"""
13	13
	14	from django.utils.dates import MONTHS, MONTHS_AP, WEEKDAYS
14	15	from calendar import isleap
15		from dates import MONTHS, MONTHS_AP, WEEKDAYS
16
17		class DateFormat:
18		year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
19
20		def __init__(self, d):
21		self.date = d
	16	import re
	17
	18	re_formatchars = re.compile(r'(?<!\\)([aABdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
	19	re_escaped = re.compile(r'\\(.)')
	20
	21	class Formatter:
	22	def format(self, formatstr):
	23	pieces = []
	24	for i, piece in enumerate(re_formatchars.split(formatstr)):
	25	if i % 2:
	26	pieces.append(str(getattr(self, piece)()))
	27	elif piece:
	28	pieces.append(re_escaped.sub(r'\1', piece))
	29	return ''.join(pieces)
	30
	31	class TimeFormat(Formatter):
	32	def __init__(self, t):
	33	self.data = t
22	34
23	35	def a(self):
24	36	"'a.m.' or 'p.m.'"
25		if self.date.hour > 11:
	37	if self.data.hour > 11:
26	38	return 'p.m.'
27	39	return 'a.m.'
…	…
29	41	def A(self):
30	42	"'AM' or 'PM'"
31		if self.date.hour > 11:
32		return 'PM'
33		return 'AM'
	43	return self.a().upper()
34	44
35	45	def B(self):
36	46	"Swatch Internet time"
37	47	raise NotImplementedError
38
39		~~def d(self):~~
40		~~"Day of the month, 2 digits with leading zeros; i.e. '01' to '31'"~~
41		~~return '%02d' % self.date.day~~
42
43		~~def D(self):~~
44		~~"Day of the week, textual, 3 letters; e.g. 'Fri'"~~
45		~~return WEEKDAYS[self.date.weekday()][0:3]~~
46	48
47	49	def f(self):
…	…
51	53	Proprietary extension.
52	54	"""
53		if self.date.minute == 0:
	55	if self.data.minute == 0:
54	56	return self.g()
55	57	return '%s:%s' % (self.g(), self.i())
56	58
57		~~def F(self):~~
58		~~"Month, textual, long; e.g. 'January'"~~
59		~~return MONTHS[self.date.month]~~
60
61	59	def g(self):
62	60	"Hour, 12-hour format without leading zeros; i.e. '1' to '12'"
63		if self.date.hour == 0:
	61	if self.data.hour == 0:
64	62	return 12
65		if self.date.hour > 12:
66		return self.date.hour - 12
67		return self.date.hour
	63	if self.data.hour > 12:
	64	return self.data.hour - 12
	65	return self.data.hour
68	66
69	67	def G(self):
70	68	"Hour, 24-hour format without leading zeros; i.e. '0' to '23'"
71		return self.date.hour
	69	return self.data.hour
72	70
73	71	def h(self):
…	…
81	79	def i(self):
82	80	"Minutes; i.e. '00' to '59'"
83		return '%02d' % self.date.minute
84
85		def I(self):
86		"'1' if Daylight Savings Time, '0' otherwise."
87		raise NotImplementedError
88
89		def j(self):
90		"Day of the month without leading zeros; i.e. '1' to '31'"
91		return self.date.day
92
93		def l(self):
94		"Day of the week, textual, long; e.g. 'Friday'"
95		return WEEKDAYS[self.date.weekday()]
96
97		def L(self):
98		"Boolean for whether it is a leap year; i.e. True or False"
99		return isleap(self.date.year)
100
101		def m(self):
102		"Month; i.e. '01' to '12'"
103		return '%02d' % self.date.month
104
105		def M(self):
106		"Month, textual, 3 letters; e.g. 'Jan'"
107		return MONTHS[self.date.month][0:3]
108
109		def n(self):
110		"Month without leading zeros; i.e. '1' to '12'"
111		return self.date.month
112
113		def N(self):
114		"Month abbreviation in Associated Press style. Proprietary extension."
115		return MONTHS_AP[self.date.month]
116
117		def O(self):
118		"Difference to Greenwich time in hours; e.g. '+0200'"
119		raise NotImplementedError
	81	return '%02d' % self.data.minute
120	82
121	83	def P(self):
…	…
126	88	Proprietary extension.
127	89	"""
128		if self.dat~~e.minute == 0 and self.date~~.hour == 0:
	90	if self.data.minute == 0 and self.data.hour == 0:
129	91	return 'midnight'
130		if self.dat~~e.minute == 0 and self.date~~.hour == 12:
	92	if self.data.minute == 0 and self.data.hour == 12:
131	93	return 'noon'
132	94	return '%s %s' % (self.f(), self.a())
133	95
	96	def s(self):
	97	"Seconds; i.e. '00' to '59'"
	98	return '%02d' % self.data.second
	99
	100	class DateFormat(TimeFormat):
	101	year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
	102
	103	def __init__(self, d):
	104	self.data = d
	105
	106	def d(self):
	107	"Day of the month, 2 digits with leading zeros; i.e. '01' to '31'"
	108	return '%02d' % self.data.day
	109
	110	def D(self):
	111	"Day of the week, textual, 3 letters; e.g. 'Fri'"
	112	return WEEKDAYS[self.data.weekday()][0:3]
	113
	114	def F(self):
	115	"Month, textual, long; e.g. 'January'"
	116	return MONTHS[self.data.month]
	117
	118	def I(self):
	119	"'1' if Daylight Savings Time, '0' otherwise."
	120	raise NotImplementedError
	121
	122	def j(self):
	123	"Day of the month without leading zeros; i.e. '1' to '31'"
	124	return self.data.day
	125
	126	def l(self):
	127	"Day of the week, textual, long; e.g. 'Friday'"
	128	return WEEKDAYS[self.data.weekday()]
	129
	130	def L(self):
	131	"Boolean for whether it is a leap year; i.e. True or False"
	132	return isleap(self.data.year)
	133
	134	def m(self):
	135	"Month; i.e. '01' to '12'"
	136	return '%02d' % self.data.month
	137
	138	def M(self):
	139	"Month, textual, 3 letters; e.g. 'Jan'"
	140	return MONTHS[self.data.month][0:3]
	141
	142	def n(self):
	143	"Month without leading zeros; i.e. '1' to '12'"
	144	return self.data.month
	145
	146	def N(self):
	147	"Month abbreviation in Associated Press style. Proprietary extension."
	148	return MONTHS_AP[self.data.month]
	149
	150	def O(self):
	151	"Difference to Greenwich time in hours; e.g. '+0200'"
	152	raise NotImplementedError
	153
134	154	def r(self):
135	155	"RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
136	156	raise NotImplementedError
137	157
138		~~def s(self):~~
139		~~"Seconds; i.e. '00' to '59'"~~
140		~~return '%02d' % self.date.second~~
141
142	158	def S(self):
143	159	"English ordinal suffix for the day of the month, 2 characters; i.e. 'st', 'nd', 'rd' or 'th'"
144		if self.date.day in (11, 12, 13): # Special case
	160	if self.data.day in (11, 12, 13): # Special case
145	161	return 'th'
146		last = self.date.day % 10
	162	last = self.data.day % 10
147	163	if last == 1:
148	164	return 'st'
…	…
167	183	def w(self):
168	184	"Day of the week, numeric, i.e. '0' (Sunday) to '6' (Saturday)"
169		weekday = self.date.weekday()
170		if weekday == 0:
171		return 6
172		return weekday - 1
	185	return (self.data.weekday() + 1) % 7
173	186
174	187	def W(self):
…	…
176	189	# Algorithm from http://www.personal.ecu.edu/mccartyr/ISOwdALG.txt
177	190	week_number = None
178		jan1_weekday = self.date.replace(month=1, day=1).weekday() + 1
179		weekday = self.date.weekday() + 1
	191	jan1_weekday = self.data.replace(month=1, day=1).weekday() + 1
	192	weekday = self.data.weekday() + 1
180	193	day_of_year = self.z()
181	194	if day_of_year <= (8 - jan1_weekday) and jan1_weekday > 4:
182		if jan1_weekday == 5 or (jan1_weekday == 6 and isleap(self.date.year-1)):
	195	if jan1_weekday == 5 or (jan1_weekday == 6 and isleap(self.data.year-1)):
183	196	week_number = 53
184	197	else:
185	198	week_number = 52
186	199	else:
187		if isleap(self.date.year):
	200	if isleap(self.data.year):
188	201	i = 366
189	202	else:
…	…
198	211	return week_number
199	212
	213	def y(self):
	214	"Year, 2 digits; e.g. '99'"
	215	return str(self.data.year)[2:]
	216
200	217	def Y(self):
201	218	"Year, 4 digits; e.g. '1999'"
202		return self.date.year
203
204		def y(self):
205		"Year, 2 digits; e.g. '99'"
206		return str(self.date.year)[2:]
	219	return self.data.year
207	220
208	221	def z(self):
209	222	"Day of the year; i.e. '0' to '365'"
210		doy = self.year_days[self.dat~~e.month] + self.date~~.day
211		if self.L() and self.date.month > 2:
	223	doy = self.year_days[self.data.month] + self.data.day
	224	if self.L() and self.data.month > 2:
212	225	doy += 1
213	226	return doy
…	…
219	232	raise NotImplementedError
220	233
221		~~def format(self, formatstr):~~
222		~~result = ''~~
223		~~for char in formatstr:~~
224		~~try:~~
225		~~result += str(getattr(self, char)())~~
226		~~except AttributeError:~~
227		~~result += char~~
228		~~return result~~
229
230		~~class TimeFormat:~~
231		~~def __init__(self, t):~~
232		~~self.time = t~~
233
234		~~def a(self):~~
235		~~"'a.m.' or 'p.m.'"~~
236		~~if self.time.hour > 11:~~
237		~~return 'p.m.'~~
238		~~else:~~
239		~~return 'a.m.'~~
240
241		~~def A(self):~~
242		~~"'AM' or 'PM'"~~
243		~~return self.a().upper()~~
244
245		~~def B(self):~~
246		~~"Swatch Internet time"~~
247		~~raise NotImplementedError~~
248
249		~~def f(self):~~
250		~~"""~~
251		~~Time, in 12-hour hours and minutes, with minutes left off if they're zero.~~
252		~~Examples: '1', '1:30', '2:05', '2'~~
253		~~Proprietary extension.~~
254		~~"""~~
255		~~if self.time.minute == 0:~~
256		~~return self.g()~~
257		~~return '%s:%s' % (self.g(), self.i())~~
258
259		~~def g(self):~~
260		~~"Hour, 12-hour format without leading zeros; i.e. '1' to '12'"~~
261		~~if self.time.hour == 0:~~
262		~~return 12~~
263		~~if self.time.hour > 12:~~
264		~~return self.time.hour - 12~~
265		~~return self.time.hour~~
266
267		~~def G(self):~~
268		~~"Hour, 24-hour format without leading zeros; i.e. '0' to '23'"~~
269		~~return self.time.hour~~
270
271		~~def h(self):~~
272		~~"Hour, 12-hour format; i.e. '01' to '12'"~~
273		~~return '%02d' % self.g()~~
274
275		~~def H(self):~~
276		~~"Hour, 24-hour format; i.e. '00' to '23'"~~
277		~~return '%02d' % self.G()~~
278
279		~~def i(self):~~
280		~~"Minutes; i.e. '00' to '59'"~~
281		~~return '%02d' % self.time.minute~~
282
283		~~def P(self):~~
284		~~"""~~
285		~~Time, in 12-hour hours, minutes and 'a.m.'/'p.m.', with minutes left off~~
286		~~if they're zero and the strings 'midnight' and 'noon' if appropriate.~~
287		~~Examples: '1 a.m.', '1:30 p.m.', 'midnight', 'noon', '12:30 p.m.'~~
288		~~Proprietary extension.~~
289		~~"""~~
290		~~if self.time.minute == 0 and self.time.hour == 0:~~
291		~~return 'midnight'~~
292		~~if self.time.minute == 0 and self.time.hour == 12:~~
293		~~return 'noon'~~
294		~~return '%s %s' % (self.f(), self.a())~~
295
296		~~def s(self):~~
297		~~"Seconds; i.e. '00' to '59'"~~
298		~~return '%02d' % self.time.second~~
299
300		~~def format(self, formatstr):~~
301		~~result = ''~~
302		~~for char in formatstr:~~
303		~~try:~~
304		~~result += str(getattr(self, char)())~~
305		~~except AttributeError:~~
306		~~result += char~~
307		~~return result~~
308
309	234	def format(value, format_string):
310	235	"Convenience function"

django/branches/i18n/docs/model-api.txt

r956	r979
172	172
173	173	``validator_list``
174		A list of extra validators to apply to the field.
	174	A list of extra validators to apply to the field. Each should be a callable
	175	that takes the parameters ``field_data, all_data`` and raises
	176	``django.core.validators.ValidationError`` for errors. (See the
	177	`validator docs`_.)
	178
	179	Django comes with quite a few validators. They're in ``django.core.validators``.
	180
	181	.. _validator docs: http://www.djangoproject.com/documentation/forms/#validators
175	182
176	183	Field types
…	…
238	245	``EmailField``
239	246	A ``CharField`` that checks that the value is a valid e-mail address.
240		~~Currently, this is a loose test~~.
	247	(Currently, this is a loose test.) This doesn't accept ``maxlength``.
241	248
242	249	``FileField``
…	…
370	377	``SlugField``
371	378	"Slug" is a newspaper term. A slug is a short label for something,
372		containing only letters, numbers ~~and underscores. They're generally used in~~
373		URLs.
	379	containing only letters, numbers, underscores or hyphens. They're generally
	380	used in URLs.
374	381
375	382	Implies ``maxlength=50`` and ``db_index=True``.

django/branches/i18n/docs/templates.txt

r932	r979
447	447	<h1>Archive for {{ year }}</h1>
448	448
449		{% for date in days %}
450		{% ifchanged %}<h3>{{ date\|date:"F" }}</h3>{% endifchanged %}
451		<a href="{{ da~~te\|date:"M/d"\|lower }}/">{{ date~~\|date:"j" }}</a>
	449	{% for day in days %}
	450	{% ifchanged %}<h3>{{ day\|date:"F" }}</h3>{% endifchanged %}
	451	<a href="{{ day\|date:"M/d"\|lower }}/">{{ day\|date:"j" }}</a>
452	452	{% endfor %}
453	453
…	…
480	480	Display the date, formatted according to the given string.
481	481
482		Uses the same format as PHP's ``date()`` function; see http://php.net/date
483		for all the possible values.
484
485		Sample usage::
	482	Uses the same format as PHP's ``date()`` function (http://php.net/date)
	483	with some custom extensions.
	484
	485	Available format strings:
	486
	487	================ ====================================== =====================
	488	Format character Description Example output
	489	================ ====================================== =====================
	490	a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'``
	491	this is slightly different than PHP's
	492	output, because this includes periods
	493	to match Associated Press style.)
	494	A ``'AM'`` or ``'PM'``. ``'AM'``
	495	B Not implemented.
	496	d Day of the month, 2 digits with ``'01'`` to ``'31'``
	497	leading zeros.
	498	D Day of the week, textual, 3 letters. ``'Fri'``
	499	f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'``
	500	with minutes left off if they're zero.
	501	Proprietary extension.
	502	F Month, textual, long. ``'January'``
	503	g Hour, 12-hour format without leading ``'1'`` to ``'12'``
	504	zeros.
	505	G Hour, 24-hour format without leading ``'0'`` to ``'23'``
	506	zeros.
	507	h Hour, 12-hour format. ``'01'`` to ``'12'``
	508	H Hour, 24-hour format. ``'00'`` to ``'23'``
	509	i Minutes. ``'00'`` to ``'59'``
	510	I Not implemented.
	511	j Day of the month without leading ``'1'`` to ``'31'``
	512	zeros.
	513	l Day of the week, textual, long. ``'Friday'``
	514	L Boolean for whether it's a leap year. ``True`` or ``False``
	515	m Month, 2 digits with leading zeros. ``'01'`` to ``'12'``
	516	M Month, textual, 3 letters. ``'Jan'``
	517	n Month without leading zeros. ``'1'`` to ``'12'``
	518	N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'``
	519	style. Proprietary extension.
	520	O Not implemented.
	521	P Time, in 12-hour hours, minutes and ``'1 a.m.'``, ``'1:30 p.m.'``, ``'midnight'``, ``'noon'``, ``'12:30 p.m.'``
	522	'a.m.'/'p.m.', with minutes left off
	523	if they're zero and the special-case
	524	strings 'midnight' and 'noon' if
	525	appropriate. Proprietary extension.
	526	r Not implemented.
	527	s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
	528	S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
	529	month, 2 characters.
	530	t Not implemented.
	531	T Not implemented.
	532	U Not implemented.
	533	w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)
	534	leading zeros.
	535	W ISO-8601 week number of year, with ``1``, ``23``
	536	weeks starting on Monday.
	537	y Year, 2 digits. ``'99'``
	538	Y Year, 4 digits. ``'1999'``
	539	z Day of the year. ``0`` to ``365``
	540	Z Not implemented.
	541	================ ====================================== =====================
	542
	543	Example::
486	544
487	545	It is {% now "jS F Y H:i" %}
	546
	547	Note that you can backslash-escape a format string if you want to use the
	548	"raw" value. In this example, "f" is backslash-escaped, because otherwise
	549	"f" is a format string that displays the time. The "o" doesn't need to be
	550	escaped, because it's not a format character.::
	551
	552	It is the {% "jS o\f F" %}
	553
	554	(Displays "It is the 4th of September" %}
488	555
489	556	``regroup``

django/branches/i18n/setup.py

r726	r979
14	14	packages = find_packages(),
15	15	package_data = {
16		'django.con~~f': ['admin_templates/.html', 'admin_templates/~~doc/.html',
17		'~~admin_~~templates/registration/*.html',
18		'~~admin_media/css/.css', 'admin_~~media/img/admin/.gif',
19		'~~admin_media/img/admin/.png', 'admin_~~media/js/.js',
20		'~~admin_media/js/admin/js', 'locale///.mo~~'],
	16	'django.contrib.admin': ['templates/admin/.html', 'templates/admin_doc/.html',
	17	'templates/registration/*.html',
	18	'media/css/.css', 'media/img/admin/.gif',
	19	'media/img/admin/.png', 'media/js/.js',
	20	'media/js/admin/*js'],
21	21	},
22	22	scripts = ['django/bin/django-admin.py'],

Download in other formats: