https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110310
Revision: 110310
Author: nikerabbit
Date: 2012-01-30 18:11:15 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
MFT 1.18wmf1 r108719 r108793 r108804 r108805 r109019 r109744 r109745 r109747
r109749 r109750 r109754 r109806
Translate help links
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/Translate/Translate.i18n.php
branches/wmf/1.18wmf1/extensions/Translate/Translate.php
branches/wmf/1.18wmf1/extensions/Translate/TranslateUtils.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialImportTranslations.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialLanguageStats.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialMagic.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialManageGroups.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialSupportedLanguages.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslate.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslationStats.php
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslations.php
Added Paths:
-----------
branches/wmf/1.18wmf1/extensions/Translate/resources/ext.translate.helplink.css
branches/wmf/1.18wmf1/extensions/Translate/resources/images/
Modified: branches/wmf/1.18wmf1/extensions/Translate/Translate.i18n.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/Translate.i18n.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/Translate.i18n.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -426,6 +426,8 @@
'translate-dynagroup-byc' => 'Translation made by {{GENDER:$1|$1}}
($2)',
'translate-dynagroup-last' => 'Latest change by {{GENDER:$1|$1}}',
'translate-dynagroup-lastc' => 'Latest change by {{GENDER:$1|$1}} ($2)',
+
+ 'translate-gethelp' => 'Help',
);
/** Message documentation (Message documentation)
@@ -685,6 +687,8 @@
'translate-workflow-set-done' => 'Submit button text when submission
completed succesfully',
'translate-workflow-autocreated-summary' => 'This is an edit summary
for the automatic creation of a workflow state page.',
'translate-stats-workflow' => 'Column header on Special:LanguageStats
and Special:MessageGroupStats',
+
+ 'translate-gethelp' => 'Link to some Translate help page or tutorial',
);
/** Faeag Rotuma (Faeag Rotuma)
Modified: branches/wmf/1.18wmf1/extensions/Translate/Translate.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/Translate.php 2012-01-30
17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/Translate.php 2012-01-30
18:11:15 UTC (rev 110310)
@@ -165,6 +165,11 @@
'position' => 'top',
) + $resourcePaths;
+$wgResourceModules['ext.translate.helplink'] = array(
+ 'styles' => 'resources/ext.translate.helplink.css',
+ 'position' => 'top',
+) + $resourcePaths;
+
$wgResourceModules['ext.translate.messagetable'] = array(
'scripts' => 'resources/ext.translate.messagetable.js',
'styles' => 'resources/ext.translate.messagetable.css',
Modified: branches/wmf/1.18wmf1/extensions/Translate/TranslateUtils.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/TranslateUtils.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/TranslateUtils.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -4,7 +4,7 @@
*
* @file
* @author Niklas Laxström
- * @copyright Copyright © 2007, 2009 Niklas Laxström
+ * @copyright Copyright © 2007, 2012 Niklas Laxström
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
@@ -312,4 +312,27 @@
return $selector;
}
+ /**
+ * @since 2012-01-12
+ */
+ public static function addSpecialHelpLink( OutputPage $out,
/*string*/$to, $overrideBaseUrl = false ) {
+ $out->addModules( 'ext.translate.helplink' );
+ $text = wfMessage( 'translate-gethelp' )->escaped();
+
+ if( $overrideBaseUrl ) {
+ $helpUrl = $to;
+ } else {
+ $helpUrl =
"//www.mediawiki.org/wiki/Special:MyLanguage/$to";
+ }
+
+ $link = Html::rawElement(
+ 'a',
+ array(
+ 'href' => $helpUrl,
+ 'target' => '_blank'
+ ),
+ "$text" );
+ $wrapper = Html::rawElement( 'div', array( 'class' =>
'mw-translate-helplink' ), $link );
+ $out->addHtml( $wrapper );
+ }
}
Copied:
branches/wmf/1.18wmf1/extensions/Translate/resources/ext.translate.helplink.css
(from rev 108719,
trunk/extensions/Translate/resources/ext.translate.helplink.css)
===================================================================
---
branches/wmf/1.18wmf1/extensions/Translate/resources/ext.translate.helplink.css
(rev 0)
+++
branches/wmf/1.18wmf1/extensions/Translate/resources/ext.translate.helplink.css
2012-01-30 18:11:15 UTC (rev 110310)
@@ -0,0 +1,14 @@
+.mw-translate-helplink {
+ position: absolute;
+ width: 100%;
+ display: block;
+ margin-top: -10px;
+}
+
+.mw-translate-helplink a {
+ /* @embed */
+ background: url(images/help.png) no-repeat scroll left center
transparent;
+ padding-left: 20px;
+ float: right;
+}
+
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialImportTranslations.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialImportTranslations.php
2012-01-30 17:45:48 UTC (rev 110309)
+++
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialImportTranslations.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -120,7 +120,7 @@
global $wgOut;
$wgOut->addModules( 'ext.translate.special.importtranslations'
);
-
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Off-line_translation' );
/**
* Ugly but necessary form building ahead, ohoy
*/
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialLanguageStats.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialLanguageStats.php
2012-01-30 17:45:48 UTC (rev 110309)
+++
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialLanguageStats.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -120,6 +120,7 @@
}
if ( !$this->including() ) {
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Statistics_and_reporting' );
$wgOut->addHTML( $this->getForm() );
}
Modified: branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialMagic.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialMagic.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialMagic.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -138,6 +138,7 @@
$this->setup( $parameters );
$this->setHeaders();
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'//translatewiki.net/wiki/FAQ#Special:AdvancedTranslate', true );
$wgOut->addHTML( $this->getForm() );
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialManageGroups.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialManageGroups.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialManageGroups.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -92,6 +92,7 @@
$groups = MessageGroups::singleton()->getGroups();
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Group_management' );
$wgOut->wrapWikiMsg( '<h2>$1</h2>',
'translate-manage-listgroups' );
$separator = wfMsg( 'word-separator' );
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialSupportedLanguages.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialSupportedLanguages.php
2012-01-30 17:45:48 UTC (rev 110309)
+++
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialSupportedLanguages.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -36,6 +36,7 @@
$this->purge = $wgRequest->getVal( 'action' ) === 'purge';
$this->setHeaders();
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Statistics_and_reporting#List_of_languages_and_translators'
);
$wgOut->addModules( 'ext.translate.special.supportedlanguages'
);
$cache = wfGetCache( CACHE_ANYTHING );
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslate.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslate.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslate.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -60,6 +60,7 @@
$errors = array();
if ( $this->options['group'] === '' ) {
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Translation_example' );
$this->groupInformation();
return;
}
@@ -81,6 +82,7 @@
$this->options['group'] = $this->defaults['group'];
}
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate' );
// Show errors nicely.
$wgOut->addHTML( $this->settingsForm( $errors ) );
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslationStats.php
===================================================================
---
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslationStats.php
2012-01-30 17:45:48 UTC (rev 110309)
+++
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslationStats.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -115,6 +115,7 @@
global $wgOut, $wgScript;
$this->setHeaders();
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Statistics_and_reporting' );
$wgOut->addWikiMsg( 'translate-statsf-intro' );
$wgOut->addHTML(
Modified:
branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslations.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslations.php
2012-01-30 17:45:48 UTC (rev 110309)
+++ branches/wmf/1.18wmf1/extensions/Translate/specials/SpecialTranslations.php
2012-01-30 18:11:15 UTC (rev 110310)
@@ -30,7 +30,6 @@
$this->setHeaders();
$this->outputHeader();
-
self::includeAssets();
if ( $this->including() ) {
@@ -54,7 +53,7 @@
} else {
$title = Title::newFromText( $par, $namespace );
}
-
+ TranslateUtils::addSpecialHelpLink( $wgOut,
'Help:Extension:Translate/Statistics_and_reporting#Translations_in_all_languages'
);
if ( !$title ) {
$title = Title::makeTitle( NS_MEDIAWIKI, '' );
$wgOut->addHTML( $this->namespaceMessageForm( $title )
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
