From: Happy-melon Date: Wed, 20 Apr 2011 17:29:24 +0000 (+0000) Subject: Follow-up r82285: prefix group css and js pages with "Group-", and fix license header. X-Git-Tag: 1.31.0-rc.0~30675 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=8b9aacebff0b675695b3c4db123744b4795f0ac5;p=lhc%2Fweb%2Fwiklou.git Follow-up r82285: prefix group css and js pages with "Group-", and fix license header. --- diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php index cebe93617a..e51d6c7c5f 100644 --- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php +++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php @@ -16,8 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @author Trevor Parscal - * @author Roan Kattouw */ /** @@ -38,8 +36,8 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule { continue; } $g = ucfirst( $group ); - $pages["MediaWiki:$g.js"] = array( 'type' => 'script' ); - $pages["MediaWiki:$g.css"] = array( 'type' => 'style' ); + $pages["MediaWiki:Group-$g.js"] = array( 'type' => 'script' ); + $pages["MediaWiki:Group-$g.css"] = array( 'type' => 'style' ); } return $pages; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 5d8c52182a..21acd39e0f 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3512,10 +3512,10 @@ You can view its source', 'print.css' => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it 'handheld.css' => '/* CSS placed here will affect handheld devices based on the skin configured in $wgHandheldStyle */', # only translate this message to other languages if you have to change it 'noscript.css' => '/* CSS placed here will affect users with JavaScript disabled */', # only translate this message to other languages if you have to change it -'autoconfirmed.css' => '/* CSS placed here will affect autoconfirmed users only */', # only translate this message to other languages if you have to change it -'bot.css' => '/* CSS placed here will affect bots only */', # only translate this message to other languages if you have to change it -'sysop.css' => '/* CSS placed here will affect sysops only */', # only translate this message to other languages if you have to change it -'bureaucrat.css' => '/* CSS placed here will affect bureaucrats only */', # only translate this message to other languages if you have to change it +'group-autoconfirmed.css' => '/* CSS placed here will affect autoconfirmed users only */', # only translate this message to other languages if you have to change it +'group-bot.css' => '/* CSS placed here will affect bots only */', # only translate this message to other languages if you have to change it +'group-sysop.css' => '/* CSS placed here will affect sysops only */', # only translate this message to other languages if you have to change it +'group-bureaucrat.css' => '/* CSS placed here will affect bureaucrats only */', # only translate this message to other languages if you have to change it # Scripts 'common.js' => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it @@ -3528,10 +3528,10 @@ You can view its source', 'simple.js' => '/* Any JavaScript here will be loaded for users using the Simple skin */', # only translate this message to other languages if you have to change it 'modern.js' => '/* Any JavaScript here will be loaded for users using the Modern skin */', # only translate this message to other languages if you have to change it 'vector.js' => '/* Any JavaScript here will be loaded for users using the Vector skin */', # only translate this message to other languages if you have to change it -'autoconfirmed.js' => '/* Any JavaScript here will be loaded for autoconfirmed users only */', # only translate this message to other languages if you have to change it -'bot.js' => '/* Any JavaScript here will be loaded for bots only */', # only translate this message to other languages if you have to change it -'sysop.js' => '/* Any JavaScript here will be loaded for sysops only */', # only translate this message to other languages if you have to change it -'bureaucrat.js' => '/* Any JavaScript here will be loaded for bureaucrats only */', # only translate this message to other languages if you have to change it +'group-autoconfirmed.js' => '/* Any JavaScript here will be loaded for autoconfirmed users only */', # only translate this message to other languages if you have to change it +'group-bot.js' => '/* Any JavaScript here will be loaded for bots only */', # only translate this message to other languages if you have to change it +'group-sysop.js' => '/* Any JavaScript here will be loaded for sysops only */', # only translate this message to other languages if you have to change it +'group-bureaucrat.js' => '/* Any JavaScript here will be loaded for bureaucrats only */', # only translate this message to other languages if you have to change it # Metadata 'nodublincore' => 'Dublin Core RDF metadata disabled for this server.', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index bf10adb2fd..1f7dc63cf4 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2460,10 +2460,10 @@ $wgMessageStructure = array( 'print.css', 'handheld.css', 'noscript.css', - 'autoconfirmed.css', - 'bot.css', - 'sysop.css', - 'bureaucrat.css', + 'group-autoconfirmed.css', + 'group-bot.css', + 'group-sysop.css', + 'group-bureaucrat.css', ), 'scripts' => array( 'common.js', @@ -2476,10 +2476,10 @@ $wgMessageStructure = array( 'simple.js', 'modern.js', 'vector.js', - 'autoconfirmed.js', - 'bot.js', - 'sysop.js', - 'bureaucrat.js', + 'group-autoconfirmed.js', + 'group-bot.js', + 'group-sysop.js', + 'group-bureaucrat.js', ), 'metadata_cc' => array( 'nodublincore',