r51794 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r51793‎ \| r51794 \| r51795 >
Date:	17:55, 12 June 2009
Author:	tparscal
Status:	deferred
Tags:
Comment:	Switched language of tabs from generic and monobook specific stuff to vector specific messages where possible
Modified paths:	/trunk/phase3/languages/messages/MessagesEn.php (modified) (history) /trunk/phase3/maintenance/language/messages.inc (modified) (history) /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
—	—	@@ -164,6 +164,30 @@
165	165	'sitetitle',
166	166	'sitesubtitle',
167	167	),
	168	+ 'vector' => array(
	169	+ 'vector-action-addsection',
	170	+ 'vector-action-delete',
	171	+ 'vector-action-move',
	172	+ 'vector-action-protect',
	173	+ 'vector-action-undelete',
	174	+ 'vector-action-unprotect',
	175	+ 'vector-namespace-category',
	176	+ 'vector-namespace-help',
	177	+ 'vector-namespace-image',
	178	+ 'vector-namespace-main',
	179	+ 'vector-namespace-media',
	180	+ 'vector-namespace-mediawiki',
	181	+ 'vector-namespace-project',
	182	+ 'vector-namespace-special',
	183	+ 'vector-namespace-talk',
	184	+ 'vector-namespace-template',
	185	+ 'vector-namespace-user',
	186	+ 'vector-view-create',
	187	+ 'vector-view-edit',
	188	+ 'vector-view-history',
	189	+ 'vector-view-view',
	190	+ 'vector-view-viewsource',
	191	+ ),
168	192	'metadata_help' => array(
169	193	'metadata_help',
170	194	),
Index: trunk/phase3/skins/Vector.php
—	—	@@ -83,20 +83,20 @@
84	84
85	85	// Adds namespace links
86	86	$links['namespaces'][$subjectId] = $this->tabAction(
87		~~- $subjectPage, 'nstab-' . $subjectId, !$isTalk, '', true~~
	87	+ $subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
88	88	);
89	89	$links['namespaces'][$talkId] = $this->tabAction(
90		~~- $talkPage, 'talk', $isTalk, '', true~~
	90	+ $talkPage, 'vector-namespace-talk', $isTalk, '', true
91	91	);
92	92
93	93	// Adds view view link
94	94	if ( $this->mTitle->exists() ) {
95	95	$links['views']['view'] = $this->tabAction(
96	96	$isTalk ? $talkPage : $subjectPage,
97		~~- 'view', ( $action == 'view' ), '', true~~
	97	+ 'vector-view-view', ( $action == 'view' ), '', true
98	98	);
99	99	}
100		-
	100	+
