From d1d9dfe622fc1f25048d12e6d739d30481f4dd1b Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Thu, 15 Aug 2019 10:33:15 -0700 Subject: [PATCH] Comma list handled via CSS in change list pages This avoids unnecessary commas in the mobile interface. Bug: T230564 Change-Id: Id486e9a5b8fd337c41c8749d0462a40d6e68dffb --- includes/changetags/ChangeTags.php | 2 +- resources/Resources.php | 1 + resources/src/mediawiki.interface.helpers.styles.less | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index 8c8125b0fb..0f6e2323d9 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -126,7 +126,7 @@ class ChangeTags { $markers = $context->msg( 'tag-list-wrapper' ) ->numParams( count( $displayTags ) ) - ->rawParams( $context->getLanguage()->commaList( $displayTags ) ) + ->rawParams( implode( ' ', $displayTags ) ) ->parse(); $markers = Xml::tags( 'span', [ 'class' => 'mw-tag-markers' ], $markers ); diff --git a/resources/Resources.php b/resources/Resources.php index c9a1660ed3..eaf720c0da 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1967,6 +1967,7 @@ return [ 'mediawiki.interface.helpers.styles' => [ 'class' => ResourceLoaderLessVarFileModule::class, 'lessMessages' => [ + 'comma-separator', 'parentheses-start', 'parentheses-end', 'brackets-start', diff --git a/resources/src/mediawiki.interface.helpers.styles.less b/resources/src/mediawiki.interface.helpers.styles.less index 59eca6b158..5cbb1158ef 100644 --- a/resources/src/mediawiki.interface.helpers.styles.less +++ b/resources/src/mediawiki.interface.helpers.styles.less @@ -47,3 +47,13 @@ content: ''; } } + +.mw-tag-marker { + &:after { + content: '@{msg-comma-separator}'; + } + + &:last-child:after { + content: ''; + } +} -- 2.20.1