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

[FIX] *: remove escaped newlines from translated strings

Browse Source 
The parser of the library we use to extract strings to be translated
(python-babel) doesn't handle escaped newlines in the same way as the
JavaScript parser. The resulting mismatch makes the content that uses
them untranslatable.

for example:
```js
const hey = _t("slt \
çv ?"
);
```
is exported as "slt \nçv ?", while the content of the variable is
"slt çv?"

This commit removes faulty occurrences from the code base and re-exports
the corresponding POT files.

*: point_of_sale, pos_sale, project, web

closes odoo/odoo#145971

Related: odoo/enterprise#52617
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
This commit is contained in:
Louis (wil)
2024-01-10 15:26:01 +00:00
parent 43bb9e18b5
commit 13bb9c21ab
8 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/i18n/point_of_sale.pot
+2 -7
View File
@@ -3694,11 +3694,6 @@ msgstr ""
msgid "Newspaper Rack"
msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__activity_calendar_event_id
msgid "Next Activity Calendar Event"
msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__activity_date_deadline
msgid "Next Activity Deadline"
@@ -5078,6 +5073,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__module_pos_preparation_display
#: model:ir.ui.menu,name:point_of_sale.menu_pos_preparation_display
#: model_terms:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
msgid "Preparation Display"
msgstr ""
@@ -6836,8 +6832,7 @@ msgstr ""
#, python-format
msgid ""
"The maximum difference allowed is %s.\n"
"\n"
" Please contact your manager to accept the closing difference."
"Please contact your manager to accept the closing difference."
msgstr ""
#. module: point_of_sale
addons/point_of_sale/static/src/app/navbar/closing_popup/closing_popup.js
+1 -2
View File
@@ -83,8 +83,7 @@ export class ClosePosPopup extends AbstractAwaitablePopup {
await this.popup.add(ConfirmPopup, {
title: _t("Payments Difference"),
body: _t(
"The maximum difference allowed is %s.\n\
Please contact your manager to accept the closing difference.",
"The maximum difference allowed is %s.\nPlease contact your manager to accept the closing difference.",
this.env.utils.formatCurrency(this.props.amount_authorized_diff)
),
confirmText: _t("OK"),
addons/pos_sale/i18n/pos_sale.pot
+2 -2
View File
@@ -171,8 +171,8 @@ msgstr ""
#: code:addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js:0
#, python-format
msgid ""
"It seems that you didn't configure a down payment product in your point of sale.\n"
" You can go to your point of sale configuration to choose one."
"It seems that you didn't configure a down payment product in your point of "
"sale. You can go to your point of sale configuration to choose one."
msgstr ""
#. module: pos_sale
addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js
+1 -2
View File
@@ -377,8 +377,7 @@ export class SaleOrderManagementScreen extends ControlButtonsMixin(Component) {
} else {
const title = _t("No down payment product");
const body = _t(
"It seems that you didn't configure a down payment product in your point of sale.\
You can go to your point of sale configuration to choose one."
"It seems that you didn't configure a down payment product in your point of sale. You can go to your point of sale configuration to choose one."
);
await this.popup.add(ErrorPopup, { title, body });
}
addons/project/i18n/project.pot
+14 -19
View File
@@ -178,9 +178,10 @@ msgstr ""
#: code:addons/project/static/src/js/tours/project.js:0
#, python-format
msgid ""
"<b>Log notes</b> for internal communications <i>(the people following this task won't be notified \n"
" of the note you are logging unless you specifically tag them)</i>. Use @ <b>mentions</b> to ping a colleague \n"
" or # <b>mentions</b> to reach an entire team."
"<b>Log notes</b> for internal communications <i>(the people following this "
"task won't be notified of the note you are logging unless you specifically "
"tag them)</i>. Use @ <b>mentions</b> to ping a colleague or # "
"<b>mentions</b> to reach an entire team."
msgstr ""
#. module: project
@@ -1097,8 +1098,9 @@ msgstr ""
#: code:addons/project/static/src/js/tours/project.js:0
#, python-format
msgid ""
"Choose a <b>name</b> for your project. <i>It can be anything you want: the name of a customer,\n"
" of a product, of a team, of a construction site, etc.</i>"
"Choose a <b>name</b> for your project. <i>It can be anything you want: the "
"name of a customer, of a product, of a team, of a construction site, "
"etc.</i>"
msgstr ""
#. module: project
@@ -2863,13 +2865,6 @@ msgstr ""
msgid "Next Activity"
msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__activity_calendar_event_id
#: model:ir.model.fields,field_description:project.field_project_task__activity_calendar_event_id
#: model:ir.model.fields,field_description:project.field_project_update__activity_calendar_event_id
msgid "Next Activity Calendar Event"
msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__activity_date_deadline
#: model:ir.model.fields,field_description:project.field_project_task__activity_date_deadline
@@ -5068,8 +5063,9 @@ msgstr ""
#: code:addons/project/static/src/js/tours/project.js:0
#, python-format
msgid ""
"Use the chatter to <b>send emails</b> and communicate efficiently with your customers. \n"
" Add new people to the followers' list to make them aware of the main changes about this task."
"Use the chatter to <b>send emails</b> and communicate efficiently with your "
"customers. Add new people to the followers' list to make them aware of the "
"main changes about this task."
msgstr ""
#. module: project
@@ -5077,12 +5073,11 @@ msgstr ""
msgid ""
"Use these keywords in the title to set new tasks:\n"
"\n"
" 30h Allocate 30 hours to the task\n"
" #tags Set tags on the task\n"
" @user Assign the task to a user\n"
" ! Set the task a high priority\n"
" #tags Set tags on the task\n"
" @user Assign the task to a user\n"
" ! Set the task a high priority\n"
"\n"
" Make sure to use the right format and order e.g. Improve the configuration screen 5h #feature #v16 @Mitchell !"
" Make sure to use the right format and order e.g. Improve the configuration screen #feature #v16 @Mitchell !"
msgstr ""
#. module: project
addons/project/static/src/js/tours/project.js
+3 -7
View File
@@ -28,8 +28,7 @@ registry.category("web_tour.tours").add('project_tour', {
width: 200,
}, {
trigger: '.o_project_name input',
content: markup(_t('Choose a <b>name</b> for your project. <i>It can be anything you want: the name of a customer,\
of a product, of a team, of a construction site, etc.</i>')),
content: markup(_t('Choose a <b>name</b> for your project. <i>It can be anything you want: the name of a customer, of a product, of a team, of a construction site, etc.</i>')),
position: 'right',
}, {
trigger: '.o_open_tasks',
@@ -87,16 +86,13 @@ registry.category("web_tour.tours").add('project_tour', {
}, {
trigger: ".o-mail-Chatter-topbar button:contains(Send message)",
extra_trigger: '.o_form_project_tasks',
content: markup(_t("Use the chatter to <b>send emails</b> 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 <b>send emails</b> 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: "button:contains(Log note)",
extra_trigger: '.o_form_project_tasks',
content: markup(_t("<b>Log notes</b> for internal communications <i>(the people following this task won't be notified \
of the note you are logging unless you specifically tag them)</i>. Use @ <b>mentions</b> to ping a colleague \
or # <b>mentions</b> to reach an entire team.")),
content: markup(_t("<b>Log notes</b> for internal communications <i>(the people following this task won't be notified of the note you are logging unless you specifically tag them)</i>. Use @ <b>mentions</b> to ping a colleague or # <b>mentions</b> to reach an entire team.")),
width: 350,
position: "bottom"
}, {
addons/web/i18n/web.pot
-2
View File
@@ -5815,10 +5815,8 @@ msgstr ""
#, python-format
msgid ""
"Ready to make your record disappear into thin air? Are you sure?\n"
"\n"
"It will be gone forever!\n"
"\n"
"\n"
"Think twice before you click that 'Delete' button!"
msgstr ""
addons/web/static/src/core/confirmation_dialog/confirmation_dialog.js
+4 -3
View File
@@ -7,9 +7,10 @@ import { useChildRef } from "@web/core/utils/hooks";
import { Component } from "@odoo/owl";
export const deleteConfirmationMessage = _t(
"Ready to make your record disappear into thin air? Are you sure?\n\
It will be gone forever!\n\n\
Think twice before you click that 'Delete' button!"
`Ready to make your record disappear into thin air? Are you sure?
It will be gone forever!
Think twice before you click that 'Delete' button!`
);
export class ConfirmationDialog extends Component {