From ddc32a583370c8b3e73bf9b2ee09fa1f7a9223b9 Mon Sep 17 00:00:00 2001 From: mainframe98 Date: Wed, 5 Aug 2020 10:22:22 +0200 Subject: [PATCH] Provide messages through skin options Bug: T259664 Depends-On: Ie52aadd6b7de8c4db66de662f2f03e295c29034d Change-Id: Ib03c0683aa00d334224e7b3507098dedcc848e44 --- includes/SkinVector.php | 8 -------- skin.json | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/SkinVector.php b/includes/SkinVector.php index 6cf60fb..af946bf 100644 --- a/includes/SkinVector.php +++ b/includes/SkinVector.php @@ -126,26 +126,18 @@ class SkinVector extends SkinMustache { // Remember that the string '0' is a valid title. // From OutputPage::getPageTitle, via ::setPageTitle(). 'html-title' => $out->getPageTitle(), - 'msg-tagline' => $skin->msg( 'tagline' )->text(), - 'html-newtalk' => $newTalksHtml ? '
' . $newTalksHtml . '
' : '', - 'msg-vector-jumptonavigation' => $skin->msg( 'vector-jumptonavigation' )->text(), - 'msg-vector-jumptosearch' => $skin->msg( 'vector-jumptosearch' )->text(), - 'html-categories' => $skin->getCategories(), 'data-footer' => $this->getFooterData(), 'html-navigation-heading' => $skin->msg( 'navigation-heading' ), // Header 'data-logos' => ResourceLoaderSkinModule::getAvailableLogos( $this->getConfig() ), - 'msg-sitetitle' => $skin->msg( 'sitetitle' )->text(), - 'msg-sitesubtitle' => $skin->msg( 'sitesubtitle' )->text(), 'main-page-href' => $mainPageHref, 'data-sidebar' => $this->buildSidebar(), 'sidebar-visible' => $this->isSidebarVisible(), - 'msg-vector-action-toggle-sidebar' => $skin->msg( 'vector-action-toggle-sidebar' )->text(), ] + $this->getMenuProps(); if ( $skin->getUser()->isLoggedIn() ) { diff --git a/skin.json b/skin.json index e292653..55f6d09 100644 --- a/skin.json +++ b/skin.json @@ -28,6 +28,14 @@ "skins.vector.styles", "mediawiki.ui.icon", "skins.vector.icons" + ], + "messages": [ + "vector-action-toggle-sidebar", + "vector-jumptonavigation", + "vector-jumptosearch", + "sitesubtitle", + "sitetitle", + "tagline" ] } ]