summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-11-27 17:56:17 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-11-27 17:56:17 +0100
commitc70992b801209ee06ebe5be0feca719a8690bf86 (patch)
tree3f19beb1552d14980f18deec6dedb779090c5735
parenta95b7d7e58b6d8e0847b9a49e3afe0ac7a939a39 (diff)
downloadChimère-c70992b801209ee06ebe5be0feca719a8690bf86.tar.bz2
Chimère-c70992b801209ee06ebe5be0feca719a8690bf86.zip
Add not_for_osm to admin marker form
-rw-r--r--chimere/admin.py4
-rw-r--r--chimere/locale/fr/LC_MESSAGES/django.po6
-rw-r--r--chimere/models.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 1d3dcbe..b2ae7e1 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -194,8 +194,8 @@ class MarkerAdmin(admin.ModelAdmin):
}),
(_(u"Import"), {
'classes':('collapse',),
- 'fields': ('modified_since_import', 'import_source',
- 'origin', 'license')
+ 'fields': ('not_for_osm', 'modified_since_import',
+ 'import_source', 'origin', 'license')
}),
(_(u"Advanced options"), {
'classes':('collapse',),
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index a497f30..08d362f 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 17:42+0100\n"
+"POT-Creation-Date: 2012-11-27 17:54+0100\n"
"PO-Revision-Date: 2010-03-20 20:00+0100\n"
"Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
"MIME-Version: 1.0\n"
@@ -459,8 +459,8 @@ msgid "Modified since last import"
msgstr "Modifié depuis le dernier import"
#: models.py:298
-msgid "Not to be imported inside OSM"
-msgstr "À ne pas importer dans OSM"
+msgid "Not to be exported to OSM"
+msgstr "À ne pas exporter vers OSM"
#: models.py:304 templates/chimere/edit.html:56
#: templates/chimere/edit_route.html:52
diff --git a/chimere/models.py b/chimere/models.py
index 63529ee..daa2d48 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -295,7 +295,7 @@ class GeographicItem(models.Model):
blank=True, null=True)
modified_since_import = models.BooleanField(_(u"Modified since last import"),
default=True)
- not_for_osm = models.BooleanField(_(u"Not to be imported inside OSM"),
+ not_for_osm = models.BooleanField(_(u"Not to be exported to OSM"),
default=False)
origin = models.CharField(_(u"Origin"), max_length=100,
blank=True, null=True)