pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] *: unify sprintf and gettext

Browse Source 
Improve gettext to directly handle value injection within translations,
removing the need for sprintf.

closes odoo/odoo#123932

Related: odoo/enterprise#45370
Signed-off-by: Samuel Degueldre (sad) <sad@odoo.com>
This commit is contained in:
Louis Wicket (wil)
2023-08-10 18:14:04 +02:00
parent 62fba62067
commit f1722c7334
123 changed files with 353 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/editor/snippets.options.js
+2 -2
View File
@@ -3,7 +3,7 @@
import core from "@web/legacy/js/services/core";
import { loadBundle, loadCSS } from "@web/core/assets";
import Dialog from "@web/legacy/js/core/dialog";
import { Markup, sprintf } from "@web/legacy/js/core/utils";
import { Markup } from "@web/legacy/js/core/utils";
import weUtils from "@web_editor/js/common/utils";
import options from "@web_editor/js/editor/snippets.options";
import { NavbarLinkPopoverWidget } from "@website/js/widgets/link_popover_widget";
@@ -2807,7 +2807,7 @@ options.registry.anchor = options.Class.extend({
_buildClipboard(buttonEl) {
const clipboard = new ClipboardJS(buttonEl, {text: () => this._getAnchorLink()});
clipboard.on("success", () => {
const message = sprintf(Markup(_t("Anchor copied to clipboard<br>Link: %s")), this._getAnchorLink());
const message = Markup(_t("Anchor copied to clipboard<br>Link: %s", this._getAnchorLink()));
this.displayNotification({
type: "success",
message: message,
addons/website/static/src/js/tours/tour_utils.js
+4 -5
View File
@@ -4,7 +4,6 @@ import { _t } from "@web/core/l10n/translation";
import { Markup } from "@web/legacy/js/core/utils";
import { registry } from "@web/core/registry";
import { sprintf } from "@web/core/utils/strings";
function addMedia(position = "right") {
return {
@@ -106,7 +105,7 @@ function changeOption(optionName, weName = '', optionTooltipLabel = '', position
const option_block = `${noPalette} we-customizeblock-option[class='snippet-option-${optionName}']`;
return {
trigger: `${option_block} ${weName}, ${option_block} [title='${weName}']`,
content: Markup(sprintf(_t("<b>Click</b> on this option to change the %s of the block."), optionTooltipLabel)),
content: Markup(_t("<b>Click</b> on this option to change the %s of the block.", optionTooltipLabel)),
position: position,
in_modal: false,
run: "click",
@@ -118,7 +117,7 @@ function selectNested(trigger, optionName, alt_trigger = null, optionTooltipLabe
const option_block = `${noPalette} we-customizeblock-option[class='snippet-option-${optionName}']`;
return {
trigger: trigger,
content: Markup(sprintf(_t("<b>Select</b> a %s."), optionTooltipLabel)),
content: Markup(_t("<b>Select</b> a %s.", optionTooltipLabel)),
alt_trigger: alt_trigger == null ? undefined : `${option_block} ${alt_trigger}`,
position: position,
run: 'click',
@@ -135,7 +134,7 @@ function changePaddingSize(direction) {
}
return {
trigger: `iframe .oe_overlay.ui-draggable.o_we_overlay_sticky.oe_active .o_handle.${paddingDirection}`,
content: Markup(sprintf(_t("<b>Slide</b> this button to change the %s padding"), direction)),
content: Markup(_t("<b>Slide</b> this button to change the %s padding", direction)),
consumeEvent: 'mousedown',
position: position,
};
@@ -235,7 +234,7 @@ function dragNDrop(snippet, position = "bottom") {
return {
trigger: `#oe_snippets .oe_snippet[name="${snippet.name}"] .oe_snippet_thumbnail:not(.o_we_already_dragging)`,
extra_trigger: ".o_website_preview.editor_enable.editor_has_snippets",
content: Markup(sprintf(_t("Drag the <b>%s</b> building block and drop it at the bottom of the page."), snippet.name)),
content: Markup(_t("Drag the <b>%s</b> 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".