101	101	wfProfileIn( __METHOD__ . '-edit' );
102	102
103	103	// Checks if user can...
—	—	@@ -121,8 +121,8 @@
122	122	$links['views']['edit'] = array(
123	123	'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
124	124	'text' => $this->mTitle->exists()
125		~~- ? wfMsg( 'edit' )~~
126		~~- : wfMsg( 'create' ),~~
	125	+ ? wfMsg( 'vector-view-edit' )
	126	+ : wfMsg( 'vector-view-create' ),
127	127	'href' =>
128	128	$this->mTitle->getLocalUrl( $this->editUrlOptions() )
129	129	);
—	—	@@ -134,7 +134,7 @@
135	135	// Adds new section link
136	136	$links['actions']['addsection'] = array(
137	137	'class' => $section == 'new' ? 'selected' : false,
138		~~- 'text' => wfMsg( 'addsection' ),~~
	138	+ 'text' => wfMsg( 'vector-action-addsection' ),
139	139	'href' => $this->mTitle->getLocalUrl(
140	140	'action=edit&section=new'
141	141	)
—	—	@@ -146,7 +146,7 @@
147	147	// Adds view source view link
148	148	$links['views']['viewsource'] = array(
149	149	'class' => ( $action == 'edit' ) ? 'selected' : false,
150		~~- 'text' => wfMsg( 'viewsource' ),~~
	150	+ 'text' => wfMsg( 'vector-view-viewsource' ),
151	151	'href' =>
152	152	$this->mTitle->getLocalUrl( $this->editUrlOptions() )
153	153	);
—	—	@@ -160,7 +160,7 @@
161	161	// Adds history view link
162	162	$links['views']['history'] = array(
163	163	'class' => ($action == 'history') ? 'selected' : false,
164		~~- 'text' => wfMsg( 'history_short' ),~~
	164	+ 'text' => wfMsg( 'vector-view-history' ),
165	165	'href' => $this->mTitle->getLocalUrl( 'action=history' ),
166	166	'rel' => 'archives',
167	167	);
—	—	@@ -168,7 +168,7 @@
169	169	if( $wgUser->isAllowed( 'delete' ) ) {
170	170	$links['actions']['delete'] = array(
171	171	'class' => ($action == 'delete') ? 'selected' : false,
172		~~- 'text' => wfMsg( 'delete' ),~~
	172	+ 'text' => wfMsg( 'vector-action-delete' ),
173	173	'href' => $this->mTitle->getLocalUrl( 'action=delete' )
174	174	);
175	175	}
—	—	@@ -179,7 +179,7 @@
180	180	$links['actions']['move'] = array(
181	181	'class' => $this->mTitle->isSpecial( 'Movepage' ) ?
182	182	'selected' : false,
183		~~- 'text' => wfMsg( 'move' ),~~
	183	+ 'text' => wfMsg( 'vector-action-move' ),
184	184	'href' => $moveTitle->getLocalUrl()
185	185	);
186	186	}
—	—	@@ -192,7 +192,7 @@
193	193	$links['actions']['protect'] = array(
194	194	'class' => ($action == 'protect') ?
195	195	'selected' : false,
196		~~- 'text' => wfMsg( 'protect' ),~~
	196	+ 'text' => wfMsg( 'vector-action-protect' ),
197	197	'href' =>
198	198	$this->mTitle->getLocalUrl( 'action=protect' )
199	199	);
—	—	@@ -201,7 +201,7 @@
202	202	$links['actions']['unprotect'] = array(
203	203	'class' => ($action == 'unprotect') ?
204	204	'selected' : false,
205		~~- 'text' => wfMsg( 'unprotect' ),~~
	205	+ 'text' => wfMsg( 'vector-action-unprotect' ),
206	206	'href' =>
207	207	$this->mTitle->getLocalUrl( 'action=unprotect' )
208	208	);
—	—	@@ -218,7 +218,7 @@
219	219	$links['actions']['undelete'] = array(
220	220	'class' => false,
221	221	'text' => wfMsgExt(
222		~~- 'undelete_short',~~
	222	+ 'vector-action-undelete',
223	223	array( 'parsemag' ),
224	224	$wgLang->formatNum( $n )
225	225	),
—	—	@@ -237,7 +237,7 @@
238	238	$links['actions']['protect'] = array(
239	239	'class' => ($action == 'protect') ?
240	240	'selected' : false,
241		~~- 'text' => wfMsg( 'protect' ),~~
	241	+ 'text' => wfMsg( 'vector-action-protect' ),
242	242	'href' =>
243	243	$this->mTitle->getLocalUrl( 'action=protect' )
244	244	);
—	—	@@ -246,7 +246,7 @@
247	247	$links['actions']['unprotect'] = array(
248	248	'class' => ($action == 'unprotect') ?
249	249	'selected' : false,
250		~~- 'text' => wfMsg( 'unprotect' ),~~
	250	+ 'text' => wfMsg( 'vector-action-unprotect' ),
251	251	'href' =>
252	252	$this->mTitle->getLocalUrl( 'action=unprotect' )
253	253	);
—	—	@@ -254,7 +254,16 @@
255	255	}
256	256	}
257	257	wfProfileOut( __METHOD__ . '-live' );
258		-
	258	+
	259	+ /**
	260	+ * The following actions use messages which, if made particular to
	261	+ * the Vector skin, would break the Ajax code which makes this
	262	+ * action happen entirely inline. Skin::makeGlobalVariablesScript
	263	+ * defines a set of messages in a javascript object - and these
	264	+ * messages are assumed to be global for all skins. Without making
	265	+ * a change to that procedure these messages will have to remain as
	266	+ * the global versions.
	267	+ */
259	268	// Checks if the user is logged in
260	269	if( $this->loggedin ) {
261	270	// Checks if the user is watching this page
—	—	@@ -283,7 +292,7 @@
284	293	} else {
285	294	$links['namespaces']['special'] = array(
286	295	'class' => 'selected',
287		~~- 'text' => wfMsg( 'nstab-special' ),~~
	296	+ 'text' => wfMsg( 'vector-namespace-special' ),
288	297	'href' => $wgRequest->getRequestURL()
289	298	);
290	299	}
Index: trunk/phase3/languages/messages/MessagesEn.php
—	—	@@ -650,6 +650,29 @@
651	651	'sitetitle' => '{{SITENAME}}', # do not translate or duplicate this message to other languages
652	652	'sitesubtitle' => '', # do not translate or duplicate this message to other languages
653	653
	654	+'vector-action-addsection' => 'Add Topic',
	655	+'vector-action-delete' => 'Delete',
	656	+'vector-action-move' => 'Move',
	657	+'vector-action-protect' => 'Protect',
	658	+'vector-action-undelete' => 'Undelete',
	659	+'vector-action-unprotect' => 'Unprotect',
	660	+'vector-namespace-category' => 'Category',
	661	+'vector-namespace-help' => 'Help page',
	662	+'vector-namespace-image' => 'File',
	663	+'vector-namespace-main' => 'Page',
	664	+'vector-namespace-media' => 'Media page',
	665	+'vector-namespace-mediawiki' => 'Message',
	666	+'vector-namespace-project' => 'Project page',
	667	+'vector-namespace-special' => 'Special page',
	668	+'vector-namespace-talk' => 'Discussion',
	669	+'vector-namespace-template' => 'Template',
	670	+'vector-namespace-user' => 'User page',
	671	+'vector-view-create' => 'Create',
	672	+'vector-view-edit' => 'Edit',
	673	+'vector-view-history' => 'View History',
	674	+'vector-view-view' => 'Read',
	675	+'vector-view-viewsource' => 'View Source',
	676	+
654	677	# Metadata in edit box
655	678	'metadata_help' => 'Metadata:',
656	679
—	—	@@ -669,7 +692,6 @@
670	693	'permalink' => 'Permanent link',
671	694	'print' => 'Print',
672	695	'edit' => 'Edit',
673		~~-'view' => 'Read',~~
674	696	'create' => 'Create',
675	697	'editthispage' => 'Edit this page',
676	698	'create-this-page' => 'Create this page',

Status & tagging log

04:13, 15 June 2009 Tim Starling (talk | contribs) changed the status of r51794 [removed: new added: deferred]