From cf9f179fdcbe2d4ef774e0c5837021b78b877346 Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Wed, 22 Feb 2017 18:17:27 +0100
Subject: [PATCH] change wording for 'category' (#15097)

---
 corbo/manage_urls.py                               | 12 ++++++------
 corbo/models.py                                    |  4 ++--
 corbo/templates/corbo/announce_list.html           |  2 +-
 corbo/templates/corbo/category_confirm_delete.html |  2 +-
 corbo/templates/corbo/category_form.html           |  4 ++--
 corbo/templates/corbo/manage.html                  |  6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/corbo/manage_urls.py b/corbo/manage_urls.py
index 1bf68ee..69f34ac 100644
--- a/corbo/manage_urls.py
+++ b/corbo/manage_urls.py
@@ -6,21 +6,21 @@ from .views import add_announce, edit_announce, delete_announce, \
 
 urlpatterns = patterns('',
             url(r'^$', manage, name='manage'),
-            url(r'^category/(?P<slug>[\w-]+)/announce/$', add_announce,
+            url(r'^section/(?P<slug>[\w-]+)/announce/$', add_announce,
                 name='add_announce'),
             url(r'^announce/edit/(?P<pk>\d+)$', edit_announce,
                 name='edit_announce'),
             url(r'^announce/delete/(?P<pk>\d+)$', delete_announce,
                 name='delete_announce'),
-            url(r'^category/(?P<slug>[\w-]+)/$', view_category,
+            url(r'^section/(?P<slug>[\w-]+)/$', view_category,
                 name='view_category'),
-            url(r'^category/add$', add_category,
+            url(r'^section/add$', add_category,
                 name='add_category'),
-            url(r'^category/edit/(?P<slug>[\w-]+)$', edit_category,
+            url(r'^section/edit/(?P<slug>[\w-]+)$', edit_category,
                 name='edit_category'),
-            url(r'^category/delete/(?P<slug>[\w-]+)$', delete_category,
+            url(r'^section/delete/(?P<slug>[\w-]+)$', delete_category,
                 name='delete_category'),
-            url(r'^category/(?P<slug>[\w-]+)/import-subscriptions/$', subscriptions_import,
+            url(r'^section/(?P<slug>[\w-]+)/import-subscriptions/$', subscriptions_import,
                 name='subscriptions-import'),
             url(r'^menu.json$', menu_json),
 )
diff --git a/corbo/models.py b/corbo/models.py
index ff30ad3..65c617a 100644
--- a/corbo/models.py
+++ b/corbo/models.py
@@ -94,7 +94,7 @@ class Category(models.Model):
 
 
 class Announce(models.Model):
-    category = models.ForeignKey('Category', verbose_name=_('category'))
+    category = models.ForeignKey('Category', verbose_name=_('section'))
     title = models.CharField(_('title'), max_length=256,
                              help_text=_('maximum 256 characters'))
     identifier = models.CharField(max_length=256, null=True, blank=True)
@@ -185,7 +185,7 @@ class Broadcast(models.Model):
 
 
 class Subscription(models.Model):
-    category = models.ForeignKey('Category', verbose_name=_('Category'))
+    category = models.ForeignKey('Category', verbose_name=_('Section'))
     uuid = models.CharField(_('User identifier'), max_length=128, blank=True)
     identifier = models.CharField(_('identifier'), max_length=128, blank=True,
                                   help_text=_('ex.: mailto, ...'))
diff --git a/corbo/templates/corbo/announce_list.html b/corbo/templates/corbo/announce_list.html
index 395f260..6b57c82 100644
--- a/corbo/templates/corbo/announce_list.html
+++ b/corbo/templates/corbo/announce_list.html
@@ -71,7 +71,7 @@
 {% else %}
 <div class="big-msg-info">
   {% blocktrans %}
-  This category doesn't have any announces yet. Click on "New announce" button in the top
+  This section doesn't have any announces yet. Click on "New announce" button in the top
   right of the page to add a first one.
   {% endblocktrans %}
 </div>
diff --git a/corbo/templates/corbo/category_confirm_delete.html b/corbo/templates/corbo/category_confirm_delete.html
index 4834015..a976926 100644
--- a/corbo/templates/corbo/category_confirm_delete.html
+++ b/corbo/templates/corbo/category_confirm_delete.html
@@ -7,7 +7,7 @@
   {% csrf_token %}
   <p>
     {% blocktrans with name=object.name %}
-    Are you sure you want to delete category "{{ name }}"?
+    Are you sure you want to delete section "{{ name }}"?
     {% endblocktrans %}
   </p>
     <p>{% trans "All its announces of will be also deleted" %}</p>
diff --git a/corbo/templates/corbo/category_form.html b/corbo/templates/corbo/category_form.html
index fdafd73..29b5665 100644
--- a/corbo/templates/corbo/category_form.html
+++ b/corbo/templates/corbo/category_form.html
@@ -3,9 +3,9 @@
 
 {% block appbar %}
 {% if object %}
-  <h2>{% trans "Edit Category" %}</h2>
+  <h2>{% trans "Edit Section" %}</h2>
 {% else %}
-  <h2>{% trans "New Category" %}</h2>
+  <h2>{% trans "New Section" %}</h2>
 {% endif %}
 {% endblock %}
 
diff --git a/corbo/templates/corbo/manage.html b/corbo/templates/corbo/manage.html
index aeffae6..edbb923 100644
--- a/corbo/templates/corbo/manage.html
+++ b/corbo/templates/corbo/manage.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 
 {% block appbar %}
-<h2>{% trans "Categories" %}</h2>
-<a href="{% url 'add_category' %}" rel='popup'>{% trans 'New category' %}</a>
+<h2>{% trans "Sections" %}</h2>
+<a href="{% url 'add_category' %}" rel='popup'>{% trans 'New section' %}</a>
 {% endblock %}
 
 {% block content %}
@@ -59,7 +59,7 @@
 {% else %}
 <div class="big-msg-info">
   {% blocktrans %}
-  There are no categories yet. Click on "New category" button in the top
+  There are no sections yet. Click on "New section" button in the top
   right of the page to add a first one.
   {% endblocktrans %}
 </div>
-- 
2.11.0