diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 17:57:20 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 17:57:20 +0100 |
commit | f07b25fd08431f529b17567ff40a52c1ebbcd71d (patch) | |
tree | 94cc6c89edb942f67b2ea8c9823d6b89311d84ce /example_project | |
parent | 7db8e005f4204ab5dabf117b0bf91a12c70fd74c (diff) | |
download | Chimère-f07b25fd08431f529b17567ff40a52c1ebbcd71d.tar.bz2 Chimère-f07b25fd08431f529b17567ff40a52c1ebbcd71d.zip |
Adapt example_project to avoid unicode characters.
Temporary fix to prevent a Django bug.
cf. https://code.djangoproject.com/ticket/18091
Diffstat (limited to 'example_project')
-rw-r--r-- | example_project/settings.py | 12 | ||||
-rw-r--r-- | example_project/urls.py | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index c48a847..b0839d6 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -10,7 +10,7 @@ DEBUG = False TEMPLATE_DEBUG = DEBUG # Django settings for chimere project. -PROJECT_NAME = u'Chimère' +PROJECT_NAME = 'Chimere' ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/" EMAIL_HOST = 'localhost' @@ -26,8 +26,7 @@ JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] GPSBABEL = '/usr/bin/gpsbabel' -GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an - # error of 5 meters +GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an error of 5 meters #GPSBABEL_OPTIONS = 'simplify,count=100' ## chimere specific ## @@ -169,10 +168,6 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.gis', 'django.contrib.staticfiles', - 'south', - 'chimere', - # activate it if you want to use old migration scripts - #'chimere.scripts', ] # celery @@ -190,8 +185,7 @@ except ImportError: INSTALLED_APPS += [ 'south', 'chimere', - # activate it if you want to use old migration scripts - #'chimere.scripts', +# 'chimere.scripts', # activate it if you want to use old migration scripts ] LOGGING = {'version': 1, diff --git a/example_project/urls.py b/example_project/urls.py index e37ae53..fff1366 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2013 Etienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as |