diff options
| author | Foram Shah <fsh@odoo.com> | 2016-06-08 17:53:22 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-06-14 16:23:50 +0200 |
| commit | 052dcd3ee8d48ffa1da0579a650065f3ff07e312 (patch) | |
| tree | e4fb2ecac7f545a8d2144d3e1a635bccb28053d7 /addons/website_blog | |
| parent | 78b52fb637c0dbd68ca8089e048781a89e3efed5 (diff) | |
[IMP] web: 'Not Archived' becomes 'Active', 'Not published' becomes 'Unpublished'
Another reason why it’s better to change ‘not archived’ into ‘active’ is
because ‘active’ is the functional name of this field in the filter list in list view.
For the rest, it’s just a better en_US way of saying it.
Diffstat (limited to 'addons/website_blog')
| -rw-r--r-- | addons/website_blog/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_blog/static/src/xml/website_blog.inline.discussion.xml | 2 | ||||
| -rw-r--r-- | addons/website_blog/views/website_blog_templates.xml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 4afd8b4e963..39fab7ad96c 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -112,7 +112,7 @@ class WebsiteBlog(http.Controller): - 'active_tag_ids' : list of active tag ids, - 'tags_list' : function to built the comma-separated tag list ids (for the url), - 'tags': all tags, for navigation - - 'state_info': state of published/not published filter + - 'state_info': state of published/unpublished filter - 'nav_list': a dict [year][month] for archives navigation - 'date': date_begin optional parameter, used in archives navigation - 'blog_url': help object to create URLs diff --git a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml index 3f95bd7e031..1192024f991 100644 --- a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml +++ b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml @@ -6,7 +6,7 @@ <img class="media-object img-circle" t-att-src="res.author_image" style="width: 30px;"/> </div> <div t-attf-class="pull-right btn-group js_publish_management #{res.website_published and 'css_published' or 'css_unpublished'} #{res.publish ? '' : 'hidden'}" data-object="mail.message" t-att-data-id="res.id"> - <button class="btn btn-danger btn-xs js_publish_btn">Not Published</button> + <button class="btn btn-danger btn-xs js_publish_btn">Unpublished</button> <button class="btn btn-success btn-xs js_publish_btn">Published</button> </div> <div class="media-body discussion_scroll_post"> diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 5360f64fbf9..561f9407fd0 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -61,7 +61,7 @@ <h4> <a t-attf-href="#{blog_url('', ['blog', 'post'], blog=post.blog_id, post=post)}" t-field="post.name"></a> <span t-if="not post.website_published" class="text-warning"> - <span class="fa fa-exclamation-triangle ml8" title="Not published"/> + <span class="fa fa-exclamation-triangle ml8" title="Unpublished"/> </span> </h4> <div class="text-muted"> @@ -161,7 +161,7 @@ <t t-if="blog_post.visits > 1">views</t> </span> - <span t-if="not blog_post.website_published" class="label label-danger">not published</span> + <span t-if="not blog_post.website_published" class="label label-danger">unpublished</span> </div> </div> </div> @@ -450,7 +450,7 @@ <a t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}">Published <span class="pull-right badge" t-esc="state_info['published']" /></a> </li> <li t-attf-class="#{state == 'unpublished' and 'active' or ''}"> - <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}">Not Published <span class="pull-right badge" t-esc="state_info['unpublished']" /></a> + <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}">Unpublished <span class="pull-right badge" t-esc="state_info['unpublished']" /></a> </li> </ul> </section> |