Tips: All emails sent or received are saved in the history here")),
position: "bottom"
}, {
trigger: ".o_Chatter .o_Composer_buttonSend",
diff --git a/addons/mail/static/src/js/tours/mail.js b/addons/mail/static/src/js/tours/mail.js
index 90b6a49ad62..85b16cc592b 100644
--- a/addons/mail/static/src/js/tours/mail.js
+++ b/addons/mail/static/src/js/tours/mail.js
@@ -1,20 +1,19 @@
/** @odoo-module **/
-import core from 'web.core';
+import {_t} from 'web.core';
+import {Markup} from 'web.utils';
import tour from 'web_tour.tour';
-var _t = core._t;
-
tour.register('mail_tour', {
url: "/web#action=mail.widgets.discuss",
sequence: 80,
}, [{
trigger: '.o_DiscussSidebar_groupChannel .o_DiscussSidebar_groupHeaderItemAdd',
- content: _t("
Channels make it easy to organize information across different topics and groups.
Try to create your first channel (e.g. sales, marketing, product XYZ, after work party, etc).
"),
+ content: Markup(_t("
Channels make it easy to organize information across different topics and groups.
Try to create your first channel (e.g. sales, marketing, product XYZ, after work party, etc).
")),
position: 'bottom',
}, {
trigger: '.o_DiscussSidebar_itemNewInput',
- content: _t("
Create a channel here.
"),
+ content: Markup(_t("
Create a channel here.
")),
position: 'bottom',
auto: true,
run: function (actions) {
@@ -23,14 +22,14 @@ tour.register('mail_tour', {
},
}, {
trigger: ".o_DiscussSidebar_newChannelAutocompleteSuggestions",
- content: _t("
Create a public or private channel.
"),
+ content: Markup(_t("
Create a public or private channel.
")),
position: 'right',
run() {
this.$consumeEventAnchors.find('li:first').click();
},
}, {
trigger: '.o_Discuss_thread .o_ComposerTextInput_textarea',
- content: _t("
Write a message to the members of the channel here.
You can notify someone with '@' or link another channel with '#'. Start your message with '/' to get the list of possible commands.
"),
+ content: Markup(_t("
Write a message to the members of the channel here.
You can notify someone with '@' or link another channel with '#'. Start your message with '/' to get the list of possible commands.
")),
position: "top",
width: 350,
run: function (actions) {
@@ -43,7 +42,7 @@ tour.register('mail_tour', {
position: "top",
}, {
trigger: '.o_Discuss_thread .o_Message_commandStar',
- content: _t("Messages can be
starred to remind you to check back later."),
+ content: Markup(_t("Messages can be
starred to remind you to check back later.")),
position: "bottom",
}, {
trigger: '.o_DiscussSidebarItem.o-starred-box',
@@ -51,6 +50,6 @@ tour.register('mail_tour', {
position: "bottom",
}, {
trigger: '.o_DiscussSidebar_groupChat .o_DiscussSidebar_groupHeaderItemAdd',
- content: _t("
Chat with coworkers in real-time using direct messages.
You might need to invite users from the Settings app first.
"),
+ content: Markup(_t("
Chat with coworkers in real-time using direct messages.
You might need to invite users from the Settings app first.
")),
position: 'bottom',
}]);
diff --git a/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js b/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
index 47dad7b1b24..b9189c261a3 100644
--- a/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
+++ b/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
@@ -1,8 +1,8 @@
odoo.define('mass_mailing.mass_mailing_tour', function (require) {
"use strict";
- var core = require('web.core');
- var _t = core._t;
+ const {_t} = require('web.core');
+ const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
var now = moment();
@@ -22,11 +22,11 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
edition: 'community',
}, {
trigger: '.o-kanban-button-new',
- content: _t("Start by creating your first
Mailing."),
+ content: Markup(_t("Start by creating your first
Mailing.")),
position: 'bottom',
}, {
trigger: 'input[name="subject"]',
- content: _t('Pick the
email subject.'),
+ content: Markup(_t('Pick the
email subject.')),
position: 'right',
run: 'text ' + now.format("MMMM") + " Newsletter",
}, {
@@ -39,13 +39,13 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
auto: true,
}, {
trigger: 'div[name="body_arch"] iframe #newsletter',
- content: _t('Choose this
theme.'),
+ content: Markup(_t('Choose this
theme.')),
position: 'left',
edition: 'enterprise',
run: 'click',
}, {
trigger: 'div[name="body_arch"] iframe #default',
- content: _t('Choose this
theme.'),
+ content: Markup(_t('Choose this
theme.')),
position: 'right',
edition: 'community',
run: 'click',
@@ -80,7 +80,7 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
run: "click",
}, {
trigger: '.o_back_button',
- content: _t("By using the
Breadcrumb, you can navigate back to the overview."),
+ content: Markup(_t("By using the
Breadcrumb, you can navigate back to the overview.")),
position: 'bottom',
run: 'click',
}]
diff --git a/addons/point_of_sale/static/src/js/tours/point_of_sale.js b/addons/point_of_sale/static/src/js/tours/point_of_sale.js
index 49a6fc0ac3e..37bc8736206 100644
--- a/addons/point_of_sale/static/src/js/tours/point_of_sale.js
+++ b/addons/point_of_sale/static/src/js/tours/point_of_sale.js
@@ -1,30 +1,29 @@
odoo.define('point_of_sale.tour', function(require) {
"use strict";
-var core = require('web.core');
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
-var _t = core._t;
-
tour.register('point_of_sale_tour', {
url: "/web",
rainbowMan: false,
sequence: 45,
}, [tour.stepUtils.showAppsMenuItem(), {
trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
- content: _t("Ready to launch your
point of sale?"),
+ content: Markup(_t("Ready to launch your
point of sale?")),
width: 215,
position: 'right',
edition: 'community'
}, {
trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
- content: _t("Ready to launch your
point of sale?"),
+ content: Markup(_t("Ready to launch your
point of sale?")),
width: 215,
position: 'bottom',
edition: 'enterprise'
}, {
trigger: ".o_pos_kanban button.oe_kanban_action_button",
- content: _t("
Ready to have a look at the POS Interface? Let's start our first session.
"),
+ content: Markup(_t("
Ready to have a look at the POS Interface? Let's start our first session.
")),
position: "bottom"
}]);
diff --git a/addons/project/static/src/js/tours/project.js b/addons/project/static/src/js/tours/project.js
index a0984eff0c8..c90d2eab0bb 100644
--- a/addons/project/static/src/js/tours/project.js
+++ b/addons/project/static/src/js/tours/project.js
@@ -1,46 +1,45 @@
odoo.define('project.tour', function(require) {
"use strict";
-var core = require('web.core');
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
-var _t = core._t;
-
tour.register('project_tour', {
sequence: 110,
url: "/web",
rainbowManMessage: "Congratulations, you are now a master of project management.",
}, [tour.stepUtils.showAppsMenuItem(), {
trigger: '.o_app[data-menu-xmlid="project.menu_main_pm"]',
- content: _t('Want a better way to
manage your projects?
It starts here.'),
+ content: Markup(_t('Want a better way to
manage your projects?
It starts here.')),
position: 'right',
edition: 'community',
}, {
trigger: '.o_app[data-menu-xmlid="project.menu_main_pm"]',
- content: _t('Want a better way to
manage your projects?
It starts here.'),
+ content: Markup(_t('Want a better way to
manage your projects?
It starts here.')),
position: 'bottom',
edition: 'enterprise',
}, {
trigger: '.o-kanban-button-new',
extra_trigger: '.o_project_kanban',
- content: _t('Let\'s create your first
project.'),
+ content: Markup(_t('Let\'s create your first
project.')),
position: 'bottom',
width: 200,
}, {
trigger: 'input.o_project_name',
- content: _t('Choose a
name for your project.
It can be anything you want: the name of a customer,\
- of a product, of a team, of a construction site, etc.'),
+ content: Markup(_t('Choose a
name for your project.
It can be anything you want: the name of a customer,\
+ of a product, of a team, of a construction site, etc.')),
position: 'right',
}, {
trigger: '.o_open_tasks',
- content: _t('Let\'s create your first
project.'),
+ content: Markup(_t('Let\'s create your first
project.')),
position: 'top',
run: function (actions) {
actions.auto('.modal:visible .btn.btn-primary');
},
}, {
trigger: ".o_kanban_project_tasks .o_column_quick_create .input-group",
- content: _t("Add columns to organize your tasks into
stages e.g. New - In Progress - Done."),
+ content: Markup(_t("Add columns to organize your tasks into
stages e.g. New - In Progress - Done.")),
position: 'right',
run: function (actions) {
actions.text("Test", this.$anchor.find("input"));
@@ -51,7 +50,7 @@ tour.register('project_tour', {
}, {
trigger: ".o_kanban_project_tasks .o_column_quick_create .input-group",
extra_trigger: '.o_kanban_group',
- content: _t("Add columns to organize your tasks into
stages e.g. New - In Progress - Done."),
+ content: Markup(_t("Add columns to organize your tasks into
stages e.g. New - In Progress - Done.")),
position: 'right',
run: function (actions) {
actions.text("Test", this.$anchor.find("input"));
@@ -62,13 +61,13 @@ tour.register('project_tour', {
}, {
trigger: '.o-kanban-button-new',
extra_trigger: '.o_kanban_group:eq(1)',
- content: _t("Let's create your first
task."),
+ content: Markup(_t("Let's create your first
task.")),
position: 'bottom',
width: 200,
}, {
trigger: '.o_kanban_quick_create input.o_field_char[name=name]',
extra_trigger: '.o_kanban_project_tasks',
- content: _t('Choose a task
name (e.g. Website Design, Purchase Goods...)'),
+ content: Markup(_t('Choose a task
name (e.g. Website Design, Purchase Goods...)')),
position: 'right',
}, {
trigger: '.o_kanban_quick_create .o_kanban_add',
@@ -78,7 +77,7 @@ tour.register('project_tour', {
}, {
trigger: ".o_kanban_record .oe_kanban_content",
extra_trigger: '.o_kanban_project_tasks',
- content: _t("
Drag & drop the card to change your task from stage."),
+ content: Markup(_t("
Drag & drop the card to change your task from stage.")),
position: "bottom",
run: "drag_and_drop .o_kanban_group:eq(1) ",
}, {
@@ -88,20 +87,20 @@ tour.register('project_tour', {
position: "bottom",
}, {
trigger: ".o_ChatterTopbar_buttonSendMessage",
- content: _t("Use the chatter to
send emails and communicate efficiently with your customers. \
- Add new people to the followers' list to make them aware of the main changes about this task."),
+ content: Markup(_t("Use the chatter to
send emails and communicate efficiently with your customers. \
+ Add new people to the followers' list to make them aware of the main changes about this task.")),
width: 350,
position: "bottom",
}, {
trigger: ".o_ChatterTopbar_buttonLogNote",
- content: _t("
Log notes for internal communications
(the people following this task won't be notified \
+ content: Markup(_t("Log notes for internal communications (the people following this task won't be notified \
of the note you are logging unless you specifically tag them). Use @ mentions to ping a colleague \
- or # mentions to reach an entire team."),
+ or # mentions to reach an entire team.")),
width: 350,
position: "bottom"
}, {
trigger: ".o_ChatterTopbar_buttonScheduleActivity",
- content: _t("Use activities to organize your daily work."),
+ content: Markup(_t("Use activities to organize your daily work.")),
}, {
trigger: ".modal-dialog .btn-primary",
content: "Schedule your activity once it is ready.",
@@ -110,7 +109,7 @@ tour.register('project_tour', {
}, {
trigger: ".breadcrumb-item:not(.active):last",
extra_trigger: '.o_form_project_tasks.o_form_readonly',
- content: _t("Let's go back to the kanban view to have an overview of your next tasks."),
+ content: Markup(_t("Let's go back to the kanban view to have an overview of your next tasks.")),
position: "right",
run: 'click',
}]);
diff --git a/addons/sale/static/src/js/tours/sale.js b/addons/sale/static/src/js/tours/sale.js
index d01b0ad6837..9c603aed152 100644
--- a/addons/sale/static/src/js/tours/sale.js
+++ b/addons/sale/static/src/js/tours/sale.js
@@ -1,11 +1,10 @@
odoo.define('sale.tour', function(require) {
"use strict";
-var core = require('web.core');
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
-var _t = core._t;
-
tour.register("sale_tour", {
url: "/web",
rainbowMan: false,
@@ -108,11 +107,11 @@ tour.register("sale_quote_tour", {
}, {
trigger: ".o_field_widget[name='price_unit'] ",
extra_trigger: ".o_sale_order",
- content: _t("Set a price."),
+ content: Markup(_t("Set a price.")),
position: "right",
run: "text 10.0"
},
- ...tour.stepUtils.statusbarButtonsSteps("Send by Email", _t("Send the quote to yourself and check what the customer will receive."), ".o_statusbar_buttons button[name='action_quotation_send']"),
+ ...tour.stepUtils.statusbarButtonsSteps("Send by Email", Markup(_t("Send the quote to yourself and check what the customer will receive.")), ".o_statusbar_buttons button[name='action_quotation_send']"),
{
trigger: ".modal-footer button.btn-primary",
auto: true,
diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index 3cc9f39c46a..a51a39d81f4 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -1,6 +1,7 @@
odoo.define('sale_timesheet.tour', function (require) {
"use strict";
+const {Markup} = require('web.utils');
const tour = require('web_tour.tour');
tour.register('sale_timesheet_tour', {
@@ -28,7 +29,7 @@ tour.register('sale_timesheet_tour', {
run: 'click',
}, {
trigger: '.o_field_widget[name="product_id"], .o_field_widget[name="product_template_id"]',
- content: 'Select a prepaid service product (e.g. Service Product (Prepaid Hours))',
+ content: Markup('Select a prepaid service product (e.g. Service Product (Prepaid Hours))'),
run: function (actions) {
actions.text('Service Product (Prepaid Hours)', this.$anchor.find('input'));
},
@@ -91,7 +92,7 @@ tour.register('sale_timesheet_tour', {
run: 'click',
}, {
trigger: 'div[name="partner_id"]',
- content: 'Select the customer of your Sales Order (e.g. Brandon Freeman). Since we have a Sales Order for this customer with a prepaid service product which the remaining hours to deliver is greater than 0, the Sales Order Item in the task should be contain the Sales Order Item containing this prepaid service product.',
+ content: Markup('Select the customer of your Sales Order (e.g. Brandon Freeman). Since we have a Sales Order for this customer with a prepaid service product which the remaining hours to deliver is greater than 0, the Sales Order Item in the task should be contain the Sales Order Item containing this prepaid service product.'),
run: function (actions) {
actions.text('Brandon Freeman', this.$anchor.find('input'));
},
@@ -186,7 +187,7 @@ tour.register('sale_timesheet_tour', {
},
}, {
trigger: 'div[name="partner_id"]',
- content: 'Add the customer for this project to select an SO and SOL for this customer (e.g. Brandon Freeman).',
+ content: Markup('Add the customer for this project to select an SO and SOL for this customer (e.g. Brandon Freeman).'),
run: function (actions) {
actions.text('Azure Interior, Brandon Freeman', this.$anchor.find('input'));
},
diff --git a/addons/web_tour/static/src/js/tour_manager.js b/addons/web_tour/static/src/js/tour_manager.js
index d85a89e426f..e8e8e0f3497 100644
--- a/addons/web_tour/static/src/js/tour_manager.js
+++ b/addons/web_tour/static/src/js/tour_manager.js
@@ -11,6 +11,7 @@ var RunningTourActionHelper = require('web_tour.RunningTourActionHelper');
var ServicesMixin = require('web.ServicesMixin');
var session = require('web.session');
var Tip = require('web_tour.Tip');
+const {Markup} = require('web.utils');
var _t = core._t;
@@ -92,7 +93,7 @@ return core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, {
wait_for: options.wait_for || Promise.resolve(),
};
if (options.skip_enabled) {
- tour.skip_link = '' + _t('Skip tour') + '
';
+ tour.skip_link = Markup`
${_t('Skip tour')}
`;
tour.skip_handler = function (tip) {
this._deactivate_tip(tip);
this._consume_tour(name);
@@ -353,7 +354,7 @@ return core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, {
var tip_info = tip;
if (tour.skip_link) {
tip_info = _.extend(_.omit(tip_info, 'content'), {
- content: tip.content + tour.skip_link,
+ content: Markup`${tip.content}${tour.skip_link}`,
event_handlers: [{
event: 'click',
selector: '.o_skip_tour',
diff --git a/addons/web_tour/static/src/js/tour_step_utils.js b/addons/web_tour/static/src/js/tour_step_utils.js
index f2b6f3930ec..866c804cf94 100644
--- a/addons/web_tour/static/src/js/tour_step_utils.js
+++ b/addons/web_tour/static/src/js/tour_step_utils.js
@@ -1,10 +1,10 @@
odoo.define('web_tour.TourStepUtils', function (require) {
'use strict';
-const core = require('web.core');
-const _t = core._t;
+const {_t, Class} = require('web.core');
+const {Markup} = require('web.utils');
-return core.Class.extend({
+return Class.extend({
_getHelpMessage: (functionName, ...args) => `Generated by function tour utils ${functionName}(${args.join(', ')})`,
addDebugHelp: helpMessage => step => {
@@ -39,7 +39,7 @@ return core.Class.extend({
return {
edition: 'enterprise',
trigger: '.o_main_navbar .o_menu_toggle',
- content: _t('Click on the
Home icon to navigate across apps.'),
+ content: Markup(_t('Click on the
Home icon to navigate across apps.')),
position: 'bottom',
};
},
diff --git a/addons/web_tour/static/src/xml/tip.xml b/addons/web_tour/static/src/xml/tip.xml
index eba661f65ca..6516fafbfa7 100644
--- a/addons/web_tour/static/src/xml/tip.xml
+++ b/addons/web_tour/static/src/xml/tip.xml
@@ -3,7 +3,7 @@
diff --git a/addons/website/static/src/js/tours/tour_utils.js b/addons/website/static/src/js/tours/tour_utils.js
index 351e1d12ecf..ab20fdcfb5f 100644
--- a/addons/website/static/src/js/tours/tour_utils.js
+++ b/addons/website/static/src/js/tours/tour_utils.js
@@ -1,15 +1,14 @@
odoo.define("website.tour_utils", function (require) {
"use strict";
-const core = require("web.core");
-const _t = core._t;
-
+const {_t} = require("web.core");
+const {Markup} = require('web.utils');
var tour = require("web_tour.tour");
function addMedia(position = "right") {
return {
trigger: `.modal-content footer .btn-primary`,
- content: _t("
Add the selected image."),
+ content: Markup(_t("
Add the selected image.")),
position: position,
run: "click",
};
@@ -18,7 +17,7 @@ function addMedia(position = "right") {
function changeBackground(snippet, position = "bottom") {
return {
trigger: ".o_we_customize_panel .o_we_bg_success",
- content: _t("
Customize any block through this menu. Try to change the background image of this block."),
+ content: Markup(_t("
Customize any block through this menu. Try to change the background image of this block.")),
position: position,
run: "click",
};
@@ -27,7 +26,7 @@ function changeBackground(snippet, position = "bottom") {
function changeBackgroundColor(position = "bottom") {
return {
trigger: ".o_we_customize_panel .o_we_color_preview",
- content: _t("
Customize any block through this menu. Try to change the background color of this block."),
+ content: Markup(_t("
Customize any block through this menu. Try to change the background color of this block.")),
position: position,
run: "click",
};
@@ -37,7 +36,7 @@ function selectColorPalette(position = "left") {
return {
trigger: ".o_we_customize_panel .o_we_so_color_palette we-selection-items",
alt_trigger: ".o_we_customize_panel .o_we_color_preview",
- content: _t(`
Select a Color Palette.`),
+ content: Markup(_t(`
Select a Color Palette.`)),
position: position,
run: 'click',
location: position === 'left' ? '#oe_snippets' : undefined,
@@ -47,7 +46,7 @@ function selectColorPalette(position = "left") {
function changeColumnSize(position = "right") {
return {
trigger: `.oe_overlay.ui-draggable.o_we_overlay_sticky.oe_active .o_handle.e`,
- content: _t("
Slide this button to change the column size."),
+ content: Markup(_t("
Slide this button to change the column size.")),
position: position,
};
}
@@ -56,7 +55,7 @@ function changeIcon(snippet, index = 0, position = "bottom") {
return {
trigger: `#wrapwrap .${snippet.id} i:eq(${index})`,
extra_trigger: "body.editor_enable",
- content: _t("
Double click on an icon to change it with one of your choice."),
+ content: Markup(_t("
Double click on an icon to change it with one of your choice.")),
position: position,
run: "dblclick",
};
@@ -66,7 +65,7 @@ function changeImage(snippet, position = "bottom") {
return {
trigger: snippet.id ? `#wrapwrap .${snippet.id} img` : snippet,
extra_trigger: "body.editor_enable",
- content: _t("
Double click on an image to change it with one of your choice."),
+ content: Markup(_t("
Double click on an image to change it with one of your choice.")),
position: position,
run: "dblclick",
};
@@ -79,7 +78,7 @@ function changeOption(optionName, weName = '', optionTooltipLabel = '', position
const option_block = `we-customizeblock-option[class='snippet-option-${optionName}']`
return {
trigger: `${option_block} ${weName}, ${option_block} [title='${weName}']`,
- content: _.str.sprintf(_t("
Click on this option to change the %s of the block."), optionTooltipLabel),
+ content: Markup(_.str.sprintf(_t("
Click on this option to change the %s of the block."), optionTooltipLabel)),
position: position,
run: "click",
};
@@ -89,7 +88,7 @@ function selectNested(trigger, optionName, alt_trigger = null, optionTooltipLabe
const option_block = `we-customizeblock-option[class='snippet-option-${optionName}']`;
return {
trigger: trigger,
- content: _.str.sprintf(_t("
Select a %s."), optionTooltipLabel),
+ content: Markup(_.str.sprintf(_t("
Select a %s."), optionTooltipLabel)),
alt_trigger: alt_trigger == null ? undefined : `${option_block} ${alt_trigger}`,
position: position,
run: 'click',
@@ -106,7 +105,7 @@ function changePaddingSize(direction) {
}
return {
trigger: `.oe_overlay.ui-draggable.o_we_overlay_sticky.oe_active .o_handle.${paddingDirection}`,
- content: _.str.sprintf(_t("
Slide this button to change the %s padding"), direction),
+ content: Markup(_.str.sprintf(_t("
Slide this button to change the %s padding"), direction)),
position: position,
};
}
@@ -118,7 +117,7 @@ function changePaddingSize(direction) {
function clickOnEdit(position = "bottom") {
return {
trigger: "a[data-action=edit]",
- content: _t("
Click Edit to start designing your homepage."),
+ content: Markup(_t("
Click Edit to start designing your homepage.")),
extra_trigger: ".homepage",
position: position,
};
@@ -133,7 +132,7 @@ function clickOnSnippet(snippet, position = "bottom") {
return {
trigger: snippet.id ? `#wrapwrap .${snippet.id}` : snippet,
extra_trigger: "body.editor_enable",
- content: _t("
Click on a snippet to access its options menu."),
+ content: Markup(_t("
Click on a snippet to access its options menu.")),
position: position,
run: "click",
};
@@ -143,7 +142,7 @@ function clickOnSave(position = "bottom") {
return [{
trigger: "button[data-action=save]",
in_modal: false,
- content: _t("Good job! It's time to
Save your work."),
+ content: Markup(_t("Good job! It's time to
Save your work.")),
position: position,
}, {
trigger: 'body:not(.editor_enable)',
@@ -162,7 +161,7 @@ function clickOnText(snippet, element, position = "bottom") {
return {
trigger: snippet.id ? `#wrapwrap .${snippet.id} ${element}` : snippet,
extra_trigger: "body.editor_enable",
- content: _t("
Click on a text to start editing it."),
+ content: Markup(_t("
Click on a text to start editing it.")),
position: position,
run: "text",
consumeEvent: "input",
@@ -179,7 +178,7 @@ function dragNDrop(snippet, position = "bottom") {
trigger: `#oe_snippets .oe_snippet[name="${snippet.name}"] .oe_snippet_thumbnail:not(.o_we_already_dragging)`,
extra_trigger: "body.editor_enable.editor_has_snippets",
moveTrigger: '.oe_drop_zone',
- content: _.str.sprintf(_t("Drag the
%s building block and drop it at the bottom of the page."), snippet.name),
+ content: Markup(_.str.sprintf(_t("Drag the
%s building block and drop it at the bottom of the page."), snippet.name)),
position: position,
// Normally no main snippet can be dropped in the default footer but
// targeting it allows to force "dropping at the end of the page".
@@ -208,7 +207,7 @@ function goToTheme(position = "bottom") {
function selectHeader(position = "bottom") {
return {
trigger: `header#top`,
- content: _t(`
Click on this header to configure it.`),
+ content: Markup(_t(`
Click on this header to configure it.`)),
position: position,
run: "click",
};
@@ -217,7 +216,7 @@ function selectHeader(position = "bottom") {
function selectSnippetColumn(snippet, index = 0, position = "bottom") {
return {
trigger: `#wrapwrap .${snippet.id} .row div[class*="col-lg-"]:eq(${index})`,
- content: _t("
Click on this column to access its options."),
+ content: Markup(_t("
Click on this column to access its options.")),
position: position,
run: "click",
};
diff --git a/addons/website_blog/static/src/js/tours/website_blog.js b/addons/website_blog/static/src/js/tours/website_blog.js
index 23b591490fb..42f68d86d1d 100644
--- a/addons/website_blog/static/src/js/tours/website_blog.js
+++ b/addons/website_blog/static/src/js/tours/website_blog.js
@@ -1,11 +1,10 @@
odoo.define("website_blog.tour", function (require) {
"use strict";
- var core = require("web.core");
+ const {_t} = require("web.core");
+ const {Markup} = require('web.utils');
var tour = require("web_tour.tour");
- var _t = core._t;
-
tour.register("blog", {
url: "/",
}, [{
@@ -30,7 +29,7 @@ odoo.define("website_blog.tour", function (require) {
}, {
trigger: "we-button[data-background]:nth(1)",
extra_trigger: "#wrap div[data-oe-expression=\"blog_post.name\"]:not(:containsExact(\"\"))",
- content: _t("Set a blog post
cover."),
+ content: Markup(_t("Set a blog post
cover.")),
position: "right",
}, {
trigger: ".o_select_media_dialog .o_we_search",
@@ -43,7 +42,7 @@ odoo.define("website_blog.tour", function (require) {
position: "top",
}, {
trigger: "#o_wblog_post_content",
- content: _t("
Write your story here. Use the top toolbar to style your text: add an image or table, set bold or italic, etc. Drag and drop building blocks for more graphical blogs."),
+ content: Markup(_t("
Write your story here. Use the top toolbar to style your text: add an image or table, set bold or italic, etc. Drag and drop building blocks for more graphical blogs.")),
position: "top",
run: function (actions) {
actions.auto();
@@ -52,12 +51,12 @@ odoo.define("website_blog.tour", function (require) {
}, {
trigger: "button[data-action=save]",
extra_trigger: "#o_wblog_post_content .o_wblog_post_content_field p:first:not(:containsExact(" + _t("Start writing here...") + "))",
- content: _t("
Click on Save to record your changes."),
+ content: Markup(_t("
Click on Save to record your changes.")),
position: "bottom",
}, {
trigger: "a[data-action=show-mobile-preview]",
extra_trigger: "body:not(.editor_enable)",
- content: _t("Use this icon to preview your blog post on
mobile devices."),
+ content: Markup(_t("Use this icon to preview your blog post on
mobile devices.")),
position: "bottom",
}, {
trigger: "button[data-dismiss=modal]",
@@ -68,11 +67,11 @@ odoo.define("website_blog.tour", function (require) {
trigger: ".js_publish_management .js_publish_btn",
extra_trigger: "body:not(.editor_enable)",
position: "bottom",
- content: _t("
Publish your blog post to make it visible to your visitors."),
+ content: Markup(_t("
Publish your blog post to make it visible to your visitors.")),
}, {
trigger: "#customize-menu > a",
extra_trigger: ".js_publish_management .js_publish_btn .css_unpublish:visible",
- content: _t("
That's it, your blog post is published! Discover more features through the
Customize menu."),
+ content: Markup(_t("
That's it, your blog post is published! Discover more features through the
Customize menu.")),
position: "bottom",
width: 500,
}]);
diff --git a/addons/website_event/static/src/js/tours/event_tour.js b/addons/website_event/static/src/js/tours/event_tour.js
index 421146c1a09..633d4f5a443 100644
--- a/addons/website_event/static/src/js/tours/event_tour.js
+++ b/addons/website_event/static/src/js/tours/event_tour.js
@@ -1,8 +1,8 @@
odoo.define('website_event.event_steps', function (require) {
"use strict";
-var core = require('web.core');
-var _t = core._t;
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var EventAdditionalTourSteps = require('event.event_steps');
@@ -16,28 +16,28 @@ EventAdditionalTourSteps.include({
this._super.apply(this, arguments);
return [{
trigger: '.o_event_form_view button[name="is_published"]',
- content: _t("Use this
shortcut to easily access your event web page."),
+ content: Markup(_t("Use this
shortcut to easily access your event web page.")),
position: 'bottom',
}, {
trigger: 'li#edit-page-menu a',
extra_trigger: '.o_wevent_event',
- content: _t("With the Edit button, you can
customize the web page visitors will see when registering."),
+ content: Markup(_t("With the Edit button, you can
customize the web page visitors will see when registering.")),
position: 'bottom',
}, {
trigger: 'div[name="Image - Text"] .oe_snippet_thumbnail',
extra_trigger: '.o_wevent_event',
- content: _t("
Drag and Drop this snippet below the event title."),
+ content: Markup(_t("
Drag and Drop this snippet below the event title.")),
position: 'bottom',
run: 'drag_and_drop #o_wevent_event_main_col',
}, {
trigger: 'button[data-action="save"]',
extra_trigger: '.o_wevent_event',
- content: _t("Don't forget to click
save when you're done."),
+ content: Markup(_t("Don't forget to click
save when you're done.")),
position: 'bottom',
}, {
trigger: 'label.js_publish_btn',
extra_trigger: '.o_wevent_event',
- content: _t("Looking great! Let's now
publish this page so that it becomes
visible on your website!"),
+ content: Markup(_t("Looking great! Let's now
publish this page so that it becomes
visible on your website!")),
position: 'bottom',
}, {
trigger: 'a.css_edit_dynamic',
diff --git a/addons/website_event/static/tests/tours/website_event.js b/addons/website_event/static/tests/tours/website_event.js
index b94e52a098f..0a3a038705d 100644
--- a/addons/website_event/static/tests/tours/website_event.js
+++ b/addons/website_event/static/tests/tours/website_event.js
@@ -1,11 +1,10 @@
odoo.define("website_event.tour", function (require) {
"use strict";
- var core = require("web.core");
+ const {_t} = require("web.core");
+ const {Markup} = require('web.utils');
var tour = require("web_tour.tour");
- var _t = core._t;
-
tour.register("website_event_tour", {
test: true,
url: "/",
@@ -19,12 +18,12 @@ odoo.define("website_event.tour", function (require) {
position: "bottom",
}, {
trigger: '.modal-dialog #editor_new_event input[type=text]',
- content: _t("Create a name for your new event and click
\"Continue\". e.g: Technical Training"),
+ content: Markup(_t("Create a name for your new event and click
\"Continue\". e.g: Technical Training")),
position: "left",
}, {
trigger: '.modal-footer button.btn-primary.btn-continue',
extra_trigger: '#editor_new_event input[type=text][value!=""]',
- content: _t("Click
Continue to create the event."),
+ content: Markup(_t("Click
Continue to create the event.")),
position: "right",
}, {
trigger: "#snippet_structure .oe_snippet:eq(2) .oe_snippet_thumbnail",
diff --git a/addons/website_sale/static/src/js/tours/website_sale_shop.js b/addons/website_sale/static/src/js/tours/website_sale_shop.js
index 6edb36dd123..5950133c7cb 100644
--- a/addons/website_sale/static/src/js/tours/website_sale_shop.js
+++ b/addons/website_sale/static/src/js/tours/website_sale_shop.js
@@ -1,8 +1,8 @@
odoo.define("website_sale.tour_shop", function (require) {
"use strict";
- var core = require("web.core");
- var _t = core._t;
+ const {_t} = require("web.core");
+ const {Markup} = require('web.utils');
// return the steps, used for backend and frontend
@@ -13,7 +13,7 @@ odoo.define("website_sale.tour_shop", function (require) {
position: "bottom",
}, {
trigger: "a[data-action=new_product]",
- content: _t("Select
New Product to create it and manage its properties to boost your sales."),
+ content: Markup(_t("Select
New Product to create it and manage its properties to boost your sales.")),
position: "bottom",
}, {
trigger: ".modal-dialog #editor_new_product input[type=text]",
@@ -21,7 +21,7 @@ odoo.define("website_sale.tour_shop", function (require) {
position: "right",
}, {
trigger: ".modal-footer button.btn-primary.btn-continue",
- content: _t("Click on
Continue to create the product."),
+ content: Markup(_t("Click on
Continue to create the product.")),
position: "right",
}, {
trigger: ".product_price .oe_currency_value:visible",
@@ -55,7 +55,7 @@ odoo.define("website_sale.tour_shop", function (require) {
run: "drag_and_drop",
}, {
trigger: "button[data-action=save]",
- content: _t("Once you click on
Save, your product is updated."),
+ content: Markup(_t("Once you click on
Save, your product is updated.")),
position: "bottom",
}, {
trigger: ".js_publish_management .js_publish_btn .css_publish",
diff --git a/addons/website_slides/static/src/js/tours/slides_tour.js b/addons/website_slides/static/src/js/tours/slides_tour.js
index 249a92f345b..db722a75bfc 100644
--- a/addons/website_slides/static/src/js/tours/slides_tour.js
+++ b/addons/website_slides/static/src/js/tours/slides_tour.js
@@ -1,116 +1,115 @@
odoo.define('website_slides.slides_tour', function (require) {
"use strict";
-var core = require('web.core');
-var _t = core._t;
-
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
tour.register('slides_tour', {
url: '/slides',
}, [{
trigger: '#new-content-menu > a',
- content: _t("Welcome on your course's home page. It's still empty for now. Click on \"
New\" to write your first course."),
+ content: Markup(_t("Welcome on your course's home page. It's still empty for now. Click on \"
New\" to write your first course.")),
position: 'bottom',
}, {
trigger: 'a[data-action="new_slide_channel"]',
- content: _t("Select
Course to create it and manage it."),
+ content: Markup(_t("Select
Course to create it and manage it.")),
position: 'bottom',
width: 210,
}, {
trigger: 'input[name="name"]',
- content: _t("Give your course an engaging
Title."),
+ content: Markup(_t("Give your course an engaging
Title.")),
position: 'bottom',
width: 280,
run: 'text My New Course',
}, {
trigger: 'textarea[name="description"]',
- content: _t("Give your course a helpful
Description."),
+ content: Markup(_t("Give your course a helpful
Description.")),
position: 'bottom',
width: 300,
run: 'text This course is for advanced users.',
}, {
trigger: 'button.btn-primary',
- content: _t("Click on the
Create button to create your first course."),
+ content: Markup(_t("Click on the
Create button to create your first course.")),
}, {
trigger: '.o_wslides_js_slide_section_add',
- content: _t("Congratulations, your course has been created, but there isn't any content yet. First, let's add a
Section to give your course a structure."),
+ content: Markup(_t("Congratulations, your course has been created, but there isn't any content yet. First, let's add a
Section to give your course a structure.")),
position: 'bottom',
}, {
trigger: 'input[name="name"]',
- content: _t("A good course has structure and a table of content. Your first section will be the
Introduction."),
+ content: Markup(_t("A good course has structure and a table of content. Your first section will be the
Introduction.")),
position: 'bottom',
}, {
trigger: 'button.btn-primary',
- content: _t("Click on
Save to apply changes."),
+ content: Markup(_t("Click on
Save to apply changes.")),
position: 'bottom',
width: 260,
}, {
trigger: 'a.btn-primary.o_wslides_js_slide_upload',
- content: _t("Your first section is created, now it's time to add lessons to your course. Click on
Add Content to upload a document, create a web page or link a video."),
+ content: Markup(_t("Your first section is created, now it's time to add lessons to your course. Click on
Add Content to upload a document, create a web page or link a video.")),
position: 'bottom',
}, {
trigger: 'a[data-slide-type="presentation"]',
- content: _t("First, let's add a
Presentation. It can be a .pdf or an image."),
+ content: Markup(_t("First, let's add a
Presentation. It can be a .pdf or an image.")),
position: 'bottom',
}, {
trigger: 'input#upload',
- content: _t("Choose a
File on your computer."),
+ content: Markup(_t("Choose a
File on your computer.")),
}, {
trigger: 'input#name',
- content: _t("The
Title of your lesson is autocompleted but you can change it if you want.A
Preview of your file is available on the right side of the screen."),
+ content: Markup(_t("The
Title of your lesson is autocompleted but you can change it if you want.A
Preview of your file is available on the right side of the screen.")),
}, {
trigger: 'input#duration',
- content: _t("The
Duration of the lesson is based on the number of pages of your document. You can change this number if your attendees will need more time to assimilate the content."),
+ content: Markup(_t("The
Duration of the lesson is based on the number of pages of your document. You can change this number if your attendees will need more time to assimilate the content.")),
}, {
trigger: 'button.o_w_slide_upload_published',
- content: _t("
Save & Publish your lesson to make it available to your attendees."),
+ content: Markup(_t("
Save & Publish your lesson to make it available to your attendees.")),
position: 'bottom',
width: 285,
}, {
trigger: 'span.badge-info:contains("New")',
- content: _t("Congratulations! Your first lesson is available. Let's see the options available here. The tag \"
New\" indicates that this lesson was created less than 7 days ago."),
+ content: Markup(_t("Congratulations! Your first lesson is available. Let's see the options available here. The tag \"
New\" indicates that this lesson was created less than 7 days ago.")),
position: 'bottom',
}, {
trigger: 'a[name="o_wslides_list_slide_add_quizz"]',
extra_trigger: '.o_wslides_slides_list_slide:hover',
- content: _t("If you want to be sure that attendees have understood and memorized the content, you can add a Quiz on the lesson. Click on
Add Quiz."),
+ content: Markup(_t("If you want to be sure that attendees have understood and memorized the content, you can add a Quiz on the lesson. Click on
Add Quiz.")),
}, {
trigger: 'input[name="question-name"]',
- content: _t("Enter your
Question. Be clear and concise."),
+ content: Markup(_t("Enter your
Question. Be clear and concise.")),
position: 'left',
width: 330,
}, {
trigger: 'input.o_wslides_js_quiz_answer_value',
- content: _t("Enter at least two possible
Answers."),
+ content: Markup(_t("Enter at least two possible
Answers.")),
position: 'left',
width: 290,
}, {
trigger: 'a.o_wslides_js_quiz_is_correct',
- content: _t("Mark the correct answer by checking the
correct mark."),
+ content: Markup(_t("Mark the correct answer by checking the
correct mark.")),
position: 'right',
width: 230,
}, {
trigger: 'i.o_wslides_js_quiz_comment_answer:last',
- content: _t("You can add
comments on answers. This will be visible with the results if the user select this answer."),
+ content: Markup(_t("You can add
comments on answers. This will be visible with the results if the user select this answer.")),
position: 'right',
}, {
trigger: 'a.o_wslides_js_quiz_validate_question',
- content: _t("
Save your question."),
+ content: Markup(_t("
Save your question.")),
position: 'left',
width: 170,
}, {
trigger: 'li.breadcrumb-item:nth-child(2)',
- content: _t("Click on your
Course to go back to the table of content."),
+ content: Markup(_t("Click on your
Course to go back to the table of content.")),
position: 'top',
}, {
trigger: 'label.js_publish_btn',
- content: _t("Once you're done, don't forget to
Publish your course."),
+ content: Markup(_t("Once you're done, don't forget to
Publish your course.")),
position: 'bottom',
}, {
trigger: 'a.o_wslides_js_slides_list_slide_link',
- content: _t("Congratulations, you've created your first course.
Click on the title of this content to see it in fullscreen mode."),
+ content: Markup(_t("Congratulations, you've created your first course.
Click on the title of this content to see it in fullscreen mode.")),
position: 'bottom',
}]);
diff --git a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
index 832819861dd..e8549b3cbcd 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
@@ -2,13 +2,14 @@ odoo.define('test_main_flows.tour', function (require) {
"use strict";
const {_t} = require('web.core');
+const {Markup} = require('web.utils');
const tour = require('web_tour.tour');
tour.register('main_flow_tour', {
test: true,
url: "/web",
}, [
-...tour.stepUtils.goToAppSteps('sale.sale_menu_root', _t('Organize your sales activities with the
Sales app.')),
+...tour.stepUtils.goToAppSteps('sale.sale_menu_root', Markup(_t('Organize your sales activities with the
Sales app.'))),
tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Quotations')"),
{
// Add Stockable product
@@ -335,11 +336,11 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
}, {
mobile: false,
trigger: ".breadcrumb-item:first",
- content: _t("Use the breadcrumbs to
go back to products."),
+ content: Markup(_t("Use the breadcrumbs to
go back to products.")),
position: "bottom"
},
...tour.stepUtils.goBackBreadcrumbsMobile(
- _t("Use the breadcrumbs to
go back to products."),
+ Markup(_t("Use the breadcrumbs to
go back to products.")),
undefined,
".breadcrumb-item.active:contains('Bill of Materials')",
".breadcrumb-item.active:contains('the_flow.product')"
@@ -432,15 +433,15 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
content: _t('Go back to the home menu'),
position: 'bottom',
},
-...tour.stepUtils.goToAppSteps('crm.crm_menu_root', _t('Organize your sales activities with the
CRM app.')),
+...tour.stepUtils.goToAppSteps('crm.crm_menu_root', Markup(_t('Organize your sales activities with the
CRM app.'))),
{
trigger: ".o-kanban-button-new",
extra_trigger: '.o_opportunity_kanban',
- content: _t("Click here to
create your first opportunity and add it to your pipeline."),
+ content: Markup(_t("Click here to
create your first opportunity and add it to your pipeline.")),
position: "bottom"
}, {
trigger: ".o_kanban_quick_create input[name='name']",
- content: _t("
Choose a name for your opportunity."),
+ content: Markup(_t("
Choose a name for your opportunity.")),
position: "right",
run: "text the_flow.opportunity",
}, {
@@ -480,12 +481,12 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
}, {
trigger: ".o_kanban_quick_create .o_kanban_add",
extra_trigger: ".o_kanban_quick_create .o_field_widget[name=partner_id] .o_external_button", // Wait name_create
- content: _t("Click here to
add your opportunity."),
+ content: Markup(_t("Click here to
add your opportunity.")),
position: "right",
}, {
mobile: false,
trigger: ".o_kanban_group:first .o_kanban_record:has(span:contains('the_flow.opportunity'))",
- content: _t("
Drag & drop opportunities between columns as you progress in your sales cycle."),
+ content: Markup(_t("
Drag & drop opportunities between columns as you progress in your sales cycle.")),
position: "right",
run: "drag_and_drop .o_opportunity_kanban .o_kanban_group:eq(2) ",
}, {
@@ -510,7 +511,7 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
position: "bottom",
},
// Create a quotation
-...tour.stepUtils.statusbarButtonsSteps('New Quotation', _t('
Create a quotation
')),
+...tour.stepUtils.statusbarButtonsSteps('New Quotation', Markup(_t('
Create a quotation
'))),
{
mobile: false,
trigger: ".o_field_widget[name=order_line] .o_field_x2many_list_row_add > a",
@@ -637,11 +638,11 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_readonly'),
content: _t("Try to send it to email"),
position: "bottom",
},
-...tour.stepUtils.statusbarButtonsSteps('Confirm', _t("
Confirm this quotation
")),
+...tour.stepUtils.statusbarButtonsSteps('Confirm', Markup(_t("
Confirm this quotation
"))),
{
trigger: ".o_form_button_save",
extra_trigger: ".o_statusbar_status .btn-primary:contains('Sales Order')",
- content: _t("
Save this quotation
"),
+ content: Markup(_t("
Save this quotation
")),
position: "bottom"
// Reordering rule
}, {
@@ -719,12 +720,12 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Inventory Ove
}, {
mobile: false,
trigger: ".o_list_button_save",
- content: _t("
Save this reordering rule
"),
+ content: Markup(_t("
Save this reordering rule
")),
position: "bottom"
}, {
mobile: true,
trigger: ".o_form_button_save",
- content: _t("
Save this reordering rule
"),
+ content: Markup(_t("
Save this reordering rule
")),
position: "bottom"
},
tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('OP/')"),
@@ -848,7 +849,7 @@ tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Manufacturing
content: _t('Go back to the home menu'),
position: 'bottom',
},
-...tour.stepUtils.goToAppSteps('sale.sale_menu_root', _t('Organize your sales activities with the
Sales app.')),
+...tour.stepUtils.goToAppSteps('sale.sale_menu_root', Markup(_t('Organize your sales activities with the
Sales app.'))),
tour.stepUtils.openBuggerMenu("li.breadcrumb-item.active:contains('Quotations')"),
{
trigger: ".o_menu_sections button[data-menu-xmlid='sale.sale_order_menu']",
@@ -1031,12 +1032,12 @@ tour.stepUtils.mobileModifier(tour.stepUtils.autoExpandMoreButtons('.o_control_p
{
edition: "enterprise",
trigger: "button.o_reconcile, button.o_validate",
- content: _t('
Click on Reconcile
'),
+ content: Markup(_t('
Click on Reconcile
')),
position: "right",
}, {
edition: "enterprise",
trigger: ".button_back_to_statement",
- content: _t('
Close this statement.
'),
+ content: Markup(_t('
Close this statement.
')),
position: "bottom",
}]);
});