Project

General

Profile

0001-change-wording-for-category-15097.patch

Serghei Mihai, 22 February 2017 06:41 PM

Download (5.59 KB)

View differences:

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(-)
corbo/manage_urls.py
6 6

  
7 7
urlpatterns = patterns('',
8 8
            url(r'^$', manage, name='manage'),
9
            url(r'^category/(?P<slug>[\w-]+)/announce/$', add_announce,
9
            url(r'^section/(?P<slug>[\w-]+)/announce/$', add_announce,
10 10
                name='add_announce'),
11 11
            url(r'^announce/edit/(?P<pk>\d+)$', edit_announce,
12 12
                name='edit_announce'),
13 13
            url(r'^announce/delete/(?P<pk>\d+)$', delete_announce,
14 14
                name='delete_announce'),
15
            url(r'^category/(?P<slug>[\w-]+)/$', view_category,
15
            url(r'^section/(?P<slug>[\w-]+)/$', view_category,
16 16
                name='view_category'),
17
            url(r'^category/add$', add_category,
17
            url(r'^section/add$', add_category,
18 18
                name='add_category'),
19
            url(r'^category/edit/(?P<slug>[\w-]+)$', edit_category,
19
            url(r'^section/edit/(?P<slug>[\w-]+)$', edit_category,
20 20
                name='edit_category'),
21
            url(r'^category/delete/(?P<slug>[\w-]+)$', delete_category,
21
            url(r'^section/delete/(?P<slug>[\w-]+)$', delete_category,
22 22
                name='delete_category'),
23
            url(r'^category/(?P<slug>[\w-]+)/import-subscriptions/$', subscriptions_import,
23
            url(r'^section/(?P<slug>[\w-]+)/import-subscriptions/$', subscriptions_import,
24 24
                name='subscriptions-import'),
25 25
            url(r'^menu.json$', menu_json),
26 26
)
corbo/models.py
94 94

  
95 95

  
96 96
class Announce(models.Model):
97
    category = models.ForeignKey('Category', verbose_name=_('category'))
97
    category = models.ForeignKey('Category', verbose_name=_('section'))
98 98
    title = models.CharField(_('title'), max_length=256,
99 99
                             help_text=_('maximum 256 characters'))
100 100
    identifier = models.CharField(max_length=256, null=True, blank=True)
......
185 185

  
186 186

  
187 187
class Subscription(models.Model):
188
    category = models.ForeignKey('Category', verbose_name=_('Category'))
188
    category = models.ForeignKey('Category', verbose_name=_('Section'))
189 189
    uuid = models.CharField(_('User identifier'), max_length=128, blank=True)
190 190
    identifier = models.CharField(_('identifier'), max_length=128, blank=True,
191 191
                                  help_text=_('ex.: mailto, ...'))
corbo/templates/corbo/announce_list.html
71 71
{% else %}
72 72
<div class="big-msg-info">
73 73
  {% blocktrans %}
74
  This category doesn't have any announces yet. Click on "New announce" button in the top
74
  This section doesn't have any announces yet. Click on "New announce" button in the top
75 75
  right of the page to add a first one.
76 76
  {% endblocktrans %}
77 77
</div>
corbo/templates/corbo/category_confirm_delete.html
7 7
  {% csrf_token %}
8 8
  <p>
9 9
    {% blocktrans with name=object.name %}
10
    Are you sure you want to delete category "{{ name }}"?
10
    Are you sure you want to delete section "{{ name }}"?
11 11
    {% endblocktrans %}
12 12
  </p>
13 13
    <p>{% trans "All its announces of will be also deleted" %}</p>
corbo/templates/corbo/category_form.html
3 3

  
4 4
{% block appbar %}
5 5
{% if object %}
6
  <h2>{% trans "Edit Category" %}</h2>
6
  <h2>{% trans "Edit Section" %}</h2>
7 7
{% else %}
8
  <h2>{% trans "New Category" %}</h2>
8
  <h2>{% trans "New Section" %}</h2>
9 9
{% endif %}
10 10
{% endblock %}
11 11

  
corbo/templates/corbo/manage.html
2 2
{% load i18n %}
3 3

  
4 4
{% block appbar %}
5
<h2>{% trans "Categories" %}</h2>
6
<a href="{% url 'add_category' %}" rel='popup'>{% trans 'New category' %}</a>
5
<h2>{% trans "Sections" %}</h2>
6
<a href="{% url 'add_category' %}" rel='popup'>{% trans 'New section' %}</a>
7 7
{% endblock %}
8 8

  
9 9
{% block content %}
......
59 59
{% else %}
60 60
<div class="big-msg-info">
61 61
  {% blocktrans %}
62
  There are no categories yet. Click on "New category" button in the top
62
  There are no sections yet. Click on "New section" button in the top
63 63
  right of the page to add a first one.
64 64
  {% endblocktrans %}
65 65
</div>
66
-