wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-23 15:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inject service LanguageConverterFactory into VectorComponentVariants

Browse source 
Change-Id: I0e1fa5a8f8f6705e2439bdbc914b9d80b0072c30
This commit is contained in:
Fomafix 2024-06-14 10:29:40 +00:00
parent ed47ecfc46
commit c9408c027e
5 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/Components/VectorComponentVariants.php
View file

@ -2,13 +2,14 @@
namespace MediaWiki\Skins\Vector\Components;
use Language;
use MediaWiki\MediaWikiServices;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\StubObject\StubUserLang;
/**
* VectorComponentVariants component
*/
class VectorComponentVariants implements VectorComponent {
private LanguageConverterFactory $languageConverterFactory;
/** @var array */
private $menuData;
/** @var Language|StubUserLang */
@ -17,11 +18,18 @@ class VectorComponentVariants implements VectorComponent {
private $ariaLabel;
/**
* @param LanguageConverterFactory $languageConverterFactory
* @param array $menuData
* @param Language|StubUserLang $pageLang
* @param string $ariaLabel
*/
public function __construct( array $menuData, $pageLang, string $ariaLabel ) {
public function __construct(
LanguageConverterFactory $languageConverterFactory,
array $menuData,
$pageLang,
string $ariaLabel
) {
$this->languageConverterFactory = $languageConverterFactory;
$this->menuData = $menuData;
$this->pageLang = $pageLang;
$this->ariaLabel = $ariaLabel;
@ -32,8 +40,7 @@ class VectorComponentVariants implements VectorComponent {
* @return string
*/
private function getDropdownLabel(): string {
$languageConverterFactory = MediaWikiServices::getInstance()->getLanguageConverterFactory();
$converter = $languageConverterFactory->getLanguageConverter( $this->pageLang );
$converter = $this->languageConverterFactory->getLanguageConverter( $this->pageLang );
return $this->pageLang->getVariantname(
$converter->getPreferredVariant()
);

6
includes/SkinVector22.php
View file

@ -3,6 +3,7 @@
namespace MediaWiki\Skins\Vector;
use ExtensionRegistry;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Skins\Vector\Components\VectorComponentAppearance;
use MediaWiki\Skins\Vector\Components\VectorComponentButton;
@ -32,15 +33,17 @@ class SkinVector22 extends SkinMustache {
/** @var null|array for caching purposes */
private $languages;
private LanguageConverterFactory $languageConverterFactory;
private FeatureManagerFactory $featureManagerFactory;
private ?FeatureManager $featureManager = null;
public function __construct(
LanguageConverterFactory $languageConverterFactory,
FeatureManagerFactory $featureManagerFactory,
array $options
) {
parent::__construct( $options );
$this->languageConverterFactory = $languageConverterFactory;
// Cannot use the context in the constructor, setContext is called after construction
$this->featureManagerFactory = $featureManagerFactory;
}
@ -413,6 +416,7 @@ class SkinVector22 extends SkinMustache {
$title->getLocalURL( [ 'action' => 'edit', 'section' => 'new' ] )
) : null,
'data-variants' => new VectorComponentVariants(
$this->languageConverterFactory,
$portlets['data-variants'],
$title->getPageLanguage(),
$this->msg( 'vector-language-variant-switcher-label' )

12
includes/SkinVectorLegacy.php
View file

@ -2,6 +2,7 @@
namespace MediaWiki\Skins\Vector;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Skins\Vector\Components\VectorComponentSearchBox;
use MediaWiki\Skins\Vector\Components\VectorComponentVariants;
use SkinMustache;
@ -21,6 +22,16 @@ class SkinVectorLegacy extends SkinMustache {
private const MENU_TYPE_DROPDOWN = 2;
private const MENU_TYPE_PORTAL = 3;
private LanguageConverterFactory $languageConverterFactory;
public function __construct(
LanguageConverterFactory $languageConverterFactory,
array $options
) {
parent::__construct( $options );
$this->languageConverterFactory = $languageConverterFactory;
}
/**
* @inheritDoc
*/
@ -108,6 +119,7 @@ class SkinVectorLegacy extends SkinMustache {
// Hopefully we can revisit and possibly remove this code when the language switcher is moved.
if ( $key === 'data-variants' ) {
$variant = new VectorComponentVariants(
$this->languageConverterFactory,
$portletData,
$this->getTitle()->getPageLanguage(),
$this->msg( 'vector-language-variant-switcher-label' )

4
skin.json
View file

@ -34,6 +34,7 @@
"vector-2022": {
"class": "MediaWiki\\Skins\\Vector\\SkinVector22",
"services": [
"LanguageConverterFactory",
"Vector.FeatureManagerFactory"
],
"args": [
@ -108,6 +109,9 @@
},
"vector": {
"class": "MediaWiki\\Skins\\Vector\\SkinVectorLegacy",
"services": [
"LanguageConverterFactory"
],
"args": [
{
"name": "vector",

8
tests/phpunit/integration/VectorHooksTest.php
View file

@ -416,6 +416,7 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
public function testOnSkinTemplateNavigation() {
$this->overrideConfigValue( 'VectorUseIconWatch', true );
$skin = new SkinVector22(
$this->getServiceContainer()->getLanguageConverterFactory(),
$this->getServiceContainer()->get( 'Vector.FeatureManagerFactory' ),
[ 'name' => 'vector' ]
);
@ -458,6 +459,7 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
*/
public function testUpdateUserLinksItems() {
$vector2022Skin = new SkinVector22(
$this->getServiceContainer()->getLanguageConverterFactory(),
$this->getServiceContainer()->get( 'Vector.FeatureManagerFactory' ),
[ 'name' => 'vector-2022' ]
);
@ -471,7 +473,10 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
'login' => [ 'class' => [], 'icon' => 'login' ],
]
];
$vectorLegacySkin = new SkinVectorLegacy( [ 'name' => 'vector' ] );
$vectorLegacySkin = new SkinVectorLegacy(
$this->getServiceContainer()->getLanguageConverterFactory(),
[ 'name' => 'vector' ]
);
$contentNavLegacy = [
'associated-pages' => [],
'views' => [],
@ -502,6 +507,7 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
// Anon users
$skin = new SkinVector22(
$this->getServiceContainer()->getLanguageConverterFactory(),
$this->getServiceContainer()->get( 'Vector.FeatureManagerFactory' ),
[ 'name' => 'vector-2022' ]
);