summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorBenoit Socias <bso@odoo.com>2020-10-16 14:42:16 +0000
committerBenoit Socias <bso@odoo.com>2020-10-22 08:57:57 +0000
commit9896af94ebc887d98ccf44e6568ef7eeb5a27172 (patch)
treefdf3d713678a4fc67e7b2a9772a58fe4f1386b2f /addons
parent0a3fe0a513abbde8f74d59de522a216035cdcd98 (diff)
[FIX] various: not translate the close icon of notifications
Same change in several areas where translations existed: - website editor notification popup - elearning share popup - forum remediation filter popup - event registration attendees popup - portal rating popup - stripe payment error popup And many other locations where there were no translations yet "&times;" has been replaced by its UTF8 character. Also introduced aria-label where missing. Before this commit the close icon was included in translated resources. For example, in Spanish the "&times;" had been turned into "&veces;" thus not rendering an icon anymore After this commit the close icon is not a translated text anymore and remains an icon across all languages https://github.com/odoo/odoo/pull/60186 task-2312878 closes odoo/odoo#60186 Related: odoo/enterprise#14209 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons')
-rw-r--r--addons/account_payment/views/account_portal_templates.xml2
-rw-r--r--addons/payment/views/payment_portal_templates.xml8
-rw-r--r--addons/payment_stripe/static/src/xml/stripe_templates.xml2
-rw-r--r--addons/portal_rating/static/src/xml/portal_rating_composer.xml2
-rw-r--r--addons/sale/views/sale_portal_templates.xml14
-rw-r--r--addons/sale_quotation_builder/views/sale_portal_templates.xml2
-rw-r--r--addons/survey/views/survey_templates.xml2
-rw-r--r--addons/web/static/src/xml/notification.xml2
-rw-r--r--addons/website/static/src/snippets/s_image_gallery/000.xml2
-rw-r--r--addons/website/views/snippets/s_popup.xml2
-rw-r--r--addons/website/views/website_templates.xml2
-rw-r--r--addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml10
-rw-r--r--addons/website_event/views/event_templates_page_registration.xml2
-rw-r--r--addons/website_event_meet/views/event_meet_templates_list.xml2
-rw-r--r--addons/website_forum/views/website_forum.xml2
-rw-r--r--addons/website_profile/views/website_profile.xml4
-rw-r--r--addons/website_slides/views/website_slides_templates_utils.xml2
17 files changed, 31 insertions, 31 deletions
diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml
index d5b225a1ea6..90973219bde 100644
--- a/addons/account_payment/views/account_portal_templates.xml
+++ b/addons/account_payment/views/account_portal_templates.xml
@@ -45,7 +45,7 @@
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">Pay with</h3>
- <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div t-if="pms or acquirers" id="payment_method" class="text-left col-md-13">
diff --git a/addons/payment/views/payment_portal_templates.xml b/addons/payment/views/payment_portal_templates.xml
index 5ce3eb8724d..3158614a21f 100644
--- a/addons/payment/views/payment_portal_templates.xml
+++ b/addons/payment/views/payment_portal_templates.xml
@@ -125,7 +125,7 @@
To be called with the 'payment_tx_id' value.
-->
<div t-if="payment_tx_id and payment_tx_id.state == 'pending'" class="alert alert-warning alert-dismissable" role="status">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
<span t-if='payment_tx_id.acquirer_id.pending_msg' t-raw="payment_tx_id.acquirer_id.pending_msg"/>
<span t-if='thanks_msg' t-raw="thanks_msg"/>
<div t-if="payment_tx_id.acquirer_id.provider == 'transfer' and reference">
@@ -141,12 +141,12 @@
</div>
</div>
<div t-if="payment_tx_id and payment_tx_id.state == 'authorized' and payment_tx_id.acquirer_id.authorize_implemented" class="alert alert-success alert-dismissable" role="alert">
- <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">×</button>
<!-- Your payment has been authorized. -->
<span t-if='payment_tx_id.acquirer_id.auth_msg' t-raw="payment_tx_id.acquirer_id.auth_msg"/>
</div>
<div t-if="payment_tx_id and payment_tx_id.state == 'done'" class="alert alert-success alert-dismissable">
- <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">×</button>
<span t-if='payment_tx_id.acquirer_id.done_msg' t-raw="payment_tx_id.acquirer_id.done_msg"/>
<span t-if='thanks_msg' t-raw="thanks_msg"/>
<div t-if="thanks_msg and payment_tx_id.acquirer_id.provider == 'transfer' and reference">
@@ -154,7 +154,7 @@
</div>
</div>
<div t-if="payment_tx_id and payment_tx_id.state == 'cancel'" class="alert alert-danger alert-dismissable">
- <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" title="Dismiss" aria-label="Dismiss">×</button>
<span t-if='payment_tx_id.acquirer_id.cancel_msg' t-raw="payment_tx_id.acquirer_id.cancel_msg"/>
</div>
<div t-if="payment_tx_id and payment_tx_id.state_message">
diff --git a/addons/payment_stripe/static/src/xml/stripe_templates.xml b/addons/payment_stripe/static/src/xml/stripe_templates.xml
index 8272aea8532..97fd4c9796c 100644
--- a/addons/payment_stripe/static/src/xml/stripe_templates.xml
+++ b/addons/payment_stripe/static/src/xml/stripe_templates.xml
@@ -6,7 +6,7 @@
<div class="modal-content">
<header class="modal-header">
<h4 class="modal-title">Error</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body">
<t t-esc="msg"></t>
diff --git a/addons/portal_rating/static/src/xml/portal_rating_composer.xml b/addons/portal_rating/static/src/xml/portal_rating_composer.xml
index 65f2b55b55a..d9d46d99689 100644
--- a/addons/portal_rating/static/src/xml/portal_rating_composer.xml
+++ b/addons/portal_rating/static/src/xml/portal_rating_composer.xml
@@ -39,7 +39,7 @@
</t>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span>&amp;times;</span>
+ <span>×</span>
</button>
</div>
<div class="modal-body">
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 837acdfbe8b..73a8f150ec6 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -205,7 +205,7 @@
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<header class="modal-header">
<h4 class="modal-title">Validate Order</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<p>
@@ -228,7 +228,7 @@
<div class="modal-content">
<header class="modal-header">
<h4 class="modal-title">Validate Order</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<p>
@@ -262,7 +262,7 @@
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<header class="modal-header">
<h4 class="modal-title">Reject This Quotation</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body">
<p>
@@ -280,7 +280,7 @@
<!-- status messages -->
<div t-if="message == 'sign_ok'" class="alert alert-success alert-dismissable d-print-none" role="status">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
<strong>Thank You!</strong><br/>
<t t-if="message == 'sign_ok' and sale_order.state in ['sale', 'done']">Your order has been confirmed.</t>
<t t-elif="message == 'sign_ok' and sale_order.has_to_be_paid()">Your order has been signed but still needs to be paid to be confirmed.</t>
@@ -288,7 +288,7 @@
</div>
<div t-if="message == 'cant_reject' and sale_order.has_to_be_signed()" class="alert alert-danger alert-dismissable d-print-none" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
Your order is not in a state to be rejected.
</div>
@@ -300,12 +300,12 @@
</t>
<div t-if="sale_order.state == 'cancel'" class="alert alert-danger alert-dismissable d-print-none" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="close">×</button>
<strong>This quotation has been canceled.</strong> <a role="button" href="#discussion"><i class="fa fa-comment"/> Contact us to get a new quotation.</a>
</div>
<div t-if="sale_order.is_expired" class="alert alert-warning alert-dismissable d-print-none" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="close">×</button>
<strong>This offer expired!</strong> <a role="button" href="#discussion"><i class="fa fa-comment"/> Contact us to get a new quotation.</a>
</div>
diff --git a/addons/sale_quotation_builder/views/sale_portal_templates.xml b/addons/sale_quotation_builder/views/sale_portal_templates.xml
index 97687814af5..7b4d9c36f8b 100644
--- a/addons/sale_quotation_builder/views/sale_portal_templates.xml
+++ b/addons/sale_quotation_builder/views/sale_portal_templates.xml
@@ -10,7 +10,7 @@
<t t-set="product_tmpl_ids" t-value="product_tmpl_ids + [line.product_id.product_tmpl_id.id]"/>
<a t-att-id="line.id"/>
<div class="alert alert-info alert-dismissable mt16 css_non_editable_mode_hidden o_not_editable" t-ignore="True" role="status">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
Product: <strong t-esc="line.product_id.name"/>:
this content will appear on the quotation only if this
product is not removed.
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 103e982ad59..c1656efa084 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -116,7 +116,7 @@
<div class="modal-content">
<header class="modal-header">
<h4 class="modal-title">A problem has occured</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body"><p>To take this survey, please close all other tabs on <strong class="text-danger"></strong>.</p></main>
<footer class="modal-footer"><button type="button" class="btn btn-primary" data-dismiss="modal">Continue here</button></footer>
diff --git a/addons/web/static/src/xml/notification.xml b/addons/web/static/src/xml/notification.xml
index e23538d1e28..0555c21caa9 100644
--- a/addons/web/static/src/xml/notification.xml
+++ b/addons/web/static/src/xml/notification.xml
@@ -8,7 +8,7 @@
<button type="button"
class="close o_notification_close"
data-dismiss="toast" aria-label="Close">
- <span class="d-inline" aria-hidden="true">&amp;times;</span>
+ <span class="d-inline" aria-hidden="true">×</span>
</button>
</t>
<div t-if="widget.title" class="toast-header">
diff --git a/addons/website/static/src/snippets/s_image_gallery/000.xml b/addons/website/static/src/snippets/s_image_gallery/000.xml
index 0b6d6385275..a50a1af5674 100644
--- a/addons/website/static/src/snippets/s_image_gallery/000.xml
+++ b/addons/website/static/src/snippets/s_image_gallery/000.xml
@@ -58,7 +58,7 @@
t-attf-style="">
<div class="modal-content bg-transparent">
<main class="modal-body o_slideshow bg-transparent">
- <button type="button" class="close text-white" data-dismiss="modal" style="position: absolute; right: 10px; top: 10px;"><span role="img" aria-label="Close">&amp;times;</span><span class="sr-only">Close</span></button>
+ <button type="button" class="close text-white" data-dismiss="modal" style="position: absolute; right: 10px; top: 10px;"><span role="img" aria-label="Close">×</span><span class="sr-only">Close</span></button>
<t t-call="website.gallery.slideshow"></t>
</main>
</div>
diff --git a/addons/website/views/snippets/s_popup.xml b/addons/website/views/snippets/s_popup.xml
index 0dc47df0f35..3d383213a30 100644
--- a/addons/website/views/snippets/s_popup.xml
+++ b/addons/website/views/snippets/s_popup.xml
@@ -14,7 +14,7 @@
role="dialog">
<div class="modal-dialog d-flex">
<div class="modal-content oe_structure">
- <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable">&amp;times;</div>
+ <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable" aria-label="Close">×</div>
<section class="s_banner oe_img_bg pt96 pb96"
data-snippet="s_banner"
style="background-image: url('/web/image/website.s_popup_default_image');">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c1f2972f543..3d7cfa97afb 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -2038,7 +2038,7 @@
</p>
<div class="alert alert-warning alert-dismissable mt16" groups="website.group_website_publisher" role="status">
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
<p>
Note: To hide this page, uncheck it from the top Customize menu.
</p>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 3ff7b69a97c..7481995a37a 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -274,7 +274,7 @@
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<header class="modal-header">
<h4 class="modal-title">New Opportunity</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="new-opp-dialog">
<div class="form-group">
@@ -430,7 +430,7 @@
<input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
<header class="modal-header">
<h4 class="modal-title">Lead Feedback</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<div class="form-group">
@@ -459,7 +459,7 @@
<input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
<header class="modal-header">
<h4 class="modal-title">Lead Feedback</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<div class="form-group">
@@ -623,7 +623,7 @@
<input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
<header class="modal-header">
<h4 class="modal-title">Edit Opportunity</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<div class="form-group">
@@ -727,7 +727,7 @@
<input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
<header class="modal-header">
<h4 class="modal-title">Edit Contact</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</header>
<main class="modal-body" id="sign-dialog">
<t t-if="opportunity.partner_name">
diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml
index ad454de1a5c..24c5456b5b9 100644
--- a/addons/website_event/views/event_templates_page_registration.xml
+++ b/addons/website_event/views/event_templates_page_registration.xml
@@ -257,7 +257,7 @@
<div class="modal-content">
<div class="modal-header align-items-center">
<h4 class="modal-title">Attendees</h4>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&amp;times;</span></button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>×</span></button>
</div>
<t t-set="counter_type" t-value="1"/>
<t t-set="counter" t-value="0"/>
diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml
index 7405c886bb6..a6b7d5b9c35 100644
--- a/addons/website_event_meet/views/event_meet_templates_list.xml
+++ b/addons/website_event_meet/views/event_meet_templates_list.xml
@@ -66,7 +66,7 @@
</div>
</div>
</nav>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
<t t-if="not event.is_done">
<span>This room is not open right now!</span><br />
Join us here on the
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 137b39d0bda..40e06e1a9f9 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1612,7 +1612,7 @@
<a class="nav-link spam_menu" id="character-tab" data-toggle="tab" href="#spam_character" role="tab" aria-controls="spam_character" aria-selected="false">圾 Text</a>
</li>
</ul>
- <button type="button" class="close align-self-start" data-dismiss="modal"><span>&amp;times;</span></button>
+ <button type="button" class="close align-self-start" data-dismiss="modal"><span aria-label="Close">×</span></button>
</div>
<div class="modal-body bg-100">
<div class="tab-content" id="o_tab_content_spam">
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
index 55e4c53fb4d..52a7338bb3a 100644
--- a/addons/website_profile/views/website_profile.xml
+++ b/addons/website_profile/views/website_profile.xml
@@ -638,14 +638,14 @@
<t t-set="done_alert_classes" t-value="done_alert_classes if done_alert_classes else 'alert alert-success alert-dismissable'"/>
<div t-if="not validation_email_sent and not is_public_user and user.karma == 0" t-att-class="send_alert_classes" role="alert">
- <button type="button" class="close validation_email_close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close validation_email_close" data-dismiss="alert" aria-label="Close">×</button>
It appears your email has not been verified.<br/>
<a class="send_validation_email alert-link" href="#" t-att-data-redirect_url="redirect_url">
<span t-esc="send_validation_email_message"/>
</a>
</div>
<div t-if="validation_email_done" t-att-class="done_alert_classes" role="status">
- <button type="button" class="close validated_email_close" data-dismiss="alert" aria-label="Close">&amp;times;</button>
+ <button type="button" class="close validated_email_close" data-dismiss="alert" aria-label="Close">×</button>
<span id="email_validated_message">Congratulations! Your email has just been validated.</span>
<span t-esc="additional_validated_email_message"/>
</div>
diff --git a/addons/website_slides/views/website_slides_templates_utils.xml b/addons/website_slides/views/website_slides_templates_utils.xml
index c2b89125df1..90591c6eb94 100644
--- a/addons/website_slides/views/website_slides_templates_utils.xml
+++ b/addons/website_slides/views/website_slides_templates_utils.xml
@@ -31,7 +31,7 @@
Share
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span>&amp;times;</span>
+ <span>×</span>
</button>
</div>
</template>