diff options
Diffstat (limited to 'chimere')
35 files changed, 4 insertions, 17 deletions
diff --git a/chimere/__init__.py b/chimere/__init__.py index e8e07a3..81b68e5 100644 --- a/chimere/__init__.py +++ b/chimere/__init__.py @@ -1,22 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -""" -import os -os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings' +# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -from django.utils.translation import ugettext as _ - -try: - # strings to be considered for translation - # templates/chimere/edit.html, templates/chimere/edit_route.html - _(u"Multimedia files") - _(u"Picture files") -except ImportError: - pass -""" - -VERSION = (2, 0) +VERSION = (2, 0, 0) def get_version(): return u'.'.join((unicode(num) for num in VERSION)) diff --git a/chimere/static/chimere/img/cloud-popup-relative.png b/chimere/static/chimere/img/cloud-popup-relative.png Binary files differindex 1215a36..1215a36 100755..100644 --- a/chimere/static/chimere/img/cloud-popup-relative.png +++ b/chimere/static/chimere/img/cloud-popup-relative.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png Binary files differindex e5a047c..e5a047c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif Binary files differindex 50820ee..50820ee 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png Binary files differindex fb8c0f8..fb8c0f8 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png Binary files differindex 7b50aff..7b50aff 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif Binary files differindex 50820ee..50820ee 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png Binary files differindex 4fe3547..4fe3547 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png Binary files differindex e809c3b..e809c3b 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png Binary files differindex 0812542..0812542 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png Binary files differindex a9be3b2..a9be3b2 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png Binary files differindex 277c87a..277c87a 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png Binary files differindex 76e50d0..76e50d0 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png Binary files differindex 8b110ba..8b110ba 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png Binary files differindex 660a254..660a254 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png Binary files differindex 7f28379..7f28379 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png Binary files differindex 4fe3547..4fe3547 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png diff --git a/chimere/tests/data_license b/chimere/tests/data_license deleted file mode 100644 index bee3231..0000000 --- a/chimere/tests/data_license +++ /dev/null @@ -1 +0,0 @@ -eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain diff --git a/chimere/utils.py b/chimere/utils.py index d1ea851..a82d88b 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -46,6 +46,8 @@ from chimere import get_version from external_utils import OsmApi def unicode_normalize(string): + if type(string) == str: + string = unicode(string.decode('utf-8')) return ''.join( (c for c in unicodedata.normalize('NFD', string) if unicodedata.category(c) != 'Mn')) |
