summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chimere/models.py6
-rw-r--r--chimere/templates/chimere/edit.html4
-rw-r--r--chimere/templates/chimere/edit_route.html4
-rw-r--r--chimere/templates/chimere/main_map.html2
4 files changed, 8 insertions, 8 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 381bf1f..31fc2f9 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"Category")
+ verbose_name = _(u"Theme")
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"Category"))
+ category = models.ForeignKey(Category, verbose_name=_(u"Theme"))
name = models.CharField(_(u"Name"), max_length=150)
available = models.BooleanField(_(u"Available"))
icon = models.ForeignKey(Icon, verbose_name=_(u"Icon"))
@@ -160,7 +160,7 @@ class SubCategory(models.Model):
return u"%s / %s" % (self.category.name, self.name)
class Meta:
ordering = ["category", "order"]
- verbose_name = _(u"Subcategory")
+ verbose_name = _(u"Subtheme")
@classmethod
def getAvailable(cls, item_types=None, area_name=None):
diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html
index cb08623..d679e48 100644
--- a/chimere/templates/chimere/edit.html
+++ b/chimere/templates/chimere/edit.html
@@ -36,12 +36,12 @@
<div class='leftform'>
<p>* {% trans "indicates a mandatory field" %}</p>
<div class="fieldWrapper">
- <label for="id_name">{% trans "Site name"%} *</label>
+ <label for="id_name">{% trans "Name"%} *</label>
{% if form.name.errors %}<div class='errors'>{{ form.name.errors }}</div>{% endif %}
{{ form.name }}
</div>
<div class="fieldWrapper">
- <label for="id_subcategory">{% trans "Categories" %} *</label>
+ <label for="id_subcategory">{% trans "Themes" %} *</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 a8121db..e887f9a 100644
--- a/chimere/templates/chimere/edit_route.html
+++ b/chimere/templates/chimere/edit_route.html
@@ -33,12 +33,12 @@
<div class='leftform'>
<p>* {% trans "indicates a mandatory field" %}</p>
<div class="fieldWrapper">
- <label for="id_name">{% trans "Site name"%} *</label>
+ <label for="id_name">{% trans "Name"%} *</label>
{{ form.name.errors }}
{{ form.name }}
</div>
<div class="fieldWrapper">
- <label for="id_subcategory">{% trans "Categories" %} *</label>
+ <label for="id_subcategory">{% trans "Themes" %} *</label>
{{ form.categories.errors }}
{{ form.categories }}
</div>
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index 534fe1f..944966e 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 "Topics"%}</h2>
+ <h2 class='ui-widget ui-state-default ui-corner-all ui-widget-header'>{% trans "Theme"%}</h2>
<form method='post' name='frm_categories' id='frm_categories'>
<div id='categories'>
{# Categories are displayed in JS #}