Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 15, 2024

Several related changes in separate commits:

  • updated spanish translation of Enterprise contract to v10a (Partnership was already up-to-date
  • spellchecking + proper emphasis of some important terms in ES Enterprise contract, e.g. the disambiguation of "Extra Covered Modules" and "Bug" translations
  • removed the "not legally binding" warning in both contracts, as Odoo now has official establishments in countries when Spanish contracts are mandatory and need to be binding. More careful reviews of the Spanish translations will be necessary from now on.
  • special case alt lang links for legal terms: adapts the generation of alternative languages links for each "legal terms page", so that it targets the correct i18n link, or goes back to the EN one, depending on the target language

Forward-Port-Of: #7382

odony added 3 commits January 15, 2024 02:27
Including spellchecking and proper emphasis of some important terms, and
the disambiguation of "Extra Covered Modules" and "Bug"

Removed the "not legally binding" warning, as Odoo now has official
establishments in countries when Spanish contracts are mandatory and
need to be binding. More careful reviews of the Spanish translations
will be necessary from now on.

X-original-commit: aa412ed
Removed the "not legally binding" warning, as Odoo now has official
establishments in countries when Spanish contracts are mandatory and
need to be binding. More careful reviews of the Spanish translations
will be necessary from now on.

X-original-commit: 43c2b85
Legal terms live under specific URL as their translations are not
managed in the same manner.

Layout is like this:
  /terms/enterprise.html (EN)
  /terms/i18n/enterprise_fr.html (FR)

This commit adapts the generation of alternative languages links for each
"legal terms page", so that it targets the correct i18n link, or goes
back to the canonical EN one, depending on the target language.

X-original-commit: 8062e54
@robodoo
Copy link
Collaborator

robodoo commented Jan 15, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 15, 2024

This PR targets 15.0 and is part of the forward-port chain. Further PRs will be created up to master.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 15, 2024

@odony the next pull request (#7384) is in conflict. You can merge the chain up to here by saying

@fw-bot r+

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@odony
Copy link
Contributor

odony commented Jan 15, 2024

@fw-bot r+

robodoo pushed a commit that referenced this pull request Jan 15, 2024
Including spellchecking and proper emphasis of some important terms, and
the disambiguation of "Extra Covered Modules" and "Bug"

Removed the "not legally binding" warning, as Odoo now has official
establishments in countries when Spanish contracts are mandatory and
need to be binding. More careful reviews of the Spanish translations
will be necessary from now on.

X-original-commit: aa412ed
Part-of: #7383
robodoo pushed a commit that referenced this pull request Jan 15, 2024
Removed the "not legally binding" warning, as Odoo now has official
establishments in countries when Spanish contracts are mandatory and
need to be binding. More careful reviews of the Spanish translations
will be necessary from now on.

X-original-commit: 43c2b85
Part-of: #7383
robodoo pushed a commit that referenced this pull request Jan 15, 2024
Legal terms live under specific URL as their translations are not
managed in the same manner.

Layout is like this:
  /terms/enterprise.html (EN)
  /terms/i18n/enterprise_fr.html (FR)

This commit adapts the generation of alternative languages links for each
"legal terms page", so that it targets the correct i18n link, or goes
back to the canonical EN one, depending on the target language.

closes #7383

X-original-commit: 8062e54
Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
@robodoo robodoo closed this Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants