[FW][FIX] website: fix typo in exit full screen message #165854
Closed
Conversation
This file contains 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
|
@dylankiss @rdeodoo cherrypicking of pull request #164893 failed. stdout: 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 |
robodoo
added
forwardport
With the conversion of inline templates in [1], a typo was introduced that changed "screen" to "string". Also the string was escaped and not displayed correctly. This commit fixes these issues. [1]: odoo@5700cc6 X-original-commit: aec6a8b
dylankiss
force-pushed
the
17.0-16.0-fix-fullscreen-typo-dyki-dnuE-fw
branch
from
c13e1de
to
5061d75
Compare
dylankiss
reviewed
May 17, 2024
| @@ -25,7 +25,7 @@ export class FullscreenIndication extends Component { | |||
| } | |||
|
|
|||
| get fullScreenIndicationText() { | |||
| return markup(sprintf(escape(_t("Press %(key)s to exit full screen")), "<span>esc</span>")); | |||
| return markup(sprintf(escape(_t("Press %(key)s to exit full screen")), {key: "<span>esc</span>"})); | |||
There was a problem hiding this comment.
@odoo/rd-security fw-port (escaped content): #164893 (comment)
|
@robodoo override=ci/security |
|
@robodoo r+ |
This was referenced May 17, 2024
lohwswilson
pushed a commit
to lohwswilson/odoo
that referenced
this pull request
Jun 5, 2024
With the conversion of inline templates in [1], a typo was introduced that changed "screen" to "string". Also the string was escaped and not displayed correctly. This commit fixes these issues. [1]: odoo@5700cc6 closes odoo#165854 X-original-commit: aec6a8b Signed-off-by: Romain Derie (rde) <rde@odoo.com> Signed-off-by: Dylan Kiss (dyki) <dyki@odoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
With the conversion of inline templates in [1], a typo was introduced that changed "screen" to "string". This commit fixes that typo and updates the .pot file.
Also, the
escapefunction used was changed to the correct one.[1] 5700cc6
Forward-Port-Of: #165442
Forward-Port-Of: #164893