fix: Fix translate substitution when OC is not defined #543
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
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
skjnldsv
requested review from
PVince81,
ChristophWurst,
juliusknorr and
max-nextcloud
juliusknorr
reviewed
Jan 5, 2023
Comment on lines
+46
to
+47
| const r = vars[b] | ||
| return r |
There was a problem hiding this comment.
Suggested change
| const r = vars[b] | |
| return r | |
| return vars[b] |
juliusknorr
reviewed
Jan 5, 2023
| if (typeof OC === 'undefined') { | ||
| console.warn('No OC found') | ||
| return textSingular | ||
| .replace(/%n/g, count?.toString() || '') | ||
| .replace(/{([^{}]*)}/g, function(a, b) { | ||
| const r = vars[b] |
There was a problem hiding this comment.
Suggested change
| const r = vars[b] | |
| return vars[b] |
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.
So, I'm not too sure about this. Here is the context
Context
When testing, we should avoid mocking unnecessary methods and reflect the real execution.
Translate do not just return the string, even if there is no translations for the requested language, it still applies the substitution on the original string.
Concerns
Shall we just move the server code here? Was there a reason for it to call OC instead of shipping working code out of the box? :)
What do you think?
Refs