diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-18 11:26:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-18 11:26:59 +0200 |
| commit | 6f29dd35427e04bdb309c7ac3fccb12843a9056c (patch) | |
| tree | 622eb5d94a30f472e8d5aa6f6933de9627d851cf | |
| parent | 65bd0743a2ef44a638950f5c5cca4efa702bd89f (diff) | |
| parent | 57a43595d7ddb1e1581653eb8d2a71f3d2f192ab (diff) | |
| download | Chimère-6f29dd35427e04bdb309c7ac3fccb12843a9056c.tar.bz2 Chimère-6f29dd35427e04bdb309c7ac3fccb12843a9056c.zip | |
Merge branch 'v2.0'
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
| -rw-r--r-- | chimere/locale/fr/LC_MESSAGES/django.po | 7 | ||||
| -rw-r--r-- | chimere/utils.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po index 9cdf92a..f0b15b1 100644 --- a/chimere/locale/fr/LC_MESSAGES/django.po +++ b/chimere/locale/fr/LC_MESSAGES/django.po @@ -864,10 +864,11 @@ msgid "SRID cannot be guessed. The default SRID (%s) has been used." msgstr "Le SRID n'a pu être trouvé. Le SRID par défaut (%s) a été utilisé." #: utils.py:367 -msgid "Type of geographic item of this shapefile is not managed by Chimère." +#, python-format +msgid "Type of geographic item (%s) of this shapefile is not managed by Chimère." msgstr "" -"Les types des éléments géographiques de ce fichier Shapefile ne sont pas " -"gérés par Chimère." +"Les types des éléments géographiques (%s) de ce fichier Shapefile ne sont pas " + "gérés par Chimère." #: utils.py:387 msgid "Bad Shapefile" diff --git a/chimere/utils.py b/chimere/utils.py index 33ebdf7..f5bc44f 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -364,8 +364,8 @@ class ShapefileManager(ImportManager): elif id_name: lbl_name = id_name if lyr.geom_type not in ('Point', 'LineString'): - return (0, 0, _(u"Type of geographic item of this shapefile " - u"is not managed by Chimère.")) + return (0, 0, _(u"Type of geographic item (%s) of this shapefile " + u"is not managed by Chimère.") % lyr.geom_type) geom_key = 'point' if lyr.geom_type == 'Point' else 'route' geom_cls = Marker if lyr.geom_type == 'Point' else Route indexes = [] |