Rechange wording: from theme to categories

5 files changed, 87 insertions, 79 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 #}
diff --git a/example_project/locale/fr/LC_MESSAGES/django.po b/example_project/locale/fr/LC_MESSAGES/django.po
index 4e41334..8421b35 100644
--- a/example_project/locale/fr/LC_MESSAGES/django.po
+++ b/example_project/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-07-25 21:54+0200\n"
+"POT-Creation-Date: 2012-08-02 13:55+0200\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"
@@ -46,32 +46,32 @@ msgstr "Flux RSS"
 msgid "Contact us"
 msgstr "Nous contacter"
 
-#: extra-locales/chimere/admin.py:58
+#: extra-locales/chimere/admin.py:62
 #: extra-locales/chimere/templates/chimere/feeds/rss.html:69
 msgid "Validate"
 msgstr "Valider"
 
-#: extra-locales/chimere/admin.py:69
+#: extra-locales/chimere/admin.py:73
 msgid "Export to KML"
 msgstr "Exporter en KML"
 
-#: extra-locales/chimere/admin.py:83
+#: extra-locales/chimere/admin.py:87
 msgid "Export to Shapefile"
 msgstr "Exporter en Shapefile"
 
-#: extra-locales/chimere/admin.py:169
+#: extra-locales/chimere/admin.py:173
 msgid "Import"
 msgstr "Import"
 
-#: extra-locales/chimere/admin.py:175
+#: extra-locales/chimere/admin.py:179
 msgid "Cancel import"
 msgstr "Annuler l'import"
 
-#: extra-locales/chimere/admin.py:181
+#: extra-locales/chimere/admin.py:185
 msgid "Cancel export"
 msgstr "Annuler l'export"
 
-#: extra-locales/chimere/admin.py:189
+#: extra-locales/chimere/admin.py:193
 msgid "Export to osm"
 msgstr "Exporter vers osm"
 
@@ -126,20 +126,20 @@ msgstr "Mauvais format de fichier : KML et GPX sont supportés"
 #: extra-locales/chimere/models.py:232 extra-locales/chimere/models.py:437
 #: extra-locales/chimere/models.py:480 extra-locales/chimere/models.py:524
 #: extra-locales/chimere/models.py:555 extra-locales/chimere/models.py:792
-#: extra-locales/chimere/models.py:804 extra-locales/chimere/models.py:887
+#: extra-locales/chimere/models.py:804 extra-locales/chimere/models.py:889
 #: extra-locales/chimere/templates/chimere/edit.html:39
 #: extra-locales/chimere/templates/chimere/edit_route.html:36
 msgid "Name"
 msgstr "Nom"
 
-#: extra-locales/chimere/forms.py:378 extra-locales/chimere/models.py:839
+#: extra-locales/chimere/forms.py:378 extra-locales/chimere/models.py:841
 msgid "Area"
 msgstr "Zone"
 
 #: extra-locales/chimere/models.py:49 extra-locales/chimere/models.py:123
 #: extra-locales/chimere/models.py:150 extra-locales/chimere/models.py:241
 #: extra-locales/chimere/models.py:441 extra-locales/chimere/models.py:810
-#: extra-locales/chimere/models.py:889
+#: extra-locales/chimere/models.py:891
 msgid "Available"
 msgstr "Disponible"
 
@@ -172,7 +172,7 @@ msgstr "Code"
 #: extra-locales/chimere/models.py:111 extra-locales/chimere/models.py:124
 #: extra-locales/chimere/models.py:154 extra-locales/chimere/models.py:482
 #: extra-locales/chimere/models.py:531 extra-locales/chimere/models.py:809
-#: extra-locales/chimere/models.py:876 extra-locales/chimere/models.py:888
+#: extra-locales/chimere/models.py:878 extra-locales/chimere/models.py:890
 msgid "Order"
 msgstr "Ordre"
 
@@ -182,8 +182,8 @@ msgstr "Couleur"
 
 #: extra-locales/chimere/models.py:130 extra-locales/chimere/models.py:148
 #: extra-locales/chimere/templates/chimere/main_map.html:13
