r86508 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r86507‎ | r86508 | r86509 >
Date:17:29, 20 April 2011
Author:happy-melon
Status:resolved (Comments)
Tags:
Comment:
Follow-up r82285: prefix group css and js pages with "Group-", and fix license header.
Modified paths:
  • /trunk/phase3/includes/resourceloader/ResourceLoaderUserGroupsModule.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -2460,10 +2460,10 @@
24612461 'print.css',
24622462 'handheld.css',
24632463 'noscript.css',
2464 - 'autoconfirmed.css',
2465 - 'bot.css',
2466 - 'sysop.css',
2467 - 'bureaucrat.css',
 2464+ 'group-autoconfirmed.css',
 2465+ 'group-bot.css',
 2466+ 'group-sysop.css',
 2467+ 'group-bureaucrat.css',
24682468 ),
24692469 'scripts' => array(
24702470 'common.js',
@@ -2476,10 +2476,10 @@
24772477 'simple.js',
24782478 'modern.js',
24792479 'vector.js',
2480 - 'autoconfirmed.js',
2481 - 'bot.js',
2482 - 'sysop.js',
2483 - 'bureaucrat.js',
 2480+ 'group-autoconfirmed.js',
 2481+ 'group-bot.js',
 2482+ 'group-sysop.js',
 2483+ 'group-bureaucrat.js',
24842484 ),
24852485 'metadata_cc' => array(
24862486 'nodublincore',
Index: trunk/phase3/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -16,8 +16,6 @@
1717 * http://www.gnu.org/copyleft/gpl.html
1818 *
1919 * @file
20 - * @author Trevor Parscal
21 - * @author Roan Kattouw
2220 */
2321
2422 /**
@@ -38,8 +36,8 @@
3937 continue;
4038 }
4139 $g = ucfirst( $group );
42 - $pages["MediaWiki:$g.js"] = array( 'type' => 'script' );
43 - $pages["MediaWiki:$g.css"] = array( 'type' => 'style' );
 40+ $pages["MediaWiki:Group-$g.js"] = array( 'type' => 'script' );
 41+ $pages["MediaWiki:Group-$g.css"] = array( 'type' => 'style' );
4442 }
4543 return $pages;
4644 }
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -3512,10 +3512,10 @@
35133513 'print.css' => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it
35143514 '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
35153515 'noscript.css' => '/* CSS placed here will affect users with JavaScript disabled */', # only translate this message to other languages if you have to change it
3516 -'autoconfirmed.css' => '/* CSS placed here will affect autoconfirmed users only */', # only translate this message to other languages if you have to change it
3517 -'bot.css' => '/* CSS placed here will affect bots only */', # only translate this message to other languages if you have to change it
3518 -'sysop.css' => '/* CSS placed here will affect sysops only */', # only translate this message to other languages if you have to change it
3519 -'bureaucrat.css' => '/* CSS placed here will affect bureaucrats only */', # only translate this message to other languages if you have to change it
 3516+'group-autoconfirmed.css' => '/* CSS placed here will affect autoconfirmed users only */', # only translate this message to other languages if you have to change it
 3517+'group-bot.css' => '/* CSS placed here will affect bots only */', # only translate this message to other languages if you have to change it
 3518+'group-sysop.css' => '/* CSS placed here will affect sysops only */', # only translate this message to other languages if you have to change it
 3519+'group-bureaucrat.css' => '/* CSS placed here will affect bureaucrats only */', # only translate this message to other languages if you have to change it
35203520
35213521 # Scripts
35223522 '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 @@
35293529 '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
35303530 '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
35313531 '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
3532 -'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
3533 -'bot.js' => '/* Any JavaScript here will be loaded for bots only */', # only translate this message to other languages if you have to change it
3534 -'sysop.js' => '/* Any JavaScript here will be loaded for sysops only */', # only translate this message to other languages if you have to change it
3535 -'bureaucrat.js' => '/* Any JavaScript here will be loaded for bureaucrats only */', # only translate this message to other languages if you have to change it
 3532+'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
 3533+'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
 3534+'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
 3535+'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
35363536
35373537 # Metadata
35383538 'nodublincore' => 'Dublin Core RDF metadata disabled for this server.',

Follow-up revisions

RevisionCommit summaryAuthorDate
r86516Follow-up r86508: also change keys in optionals.siebrand18:04, 20 April 2011
r88526* (bug 29047) Follow-up r86508, update RELEASE-NOTES entryialex18:32, 21 May 2011
r100239Follow-up r82285: we should not apply case conversion to these names, because...happy-melon17:09, 19 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r82285Create a user.groups module in ResourceLoader, which bundles a CSS and JS pag...happy-melon19:54, 16 February 2011

Comments

#Comment by Siebrand (talk | contribs)   17:43, 20 April 2011

messageTypes.inc was not updated (these are changes in optional messages).

#Comment by Happy-melon (talk | contribs)   18:48, 20 April 2011

Does r86516 make this ok again?

Status & tagging log