Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138615
Change subject: * i18n fixes * Code cleanup * Fixed the help page link under
the "Help us" menu in the header
......................................................................
* i18n fixes
* Code cleanup
* Fixed the help page link under the "Help us" menu in the header
Change-Id: I37a0e40f9f0b564ca9654a5480a80d253efd3688
---
M BlueSky.i18n.php
M BlueSky.skin.php
2 files changed, 13 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky
refs/changes/15/138615/1
diff --git a/BlueSky.i18n.php b/BlueSky.i18n.php
index ddd558e..0ae2db2 100644
--- a/BlueSky.i18n.php
+++ b/BlueSky.i18n.php
@@ -20,6 +20,7 @@
'bluesky-more-ideas' => 'More ideas...',
'bluesky-more-ideas-url' => 'Project:Contribute to {{SITENAME}}',
'bluesky-mylinks' => 'My Links', // originally called 'mylinks'
+ 'bluesky-my-page' => 'My page',
'bluesky-navbar-explore' => 'Explore',
'bluesky-navbar-help' => 'Help us',
'bluesky-navbar-messages' => 'Messages',
diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index 9c9f6cf..98cca88 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -1254,13 +1254,6 @@
if ( !$isLoggedIn ) {
break;
}
- /**
- $html .= Linker::link(
SpecialPage::getTitleFor( 'Importvideo', $wgTitle->getText() ), wfMessage(
'importvideo' )->text() );
- if ( $wgLanguageCode == 'en' ) {
- $html .= Linker::link(
Title::makeTitle( NS_SPECIAL, 'RelatedArticle' ), wfMessage(
'manage_related_articles' )->text(), array(), array( "target" =>
$wgTitle->getPrefixedURL() ) ) .
- Linker::link(
SpecialPage::getTitleFor( 'Articlestats', $wgTitle->getText() ), wfMessage(
'articlestats' )->text() );
- }
- **/
$html .= Linker::link(
SpecialPage::getTitleFor(
'Whatlinkshere', $title->getPrefixedURL() ),
wfMessage( 'whatlinkshere' )->plain(),
@@ -1271,16 +1264,20 @@
);
break;
case 'profile':
+ // @todo Theoretically this should call
$this->getPersonalToolsList(),
+ // but since that generates <a>s inside <li>s,
it won't work for
+ // our particular use case :-( As a result of
not using that
+ // method, the PersonalUrls hook never gets
called for this skin
if ( $isLoggedIn ) {
- $html = Linker::link( Title::makeTitle(
NS_SPECIAL, 'Mytalk', 'post' ), wfMessage( 'mytalkpage' )->text() ) .
- Linker::link(
Title::makeTitle( NS_SPECIAL, 'Mypage' ), wfMessage( 'myauthorpage' )->text() )
.
+ $html = Linker::link( Title::makeTitle(
NS_SPECIAL, 'Mytalk', 'post' ), wfMessage( 'mytalk' )->plain() ) .
+ Linker::link(
SpecialPage::getTitleFor( 'Mypage' ), wfMessage( 'bluesky-my-page' )->plain() )
.
#Linker::link(
Title::makeTitle( NS_SPECIAL, 'Notifications' ), wfMessage( 'mynotifications'
)->text() ) .
- Linker::link(
Title::makeTitle( NS_SPECIAL, 'Watchlist' ), wfMessage( 'watchlist' )->text() )
.
+ Linker::link(
SpecialPage::getTitleFor( 'Watchlist' ), wfMessage( 'watchlist' )->plain() ) .
#Linker::link(
Title::makeTitle( NS_SPECIAL, 'Drafts' ), wfMessage( 'mydrafts' )->text() ) .
- Linker::link(
SpecialPage::getTitleFor( 'Mypages', 'Contributions' ), wfMessage( 'mycontris'
)->text() ) .
+ Linker::link(
SpecialPage::getTitleFor( 'Mypages', 'Contributions' ), wfMessage( 'mycontris'
)->plain() ) .
#Linker::link(
SpecialPage::getTitleFor( 'Mypages', 'Fanmail' ), wfMessage( 'myfanmail'
)->text() ) .
- Linker::link(
Title::makeTitle( NS_SPECIAL, 'Preferences' ), wfMessage( 'mypreferences'
)->text() ) .
- Linker::link(
Title::makeTitle( NS_SPECIAL, 'Userlogout' ), wfMessage( 'logout' )->text() );
+ Linker::link(
SpecialPage::getTitleFor( 'Preferences' ), wfMessage( 'mypreferences'
)->plain() ) .
+ Linker::link(
SpecialPage::getTitleFor( 'Userlogout' ), wfMessage( 'logout' )->plain() );
} else {
$html = /*( class_exists(
'UserLoginBox' ) ? UserLoginBox::getLogin( true ) :*/ '@todo FIXME' /*)*/;
$menu_css = 'menu_login';
@@ -1318,11 +1315,11 @@
}
break;
case 'help':
- $editHelpTitle = Title::newFromText( wfMessage(
'edithelppage' )->text() );
+ $editHelpMsgContents = wfMessage(
'edithelppage' )->text();
// By default it's an (external) URL, hence not
a valid Title.
// But because MediaWiki is by nature very
customizable, someone
// might've changed it to point to a local
page. Tricky!
- if ( !$editHelpTitle instanceof Title ) {
+ if ( preg_match( '/^(?:' . wfUrlProtocols() .
')/', $editHelpMsgContents ) ) {
$html = Linker::makeExternalLink(
wfMessage( 'edithelppage'
)->text(),
wfMessage( 'edithelp' )->plain()
@@ -1333,22 +1330,6 @@
wfMessage( 'edithelp' )->plain()
);
}
- /**
- if ( $wgLanguageCode == 'en' ) {
- $html .= Linker::link(
Title::makeTitle( NS_SPECIAL, 'RequestTopic' ), wfMessage( 'requesttopic'
)->text() ) .
- Linker::link(
Title::makeTitle( NS_SPECIAL, 'ListRequestedTopics' ), wfMessage(
'listrequtestedtopics' )->text() );
- }
-
- if ( $isLoggedIn ) {
- if ( $wgLanguageCode == 'en' ) {
- $html .= Linker::link(
Title::makeTitle( NS_SPECIAL, 'TipsPatrol' ), wfMessage(
'bluesky-navmenu-tipspatrol' )->text() );
- }
- $html .= Linker::link(
Title::makeTitle( NS_SPECIAL, 'RCPatrol' ), wfMessage( 'PatrolRC' )->text() );
- if ( $wgLanguageCode == 'en' ) {
- $html .= Linker::link(
Title::makeTitle( NS_SPECIAL, 'Categorizer' ), wfMessage( 'categorize_articles'
)->text() );
- }
- }
- **/
$html .= Linker::link(
SpecialPage::getTitleFor(
'Uncategorizedpages' ),
--
To view, visit https://gerrit.wikimedia.org/r/138615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37a0e40f9f0b564ca9654a5480a80d253efd3688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSky
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