-msgid "Theme"
-msgstr "Thème"
+msgid "Category"
+msgstr "Catégorie"
 
 #: extra-locales/chimere/models.py:136 extra-locales/chimere/models.py:433
 #: extra-locales/chimere/models.py:525 extra-locales/chimere/models.py:620
@@ -223,12 +223,12 @@ msgid "Item type"
 msgstr "Type d'élément"
 
 #: extra-locales/chimere/models.py:163
-msgid "Subtheme"
-msgstr "Sous-thème"
+msgid "Sub-category"
+msgstr "Sous-catégorie"
 
 #: extra-locales/chimere/models.py:164
-msgid "Subthemes"
-msgstr "Sous-thèmes"
+msgid "Sub-categories"
+msgstr "Sous-catégories"
 
 #: extra-locales/chimere/models.py:210
 msgid "Importer type"
@@ -349,7 +349,7 @@ msgstr "Date de mise en disponibilité"
 msgid "Description"
 msgstr "Description"
 
-#: extra-locales/chimere/models.py:337 extra-locales/chimere/models.py:911
+#: extra-locales/chimere/models.py:337 extra-locales/chimere/models.py:913
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
@@ -467,122 +467,122 @@ msgid "Only one area is set by default"
 msgstr "Seule une zone est définie par défaut"
 
 #: extra-locales/chimere/models.py:820
-msgid "Themes checked by default"
-msgstr "Thèmes cochés par défaut"
-
-#: extra-locales/chimere/models.py:821
-msgid "Themes dynamicaly displayed"
-msgstr "Thèmes affichés dynamiquement"
+msgid "Sub-categories checked by default"
+msgstr "Sous-catégories cochées par défaut"
 
 #: extra-locales/chimere/models.py:822
+msgid "Sub-categories dynamicaly displayed"
+msgstr "Sous-categories affichées dynamiquement"
+
+#: extra-locales/chimere/models.py:823
 msgid ""
-"If checked, themes are only displayed in the menu if they are available on "
-"the current extent."
+"If checked, categories are only displayed in the menu if they are available "
+"on the current extent."
 msgstr ""
-"Si coché, les thèmes sont disponibles sur le menu seulement si ils "
+"Si coché, les catégories sont disponibles sur le menu seulement si elles "
 "apparaissent sur la zone affichée."
 
-#: extra-locales/chimere/models.py:826
-msgid "Restricted to theses subthemes"
-msgstr "Restreindre à ces sous-thèmes"
-
 #: extra-locales/chimere/models.py:827
-msgid "If no subtheme is set all subthemes are available"
+msgid "Restricted to theses sub-categories"
+msgstr "Restreindre à ces sous-categories"
+
+#: extra-locales/chimere/models.py:828
+msgid "If no sub-category is set all sub-categories are available"
 msgstr ""
-"Si aucun sous-thème n'est défini tous les sous-thèmes sont "
+"Si aucune sous-catégorie n'est définie toutes les sous-catégories sont "
 "disponibles"
 
-#: extra-locales/chimere/models.py:828
+#: extra-locales/chimere/models.py:830
 msgid "Link to an external CSS"
 msgstr "Lien vers une feuille de style externe"
 
-#: extra-locales/chimere/models.py:830
+#: extra-locales/chimere/models.py:832
 msgid "Restrict to the area extent"
 msgstr "Restreindre à l'étendue de la zone"
 
-#: extra-locales/chimere/models.py:877
+#: extra-locales/chimere/models.py:879
 msgid "Default layer"
 msgstr "Couche par défaut"
 
-#: extra-locales/chimere/models.py:881 extra-locales/chimere/models.py:882
+#: extra-locales/chimere/models.py:883 extra-locales/chimere/models.py:884
 msgid "Layers"
 msgstr "Couches"
 
-#: extra-locales/chimere/models.py:890
+#: extra-locales/chimere/models.py:892
 msgid "Text"
 msgstr "Texte"
 
-#: extra-locales/chimere/models.py:891
+#: extra-locales/chimere/models.py:893
 msgid "Long text"
 msgstr "Texte long"
 
-#: extra-locales/chimere/models.py:892
+#: extra-locales/chimere/models.py:894
 msgid "Password"
 msgstr "Mot de passe"
 
-#: extra-locales/chimere/models.py:896
+#: extra-locales/chimere/models.py:898
 msgid "Type"
 msgstr "Type"
 
