From fec2bbe82d4c24f0f989e49752e944ef5ad0b707 Mon Sep 17 00:00:00 2001 From: "This, that and the other" Date: Wed, 20 Nov 2013 13:57:56 +1100 Subject: [PATCH] Remove needless leading dash on Main Page interlanguage links Adds a message "interlanguage-link-title-langonly" with contents "$1", to allow customization of the tooltip in all circumstances. Bug: 55865 Change-Id: Icd348919377bac77e27018a44e981028a263c6e1 --- includes/SkinTemplate.php | 9 ++++++++- languages/messages/MessagesEn.php | 1 + languages/messages/MessagesQqq.php | 3 +++ maintenance/language/messages.inc | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 0990584da3..014d5142d7 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -156,10 +156,17 @@ class SkinTemplate extends Skin { // otherwise we'll end up with the autonym again. $ilLangLocalName = Language::fetchLanguageName( $ilInterwikiCode, $userLang->getCode() ); + if ( $languageLinkTitle->getText() === '' ) { + $ilTitle = wfMessage( 'interlanguage-link-title-langonly', $ilLangLocalName )->text(); + } else { + $ilTitle = wfMessage( 'interlanguage-link-title', $languageLinkTitle->getText(), + $ilLangLocalName )->text(); + } + $language_urls[] = array( 'href' => $languageLinkTitle->getFullURL(), 'text' => $ilLangName, - 'title' => wfMessage( 'interlanguage-link-title', $languageLinkTitle->getText(), $ilLangLocalName )->text(), + 'title' => $ilTitle, 'class' => $class, 'lang' => wfBCP47( $ilInterwikiCode ), 'hreflang' => wfBCP47( $ilInterwikiCode ), diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 0766cd2df4..221ac8cdc5 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -977,6 +977,7 @@ See [[Special:Version|version page]].', 'sort-descending' => 'Sort descending', 'sort-ascending' => 'Sort ascending', 'interlanguage-link-title' => '$1 – $2', # only translate this message to other languages if you have to change it +'interlanguage-link-title-langonly' => '$1', # only translate this message to other languages if you have to change it # Short words for each namespace, by default used in the namespace tab in monobook 'nstab-main' => 'Page', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 3c2fdab9c9..13a569233f 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -7849,6 +7849,9 @@ See also: Format of a sidebar interwiki link tooltip. Parameters: * $1 - page name in the target wiki * $2 - target wiki language autonym', +'interlanguage-link-title-langonly' => '{{Optional}} +Format of a sidebar interwiki link tooltip where the target page name is not available. Parameters: +* $1 - target wiki language autonym', # Stylesheets 'common.css' => '{{optional}} diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 09bd302577..137a1b1fab 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2721,6 +2721,7 @@ $wgMessageStructure = array( 'tooltip-preferences-save', 'tooltip-summary', 'interlanguage-link-title', + 'interlanguage-link-title-langonly', ), 'stylesheets' => array( 'common.css', -- 2.20.1