[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.
This commit is contained in:
Foram Shah
2016-06-14 16:23:50 +02:00
committed by Yannick Tivisse
parent 78b52fb637
commit 052dcd3ee8
12 changed files with 15 additions and 15 deletions
@@ -634,7 +634,7 @@ var FieldBooleanButton = common.AbstractField.extend({
this.hover_false = _t("Activate"); this.hover_false = _t("Activate");
break; break;
case "archive": case "archive":
this.string_true = _t("Not Archived"); this.string_true = _t("Active");
this.hover_true = _t("Archive"); this.hover_true = _t("Archive");
this.string_false = _t("Archived"); this.string_false = _t("Archived");
this.hover_false = _t("Unarchive"); this.hover_false = _t("Unarchive");
@@ -19,7 +19,7 @@ var WidgetWebsiteButton = form_common.AbstractField.extend({
.removeClass('text-danger') .removeClass('text-danger')
.addClass('text-success'); .addClass('text-success');
} else { } else {
$value.html(_t('Not Published')) $value.html(_t('Unpublished'))
.removeClass('text-success') .removeClass('text-success')
.addClass('text-danger'); .addClass('text-danger');
} }
+2 -2
View File
@@ -423,7 +423,7 @@
<template id="publish_management"> <template id="publish_management">
<div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None"> <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None">
<div t-attf-class="btn-group js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller"> <div t-attf-class="btn-group js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
<button class="btn btn-danger js_publish_btn">Not Published</button> <button class="btn btn-danger js_publish_btn">Unpublished</button>
<button class="btn btn-success js_publish_btn">Published</button> <button class="btn btn-success js_publish_btn">Published</button>
<button type="button" t-attf-class="btn btn-default dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown"> <button type="button" t-attf-class="btn btn-default dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
@@ -442,7 +442,7 @@
<template id="publish_short"> <template id="publish_short">
<t groups="base.group_website_publisher" t-ignore="true"> <t groups="base.group_website_publisher" t-ignore="true">
<div t-attf-class="pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller"> <div t-attf-class="pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
<button class="btn btn-danger js_publish_btn">Not Published</button> <button class="btn btn-danger js_publish_btn">Unpublished</button>
<button class="btn btn-success js_publish_btn">Published</button> <button class="btn btn-success js_publish_btn">Published</button>
</div> </div>
</t> </t>
+1 -1
View File
@@ -112,7 +112,7 @@ class WebsiteBlog(http.Controller):
- 'active_tag_ids' : list of active tag ids, - 'active_tag_ids' : list of active tag ids,
- 'tags_list' : function to built the comma-separated tag list ids (for the url), - 'tags_list' : function to built the comma-separated tag list ids (for the url),
- 'tags': all tags, for navigation - '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 - 'nav_list': a dict [year][month] for archives navigation
- 'date': date_begin optional parameter, used in archives navigation - 'date': date_begin optional parameter, used in archives navigation
- 'blog_url': help object to create URLs - 'blog_url': help object to create URLs
@@ -6,7 +6,7 @@
<img class="media-object img-circle" t-att-src="res.author_image" style="width: 30px;"/> <img class="media-object img-circle" t-att-src="res.author_image" style="width: 30px;"/>
</div> </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"> <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> <button class="btn btn-success btn-xs js_publish_btn">Published</button>
</div> </div>
<div class="media-body discussion_scroll_post"> <div class="media-body discussion_scroll_post">
@@ -61,7 +61,7 @@
<h4> <h4>
<a t-attf-href="#{blog_url('', ['blog', 'post'], blog=post.blog_id, post=post)}" t-field="post.name"></a> <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 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> </span>
</h4> </h4>
<div class="text-muted"> <div class="text-muted">
@@ -161,7 +161,7 @@
<t t-if="blog_post.visits > 1">views</t> <t t-if="blog_post.visits > 1">views</t>
</span> </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> </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> <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>
<li t-attf-class="#{state == 'unpublished' and 'active' or ''}"> <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> </li>
</ul> </ul>
</section> </section>
@@ -59,7 +59,7 @@
<a itemprop="url" t-att-class="event.state == 'done' and 'text-success'" t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register' or ''}"><span itemprop="name" t-field="event.name"> </span></a> <a itemprop="url" t-att-class="event.state == 'done' and 'text-success'" t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register' or ''}"><span itemprop="name" t-field="event.name"> </span></a>
<small t-if="event.is_participating" class="label label-info">Participating</small> <small t-if="event.is_participating" class="label label-info">Participating</small>
<small t-if="not event.address_id" class="label label-info">Online</small> <small t-if="not event.address_id" class="label label-info">Online</small>
<small t-if="not event.website_published" class="label label-danger">not published</small> <small t-if="not event.website_published" class="label label-danger">unpublished</small>
</h4> </h4>
<div> <div>
<t t-if="event.organizer_id"> <t t-if="event.organizer_id">
@@ -126,7 +126,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
<h3 class="mt0 mb0"> <h3 class="mt0 mb0">
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a> <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
<small t-if="not track.website_published" class="label label-danger">not published</small> <small t-if="not track.website_published" class="label label-danger">unpublished</small>
</h3> </h3>
<ul class="list-inline mb0"> <ul class="list-inline mb0">
<li t-if="track.speaker_ids" class="text-muted fa fa-user"> <li t-if="track.speaker_ids" class="text-muted fa fa-user">
@@ -73,7 +73,7 @@
"fields": ["address"], "fields": ["address"],
"no_tag_br": true "no_tag_br": true
}'/> }'/>
<span t-if="not job.website_published" class="label label-danger">not published</span> <span t-if="not job.website_published" class="label label-danger">unpublished</span>
<div class="text-muted"> <div class="text-muted">
<i class="fa fa-clock-o"/> <span t-field="job.write_date"/> <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
</div> </div>
@@ -20,7 +20,7 @@ class WebsiteRatingProject(http.Controller):
user = request.env.user user = request.env.user
project = request.env['project.project'].sudo().browse(project_id) project = request.env['project.project'].sudo().browse(project_id)
# to avoid giving any access rights on projects to the public user, let's use sudo # to avoid giving any access rights on projects to the public user, let's use sudo
# and check if the user should be able to view the project (project managers only if it's not published or has no rating) # and check if the user should be able to view the project (project managers only if it's unpublished or has no rating)
if not (project.is_visible_happy_customer and project.website_published) and not user.sudo(user).has_group('project.group_project_manager'): if not (project.is_visible_happy_customer and project.website_published) and not user.sudo(user).has_group('project.group_project_manager'):
raise NotFound() raise NotFound()
issues = request.env['project.issue'].sudo().search([('project_id', '=', project.id)]) issues = request.env['project.issue'].sudo().search([('project_id', '=', project.id)])
+1 -1
View File
@@ -171,7 +171,7 @@ class website_slides(http.Controller):
def slide_comment(self, slide, **post): def slide_comment(self, slide, **post):
""" Controller for message_post. Public user can post; their name and """ Controller for message_post. Public user can post; their name and
email is used to find or create a partner and post as admin with the email is used to find or create a partner and post as admin with the
right partner. Their comments are not published by default. Logged right partner. Their comments are unpublished by default. Logged
users can post as usual. """ users can post as usual. """
# TDE TODO : # TDE TODO :
# - subscribe partner instead of user writing the message ? # - subscribe partner instead of user writing the message ?
@@ -337,7 +337,7 @@
<a t-attf-href="/slides/slide/#{slug(slide)}"> <a t-attf-href="/slides/slide/#{slug(slide)}">
<img t-attf-src="/web/image/slide.slide/#{slide.id}/image_thumb" class="img-responsive img-thumbnail oe_slides_grid_thumbnail"/> <img t-attf-src="/web/image/slide.slide/#{slide.id}/image_thumb" class="img-responsive img-thumbnail oe_slides_grid_thumbnail"/>
</a> </a>
<span t-if="not slide.website_published" class="label label-danger" style="position: absolute;right: 20px;top: 7px;">Not Published</span> <span t-if="not slide.website_published" class="label label-danger" style="position: absolute;right: 20px;top: 7px;">Unpublished</span>
<a t-if="not is_public_user and slide.website_published and slide.channel_id.promote_strategy == 'custom' and slide.channel_id.promoted_slide_id.id != slide.id" <a t-if="not is_public_user and slide.website_published and slide.channel_id.promote_strategy == 'custom' and slide.channel_id.promoted_slide_id.id != slide.id"
groups="base.group_user" groups="base.group_user"
t-attf-href="/slides/slide/#{slide.id}/promote" t-attf-href="/slides/slide/#{slide.id}/promote"