support for combining parameters and apostrophe #356
Merged
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
chenejac
commented
Dec 16, 2022
| @@ -165,7 +165,7 @@ private static String formatString(String textString, Object... parameters) { | |||
| if (parameters.length == 0) { | |||
There was a problem hiding this comment.
While I was debugging I noticed that in some cases when {0} are used in the label translation, parameters.length is zero here, but later in I18nStringTemplateModel it is replaced as it should be (for instance for Taille minimale de l'image: {0} par {1} pixels). I hope @litvinovg is aware of this, and this is working in accordance with his expectations.
chenejac
commented
Dec 16, 2022
| * @return | ||
| */ | ||
| private String getOnlineTranslationsFormattedMessage(String preProcessed, Object[] args) { | ||
| String[] parts = preProcessed.split(I18nBundle.INT_SEP); | ||
| final int messageIndex = parts.length -1; | ||
| String message = MessageFormat.format(parts[messageIndex], args); | ||
| String message = MessageFormat.format(parts[messageIndex].replaceAll("''", "'").replaceAll("'", "''"), args); |
There was a problem hiding this comment.
@litvinovg please check do we need this here
There was a problem hiding this comment.
I think replace should be used instead of replaceAll as there is no regex used.
I suggest to extract method that does it instead of inline fixes.
… input strings for MethodFormat.format method
litvinovg
approved these changes
Dec 16, 2022
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.
VIVO GitHub issue: 3393
Please, find more about the issue also at this discussion
What does this pull request do?
Add support for combining apostrophe and parameters:
Taille maximale de l'image: {0} mégaoctetsIt might be resolved in i18n label files by replacing ' with '', and in some cases it has been done, but not in all cases. However, this might be also resolved in java files when we are invoking MessageFormat.format method. This PR should support both cases
Taille maximale de l'image: {0} mégaoctetsand
Taille maximale de l''image: {0} mégaoctetsWhat's new?
In the invocation of MessageFormat.format method, firstly all double apostrophe ('') are replaced with single, then single apostrophe is replaced with double. At the end, '' and ' are ''
How should this be tested?
Taille maximale de l'image: 6 mégaoctets,Taille minimale de l'image: 200 par 200 pixelsInterested parties
Tag (@ mention) interested parties or, if unsure, @VIVO-project/vivo-committers