[FW][FIX] *: various localisation issues
Cf commit messages, courtesy of Erwin van der Ploeg closes odoo/odoo#66983 Forward-port-of: odoo/odoo#66940 Forward-port-of: odoo/odoo#66790 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This commit is contained in:
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server saas~14.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-02-18 14:28+0000\n"
|
||||
"PO-Revision-Date: 2021-02-18 14:28+0000\n"
|
||||
"POT-Creation-Date: 2021-02-25 10:15+0000\n"
|
||||
"PO-Revision-Date: 2021-02-25 10:15+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -139,6 +139,12 @@ msgstr ""
|
||||
msgid ". You might want to put a higher number here."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_resequence.py:0
|
||||
#, python-format
|
||||
msgid "... (%s other)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model_terms:ir.ui.view,arch_db:account.view_move_form
|
||||
msgid "1 Payment"
|
||||
@@ -2313,6 +2319,13 @@ msgstr ""
|
||||
msgid "Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
#: code:addons/account/static/src/js/account_selection.js:0
|
||||
#, python-format
|
||||
msgid "Balance Sheet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_bank_statement__balance_end
|
||||
msgid "Balance as calculated based on Opening Balance and transaction lines"
|
||||
@@ -8201,6 +8214,12 @@ msgstr ""
|
||||
msgid "Options"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_tour_upload_bill.py:0
|
||||
#, python-format
|
||||
msgid "Or send a bill to %s@%s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_resequence_wizard__ordering
|
||||
msgid "Ordering"
|
||||
@@ -12742,6 +12761,12 @@ msgstr ""
|
||||
msgid "Transfers"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_tour_upload_bill.py:0
|
||||
#, python-format
|
||||
msgid "Try a sample vendor bill"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account__user_type_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template__user_type_id
|
||||
@@ -12941,6 +12966,12 @@ msgstr ""
|
||||
msgid "Upload"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_tour_upload_bill.py:0
|
||||
#, python-format
|
||||
msgid "Upload your own bill"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_chart_template__use_anglo_saxon
|
||||
msgid "Use Anglo-Saxon accounting"
|
||||
|
||||
@@ -27,7 +27,7 @@ odoo.define('account.hierarchy.selection', function (require) {
|
||||
self.values = _.map(arg, v => [v['id'], v['display_name']])
|
||||
self.hierarchy_groups = [
|
||||
{
|
||||
'name': _('Balance Sheet'),
|
||||
'name': _t('Balance Sheet'),
|
||||
'children': [
|
||||
{'name': _t('Assets'), 'ids': _.map(_.filter(arg, v => v['internal_group'] == 'asset'), v => v['id'])},
|
||||
{'name': _t('Liabilities'), 'ids': _.map(_.filter(arg, v => v['internal_group'] == 'liability'), v => v['id'])},
|
||||
|
||||
@@ -60,7 +60,7 @@ class ReSequenceWizard(models.TransientModel):
|
||||
or (self.sequence_number_reset == 'year' and line['server-date'][0:4] != previous_line['server-date'][0:4])\
|
||||
or (self.sequence_number_reset == 'month' and line['server-date'][0:7] != previous_line['server-date'][0:7]):
|
||||
if in_elipsis:
|
||||
changeLines.append({'current_name': '... (%s other)' % str(in_elipsis), 'new_by_name': '...', 'new_by_date': '...', 'date': '...'})
|
||||
changeLines.append({'current_name': _('... (%s other)', in_elipsis), 'new_by_name': '...', 'new_by_date': '...', 'date': '...'})
|
||||
in_elipsis = 0
|
||||
changeLines.append(line)
|
||||
else:
|
||||
|
||||
@@ -28,9 +28,9 @@ class AccountTourUploadBill(models.TransientModel):
|
||||
journal_alias = self.env['account.journal'] \
|
||||
.search([('type', '=', 'purchase'), ('company_id', '=', self.env.company.id)], limit=1)
|
||||
|
||||
return [('sample', 'Try a sample vendor bill'),
|
||||
('upload', 'Upload your own bill'),
|
||||
('email', 'Or send a bill to %s@%s' % (journal_alias.alias_name, journal_alias.alias_domain))]
|
||||
return [('sample', _('Try a sample vendor bill')),
|
||||
('upload', _('Upload your own bill')),
|
||||
('email', _('Or send a bill to %s@%s', journal_alias.alias_name, journal_alias.alias_domain))]
|
||||
|
||||
def _compute_sample_bill_image(self):
|
||||
""" Retrieve sample bill with facturx to speed up onboarding """
|
||||
|
||||
@@ -190,7 +190,7 @@ class Digest(models.Model):
|
||||
invalid_fields = []
|
||||
kpis = [
|
||||
dict(kpi_name=field_name,
|
||||
kpi_fullname=self._fields[field_name].string,
|
||||
kpi_fullname=self.env['ir.model.fields']._get(self._name, field_name).field_description,
|
||||
kpi_action=False,
|
||||
kpi_col1=dict(),
|
||||
kpi_col2=dict(),
|
||||
|
||||
@@ -155,9 +155,7 @@
|
||||
<t t-if="not sale_order.is_expired and sale_order.state in ['draft', 'sent']">
|
||||
<li t-if="sale_order.validity_date" class="list-group-item">
|
||||
<small><b class="text-muted">This offer expires on</b></small>
|
||||
<div>
|
||||
<t t-esc="sale_order.validity_date.strftime('%d %B %Y')"/>
|
||||
</div>
|
||||
<div t-field="sale_order.validity_date"></div>
|
||||
</li>
|
||||
<li t-if="sale_order.amount_undiscounted - sale_order.amount_untaxed > 0.01" class="list-group-item flex-grow-1">
|
||||
<small><b class="text-muted">Your advantage</b></small>
|
||||
|
||||
+495
-274
File diff suppressed because it is too large
Load Diff
+488
-270
File diff suppressed because it is too large
Load Diff
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server saas~14.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-02-18 14:29+0000\n"
|
||||
"PO-Revision-Date: 2021-02-18 14:29+0000\n"
|
||||
"POT-Creation-Date: 2021-02-25 10:30+0000\n"
|
||||
"PO-Revision-Date: 2021-02-25 10:30+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -4369,6 +4369,13 @@ msgstr ""
|
||||
msgid "Variation"
|
||||
msgstr ""
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
#: code:addons/web/static/src/xml/base.xml:0
|
||||
#, python-format
|
||||
msgid "View %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
#: code:addons/web/static/src/xml/debug.xml:0
|
||||
@@ -4952,13 +4959,6 @@ msgstr ""
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
#: code:addons/web/static/src/xml/colorpicker.xml:0
|
||||
#, python-format
|
||||
msgid "p-0 text-center text-monospace bg-transparent text-white"
|
||||
msgstr ""
|
||||
|
||||
#. module: web
|
||||
#. openerp-web
|
||||
#: code:addons/web/static/src/js/widgets/domain_selector.js:0
|
||||
|
||||
@@ -123,6 +123,8 @@ odoo.define('web.ControlPanel', function (require) {
|
||||
};
|
||||
|
||||
this.fields = this._formatFields(this.props.fields);
|
||||
|
||||
this.sprintf = _.str.sprintf;
|
||||
}
|
||||
|
||||
mounted() {
|
||||
|
||||
@@ -631,12 +631,13 @@
|
||||
</t>
|
||||
|
||||
<t t-name="web.ViewSwitcherButton" owl="1">
|
||||
<t t-set="buttonLabel">View %s</t>
|
||||
<button type="button"
|
||||
t-att-accesskey="view.accessKey"
|
||||
t-attf-class="btn btn-secondary fa fa-lg o_switch_view o_{{ view.type }} {{ view.icon }}"
|
||||
t-att-class="{ active: env.view.type === view.type }"
|
||||
t-attf-aria-label="View {{ view.type }}"
|
||||
t-attf-title="View {{ view.type }}"
|
||||
t-att-aria-label="sprintf(buttonLabel.toString(), view.type)"
|
||||
t-att-title="sprintf(buttonLabel.toString(), view.type)"
|
||||
data-toggle="tooltip"
|
||||
tabindex="-1"
|
||||
t-on-click="trigger('switch-view', { view_type: view.type })"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</div>
|
||||
<div t-if="widget.options.colorPreview" class="o_color_preview mb-1 w-100 p-2"/>
|
||||
<div class="o_color_picker_inputs d-flex justify-content-between mb-2">
|
||||
<t t-set="input_classes">p-0 text-center text-monospace bg-transparent text-white</t>
|
||||
<t t-set="input_classes" t-value="'p-0 text-center text-monospace bg-transparent text-white'" />
|
||||
|
||||
<div class="o_hex_div bg-black-50 px-1 d-flex align-items-baseline">
|
||||
<input type="text" t-attf-class="o_hex_input {{input_classes}}" data-color-method="hex" size="1"/>
|
||||
|
||||
@@ -704,6 +704,7 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#. module: website_forum
|
||||
#. openerp-web
|
||||
#: code:addons/website_forum/controllers/main.py:0
|
||||
#: model_terms:ir.ui.view,arch_db:website_forum.forum_index
|
||||
#, python-format
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 14.0\n"
|
||||
"Project-Id-Version: Odoo Server saas~14.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-11-17 06:20+0000\n"
|
||||
"PO-Revision-Date: 2020-11-17 06:20+0000\n"
|
||||
"POT-Creation-Date: 2021-03-01 07:49+0000\n"
|
||||
"PO-Revision-Date: 2021-03-01 07:49+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -20,6 +20,12 @@ msgstr ""
|
||||
msgid ", .o_newsletter_popup"
|
||||
msgstr ""
|
||||
|
||||
#. module: website_mass_mailing
|
||||
#: code:addons/website_mass_mailing/models/mailing_list.py:0
|
||||
#, python-format
|
||||
msgid "<p>Thanks for subscribing!</p>"
|
||||
msgstr ""
|
||||
|
||||
#. module: website_mass_mailing
|
||||
#. openerp-web
|
||||
#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:0
|
||||
@@ -182,6 +188,7 @@ msgstr ""
|
||||
|
||||
#. module: website_mass_mailing
|
||||
#: model:ir.model.fields,field_description:website_mass_mailing.field_mailing_list__toast_content
|
||||
#: model_terms:ir.ui.view,arch_db:website_mass_mailing.mailing_list_view_form
|
||||
msgid "Toast Content"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import fields, models
|
||||
from odoo.tools.translate import _
|
||||
|
||||
|
||||
class MailingList(models.Model):
|
||||
_inherit = 'mailing.list'
|
||||
|
||||
def _default_toast_content(self):
|
||||
return '<p>Thanks for subscribing!</p>'
|
||||
return _('<p>Thanks for subscribing!</p>')
|
||||
|
||||
website_popup_ids = fields.One2many('website.mass_mailing.popup', 'mailing_list_id', string="Website Popups")
|
||||
toast_content = fields.Html(default=_default_toast_content, translate=True)
|
||||
|
||||
Reference in New Issue
Block a user