Changeset 738

Timestamp:

05/03/07 01:20:08 (1 year ago)

Author:

brian

Message:

finished the language detection for website/docs. this also includes a refactor of docs urls and now performs some auto versioning

Files:

cherokee-www/trunk/cherokee/documentation/urls.py

r734	r738
4	4
5	5	urlpatterns = patterns('',
6		(r'^$', doc_~~detail~~),
	6	(r'^$', doc_index),
7	7	(r'^(?P<version>[\d.]+)/$', doc_detail),
8		(r'^~~(?P<slug>[\w\.-]+)/$', doc_detail~~),
	8	(r'^trunk/$', doc_detail, {'version': 'trunk'}),
9	9	(r'^(?P<version>[\d.]+)/(?P<slug>[\w\.-]+)/$', doc_detail),
	10	(r'^trunk/(?P<slug>[\w\.-]+)/$', doc_detail, {'version': 'trunk'}),
10	11	)

r734	r738
17	17	return ''.join(args)
18	18
19		def doc_detail(request, slug='index', version='trunk', lang='en-us'):
	19	def doc_index(request):
	20	versions = _get_versions()
	21	return render_to_response('documentation/index.html', {
	22	'versions': versions,
	23	}, RequestContext(request, {}))
	24
	25	def doc_detail(request, slug='index', version='trunk'):
	26	lang = request.LANGUAGE_CODE
20	27	cache_key = 'cherokeewebsite:docs:%s:%s:%s' % (slug, version, lang,)
21	28	doc = cache.get(cache_key)
…	…
38	45	}, RequestContext(request, {}))
39	46
	47	def _get_versions():
	48	versions = []
	49	client = pysvn.Client()
	50	contents = client.ls(urljoin(settings.CHEROKEE_SVN_ROOT, 'branches/'))
	51
	52	for entry in contents:
	53	version = entry.name.split('/')[-1]
	54	versions.append({'version': version, 'name': version})
	55
	56	revision = client.info2(urljoin(settings.CHEROKEE_SVN_ROOT, 'trunk/'))[0][1].last_changed_rev
	57	versions.append({'version': 'trunk', 'name': 'Development Trunk r%d' % revision.number})
	58
	59	return versions
	60
40	61	def _get_svnroot(version, subpath):
41	62	client = pysvn.Client()

r735	r738
16	16
17	17	CHEROKEE_SVN_ROOT = 'svn://svn.cherokee-project.com/cherokee-www/'
	18	# CHEROKEE_SVN_ROOT = 'svn://svn.cherokee-project.com/cherokee/'
18	19
19	20	TIME_ZONE = 'America/Denver'
…	…
37	38	'django.middleware.common.CommonMiddleware',
38	39	'django.contrib.sessions.middleware.SessionMiddleware',
	40	'django.middleware.locale.LocaleMiddleware',
39	41	'django.contrib.auth.middleware.AuthenticationMiddleware',
40	42	'django.middleware.doc.XViewMiddleware',
…	…
42	44
43	45	ROOT_URLCONF = 'cherokee.urls'
	46
	47	TEMPLATE_CONTEXT_PROCESSORS = (
	48	'django.core.context_processors.i18n',
	49	)
44	50
45	51	TEMPLATE_DIRS = (