-#: extra-locales/chimere/models.py:901 extra-locales/chimere/models.py:913
+#: extra-locales/chimere/models.py:903 extra-locales/chimere/models.py:915
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: extra-locales/chimere/models.py:914
+#: extra-locales/chimere/models.py:916
 msgid "Value"
 msgstr "Valeur"
 
-#: extra-locales/chimere/models.py:918
+#: extra-locales/chimere/models.py:920
 msgid "Property"
 msgstr "Propriété"
 
-#: extra-locales/chimere/tasks.py:42
+#: extra-locales/chimere/tasks.py:47
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: extra-locales/chimere/tasks.py:43
+#: extra-locales/chimere/tasks.py:48
 msgid "Import processing"
 msgstr "Import en cours"
 
-#: extra-locales/chimere/tasks.py:44
+#: extra-locales/chimere/tasks.py:49
 msgid "Import successfuly done"
 msgstr "Import fait avec succès"
 
-#: extra-locales/chimere/tasks.py:45
+#: extra-locales/chimere/tasks.py:50
 #, python-format
 msgid " %(new)d new item(s), %(updated)d updated item(s)"
 msgstr " %(new)d nouveau(x) élément(s), %(updated)d élément(s) mis à jour"
 
-#: extra-locales/chimere/tasks.py:46
+#: extra-locales/chimere/tasks.py:51
 msgid "Import failed"
 msgstr "Import échoué"
 
-#: extra-locales/chimere/tasks.py:47
+#: extra-locales/chimere/tasks.py:52
 msgid "Import canceled"
 msgstr "Import annulé"
 
-#: extra-locales/chimere/tasks.py:48
+#: extra-locales/chimere/tasks.py:53
 msgid "Export pending"
 msgstr "Export en attente"
 
-#: extra-locales/chimere/tasks.py:49
+#: extra-locales/chimere/tasks.py:54
 msgid "Export processing"
 msgstr "Export en cours"
 
-#: extra-locales/chimere/tasks.py:50
+#: extra-locales/chimere/tasks.py:55
 msgid "Export successfuly done"
 msgstr "Export réalisé avec succès"
 
-#: extra-locales/chimere/tasks.py:51
+#: extra-locales/chimere/tasks.py:56
 #, python-format
 msgid " %(updated)d updated item(s)"
 msgstr " %(updated)d éléments mis à jour"
 
-#: extra-locales/chimere/tasks.py:52
+#: extra-locales/chimere/tasks.py:57
 msgid "Export failed"
 msgstr "Export échoué"
 
-#: extra-locales/chimere/tasks.py:53
+#: extra-locales/chimere/tasks.py:58
 msgid "Export canceled"
 msgstr "Export annulé"
 
@@ -840,8 +840,8 @@ msgstr "indique un champ obligatoire"
 
 #: extra-locales/chimere/templates/chimere/edit.html:44
 #: extra-locales/chimere/templates/chimere/edit_route.html:41
-msgid "Themes"
-msgstr "Thèmes"
+msgid "Categories"
+msgstr "Catégories"
 
 #: extra-locales/chimere/templates/chimere/edit.html:86
 #: extra-locales/chimere/templates/chimere/edit_route.html:77
@@ -971,14 +971,20 @@ msgstr "Choisir une zone pré-définie"
 msgid "Or select the area by zooming and panning this map"
 msgstr "Ou sélectionner une zone en zoomant et en se déplaçant sur cette carte"
 
-#~ msgid "Category"
-#~ msgstr "Catégorie"
+#~ msgid "Categorys"
+#~ msgstr "Catégories"
+
+#~ msgid "Theme"
+#~ msgstr "Thème"
 
-#~ msgid "Subcategory"
-#~ msgstr "Sous-catégorie"
+#~ msgid "Subtheme"
+#~ msgstr "Sous-thème"
+
+#~ msgid "Subthemes"
+#~ msgstr "Sous-thèmes"
+
+#~ msgid "Themes"
+#~ msgstr "Thèmes"
 
 #~ msgid "Site name"
 #~ msgstr "Nom du site"
-
-#~ msgid "Categories"
-#~ msgstr "Catégories"