r60965 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r60964‎ \| r60965 \| r60966 >
Date:	07:27, 12 January 2010
Author:	tstarling
Status:	resolved (Comments)
Tags:
Comment:	* Finished renaming GNSM to GoogleNewsSitemap. I used "Sitemap" instead of "SiteMap" because that's how Google spells it. * Renamed feedSMItem to FeedSitemapItem. * Removed "Special" from the special page aliases, as in "SpecialGNSM", since special pages do not normally have special in their name twice (once in the namespace and once in the second part). That meant that all the localisations could be removed since they were only translating the word "Special".
Modified paths:	/trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.alias.php (modified) (history) /trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.i18n.php (modified) (history) /trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.php (modified) (history) /trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap_body.php
—	—	@@ -2,11 +2,11 @@
3	3	if (!defined('MEDIAWIKI')) die();
4	4
5	5	/**
6		~~- * Class GNSM creates Atom/RSS feeds for Wikinews~~
	6	+ * Class GoogleNewsSitemap creates Atom/RSS feeds for Wikinews
7	7	**
8	8	* Simple feed using Atom/RSS coupled to DynamicPageList category searching.
9	9	*
10		~~- * To use: http://wiki.url/Special:GNSM/<feedType>?[paramter=value][...]~~
	10	+ * To use: http://wiki.url/Special:GoogleNewsSitemap/<feedType>?[paramter=value][...]
11	11	*
12	12	* Implemented parameters are marked with an @
13	13	**
—	—	@@ -26,7 +26,7 @@
27	27	* suppresserrors = bool ; default = false
28	28	**/
29	29
30		~~-class GNSM extends IncludableSpecialPage {~~
	30	+class GoogleNewsSitemap extends IncludableSpecialPage {
31	31
32	32
33	33	/**
—	—	@@ -65,7 +65,7 @@
66	66	* Constructor
67	67	**/
68	68	public function __construct() {
69		~~- parent::__construct( 'GNSM' );~~
	69	+ parent::__construct( 'GoogleNewsSitemap' );
70	70	}
71	71
72	72	/**
—	—	@@ -77,7 +77,7 @@
78	78	global $wgContLang;
79	79	global $wgRequest, $wgOut;
80	80	global $wgSitename, $wgServer, $wgScriptPath;
81		~~- wfLoadExtensionMessages( 'GNSM' );~~
	81	+ wfLoadExtensionMessages( 'GoogleNewsSitemap' );
82	82	global $wgFeedClasses, $wgLocaltimezone;
83	83
84	84	// Not sure how clean $wgLocaltimezone is
—	—	@@ -143,7 +143,7 @@
144	144	$this->pubDate = isset( $row->cl_timestamp ) ? $row->cl_timestamp : date( DATE_ATOM );
145	145	$feedArticle = new Article( $title );
146	146
147		~~- $feedItem = new feedSMItem(~~
	147	+ $feedItem = new FeedSitemapItem(
148	148	trim( $title->getFullURL() ),
149	149	wfTimeStamp( TS_ISO_8601, $this->pubDate ),
150	150	$this->getKeywords( $title ),
—	—	@@ -515,11 +515,11 @@
516	516	}
517	517
518	518	/**
519		~~- * feedSMItem Class~~
	519	+ * FeedSitemapItem Class
520	520	**
521	521	* Base class for basic SiteMap support, for building url containers.
522	522	**/
523		~~-class feedSMItem{~~
	523	+class FeedSitemapItem{
524	524	/**
525	525	* Var string
526	526	**/
—	—	@@ -610,7 +610,7 @@
611	611
612	612	}
613	613
614		~~-class SitemapFeed extends feedSMItem{~~
	614	+class SitemapFeed extends FeedSitemapItem{
615	615	/**
616	616	* Output feed headers
617	617	**/
—	—	@@ -623,7 +623,7 @@
624	624	}
625	625	/**
626	626	* Output a SiteMap 0.9 item
627		~~- * @param feedSMItem item to be output~~
	627	+ * @param FeedSitemapItem item to be output
628	628	**/
629	629	function outItem( $item ) {
630	630	?>
Index: trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.i18n.php
—	—	@@ -1,6 +1,6 @@
2	2	<?php
3	3	/**
4		~~- * Internationalisation file for extension special page GNSM~~
	4	+ * Internationalisation file for extension special page GoogleNewsSitemap
5	5	* New version of DynamicPageList extension for use by Wikinews projects
6	6	*
7	7	* @addtogroup Extensions
—	—	@@ -13,7 +13,7 @@
14	14	**/
15	15
16	16	$messages['en'] = array(
17		~~- 'gnsm' => 'Google News SiteMap',~~
	17	+ 'gnsm' => 'Google News Sitemap',
18	18	'gnsm-desc' => 'Outputs an Atom/RSS feed as a Google News Sitemap.',
19	19	'gnsm_categorymap' => '', #default empty. list of categories to map to keywords. do not translate.
20	20	'gnsm_toomanycats' => 'Error: Too many categories!',
—	—	@@ -27,7 +27,7 @@
28	28	**/
29	29
30	30	$messages['fr'] = array(
31		~~- 'gnsm' => 'Google nouvelles SiteMap',~~
	31	+ 'gnsm' => 'Google nouvelles Sitemap',
32	32	'gnsm-desc' => 'Cre un Atom ou RSS feed comme un plan Sitemap pour Google.',
33	33	'gnsm_toomanycats' => 'Erreur: Trop de nombreuses catégories!',
34	34	'gnsm_toofewcats' => 'Erreur: Trop peu de catégories!',
Index: trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.php
—	—	@@ -1,8 +1,8 @@
2	2	<?php
3	3	if (!defined('MEDIAWIKI')) {
4	4	echo <<<EOT
5		~~-To install GNSM extension, an extension special page, put the following line in LocalSettings.php:~~
6		~~-require_once( dirname(__FILE__) . '/extensions/GNSM/SpecialGNSM.php' );~~
	5	+To install GoogleNewsSitemap extension, an extension special page, put the following line in LocalSettings.php:
	6	+require_once( dirname(__FILE__) . '/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.php' );
7	7	EOT;
8	8	exit( 1 );
9	9	}
—	—	@@ -17,11 +17,11 @@
18	18	* - 0.92 http://www.rssboard.org/rss-0-9-2
19	19	* Atom feed output - 2005 http://tools.ietf.org/html/rfc4287
20	20	**
21		~~- * This page can be accessed from Special:GNSM[/][\|category=Catname]~~
	21	+ * This page can be accessed from Special:GoogleNewsSitemap[/][\|category=Catname]
22	22	* [\|notcategory=OtherCatName][\|namespace=0][\|notnamespace=User]
23	23	* [\|feed=sitemap][\|count=10][\|mode=ul][\|ordermethod=lastedit]
24	24	* [\|order=ascending] as well as being included like
25		~~- * {{Special:GNSM/[options][...]}}~~
	25	+ * {{Special:GoogleNewsSitemap/[options][...]}}
26	26	**
27	27	* This program is free software; you can redistribute it and/or modify it
28	28	* under the terms of the GNU General Public License as published by the Free
—	—	@@ -45,7 +45,7 @@
46	46	* n:en:User:IlyaHaykinson http://en.wikinews.org/wiki/User:IlyaHaykinson
47	47	**
48	48	* FIXME requests
49		~~- * use=Mediawiki:GNSM_Feedname Parameter to allow on-site control of feed~~
	49	+ * use=Mediawiki:GoogleNewsSitemap_Feedname Parameter to allow on-site control of feed
50	50	**
51	51	* @addtogroup Extensions
52	52	*
—	—	@@ -55,15 +55,15 @@
56	56	*/
57	57	$wgExtensionCredits['specialpage'][] = array(
58	58	'path' => __FILE__,
59		~~- 'name' => 'GNSM',~~
	59	+ 'name' => 'GoogleNewsSitemap',
60	60	'author' => 'Amgine',
61	61	'description' => 'Outputs xml based on defined criteria',
62	62	'descriptionmsg' => 'gnsm-desc',
63		~~- 'url' => 'http://www.mediawiki.org/wiki/Extension:GNSM',~~
	63	+ 'url' => 'http://www.mediawiki.org/wiki/Extension:GoogleNewsSitemap',
64	64	);
65	65
66	66	$dir = dirname(__FILE__) . '/';
67		~~-$wgExtensionMessagesFiles['GNSM'] = $dir . 'SpecialGNSM.i18n.php';~~
68		~~-$wgExtensionAliasesFiles['GNSM'] = $dir . 'SpecialGNSM.alias.php';~~
69		~~-$wgAutoloadClasses['GNSM'] = $dir . 'SpecialGNSM_body.php';~~
70		~~-$wgSpecialPages['GNSM'] = 'GNSM';~~
\ No newline at end of file
	67	+$wgExtensionMessagesFiles['GoogleNewsSitemap'] = $dir . 'SpecialGoogleNewsSitemap.i18n.php';
	68	+$wgExtensionAliasesFiles['GoogleNewsSitemap'] = $dir . 'SpecialGoogleNewsSitemap.alias.php';
	69	+$wgAutoloadClasses['GoogleNewsSitemap'] = $dir . 'SpecialGoogleNewsSitemap_body.php';
	70	+$wgSpecialPages['GoogleNewsSitemap'] = 'GoogleNewsSitemap';
Index: trunk/extensions/GoogleNewsSitemap/SpecialGoogleNewsSitemap.alias.php
—	—	@@ -1,42 +1,14 @@
2	2	<?php
3	3	/**
4		~~- * Aliases for Special:Editcount~~
	4	+ * Aliases for Special:GoogleNewsSitemap
5	5	*
6	6	* @addtogroup Extensions
7	7	*/
8	8
9		-/**
10		~~- * Deutsch~~
11		~~- * @author Amgine~~
12		~~- **/~~
13		~~-$aliases['de'] = array(~~
14		~~- 'GNSM' => array( 'SpezialGNSM' )~~
15		~~-);~~
16		-
17	9	/** English
18	10	* @author Amgine
19	11	**/
20	12	$aliases['en'] = array(
21		~~- 'GNSM' => array( 'Google News SiteMap', 'SpecialGNSM' ),~~
	13	+ 'GoogleNewsSitemap' => array( 'Google News Sitemap' ),
22	14	);
23	15
24		~~-/** Français~~
25		~~- * @author Amgine~~
26		~~- **/~~
27		~~-$aliases['fr'] = array(~~
28		~~- 'GNSM' => array( 'GNSMSpécial' ),~~
29		~~-);~~
30		-
31		~~-/** Nederlands~~
32		~~- * @author Amgine~~
33		~~- **/~~
34		~~-$aliases['nl'] = array(~~
35		~~- 'GNSM' => array( 'GNSMSpeciaal' )~~
36		~~-);~~
37		-
38		~~-/** Norsk (bokmål)~~
39		~~- * @author Amgine~~
40		~~- **/~~
41		~~-$aliases['no'] = array(~~
42		~~- 'GNSM' => array( 'SpesialGNSM' ),~~
43		~~-);~~
\ No newline at end of file

Follow-up revisions

Revision	Commit summary	Author	Date
r78867	Rename i18n key from gnsm to googlenewssitemap per fixme on r60965	reedy	00:24, 23 December 2010

Comments

#Comment by MarkAHershberger (talk | contribs) 18:32, 11 November 2010

- 'gnsm' => 'Google News SiteMap', + 'gnsm' => 'Google News Sitemap',

Because you used 'gnsm' here instead of 'googlenewssitemap' this shows up as <googlenewssitemap> on the list of special pages.

Status & tagging log

00:24, 23 December 2010 Reedy (talk | contribs) changed the status of r60965 [removed: fixme added: resolved]
18:32, 11 November 2010 MarkAHershberger (talk | contribs) changed the status of r60965 [removed: ok added: fixme]
11:55, 12 January 2010 😂 (talk | contribs) changed the status of r60965 [removed: new added: ok]