Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/382095 )
Change subject: Revert "Use Language type hint in hooks" ...................................................................... Revert "Use Language type hint in hooks" This reverts commit d80000572921ee11e0c483b3637f600872b6eb09. Bug: T177352 Change-Id: I3ac248e6e2152b4b3032def56c433b12aceb798c --- M TranslateHooks.php M tag/PageTranslationHooks.php 2 files changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/95/382095/1 diff --git a/TranslateHooks.php b/TranslateHooks.php index 1a7613f..bcd2b94 100644 --- a/TranslateHooks.php +++ b/TranslateHooks.php @@ -438,9 +438,9 @@ * Set the correct page content language for translation units. * * @param Title $title - * @param Language &$pageLang + * @param string &$pageLang */ - public static function onPageContentLanguage( Title $title, Language &$pageLang ) { + public static function onPageContentLanguage( Title $title, &$pageLang ) { $handle = new MessageHandle( $title ); if ( $handle->isMessageNamespace() ) { $pageLang = $handle->getEffectiveLanguage(); diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php index 614ceae..f97df48 100644 --- a/tag/PageTranslationHooks.php +++ b/tag/PageTranslationHooks.php @@ -72,16 +72,13 @@ /** * Set the right page content language for translated pages ("Page/xx"). * Hook: PageContentLanguage - * - * @param Title $title - * @param Language &$pageLang */ - public static function onPageContentLanguage( Title $title, Language &$pageLang ) { + public static function onPageContentLanguage( Title $title, /*string*/&$pageLang ) { // For translation pages, parse plural, grammar etc with correct language, // and set the right direction if ( TranslatablePage::isTranslationPage( $title ) ) { list( , $code ) = TranslateUtils::figureMessage( $title->getText() ); - $pageLang = Language::factory( $code ); + $pageLang = $code; } return true; -- To view, visit https://gerrit.wikimedia.org/r/382095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ac248e6e2152b4b3032def56c433b12aceb798c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: wmf/1.31.0-wmf.2 Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits