diff options
Diffstat (limited to 'chimere')
| -rw-r--r-- | chimere/models.py | 22 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit_route.html | 2 | ||||
| -rw-r--r-- | chimere/templates/chimere/main_map.html | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/chimere/models.py b/chimere/models.py index 8297664..2454c86 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -127,7 +127,7 @@ class Category(models.Model): return self.name class Meta: ordering = ["order"] - verbose_name = _(u"Theme") + verbose_name = _(u"Category") class Icon(models.Model): '''Icon @@ -145,7 +145,7 @@ class Icon(models.Model): class SubCategory(models.Model): '''Sub-category ''' - category = models.ForeignKey(Category, verbose_name=_(u"Theme")) + category = models.ForeignKey(Category, verbose_name=_(u"Category")) name = models.CharField(_(u"Name"), max_length=150) available = models.BooleanField(_(u"Available")) icon = models.ForeignKey(Icon, verbose_name=_(u"Icon")) @@ -160,8 +160,8 @@ class SubCategory(models.Model): return u"%s / %s" % (self.category.name, self.name) class Meta: ordering = ["category", "order"] - verbose_name = _(u"Subtheme") - verbose_name_plural = _(u"Subthemes") + verbose_name = _(u"Sub-category") + verbose_name_plural = _(u"Sub-categories") @classmethod def getAvailable(cls, item_types=None, area_name=None): @@ -817,14 +817,16 @@ class Area(models.Model, SimpleArea): layers = SelectMultipleField(Layer, related_name='areas', through='AreaLayers', blank=True) default_subcategories = SelectMultipleField(SubCategory, blank=True, - verbose_name=_(u"Themes checked by default")) - dynamic_categories = models.NullBooleanField(_(u"Themes dynamicaly displayed"), - help_text=_(u"If checked, themes are only displayed in the menu if they" - u" are available on the current extent.")) + verbose_name=_(u"Sub-categories checked by default")) + dynamic_categories = models.NullBooleanField( + _(u"Sub-categories dynamicaly displayed"), + help_text=_(u"If checked, categories are only displayed in the menu if " + u"they are available on the current extent.")) subcategories = SelectMultipleField(SubCategory, related_name='areas', blank=True, db_table='chimere_subcategory_areas', - verbose_name=_(u"Restricted to theses subthemes"), - help_text=_(u"If no subtheme is set all subthemes are available")) + verbose_name=_(u"Restricted to theses sub-categories"), + help_text=_(u"If no sub-category is set all sub-categories are " + u"available")) external_css = models.URLField(_(u"Link to an external CSS"), blank=True, null=True) restrict_to_extent = models.BooleanField(_(u"Restrict to the area extent"), diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index d679e48..26ed3d5 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -41,7 +41,7 @@ {{ form.name }} </div> <div class="fieldWrapper"> - <label for="id_subcategory">{% trans "Themes" %} *</label> + <label for="id_subcategory">{% trans "Categories" %} *</label> {% if form.categories.errors %}<div class='errors'>{{ form.categories.errors }}</div>{% endif %} {{ form.categories }} </div> diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html index e887f9a..0337723 100644 --- a/chimere/templates/chimere/edit_route.html +++ b/chimere/templates/chimere/edit_route.html @@ -38,7 +38,7 @@ {{ form.name }} </div> <div class="fieldWrapper"> - <label for="id_subcategory">{% trans "Themes" %} *</label> + <label for="id_subcategory">{% trans "Categories" %} *</label> {{ form.categories.errors }} {{ form.categories }} </div> diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html index 944966e..f84b372 100644 --- a/chimere/templates/chimere/main_map.html +++ b/chimere/templates/chimere/main_map.html @@ -10,7 +10,7 @@ {% block message_edit %}{% endblock %} {% block sidebar %} <div id='panel' class='draggable ui-widget ui-corner-all'> - <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{% trans "Theme"%}</h2> + <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{% trans "Category"%}</h2> <form method='post' name='frm_categories' id='frm_categories'> <div id='categories'> {# Categories are displayed in JS #} |