[FW][CHG] Update Spanish T&C as official + fix navigation links for translated terms #7384
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Collaborator
Author
|
@odony cherrypicking of pull request #7382 failed. stderr: Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?). In the former case, you may want to edit this PR message as well. More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
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. Part-of: #7382
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. UPDATE for forward-port: also updated the partnership text to version 11 Part-of: #7382
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 #7382 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
force-pushed
the
saas-15.2-14.0-terms-es-update-4zzE-fw
branch
from
5277516 to
0376279
Compare
Contributor
|
@robodoo r+ rebase-ff The saas-15.2 branch had an outdated partnership contract (ES), which explains the conflict. I guess we'll get the conflict in the other direction for the 16.0 branch. |
Collaborator
|
Merge method set to rebase and fast-forward. |
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. Part-of: #7384
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. UPDATE for forward-port: also updated the partnership text to version 11 Part-of: #7384
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 #7382 closes #7384 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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. Part-of: #7384
odony
added 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. Part-of: #7384
odony
added 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 #7382 closes #7384 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
odony
added 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 #7382 closes #7384 closes #7387 Signed-off-by: Olivier Dony (odo) <odo@odoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Several related changes in separate commits:
Forward-Port-Of: #7382