Merge "BlockLog.vue: Wrap user tool links onto own line when it doesn't fit"

Author: jenkins-bot

languages/i18n/en.json

@@ -3649,7 +3649,6 @@
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|talk]])",
 	"signature-anon": "[[{{#special:Contributions}}/$1|$2]]",
 	"signature-temp": "[[{{#special:Contributions}}/$1|$2]] ([[{{ns:user_talk}}:$1|talk]])",
-	"userlink-with-contribs": "[[{{ns:user}}:$1|$1]] ([[{{ns:user_talk}}:$1|{{int:talkpagelinktext}}]] {{int:pipe-separator}} [[{{ns:special}}:Contributions/$1|{{int:contribslink}}]])",
 	"timezone-utc": "UTC",
 	"timezone-local": "Local",
 	"duplicate-defaultsort": "<strong>Warning:</strong> Default sort key \"$2\" overrides earlier default sort key \"$1\".",

languages/i18n/qqq.json

@@ -3913,7 +3913,6 @@
 	"signature": "This will be substituted in the signature (~<nowiki></nowiki>~~ or ~~<nowiki></nowiki>~~ excluding timestamp).\n\n'''Translate the word \"talk\" towards the end.''' It's probably the same as {{mw-msg|Sp-contributions-talk}}.\n\nParameters:\n* $1 - the username that is currently login\n* $2 - the customized signature which is specified in [[Special:Preferences|user's preferences]] as non-raw\n\nUse your language default parentheses ({{msg-mw|parentheses}}), but not use the message direct.\n\nSee also:\n* {{msg-mw|Signature-anon}} - signature for anonymous user",
 	"signature-anon": "{{notranslate}}\nUsed as signature for anonymous user. Parameters:\n* $1 - username (IP address?)\n* $2 - nickname (IP address?)\nSee also:\n* {{msg-mw|Signature}} - signature for registered user",
 	"signature-temp": "Used as a signature for automatically created temporary users (when IP masking is enabled).",
-	"userlink-with-contribs": "A link to a userpage, the talk page and the contributions page, in the format User (talk | contribs). Parameters:\n* $1 - the username",
 	"timezone-utc": "{{optional}}",
 	"timezone-local": "Label to indicate that a time is in the user's local timezone.\n{{Identical|Local}}",
 	"duplicate-defaultsort": "<strong>Warning:</strong> Default sort key \"$2\" overrides earlier default sort key \"$1\".",

resources/Resources.php

@@ -2404,7 +2404,6 @@
 			'parentheses-start',
 			'pipe-separator',
 			'talkpagelinktext',
-			'userlink-with-contribs',
 		],
 	],
 	'mediawiki.protectionIndicators.styles' => [

resources/src/mediawiki.special.block/components/BlockLog.vue

@@ -76,8 +76,20 @@
 				<span v-else></span>
 			</template>
 			<template #item-blockedby="{ item }">
-				<!-- eslint-disable-next-line vue/no-v-html -->
-				<span v-html="$i18n( 'userlink-with-contribs', item ).parse()"></span>
+				<a :href="mw.util.getUrl( `User:${ item }` )">
+					{{ item }}
+				</a>
+				<span class="mw-usertoollinks">
+					{{ $i18n( 'parentheses-start' ).text() }}<a :href="mw.util.getUrl( `User talk:${ item }` )">
+						{{ $i18n( 'talkpagelinktext' ).text() }}
+					</a>
+					<span>
+						{{ $i18n( 'pipe-separator' ).text() }}
+						<a :href="mw.util.getUrl( `Special:Contributions/${ item }` )">
+							{{ $i18n( 'contribslink' ).text() }}
+						</a>
+					</span>{{ $i18n( 'parentheses-end' ).text() }}
+				</span>
 			</template>
 			<template #item-parameters="{ item }">
 				<ul v-if="item && item.length">
@@ -312,6 +324,10 @@ module.exports = exports = defineComponent( {
 	.cdx-accordion__content {
 		font-size: unset;
 	}
+
+	.mw-usertoollinks {
+		white-space: nowrap;
+	}
 }
 
 .mw-block-log-fulllog {