https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113300
Revision: 113300
Author: netbrain
Date: 2012-03-07 21:24:01 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
tweaked extension for translations
Modified Paths:
--------------
trunk/extensions/SideBarMenu/SideBarMenu.hooks.php
trunk/extensions/SideBarMenu/SideBarMenu.i18n.php
trunk/extensions/SideBarMenu/SideBarMenu.php
trunk/extensions/SideBarMenu/includes/MenuItem.php
trunk/extensions/SideBarMenu/includes/MenuParser.php
Modified: trunk/extensions/SideBarMenu/SideBarMenu.hooks.php
===================================================================
--- trunk/extensions/SideBarMenu/SideBarMenu.hooks.php 2012-03-07 21:20:36 UTC
(rev 113299)
+++ trunk/extensions/SideBarMenu/SideBarMenu.hooks.php 2012-03-07 21:24:01 UTC
(rev 113300)
@@ -21,7 +21,7 @@
$output .= $menuParser->getMenuTree($input)->toHTML();
}catch(Exception $x){
wfDebug("An error occured during parsing of: '$input' caught
exception: $x");
- return wfMsg('parser.input-error',$x->getMessage());
+ return wfMsg('sidebarmenu-parser.input-error',$x->getMessage());
}
$output .= '</div>';
@@ -83,8 +83,8 @@
{
global $wgSideBarMenuConfig;
$config[SBM_EXPANDED] = array_key_exists(SBM_EXPANDED, $args) ?
filter_var($args[SBM_EXPANDED], FILTER_VALIDATE_BOOLEAN) :
$wgSideBarMenuConfig[SBM_EXPANDED];
- $config[SBM_CONTROLS_SHOW] = array_key_exists(SBM_CONTROLS_SHOW,
$args) ? $args[SBM_CONTROLS_SHOW] :
(isset($wgSideBarMenuConfig[SBM_CONTROLS_SHOW]) ?
$wgSideBarMenuConfig[SBM_CONTROLS_SHOW] : wfMsg(SBM_CONTROLS_SHOW));
- $config[SBM_CONTROLS_HIDE] = array_key_exists(SBM_CONTROLS_HIDE,
$args) ? $args[SBM_CONTROLS_HIDE] :
(isset($wgSideBarMenuConfig[SBM_CONTROLS_HIDE]) ?
$wgSideBarMenuConfig[SBM_CONTROLS_HIDE] : wfMsg(SBM_CONTROLS_HIDE));
+ $config[SBM_CONTROLS_SHOW] = array_key_exists(SBM_CONTROLS_SHOW,
$args) ? $args[SBM_CONTROLS_SHOW] :
(isset($wgSideBarMenuConfig[SBM_CONTROLS_SHOW]) ?
$wgSideBarMenuConfig[SBM_CONTROLS_SHOW] : '['.wfMsg('showtoc').']');
+ $config[SBM_CONTROLS_HIDE] = array_key_exists(SBM_CONTROLS_HIDE,
$args) ? $args[SBM_CONTROLS_HIDE] :
(isset($wgSideBarMenuConfig[SBM_CONTROLS_HIDE]) ?
$wgSideBarMenuConfig[SBM_CONTROLS_HIDE] : '['.wfMsg('hidetoc').']');
$config[SBM_JS_ANIMATE] = array_key_exists(SBM_JS_ANIMATE, $args) ?
$args[SBM_JS_ANIMATE] : $wgSideBarMenuConfig[SBM_JS_ANIMATE];
return $config;
}
Modified: trunk/extensions/SideBarMenu/SideBarMenu.i18n.php
===================================================================
--- trunk/extensions/SideBarMenu/SideBarMenu.i18n.php 2012-03-07 21:20:36 UTC
(rev 113299)
+++ trunk/extensions/SideBarMenu/SideBarMenu.i18n.php 2012-03-07 21:24:01 UTC
(rev 113300)
@@ -1,9 +1,25 @@
<?php
$messages = array();
+
+/** Message documentation (Message documentation)
+ *
+ */
+$messages['qqq'] = array(
+ 'sidebarmenu-extension.description' => '{{desc}}',
+ 'sidebarmenu-parser.input-error' => '$1 is the error
message returned',
+ 'sidebarmenu-parser.syntax-error' => '$1 is the line which
failed to be parsed',
+ 'sidebarmenu-js.init-error' => 'General error message',
+ 'sidebarmenu-parser.menuitem.expanded.null' =>
'parser.menuitem.expanded is a configuration property'
+);
+
+/** English
+ * @author Kim Eik
+ */
$messages['en'] = array(
- 'controls.show' => '[show]',
- 'controls.hide' => '[hide]',
- 'parser.input-error' => 'FATAL ERROR: parser returned with error: $1',
- 'parser.syntax-error' => 'Could not parse "$1", make sure the syntax is
correct.',
- 'js.init-error' => 'Error loading javascript resources'
-);
\ No newline at end of file
+ 'sidebarmenu-extension.description' => 'A simple sidebar menu
parser which creates collapsable/expandable menus and sub-menus.',
+ 'sidebarmenu-parser.input-error' => 'Parser returned with
error: $1',
+ 'sidebarmenu-parser.syntax-error' => 'Could not parse "$1",
make sure the syntax is correct.',
+ 'sidebarmenu-js.init-error' => 'Failed loading
JavaScript resources.',
+ 'sidebarmenu-parser.menuitem.expanded.null' =>
'\'parser.menuitem.expanded\' should be true or false, instead it\'s null.'
+);
+
Modified: trunk/extensions/SideBarMenu/SideBarMenu.php
===================================================================
--- trunk/extensions/SideBarMenu/SideBarMenu.php 2012-03-07 21:20:36 UTC
(rev 113299)
+++ trunk/extensions/SideBarMenu/SideBarMenu.php 2012-03-07 21:24:01 UTC
(rev 113300)
@@ -23,7 +23,7 @@
'version' => 0.1,
'author' => 'Kim Eik',
'url' => 'https://www.mediawiki.org/wiki/Extension:SideBarMenu',
- 'descriptionmsg' => 'A simple sidebar menu parser which creates
collapsable/expandable menus and sub-menus.'
+ 'descriptionmsg' => 'sidebarmenu-extension.description'
);
Modified: trunk/extensions/SideBarMenu/includes/MenuItem.php
===================================================================
--- trunk/extensions/SideBarMenu/includes/MenuItem.php 2012-03-07 21:20:36 UTC
(rev 113299)
+++ trunk/extensions/SideBarMenu/includes/MenuItem.php 2012-03-07 21:24:01 UTC
(rev 113300)
@@ -11,7 +11,7 @@
public function setExpanded($expanded)
{
if(is_null($expanded)){
- throw new InvalidArgumentException();
+ throw new
InvalidArgumentException(wfMsg('sidebarmenu-parser.menuitem.expanded.null'));
}else{
$this->expanded = $expanded;
}
Modified: trunk/extensions/SideBarMenu/includes/MenuParser.php
===================================================================
--- trunk/extensions/SideBarMenu/includes/MenuParser.php 2012-03-07
21:20:36 UTC (rev 113299)
+++ trunk/extensions/SideBarMenu/includes/MenuParser.php 2012-03-07
21:24:01 UTC (rev 113300)
@@ -81,7 +81,7 @@
$levelArray[$level][] = $line;
}else{
//syntax error
- throw new
InvalidArgumentException(wfMsg('parser.syntax-error',$line));
+ throw new
InvalidArgumentException(wfMsg('sidebarmenu-parser.syntax-error',$line));
}
$prevLevel = $level;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
