XWIKI-22205: Underline inline link in CSRF confirmation Panel #3200
Conversation
* Fixed all the translation values by adding a class to force this specific link to be underlined.
...i-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_bg.properties
Outdated
Show resolved
Hide resolved
This reverts commit 4441f13.
* Replaced all the HTML with parameters in the english translation and both of its uses TODO: update all the translations with actual values
| @@ -3640,7 +3640,7 @@ XWiki.SearchSuggestSourceClass_activated=Activated | |||
| XWiki.SearchSuggestSourceClass_activated.hint=Whether this source is used or not (as long as the source search engine matches the search engine used by the current wiki). | |||
|
|
|||
| ### CSRFToken resources | |||
| csrf.confirmation=<p>This request contains an invalid authentication information.</p><p>This might happen in the following situations:</p><ul><li>You left the editor open in another window/tab and logged off and on again</li><li>Your authentication token expired after a long period of inactivity</li><li>Somebody tried to perform a CSRF attack</li></ul><p>If you are sure that none of these situations apply in your case, you might have found a bug. We are sorry about that, please report it on <a href="http://jira.xwiki.org/">XWiki JIRA</a></p><p>Do you want to resend the request? If unsure, say <strong>No</strong>.</p> | |||
| csrf.confirmation={0}This request contains an invalid authentication information.{1}{2}This might happen in the following situations:{3}{4}You left the editor open in another window/tab and logged off and on again{5}{6}Your authentication token expired after a long period of inactivity{7}{8}Somebody tried to perform a CSRF attack{9}{10}If you are sure that none of these situations apply in your case, you might have found a bug. We are sorry about that, please report it on {11}XWiki JIRA{12}{13}Do you want to resend the request? If unsure, say {14}No{15}.{16} | |||
There was a problem hiding this comment.
@surli Does this solution look good to you?
Technically we're breaking backward compatibility on this translation key (the number of parameters was changed). Should I deprecate this exact key and introduce a new one with the correct amount of parameters?
Since updating all the translations will take a bit of time, I want to make sure we're on the same line before doing it :)
There was a problem hiding this comment.
Should I deprecate this exact key and introduce a new one with the correct amount of parameters?
Yes you should do that.
There was a problem hiding this comment.
Note that we could also decide to split this translation in multiple keys: e.g. one key for the message title, one for a description, one for details. Might be more clean.
There was a problem hiding this comment.
I did split this translation in multiple parts according to your comment 👍
I'm not 100% certain on how to name those parts, we might need to change this before a merge.
See my message below for a view of the manual tests I just made to make sure I didn't break the templates with these updates.
* Deprecated the old translation key that contained HTML syntax * Replaced it with a juxtaposition of smaller translations. * When nesting was needed, used parameters to make sure we don't have syntax inside the translation values. * Updated the two uses of the old translation key
|
Here is what the UI using the updated translations look like after the changes proposed in this PR: |
* Deprecated the old translation key that contained HTML syntax * Replaced it with a juxtaposition of smaller translations. * When nesting was needed, used parameters to make sure we don't have syntax inside the translation values. * Updated the two uses of the old translation key (cherry picked from commit cf1c0d5)
* Deprecated the old translation key that contained HTML syntax * Replaced it with a juxtaposition of smaller translations. * When nesting was needed, used parameters to make sure we don't have syntax inside the translation values. * Updated the two uses of the old translation key (cherry picked from commit cf1c0d5)
Jira URL
https://jira.xwiki.org/browse/XWIKI-22205
Changes
Description
Clarifications
Screenshots & Video
None.
Executed Tests
None. This is a style only change with a very low scope.
Expected merging strategy