r92037 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r92036‎ \| r92037 \| r92038 >
Date:	00:30, 13 July 2011
Author:	kaldari
Status:	ok (Comments)
Tags:
Comment:	output campaign log details
Modified paths:	/trunk/extensions/CentralNotice/CentralNotice.db.php (modified) (history) /trunk/extensions/CentralNotice/CentralNotice.i18n.php (modified) (history) /trunk/extensions/CentralNotice/centralnotice.css (modified) (history) /trunk/extensions/CentralNotice/centralnotice.js (modified) (history) /trunk/extensions/CentralNotice/special/SpecialCentralNotice.php (modified) (history) /trunk/extensions/CentralNotice/special/SpecialCentralNoticeLogs.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralNotice/special/SpecialCentralNotice.php
—	—	@@ -556,7 +556,7 @@
557	557	// Countries
558	558	$htmlOut .= Xml::openElement( 'tr' );
559	559	$htmlOut .= Xml::tags( 'td', array(),
560		~~- Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) );~~
	560	+ Xml::label( wfMsg( 'centralnotice-geo' ), 'geotargeted' ) );
561	561	$htmlOut .= Xml::tags( 'td', array(),
562	562	Xml::check( 'geotargeted', false,
563	563	wfArrayMerge( $readonly, array( 'value' => 1, 'id' => 'geotargeted' ) ) ) );
—	—	@@ -880,7 +880,7 @@
881	881	// Countries
882	882	$htmlOut .= Xml::openElement( 'tr' );
883	883	$htmlOut .= Xml::tags( 'td', array(),
884		~~- Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) );~~
	884	+ Xml::label( wfMsg( 'centralnotice-geo' ), 'geotargeted' ) );
885	885	$htmlOut .= Xml::tags( 'td', array(),
886	886	Xml::check( 'geotargeted', $isGeotargeted,
887	887	wfArrayMerge(
Index: trunk/extensions/CentralNotice/special/SpecialCentralNoticeLogs.php
—	—	@@ -54,7 +54,8 @@
55	55	$htmlOut .= Xml::closeElement( 'form' );
56	56
57	57	// End log selection fieldset
58		~~- $htmlOut .= Xml::closeElement( 'fieldset' );~~
	58	+ // Uncomment when we have multiple logs
	59	+ //$htmlOut .= Xml::closeElement( 'fieldset' );
59	60
60	61	$wgOut->addHTML( $htmlOut );
61	62
—	—	@@ -74,7 +75,8 @@
75	76	$htmlOut = '';
76	77
77	78	// Begin log fieldset
78		~~- $htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) );~~
	79	+ // Uncomment when we have multiple logs
	80	+ //$htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) );
79	81
80	82	// Show paginated list of log entries
81	83	$htmlOut .= Xml::tags( 'div',
—	—	@@ -120,13 +122,7 @@
121	123	function getQueryInfo() {
122	124	return array(
123	125	'tables' => array( 'cn_notice_log' ),
124		~~- 'fields' => array(~~
125		~~- 'notlog_timestamp',~~
126		~~- 'notlog_user_id',~~
127		~~- 'notlog_action',~~
128		~~- 'notlog_not_id',~~
129		~~- 'notlog_not_name',~~
130		~~- )~~
	126	+ 'fields' => '*',
131	127	);
132	128	}
133	129
—	—	@@ -134,7 +130,7 @@
135	131	* Generate the content of each table row (1 row = 1 log entry)
136	132	*/
137	133	function formatRow( $row ) {
138		~~- global $wgLang;~~
	134	+ global $wgLang, $wgExtensionAssetsPath;
139	135
140	136	// Create a user object so we can pull the name, user page, etc.
141	137	$loggedUser = User::newFromId( $row->notlog_user_id );
—	—	@@ -147,47 +143,212 @@
148	144	htmlspecialchars( $row->notlog_not_name ),
149	145	'method=listNoticeDetail&notice=' . urlencode( $row->notlog_not_name ) );
150	146
151		~~- // Begin banner row~~
	147	+ // Begin log entry primary row
152	148	$htmlOut = Xml::openElement( 'tr' );
153	149
154		~~- $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),~~
	150	+ $htmlOut .= Xml::openElement( 'td', array( 'valign' => 'top' ) );
	151	+ if ( $row->notlog_action !== 'removed' ) {
	152	+ $htmlOut .= '<a href="javascript:toggleDisplay(\''.$row->notlog_id.'\')">'.
	153	+ '<img src="'.$wgExtensionAssetsPath.'/CentralNotice/collapsed.png" id="cn-collapsed-'.$row->notlog_id.'" style="display:block;vertical-align:baseline;"/>'.
	154	+ '<img src="'.$wgExtensionAssetsPath.'/CentralNotice/uncollapsed.png" id="cn-uncollapsed-'.$row->notlog_id.'" style="display:none;vertical-align:baseline;"/>'.
	155	+ '</a>';
	156	+ }
	157	+ $htmlOut .= Xml::closeElement( 'td' );
	158	+ $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ),
155	159	$wgLang->date( $row->notlog_timestamp ) . ' ' . $wgLang->time( $row->notlog_timestamp )
156	160	);
157		~~- $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),~~
	161	+ $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ),
158	162	$userLink
159	163	);
160		~~- $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),~~
	164	+ $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ),
161	165	$row->notlog_action
162	166	);
163		~~- $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),~~
	167	+ $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ),
164	168	$campaignLink
165	169	);
	170	+ $htmlOut .= Xml::tags( 'td', array(),
	171	+ ' '
	172	+ );
166	173
167		~~- // End banner row~~
	174	+ // End log entry primary row
168	175	$htmlOut .= Xml::closeElement( 'tr' );
169	176
	177	+ if ( $row->notlog_action !== 'removed' ) {
	178	+ // Begin log entry secondary row
	179	+ $htmlOut .= Xml::openElement( 'tr', array( 'id' => 'cn-log-details-'.$row->notlog_id, 'style' => 'display:none;' ) );
	180	+
	181	+ $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),
	182	+ ' ' // force a table cell in older browsers
	183	+ );
	184	+ $htmlOut .= Xml::openElement( 'td', array( 'valign' => 'top', 'colspan' => '5' ) );
	185	+ if ( $row->notlog_action == 'created' ) {
	186	+ $htmlOut .= $this->showInitialSettings( $row );
	187	+ } else if ( $row->notlog_action == 'modified' ) {
	188	+ $htmlOut .= $this->showChanges( $row );
	189	+ }
	190	+ $htmlOut .= Xml::closeElement( 'td' );
	191	+
	192	+ // End log entry primary row
	193	+ $htmlOut .= Xml::closeElement( 'tr' );
	194	+ }
	195	+
170	196	return $htmlOut;
171	197	}
172	198
	199	+ function showInitialSettings( $row ) {
	200	+ global $wgLang;
	201	+ $details = '';
	202	+ $details .= '<b>'.wfMsg ( 'centralnotice-start-date' ).':</b> '.
	203	+ $wgLang->date( $row->notlog_end_start ).' '.
	204	+ $wgLang->time( $row->notlog_end_start )."<br/>";
	205	+ $details .= '<b>'.wfMsg ( 'centralnotice-end-date' ).':</b> '.
	206	+ $wgLang->date( $row->notlog_end_end ).' '.
	207	+ $wgLang->time( $row->notlog_end_end )."<br/>";
	208	+ $details .= '<b>'.wfMsg ( 'centralnotice-projects' ).':</b> '.
	209	+ $row->notlog_end_projects."<br/>";
	210	+ $language_count = count( explode ( ', ', $row->notlog_end_languages ) );
	211	+ $languageList = '';
	212	+ if ( $language_count > 15 ) {
	213	+ $languageList = wfMsg ( 'centralnotice-multiple-languages', $language_count );
	214	+ } elseif ( $language_count > 0 ) {
	215	+ $languageList = $row->notlog_end_languages;
	216	+ }
	217	+ $details .= '<b>'.wfMsg ( 'centralnotice-languages' ).':</b> '.
	218	+ $languageList."<br/>";
	219	+ $details .= '<b>'.wfMsg ( 'centralnotice-geo' ).':</b> ';
	220	+ $details .= $row->notlog_end_geo ? 'on' : 'off';
	221	+ $details .= "<br/>";
	222	+ if ( $row->notlog_end_geo ) {
	223	+ $country_count = count( explode ( ', ', $row->notlog_end_countries ) );
	224	+ $countryList = '';
	225	+ if ( $country_count > 20 ) {
	226	+ $countryList = wfMsg ( 'centralnotice-multiple-countries', $country_count );
	227	+ } elseif ( $country_count > 0 ) {
	228	+ $countryList = $row->notlog_end_countries;
	229	+ }
	230	+ $details .= '<b>'.wfMsg ( 'centralnotice-countries' ).':</b> '.
	231	+ $countryList."<br/>";
	232	+ }
	233	+ return $details;
	234	+ }
	235	+
	236	+ function showChanges( $row ) {
	237	+ global $wgLang;
	238	+ $details = '';
	239	+ if ( $row->notlog_begin_start !== $row->notlog_end_start ) {
	240	+ $details .= '<b>'.wfMsg ( 'centralnotice-start-date' ).':</b> ';
	241	+ $details .= wfMsg ( 'centralnotice-changed',
	242	+ $wgLang->date( $row->notlog_begin_start ).' '.$wgLang->time( $row->notlog_begin_start ),
	243	+ $wgLang->date( $row->notlog_end_start ).' '.$wgLang->time( $row->notlog_end_start ) )."<br/>";
	244	+ }
	245	+ if ( $row->notlog_begin_end !== $row->notlog_end_end ) {
	246	+ $details .= '<b>'.wfMsg ( 'centralnotice-end-date' ).':</b> ';
	247	+ $details .= wfMsg ( 'centralnotice-changed',
	248	+ $wgLang->date( $row->notlog_begin_end ).' '.$wgLang->time( $row->notlog_begin_end ),
	249	+ $wgLang->date( $row->notlog_end_end ).' '.$wgLang->time( $row->notlog_end_end ) )."<br/>";
	250	+ }
	251	+ $details .= $this->testBooleanChange( 'enabled', $row );
	252	+ $details .= $this->testBooleanChange( 'preferred', $row );
	253	+ $details .= $this->testBooleanChange( 'locked', $row );
	254	+ $details .= $this->testBooleanChange( 'geo', $row );
	255	+ $details .= $this->testSetChange( 'projects', $row );
	256	+ $details .= $this->testSetChange( 'languages', $row );
	257	+ $details .= $this->testSetChange( 'countries', $row );
	258	+ if ( $row->notlog_begin_banners !== $row->notlog_end_banners ) {
	259	+ // Show changes to banner weights and assignment
	260	+ $beginBannersObject = json_decode( $row->notlog_begin_banners );
	261	+ $endBannersObject = json_decode( $row->notlog_end_banners );
	262	+ $beginBanners = array();
	263	+ $endBanners = array();
	264	+ foreach( $beginBannersObject as $key => $weight ) {
	265	+ $beginBanners[$key] = $key.' ('.$weight.')';
	266	+ }
	267	+ foreach( $endBannersObject as $key => $weight ) {
	268	+ $endBanners[$key] = $key.' ('.$weight.')';
	269	+ }
	270	+ $details .= '<b>'.wfMsg ( 'centralnotice-templates' ).':</b> ';
	271	+ if ( $beginBanners ) {
	272	+ $before = implode( ', ', $beginBanners );
	273	+ } else {
	274	+ $before = wfMsg ( 'centralnotice-no-assignments' );
	275	+ }
	276	+ if ( $endBanners ) {
	277	+ $after = implode( ', ', $endBanners );
	278	+ } else {
	279	+ $after = wfMsg ( 'centralnotice-no-assignments' );
	280	+ }
	281	+ $details .= wfMsg ( 'centralnotice-changed', $before, $after) . "<br/>";
	282	+ }
	283	+ return $details;
	284	+ }
	285	+
	286	+ private function testBooleanChange( $param, $row ) {
	287	+ $result = '';
	288	+ $beginField = 'notlog_begin_'.$param;
	289	+ $endField = 'notlog_end_'.$param;
	290	+ if ( $row->$beginField !== $row->$endField ) {
	291	+ $result .= '<b>'.wfMsg ( 'centralnotice-'.$param ).':</b> ';
	292	+ $result .= wfMsg ( 'centralnotice-changed',
	293	+ ( $row->$beginField ? wfMsg ( 'centralnotice-on' ) : wfMsg ( 'centralnotice-off' ) ),
	294	+ ( $row->$endField ? wfMsg ( 'centralnotice-on' ) : wfMsg ( 'centralnotice-off' ) ) )."<br/>";
	295	+ }
	296	+ return $result;
	297	+ }
	298	+
	299	+ private function testSetChange( $param, $row ) {
	300	+ $result = '';
	301	+ $beginField = 'notlog_begin_'.$param;
	302	+ $endField = 'notlog_end_'.$param;
	303	+ if ( $row->$beginField !== $row->$endField ) {
	304	+ $beginSet = array();
	305	+ $endSet = array();
	306	+ if ( $row->$beginField ) {
	307	+ $beginSet = explode( ', ', $row->$beginField );
	308	+ }
	309	+ if ( $row->$endField ) {
	310	+ $endSet = explode( ', ', $row->$endField );
	311	+ }
	312	+ $added = array_diff( $endSet, $beginSet );
	313	+ $removed = array_diff( $beginSet, $endSet );
	314	+ $result .= '<b>'.wfMsg ( 'centralnotice-'.$param ).':</b> ';
	315	+ if ( $added ) {
	316	+ $result .= wfMsg ( 'centralnotice-added', implode( ', ', $added ) );
	317	+ if ( $removed ) {
	318	+ $result .= '; ';
	319	+ } else {
	320	+ $result .= '<br/>';
	321	+ }
	322	+ }
	323	+ if ( $removed ) {
	324	+ $result .= wfMsg ( 'centralnotice-removed', implode( ', ', $removed ) ).'<br/>';
	325	+ }
	326	+ }
	327	+ return $result;
	328	+ }
	329	+
173	330	/**
174	331	* Specify table headers
175	332	*/
176	333	function getStartBody() {
177	334	$htmlOut = '';
178		~~- $htmlOut .= Xml::openElement( 'table', array( 'id' => 'cn-campaign-logs', 'cellpadding' => 4 ) );~~
	335	+ $htmlOut .= Xml::openElement( 'table', array( 'id' => 'cn-campaign-logs', 'cellpadding' => 3 ) );
179	336	$htmlOut .= Xml::openElement( 'tr' );
180		~~- $htmlOut .= Xml::element( 'th', array( 'align' => 'left' ),~~
	337	+ $htmlOut .= Xml::element( 'th', array( 'style' => 'width: 20px;' ) );
	338	+ $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 130px;' ),
181	339	wfMsg ( 'centralnotice-timestamp' )
182	340	);
183		~~- $htmlOut .= Xml::element( 'th', array( 'align' => 'left' ),~~
	341	+ $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 130px;' ),
184	342	wfMsg ( 'centralnotice-user' )
185	343	);
186		~~- $htmlOut .= Xml::element( 'th', array( 'align' => 'left' ),~~
	344	+ $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 130px;' ),
187	345	wfMsg ( 'centralnotice-action' )
188	346	);
189		~~- $htmlOut .= Xml::element( 'th', array( 'align' => 'left' ),~~
	347	+ $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 130px;' ),
190	348	wfMsg ( 'centralnotice-notice' )
191	349	);
	350	+ $htmlOut .= Xml::tags( 'td', array(),
	351	+ ' '
	352	+ );
192	353	$htmlOut .= Xml::closeElement( 'tr' );
193	354	return $htmlOut;
194	355	}
Index: trunk/extensions/CentralNotice/centralnotice.css
—	—	@@ -60,6 +60,15 @@
61	61	#preferences table#cn-campaign-logs {
62	62	width: auto;
63	63	}
	64	+#preferences table#cn-campaign-logs td.primary {
	65	+ background-color: #F0F0F0;
	66	+}
	67	+#preferences .cn-new-value {
	68	+ color: #006400;
	69	+}
	70	+#preferences .cn-old-value {
	71	+ color: #8B0000;
	72	+}
64	73
65	74	/* Vector-specific definitions */
66	75	body.skin-vector #preferences fieldset.prefsection {
Index: trunk/extensions/CentralNotice/CentralNotice.i18n.php
—	—	@@ -39,7 +39,9 @@
40	40	'centralnotice-show-notices' => 'Show campaigns',
41	41	'centralnotice-list-templates' => 'List banners',
42	42	'centralnotice-multiple-projects' => 'Multiple ($1)',
43		~~- 'centralnotice-multiple-languages' => 'Multiple ($1)', 'centralnotice-all-projects' => 'All projects',~~
	43	+ 'centralnotice-multiple-languages' => 'Multiple ($1)',
	44	+ 'centralnotice-multiple-countries' => 'Multiple ($1)',
	45	+ 'centralnotice-all-projects' => 'All projects',
44	46	'centralnotice-language-listing' => '$1 - $2',
45	47	'centralnotice-translations' => 'Translations',
46	48	'centralnotice-translate-to' => 'Translate to',
—	—	@@ -131,7 +133,7 @@
132	134	'centralnotice-banner-fundraising' => 'This is a fundraising banner',
133	135	'centralnotice-banner-fundraising-help' => 'Create an anchor tag in the banner body with id="cn_fundraising_link" and enter one or more landing pages below, for example, "JimmyAppeal01". The href of the link will be constructed automatically.',
134	136	'centralnotice-banner-landing-pages' => 'Landing pages (comma-separated):',
135		~~- 'centralnotice-geotargeted' => 'Geotargeted',~~
	137	+ 'centralnotice-geo' => 'Geotargeted',
136	138	'centralnotice-countries' => 'Countries',
137	139	'centralnotice-allocation' => 'Allocation',
138	140	'centralnotice-view-allocation' => 'View banner allocation',
—	—	@@ -149,6 +151,13 @@
150	152	'centralnotice-timestamp' => 'Timestamp',
151	153	'centralnotice-user' => 'User',
152	154	'centralnotice-action' => 'Action',
	155	+ 'centralnotice-changed' => 'Changed from <span class="cn-old-value">$1</span> to <span class="cn-new-value">$2</span>',
	156	+ 'centralnotice-on' => 'on',
	157	+ 'centralnotice-off' => 'off',
	158	+ 'centralnotice-added' => 'Added <span class="cn-new-value">$1</span>',
	159	+ 'centralnotice-removed' => 'Removed <span class="cn-old-value">$1</span>',
	160	+ 'centralnotice-banners-changed' => 'Banner assignments were changed',
	161	+ 'centralnotice-no-assignments' => 'no banners assigned',
153	162	);
154	163
155	164	/** Message documentation (Message documentation)
—	—	@@ -190,7 +199,8 @@
191	200	'centralnotice-translate-heading' => 'Fieldset label. $1 is a name of a template.',
192	201	'centralnotice-manage' => 'Title of sub-page of [http://meta.wikimedia.org/wiki/Special:CentralNotice Manage Central Notice] special page.',
193	202	'centralnotice-add' => '{{Identical\|Add}}',
194		~~- 'centralnotice-multiple-languages' => '$1 is the number of languages in which the notice is available. It is always greater than 3. This message in the column "languages" in the table.',~~
	203	+ 'centralnotice-multiple-languages' => '$1 is the number of languages in which the notice is available. It is always greater than 3. This message is in the column "languages" in the table.',
	204	+ 'centralnotice-multiple-languages' => '$1 is the number of countries in which the notice is available.',
195	205	'centralnotice-all-projects' => 'Data entry in the column "Projects" in the table on the [[m:Special:CentralNotice\|Central Notice]] special page.',
196	206	'centralnotice-language-listing' => 'A language listing for the language multi-select box. First parameter is the language code. Second parameter is the name of the language.',
197	207	'centralnotice-translations' => '{{Identical\|Translation}}',
—	—	@@ -219,7 +229,7 @@
220	230	'centralnotice-insert' => '{{Identical\|Insert}}',
221	231	'centralnotice-hide-button' => 'See also {{msg\|Centralnotice-expand-button}}.',
222	232	'centralnotice-expand-button' => 'See also {{msg\|Centralnotice-hide-button}}.',
223		~~- 'centralnotice-geotargeted' => 'Used to label a checkbox which activates geotargeting',~~
	233	+ 'centralnotice-geo' => 'Used to label a checkbox which activates geotargeting',
224	234	'centralnotice-allocation' => 'Tab for sub-page [[m:BannerAllocation\|banner allocation]] to central notice special page.',
225	235	'centralnotice-view-allocation' => 'Heading of dialog box on [[m:Special:BannerAllocation\|banner allocation]] special page.',
226	236	'centralnotice-allocation-instructions' => 'Dialog box instructions on [[m:Special:BannerAllocation\|banner allocation]] special page.',
—	—	@@ -236,6 +246,7 @@
237	247	'centralnotice-logs' => 'Label for tab which displays a log of changes',
238	248	'centralnotice-user' => '{{Identical\|User}}',
239	249	'centralnotice-action' => '{{Identical\|Action}}',
	250	+ 'centralnotice-no-assignments' => 'Appears in the middle of a sentence; should be all lower case.',
240	251	);
241	252
242	253	/** Afrikaans (Afrikaans)
—	—	@@ -551,7 +562,7 @@
552	563	'centralnotice-banner-fundraising' => 'هذا هو شعار جمع التبرعات.',
553	564	'centralnotice-banner-fundraising-help' => 'إنشاء علامة ارتساء في نص الشعار مع معرف = "cn_fundraising_link"، وقم بإدخال واحد أو أكثر الصفحات المقصودة أدناه، على سبيل المثال، "JimmyAppeal01". سيتم تعبيد href الارتباط تلقائياً.',
554	565	'centralnotice-banner-landing-pages' => 'الصفحات المقصودة (مفصولة بفواصل) :',
555		~~- 'centralnotice-geotargeted' => 'الاستهداف الجغرافي',~~
	566	+ 'centralnotice-geo' => 'الاستهداف الجغرافي',
556	567	'centralnotice-countries' => 'الدول',
557	568	'centralnotice-allocation' => 'تخصيص',
558	569	'centralnotice-view-allocation' => 'موقع عرض الشعار',
—	—	@@ -928,7 +939,7 @@
929	940	'centralnotice-banner-type' => 'Баннер төрө:',
930	941	'centralnotice-banner-hidable' => 'Статик/йәшерелеүсән',
931	942	'centralnotice-banner-collapsible' => 'Төрөлөүсән',
932		~~- 'centralnotice-geotargeted' => 'Геобәйләнеш',~~
	943	+ 'centralnotice-geo' => 'Геобәйләнеш',
933	944	'centralnotice-countries' => 'Илдәр',
934	945	'centralnotice-allocation' => 'Урынлашыу',
935	946	'centralnotice-view-allocation' => 'Баннерҙарҙың урынлашыуын ҡарау',
—	—	@@ -1111,7 +1122,7 @@
1112	1123	'centralnotice-banner-fundraising' => 'Гэта банэр для збору ахвяраваньняў',
1113	1124	'centralnotice-banner-fundraising-help' => 'Стварыце тэг спасылкі ў зьмесьце банэра з id="cn_fundraising_link" і пазначце адну ці некалькі мэтавых старонак, напрыклад, «JimmyAppeal01». Атрыбут href будзе створаны аўтаматычна.',
1114	1125	'centralnotice-banner-landing-pages' => 'Мэтавыя старонкі (праз коску):',
1115		~~- 'centralnotice-geotargeted' => 'Геаграфічная прывязка',~~
	1126	+ 'centralnotice-geo' => 'Геаграфічная прывязка',
1116	1127	'centralnotice-countries' => 'Краіны',
1117	1128	'centralnotice-allocation' => 'Прызначэньне',
1118	1129	'centralnotice-view-allocation' => 'Паказаць разьмяшчэньне банэра',
—	—	@@ -1325,7 +1336,7 @@
1326	1337	'centralnotice-banner-type' => 'ব্যানারের ধরন:',
1327	1338	'centralnotice-banner-hidable' => 'স্ট্যাটিক/লুকানোযোগ্য',
1328	1339	'centralnotice-banner-collapsible' => 'ভাঁজযোগ্য',
1329		~~- 'centralnotice-geotargeted' => 'স্থানাংকলক্ষ্য',~~
	1340	+ 'centralnotice-geo' => 'স্থানাংকলক্ষ্য',
1330	1341	'centralnotice-countries' => 'দেশ',
1331	1342	'centralnotice-languages' => 'ভাষা',
1332	1343	'centralnotice-projects' => 'প্রকল্প',
—	—	@@ -1479,7 +1490,7 @@
1480	1491	'centralnotice-banner-fundraising' => "Ur giton dastum arc'hant eo hemañ",
1481	1492	'centralnotice-banner-fundraising-help' => 'Krouiñ ur valizenn eoriañ e-korf ar giton gant id = "cn_fundraising_link" ha merkit ur bajenn dal pe meur a hini a-is, da skouer, "JimmyAppeal01". Savet e vo href al liamm ent emgefre.',
1482	1493	'centralnotice-banner-landing-pages' => 'Pajennoù pal (dispartiet dre skejoù) :',
1483		~~- 'centralnotice-geotargeted' => "Geolec'hiet",~~
	1494	+ 'centralnotice-geo' => "Geolec'hiet",
1484	1495	'centralnotice-countries' => 'Broioù',
1485	1496	'centralnotice-allocation' => 'Skorenn',
1486	1497	'centralnotice-view-allocation' => 'Gwelout skorenn ar giton',
—	—	@@ -1622,7 +1633,7 @@
1623	1634	'centralnotice-banner-fundraising' => 'Ovo je plakat za donacije',
1624	1635	'centralnotice-banner-fundraising-help' => 'Pravi oznaku za uklapanje u tijelo banera sa id="cn_fundraising_link" i unosi jedan ili više ciljnih članaka ispod, naprimjer, "JimmyAppeal01". Oznaka href za link će biti automatski napravljen.',
1625	1636	'centralnotice-banner-landing-pages' => 'Ciljne stranice (razdvojene zarezima):',
1626		~~- 'centralnotice-geotargeted' => 'Geociljano',~~
	1637	+ 'centralnotice-geo' => 'Geociljano',
1627	1638	'centralnotice-countries' => 'Države',
1628	1639	'centralnotice-allocation' => 'Raspoređivanje',
1629	1640	'centralnotice-view-allocation' => 'Pogledaj dodjelu obavještenja',
—	—	@@ -1767,7 +1778,7 @@
1768	1779	'centralnotice-banner-type' => 'Tipus de pancarta:',
1769	1780	'centralnotice-banner-hidable' => 'Estàtic/Amagable',
1770	1781	'centralnotice-banner-collapsible' => 'Plegable',
1771		~~- 'centralnotice-geotargeted' => 'Geolocalitzat',~~
	1782	+ 'centralnotice-geo' => 'Geolocalitzat',
1772	1783	'centralnotice-countries' => 'Països',
1773	1784	'centralnotice-allocation' => 'Assignació',
1774	1785	'centralnotice-view-allocation' => 'Veure la disposició de la pancarta',
—	—	@@ -1937,7 +1948,7 @@
1938	1949	'centralnotice-banner-fundraising' => 'Tohle je banner pro fundraising',
1939	1950	'centralnotice-banner-fundraising-help' => 'V těle banneru vytvořte odkaz s id="cn_fundraising_link" a níže zadejte jednu nebo více cílových stránek, například „JimmyAppeal01“. U odkazu se href vyplní automaticky.',
1940	1951	'centralnotice-banner-landing-pages' => 'Cílové stránky (oddělené čárkou):',
1941		~~- 'centralnotice-geotargeted' => 'Zeměpisně cílené',~~
	1952	+ 'centralnotice-geo' => 'Zeměpisně cílené',
1942	1953	'centralnotice-countries' => 'Země',
1943	1954	'centralnotice-allocation' => 'Přidělení',
1944	1955	'centralnotice-view-allocation' => 'Zobrazit přidělení bannerů',
—	—	@@ -2284,7 +2295,7 @@
2285	2296	'centralnotice-banner-fundraising' => 'Dies ist ein Fundraisingbanner',
2286	2297	'centralnotice-banner-fundraising-help' => 'Ein Ankerelement im Korpus des Banners mit id="cn_fundraising_link" erstellen sowie eine oder mehrere Zielseiten, wie bspw. "JimmysAufruf01". Das href-Attribut des Links wird automatisch erstellt.',
2287	2298	'centralnotice-banner-landing-pages' => 'Zielseiten (durch Kommata getrennt):',
2288		~~- 'centralnotice-geotargeted' => 'Geo-anvisiert',~~
	2299	+ 'centralnotice-geo' => 'Geo-anvisiert',
2289	2300	'centralnotice-countries' => 'Staaten',
2290	2301	'centralnotice-allocation' => 'Anordnung',
2291	2302	'centralnotice-view-allocation' => 'Anordnung der Vorlagen ansehen',
—	—	@@ -2523,7 +2534,7 @@
2524	2535	'centralnotice-banner-type' => 'Chórgojowy typ:',
2525	2536	'centralnotice-banner-hidable' => 'Statiski/Chowajobny',
2526	2537	'centralnotice-banner-collapsible' => 'Fałdujobny',
2527		~~- 'centralnotice-geotargeted' => 'Geolokalizěrowany',~~
	2538	+ 'centralnotice-geo' => 'Geolokalizěrowany',
2528	2539	'centralnotice-countries' => 'Kraje',
2529	2540	'centralnotice-allocation' => 'Zrědowanje',
2530	2541	'centralnotice-view-allocation' => 'Zrědowanje banarja se woglědaś',
—	—	@@ -2674,7 +2685,7 @@
2675	2686	'centralnotice-banner-type' => 'Τύπος banner:',
2676	2687	'centralnotice-banner-hidable' => 'Στατικό / Αποκρύψιμο',
2677	2688	'centralnotice-banner-collapsible' => 'Πτυσσόμενο',
2678		~~- 'centralnotice-geotargeted' => 'Γεωγραφικά στοχοποιημένο',~~
	2689	+ 'centralnotice-geo' => 'Γεωγραφικά στοχοποιημένο',
2679	2690	'centralnotice-countries' => 'Χώρες',
2680	2691	'centralnotice-allocation' => 'Κατανομή',
2681	2692	'centralnotice-view-allocation' => 'Δείτε κατανομή banner',
—	—	@@ -2813,7 +2824,7 @@
2814	2825	'centralnotice-banner-type' => 'Rubanda tipo:',
2815	2826	'centralnotice-banner-hidable' => 'Statika/Kaŝebla',
2816	2827	'centralnotice-banner-collapsible' => 'Maletendebla',
2817		~~- 'centralnotice-geotargeted' => 'Ŝalti geografian lokigadon',~~
	2828	+ 'centralnotice-geo' => 'Ŝalti geografian lokigadon',
2818	2829	'centralnotice-countries' => 'Landoj',
2819	2830	'centralnotice-allocation' => 'Asigno',
2820	2831	'centralnotice-view-allocation' => 'Vidi asignon de reklamrubando',
—	—	@@ -2962,7 +2973,7 @@
2963	2974	'centralnotice-banner-hidable' => 'Estático/Ocultable',
2964	2975	'centralnotice-banner-collapsible' => 'Colapsable',
2965	2976	'centralnotice-banner-fundraising' => 'Esto es un anuncio de la campaña de recaudación de fondos',
2966		~~- 'centralnotice-geotargeted' => 'Geosegmentado',~~
	2977	+ 'centralnotice-geo' => 'Geosegmentado',
2967	2978	'centralnotice-countries' => 'Países',
2968	2979	'centralnotice-allocation' => 'Asignación',
2969	2980	'centralnotice-view-allocation' => 'Asignación de visualización de pancarta',
—	—	@@ -3084,7 +3095,7 @@
3085	3096	'centralnotice-banner-logged-in' => 'Sisseloginud kasutajatele',
3086	3097	'centralnotice-banner-type' => 'Malli tüüp:',
3087	3098	'centralnotice-banner-collapsible' => 'Kokkulükatav',
3088		~~- 'centralnotice-geotargeted' => 'Kohamääranguga',~~
	3099	+ 'centralnotice-geo' => 'Kohamääranguga',
3089	3100	'centralnotice-countries' => 'Riigid',
3090	3101	'centralnotice-allocation' => 'Ülesseadmine',
3091	3102	'centralnotice-view-allocation' => 'Mallide ülesseade vaatamine',
—	—	@@ -3287,7 +3298,7 @@
3288	3299	'centralnotice-banner-type' => 'نوع پرچم:',
3289	3300	'centralnotice-banner-hidable' => 'ایستا/نهفتنی',
3290	3301	'centralnotice-banner-collapsible' => 'متلاشی‌پذیر',
3291		~~- 'centralnotice-geotargeted' => 'دارای تخصیص جغرفیایی',~~
	3302	+ 'centralnotice-geo' => 'دارای تخصیص جغرفیایی',
3292	3303	'centralnotice-countries' => 'کشورها',
3293	3304	'centralnotice-allocation' => 'تخصیص',
3294	3305	'centralnotice-view-allocation' => 'نمایش تخصیص آگهی',
—	—	@@ -3429,7 +3440,7 @@
3430	3441	'centralnotice-banner-type' => 'Bannerityyppi',
3431	3442	'centralnotice-banner-hidable' => 'Pysyvä/Piilotettava',
3432	3443	'centralnotice-banner-collapsible' => 'Piilotettava',
3433		~~- 'centralnotice-geotargeted' => 'Maantieteellisesti suunnattu',~~
	3444	+ 'centralnotice-geo' => 'Maantieteellisesti suunnattu',
3434	3445	'centralnotice-countries' => 'Maat',
3435	3446	'centralnotice-allocation' => 'Jakaminen',
3436	3447	'centralnotice-view-allocation' => 'Näytä bannerin jakaminen',
—	—	@@ -3580,7 +3591,7 @@
3581	3592	'centralnotice-banner-fundraising' => "Il s'agit d'une bannière de levée de fonds",
3582	3593	'centralnotice-banner-fundraising-help' => 'Créer une balise d\'ancrage dans le corps de la bannière avec id = "cn_fundraising_link" et entrez un ou plusieurs pages de destination ci-dessous, par exemple, "JimmyAppeal01". Le href du lien sera construit automatiquement.',
3583	3594	'centralnotice-banner-landing-pages' => 'Pages de destination (séparées par des virgules):',
3584		~~- 'centralnotice-geotargeted' => 'Géolocalisé',~~
	3595	+ 'centralnotice-geo' => 'Géolocalisé',
3585	3596	'centralnotice-countries' => 'Pays',
3586	3597	'centralnotice-allocation' => 'Allocation',
3587	3598	'centralnotice-view-allocation' => 'Voir la disposition de bannière',
—	—	@@ -3719,7 +3730,7 @@
3720	3731	'centralnotice-banner-type' => 'Tipo de baniére :',
3721	3732	'centralnotice-banner-hidable' => 'Statica / cachâbla',
3722	3733	'centralnotice-banner-collapsible' => 'Rèductibla',
3723		~~- 'centralnotice-geotargeted' => 'G·eolocalisâ',~~
	3734	+ 'centralnotice-geo' => 'G·eolocalisâ',
3724	3735	'centralnotice-countries' => 'Payis',
3725	3736	'centralnotice-allocation' => 'Alocacion',
3726	3737	'centralnotice-view-allocation' => 'Vêre l’alocacion de baniére',
—	—	@@ -3867,7 +3878,7 @@
3868	3879	'centralnotice-banner-fundraising' => 'Este é un cartel da recadación de fondos',
3869	3880	'centralnotice-banner-fundraising-help' => 'Cree unha etiqueta de largo no corpo do cartel con id="cn_fundraising_link" e insira a continuación unha ou máis páxina de destino; por exemplo, "JimmyAppeal01". O parámetro href da ligazón construirase automaticamente.',
3870	3881	'centralnotice-banner-landing-pages' => 'Páxinas de destino (separadas por comas):',
3871		~~- 'centralnotice-geotargeted' => 'Localizado xeograficamente',~~
	3882	+ 'centralnotice-geo' => 'Localizado xeograficamente',
3872	3883	'centralnotice-countries' => 'Países',
3873	3884	'centralnotice-allocation' => 'Asignación',
3874	3885	'centralnotice-view-allocation' => 'Ollar a asignación do modelo',
—	—	@@ -4030,7 +4041,7 @@
4031	4042	'centralnotice-banner-type' => 'Bannertyp:',
4032	4043	'centralnotice-banner-hidable' => 'Statisch/Uusbländbar',
4033	4044	'centralnotice-banner-collapsible' => 'Yyklappbar',
4034		~~- 'centralnotice-geotargeted' => 'Geo-aavisiert',~~
	4045	+ 'centralnotice-geo' => 'Geo-aavisiert',
4035	4046	'centralnotice-countries' => 'Länder',
4036	4047	'centralnotice-allocation' => 'Zuewysig',
4037	4048	'centralnotice-view-allocation' => 'Aaornig vu dr Banner aaluege',
—	—	@@ -4174,7 +4185,7 @@
4175	4186	'centralnotice-banner-fundraising' => 'זוהי כרזת התרמה',
4176	4187	'centralnotice-banner-fundraising-help' => 'נא ליצור תג עוגן בגוף הכּרזה עם id="cn_fundraising_link"‎ ולהזין דף נחיתה אחד או יותר בהמשך, למשל "JimmyAppeal01". ערך ה־href של הקישור ייבנה באופן אוטומטי.',
4177	4188	'centralnotice-banner-landing-pages' => 'דפי נחיתה (מופרדים בפסיקים):',
4178		~~- 'centralnotice-geotargeted' => 'ממוקד גאוגרפית',~~
	4189	+ 'centralnotice-geo' => 'ממוקד גאוגרפית',
4179	4190	'centralnotice-countries' => 'מדינות',
4180	4191	'centralnotice-allocation' => 'הקצאה',
4181	4192	'centralnotice-view-allocation' => 'צפייה בהקצאת הבאנר',
—	—	@@ -4334,7 +4345,7 @@
4335	4346	'centralnotice-banner-type' => 'Tip obavijesti:',
4336	4347	'centralnotice-banner-hidable' => 'Statični/Dinamični',
4337	4348	'centralnotice-banner-collapsible' => 'Moguće sakriti',
4338		~~- 'centralnotice-geotargeted' => 'Geociljano',~~
	4349	+ 'centralnotice-geo' => 'Geociljano',
4339	4350	'centralnotice-countries' => 'Države',
4340	4351	'centralnotice-allocation' => 'Dodjela',
4341	4352	'centralnotice-view-allocation' => 'Prikaži raspodjelu obavijesti',
—	—	@@ -4471,7 +4482,7 @@
4472	4483	'centralnotice-banner-type' => 'Chorhojowy typ:',
4473	4484	'centralnotice-banner-hidable' => 'Statiski/Chowajomny',
4474	4485	'centralnotice-banner-collapsible' => 'Fałdujomny',
4475		~~- 'centralnotice-geotargeted' => 'Geolokalizowany',~~
	4486	+ 'centralnotice-geo' => 'Geolokalizowany',
4476	4487	'centralnotice-countries' => 'Kraje',
4477	4488	'centralnotice-allocation' => 'Přidźělenje',
4478	4489	'centralnotice-view-allocation' => 'Přidźělenje chorhoje sej wobhladać',
—	—	@@ -4610,7 +4621,7 @@
4611	4622	'centralnotice-banner-type' => 'Hirdetés típusa:',
4612	4623	'centralnotice-banner-hidable' => 'Statikus/elrejthető',
4613	4624	'centralnotice-banner-collapsible' => 'Becsukható',
4614		~~- 'centralnotice-geotargeted' => 'Célzás földrajzi hely szerint',~~
	4625	+ 'centralnotice-geo' => 'Célzás földrajzi hely szerint',
4615	4626	'centralnotice-countries' => 'Országok',
4616	4627	'centralnotice-allocation' => 'Kiosztás',
4617	4628	'centralnotice-view-allocation' => 'Hirdetéskiosztás megtekintése',
—	—	@@ -4751,7 +4762,7 @@
4752	4763	'centralnotice-banner-fundraising' => 'Isto es un bandiera de collecta de fundos',
4753	4764	'centralnotice-banner-fundraising-help' => 'Crea un etiquetta de ancora in le corpore del bandiera con id="cn_fundraising_link" e entra un o plus paginas de arrivata hic infra, per exemplo "AppelloJimmy01". Le "href" del ligamine essera construite automaticamente.',
4754	4765	'centralnotice-banner-landing-pages' => 'Paginas de arrivata (separate per commas):',
4755		~~- 'centralnotice-geotargeted' => 'Localisation geographic',~~
	4766	+ 'centralnotice-geo' => 'Localisation geographic',
4756	4767	'centralnotice-countries' => 'Paises',
4757	4768	'centralnotice-allocation' => 'Allocation',
4758	4769	'centralnotice-view-allocation' => 'Vider allocation de bandieras',
—	—	@@ -4898,7 +4909,7 @@
4899	4910	'centralnotice-banner-type' => 'Jenis panji:',
4900	4911	'centralnotice-banner-hidable' => 'Statis/Dapat disembunyikan',
4901	4912	'centralnotice-banner-collapsible' => 'Dapat dibuka',
4902		~~- 'centralnotice-geotargeted' => 'Ditargetgeokan',~~
	4913	+ 'centralnotice-geo' => 'Ditargetgeokan',
4903	4914	'centralnotice-countries' => 'Negara',
4904	4915	'centralnotice-allocation' => 'Alokasi',
4905	4916	'centralnotice-view-allocation' => 'Lihat alokasi pengumuman',
—	—	@@ -5231,7 +5242,7 @@
5232	5243	'centralnotice-banner-hidable' => '固定/非表示可',
5233	5244	'centralnotice-banner-collapsible' => '折りたたみ',
5234	5245	'centralnotice-banner-fundraising' => 'これは資金調達のバナーです',
5235		~~- 'centralnotice-geotargeted' => '対象地域',~~
	5246	+ 'centralnotice-geo' => '対象地域',
5236	5247	'centralnotice-countries' => '国',
5237	5248	'centralnotice-allocation' => '割り当て',
5238	5249	'centralnotice-view-allocation' => 'テンプレートの割り当てを表示',
—	—	@@ -5442,7 +5453,7 @@
5443	5454	'centralnotice-banner-type' => 'ბანერის ტიპი:',
5444	5455	'centralnotice-banner-hidable' => 'სტატიკური/დაფარული',
5445	5456	'centralnotice-banner-collapsible' => 'დასაკეცი',
5446		~~- 'centralnotice-geotargeted' => 'გეო-მიზნობრივი',~~
	5457	+ 'centralnotice-geo' => 'გეო-მიზნობრივი',
5447	5458	'centralnotice-countries' => 'ქვეყნები',
5448	5459	'centralnotice-allocation' => 'განაწილება',
5449	5460	'centralnotice-view-allocation' => 'თარგების განაწილების ხილვა',
—	—	@@ -5544,7 +5555,7 @@
5545	5556	'centralnotice-banner-hidable' => 'នឹងថ្កល់/អាចលាក់បាន',
5546	5557	'centralnotice-banner-collapsible' => 'អាចបង្រួញបាន',
5547	5558	'centralnotice-banner-fundraising' => 'នេះជាបដាសំរាប់ឃោសនារៃអង្គាសប្រាក់',
5548		~~- 'centralnotice-geotargeted' => 'អាចកំនត់តំបន់សំរាប់បង្ហាញ',~~
	5559	+ 'centralnotice-geo' => 'អាចកំនត់តំបន់សំរាប់បង្ហាញ',
5549	5560	'centralnotice-countries' => 'ប្រទេស',
5550	5561	'centralnotice-languages' => 'ភាសា',
5551	5562	'centralnotice-projects' => 'គំរោង',
—	—	@@ -5684,7 +5695,7 @@
5685	5696	'centralnotice-banner-type' => '배너 유형:',
5686	5697	'centralnotice-banner-hidable' => '정적/숨길 수 있음',
5687	5698	'centralnotice-banner-collapsible' => '접을 수 있음',
5688		~~- 'centralnotice-geotargeted' => '특정 지역을 대상으로 공지',~~
	5699	+ 'centralnotice-geo' => '특정 지역을 대상으로 공지',
5689	5700	'centralnotice-countries' => '국가',
5690	5701	'centralnotice-allocation' => '배당',
5691	5702	'centralnotice-languages' => '언어',
—	—	@@ -5819,7 +5830,7 @@
5820	5831	'centralnotice-banner-type' => 'De Zoot Banner_Schablohn:',
5821	5832	'centralnotice-banner-hidable' => 'Faß udder ußschaltbaa',
5822	5833	'centralnotice-banner-collapsible' => 'Enklappbaa',
5823		~~- 'centralnotice-geotargeted' => 'Met Koodinaate op de Ääd',~~
	5834	+ 'centralnotice-geo' => 'Met Koodinaate op de Ääd',
5824	5835	'centralnotice-countries' => 'Länder',
5825	5836	'centralnotice-allocation' => 'Verdeilong',
5826	5837	'centralnotice-view-allocation' => 'De Banner_Schablohne iehr Zohdeilong beloore',
—	—	@@ -5994,7 +6005,7 @@
5995	6006	'centralnotice-banner-hidable' => 'Statesch/Ka verstoppt ginn',
5996	6007	'centralnotice-banner-collapsible' => 'Aklappbar',
5997	6008	'centralnotice-banner-fundraising' => "Dëst ass e Banner vun enger Campagne fir Don'en ze sammelen",
5998		~~- 'centralnotice-geotargeted' => 'Geografesch geziilt',~~
	6009	+ 'centralnotice-geo' => 'Geografesch geziilt',
5999	6010	'centralnotice-countries' => 'Länner',
6000	6011	'centralnotice-allocation' => 'Dispositioun',
6001	6012	'centralnotice-view-allocation' => 'Dispositioun vum Banner weisen',
—	—	@@ -6141,7 +6152,7 @@
6142	6153	'centralnotice-banner-type' => 'Vaantiep:',
6143	6154	'centralnotice-banner-hidable' => 'Statisch/verbergbaar',
6144	6155	'centralnotice-banner-collapsible' => 'inklapbaar',
6145		~~- 'centralnotice-geotargeted' => 'Geografische doele',~~
	6156	+ 'centralnotice-geo' => 'Geografische doele',
6146	6157	'centralnotice-countries' => 'Lenj',
6147	6158	'centralnotice-allocation' => 'Toewiezing',
6148	6159	'centralnotice-view-allocation' => 'Betrach vaantoewiezing',
—	—	@@ -6227,7 +6238,7 @@
6228	6239	'centralnotice-banner-type' => 'Pranešimo tipas:',
6229	6240	'centralnotice-banner-hidable' => 'Statinis/Paslepiamas',
6230	6241	'centralnotice-banner-collapsible' => 'Sutraukiamas',
6231		~~- 'centralnotice-geotargeted' => 'Taikomas geografiškai',~~
	6242	+ 'centralnotice-geo' => 'Taikomas geografiškai',
6232	6243	'centralnotice-countries' => 'Valstybės',
6233	6244	'centralnotice-languages' => 'Kalbos',
6234	6245	'centralnotice-projects' => 'Projektai',
—	—	@@ -6476,7 +6487,7 @@
6477	6488	'centralnotice-banner-fundraising' => 'Ова е плакат за прибирање на средства',
6478	6489	'centralnotice-banner-fundraising-help' => 'Создајте ознака за вкотвување во содржината на плакатот со id="cn_fundraising_link" и внесете една или повеќе целни страници, како на пр. „JimmyAppeal01“. href на врската ќе се исконструира автоматски.',
6479	6490	'centralnotice-banner-landing-pages' => 'Целни страници (одделени со запирки):',
6480		~~- 'centralnotice-geotargeted' => 'Геобележано',~~
	6491	+ 'centralnotice-geo' => 'Геобележано',
6481	6492	'centralnotice-countries' => 'Земји',
6482	6493	'centralnotice-allocation' => 'Распределба',
6483	6494	'centralnotice-view-allocation' => 'Преглед на распределбата на плакати',
—	—	@@ -6621,7 +6632,7 @@
6622	6633	'centralnotice-banner-collapsible' => 'ചുരുക്കാവുന്നത്',
6623	6634	'centralnotice-banner-fundraising' => 'ഇത് ഫണ്ട്‌റൈസിങ് എഴുത്തുപട്ടയാണ്',
6624	6635	'centralnotice-banner-landing-pages' => 'എത്തിച്ചേരേണ്ട താളുകൾ (അങ്കുശത്താൽ വേർതിരിച്ച്):',
6625		~~- 'centralnotice-geotargeted' => 'ഭൂപ്രദേശങ്ങൾ ലക്ഷ്യമാക്കിയവ',~~
	6636	+ 'centralnotice-geo' => 'ഭൂപ്രദേശങ്ങൾ ലക്ഷ്യമാക്കിയവ',
6626	6637	'centralnotice-countries' => 'രാജ്യങ്ങൾ',
6627	6638	'centralnotice-allocation' => 'വിന്യാസം',
6628	6639	'centralnotice-view-allocation' => 'എഴുത്തുപട്ടയ്ക്ക് അനുവദിച്ചിരിക്കുന്ന സ്ഥാനം കാണുക',
—	—	@@ -7109,7 +7120,7 @@
7110	7121	'centralnotice-banner-fundraising' => 'Dit is een fondsenwervingsbanner',
7111	7122	'centralnotice-banner-fundraising-help' => 'Maak een ankertag in de body van de banner met id="cn_fundraising_link" en voer hieronder een of meer bestemmingspagina\'s in, bijvoorbeeld "JimmyAppeal01". De href voor de verwijzing wordt automatisch geconstrueerd.',
7112	7123	'centralnotice-banner-landing-pages' => "Landingspagina's (kommagescheiden):",
7113		~~- 'centralnotice-geotargeted' => 'Geografische doelen',~~
	7124	+ 'centralnotice-geo' => 'Geografische doelen',
7114	7125	'centralnotice-countries' => 'Landen',
7115	7126	'centralnotice-allocation' => 'Toewijzing',
7116	7127	'centralnotice-view-allocation' => 'Bannertoewijzing bekijken',
—	—	@@ -7336,7 +7347,7 @@
7337	7348	'centralnotice-banner-type' => 'Banner type:',
7338	7349	'centralnotice-banner-hidable' => 'Statisk/skjulbar',
7339	7350	'centralnotice-banner-collapsible' => 'Sammenleggbar',
7340		~~- 'centralnotice-geotargeted' => 'Geografisk målrettet',~~
	7351	+ 'centralnotice-geo' => 'Geografisk målrettet',
7341	7352	'centralnotice-countries' => 'Land',
7342	7353	'centralnotice-allocation' => 'Tildeling',
7343	7354	'centralnotice-view-allocation' => 'Vis bannertildeling',
—	—	@@ -7625,7 +7636,7 @@
7626	7637	'centralnotice-banner-fundraising' => 'Baner zbiórki pieniędzy',
7627	7638	'centralnotice-banner-fundraising-help' => 'Utwórz znacznik kotwicy w ciele banera z id="cn_fundraising_link" i wprowadź jedną lub więcej stron docelowych, na przykład "ApelJimmiego01". Dla linku href zostanie wygenerowane automatycznie.',
7628	7639	'centralnotice-banner-landing-pages' => 'Strony docelowe (rozdzielone przecinkami):',
7629		~~- 'centralnotice-geotargeted' => 'Geograficznie nakierowane',~~
	7640	+ 'centralnotice-geo' => 'Geograficznie nakierowane',
7630	7641	'centralnotice-countries' => 'Kraje',
7631	7642	'centralnotice-allocation' => 'Przydział',
7632	7643	'centralnotice-view-allocation' => 'Zobacz przydziały dla banera',
—	—	@@ -7768,7 +7779,7 @@
7769	7780	'centralnotice-banner-type' => 'Sòrt ëd tilèt:',
7770	7781	'centralnotice-banner-hidable' => 'Stàtich/Stërmàbil',
7771	7782	'centralnotice-banner-collapsible' => 'Strenzìbil',
7772		~~- 'centralnotice-geotargeted' => 'Geolocalisà',~~
	7783	+ 'centralnotice-geo' => 'Geolocalisà',
7773	7784	'centralnotice-countries' => 'Pais',
7774	7785	'centralnotice-allocation' => 'Alocassion',
7775	7786	'centralnotice-view-allocation' => 'Vëdde la disposission dël tilèt',
—	—	@@ -7966,7 +7977,7 @@
7967	7978	'centralnotice-banner-fundraising' => 'Este é um modelo de angariação de fundos',
7968	7979	'centralnotice-banner-fundraising-help' => 'Crie uma âncora no corpo do modelo com id="cn_fundraising_link" e introduza abaixo uma ou mais páginas de destino. Por exemplo, "ApeloJimmy01". O parâmetro href do link será construído automaticamente.',
7969	7980	'centralnotice-banner-landing-pages' => 'Páginas de destino (separadas por vírgulas):',
7970		~~- 'centralnotice-geotargeted' => 'Com segmentação geográfica',~~
	7981	+ 'centralnotice-geo' => 'Com segmentação geográfica',
7971	7982	'centralnotice-countries' => 'Países',
7972	7983	'centralnotice-allocation' => 'Atribuição',
7973	7984	'centralnotice-view-allocation' => 'Ver atribuição de modelos',
—	—	@@ -8115,7 +8126,7 @@
8116	8127	'centralnotice-banner-fundraising' => 'Este é um banner de angariação de fundos',
8117	8128	'centralnotice-banner-fundraising-help' => 'Crie uma âncora no corpo do banner com id="cn_fundraising_link" e introduza abaixo uma ou mais páginas de destino. Por exemplo, "ApeloJimmy01". O parâmetro href do link será construído automaticamente.',
8118	8129	'centralnotice-banner-landing-pages' => 'Páginas de destino (separadas por vírgulas):',
8119		~~- 'centralnotice-geotargeted' => 'Localizado geograficamente',~~
	8130	+ 'centralnotice-geo' => 'Localizado geograficamente',
8120	8131	'centralnotice-countries' => 'Países',
8121	8132	'centralnotice-allocation' => 'Atribuição',
8122	8133	'centralnotice-view-allocation' => 'Ver atribuição de modelos',
—	—	@@ -8254,7 +8265,7 @@
8255	8266	'centralnotice-banner-type' => 'Unancha laya:',
8256	8267	'centralnotice-banner-hidable' => 'Ranuy/Pakana',
8257	8268	'centralnotice-banner-collapsible' => 'Thuñichina',
8258		~~- 'centralnotice-geotargeted' => 'Allpapacha taripanachasqa',~~
	8269	+ 'centralnotice-geo' => 'Allpapacha taripanachasqa',
8259	8270	'centralnotice-countries' => 'Mama llaqtakuna',
8260	8271	'centralnotice-allocation' => 'Ñiqinchay',
8261	8272	'centralnotice-view-allocation' => 'Unancha ñiqinchayta qhaway',
—	—	@@ -8397,7 +8408,7 @@
8398	8409	'centralnotice-banner-collapsible' => 'Reductibil',
8399	8410	'centralnotice-banner-fundraising' => 'Acesta este un banner pentru strângerea de fonduri',
8400	8411	'centralnotice-banner-landing-pages' => 'Pagini de destinație (separate prin virgulă):',
8401		~~- 'centralnotice-geotargeted' => 'Geolocalizat',~~
	8412	+ 'centralnotice-geo' => 'Geolocalizat',
8402	8413	'centralnotice-countries' => 'Țări',
8403	8414	'centralnotice-allocation' => 'Alocare',
8404	8415	'centralnotice-view-allocation' => 'Vedeți alocarea bannerului',
—	—	@@ -8539,7 +8550,7 @@
8540	8551	'centralnotice-banner-type' => 'Tipe de banner:',
8541	8552	'centralnotice-banner-hidable' => 'Stateche/Scunnibbele',
8542	8553	'centralnotice-banner-collapsible' => 'Collassabbele',
8543		~~- 'centralnotice-geotargeted' => 'Geo referenziate',~~
	8554	+ 'centralnotice-geo' => 'Geo referenziate',
8544	8555	'centralnotice-countries' => 'Paìse',
8545	8556	'centralnotice-allocation' => 'Allocazione',
8546	8557	'centralnotice-view-allocation' => "Visualizze l'assignazione d'u banner",
—	—	@@ -8686,7 +8697,7 @@
8687	8698	'centralnotice-banner-fundraising' => 'Это баннер сбора средств',
8688	8699	'centralnotice-banner-fundraising-help' => 'Создайте тег ссылки в тела баннера с id="cn_fundraising_link" и укажите ниже одну или несколько целевых страниц, например, «JimmyAppeal01». Поле HREF ссылки будет создано автоматически.',
8689	8700	'centralnotice-banner-landing-pages' => 'Целевые страницы (через запятую):',
8690		~~- 'centralnotice-geotargeted' => 'Геопривязка',~~
	8701	+ 'centralnotice-geo' => 'Геопривязка',
8691	8702	'centralnotice-countries' => 'Страны',
8692	8703	'centralnotice-allocation' => 'Распределение',
8693	8704	'centralnotice-view-allocation' => 'Просмотр размещения баннеров',
—	—	@@ -8822,7 +8833,7 @@
8823	8834	'centralnotice-banner-type' => 'Тіп банера:',
8824	8835	'centralnotice-banner-hidable' => 'Статічный / Сховательный',
8825	8836	'centralnotice-banner-collapsible' => 'Зложытельный',
8826		~~- 'centralnotice-geotargeted' => 'Ґеоґрафічно цілене',~~
	8837	+ 'centralnotice-geo' => 'Ґеоґрафічно цілене',
8827	8838	'centralnotice-countries' => 'Країны',
8828	8839	'centralnotice-allocation' => 'Придїлїня',
8829	8840	'centralnotice-view-allocation' => 'Зобразити придїлїня баверів',
—	—	@@ -8961,7 +8972,7 @@
8962	8973	'centralnotice-banner-hidable' => 'Статическэй / Кистэниллэр',
8963	8974	'centralnotice-banner-collapsible' => 'Кыччатыллар',
8964	8975	'centralnotice-banner-fundraising' => 'Харчы хомуйуу бааннера',
8965		~~- 'centralnotice-geotargeted' => 'Сиргэ баайыы',~~
	8976	+ 'centralnotice-geo' => 'Сиргэ баайыы',
8966	8977	'centralnotice-countries' => 'Дойдулар',
8967	8978	'centralnotice-allocation' => 'Тарҕаныыта',
8968	8979	'centralnotice-view-allocation' => 'Бааннердар ханна баалларын көрүү',
—	—	@@ -9194,7 +9205,7 @@
9195	9206	'centralnotice-banner-type' => 'බැනර වර්ගය:',
9196	9207	'centralnotice-banner-hidable' => 'ස්ථිතික/සැඟවිය හැකි',
9197	9208	'centralnotice-banner-collapsible' => 'කුඩා කළ හැකි',
9198		~~- 'centralnotice-geotargeted' => 'භූමි එල්ල කළ (geotargeted)',~~
	9209	+ 'centralnotice-geo' => 'භූමි එල්ල කළ (geotargeted)',
9199	9210	'centralnotice-countries' => 'රටවල්',
9200	9211	'centralnotice-allocation' => 'වෙන්කිරීම',
9201	9212	'centralnotice-view-allocation' => 'බැනරයේ වෙන්කිරීම පෙන්වන්න',
—	—	@@ -9320,7 +9331,7 @@
9321	9332	'centralnotice-banner-type' => 'Typ oznamu:',
9322	9333	'centralnotice-banner-hidable' => 'Statický/skrývateľný',
9323	9334	'centralnotice-banner-collapsible' => 'Zbaliteľný',
9324		~~- 'centralnotice-geotargeted' => 'Geograficky cielený',~~
	9335	+ 'centralnotice-geo' => 'Geograficky cielený',
9325	9336	'centralnotice-countries' => 'Krajiny',
9326	9337	'centralnotice-allocation' => 'Alokácia',
9327	9338	'centralnotice-view-allocation' => 'Zobraziť alokáciu oznamu',
—	—	@@ -9461,7 +9472,7 @@
9462	9473	'centralnotice-banner-fundraising' => 'To je donatorska pasica',
9463	9474	'centralnotice-banner-fundraising-help' => 'Ustvarite sidrno oznako v telesu pasice z id="cn_fundraising_link" in spodaj vnesite eno ali več ciljnih strani, na primer "JimmyAppeal01". Celotna povezava bo ustvarjena samodejno.',
9464	9475	'centralnotice-banner-landing-pages' => 'Ciljne strani (ločene z vejicami):',
9465		~~- 'centralnotice-geotargeted' => 'Geociljano',~~
	9476	+ 'centralnotice-geo' => 'Geociljano',
9466	9477	'centralnotice-countries' => 'Države',
9467	9478	'centralnotice-allocation' => 'Dodelitev',
9468	9479	'centralnotice-view-allocation' => 'Ogled dodelitve pasic',
—	—	@@ -9609,7 +9620,7 @@
9610	9621	'centralnotice-banner-fundraising' => 'Ky është një flamur për mbledhjen e fondeve',
9611	9622	'centralnotice-banner-fundraising-help' => 'Krijo një spirancë tag në trup flamurin me id = "cn_fundraising_link" dhe hyjnë në një apo më shumë faqe ulje më poshtë, për shembull, "JimmyAppeal01". Href e lidhjes do të ndërtohet automatikisht.',
9612	9623	'centralnotice-banner-landing-pages' => 'Faqet ulje (comma-ndarë):',
9613		~~- 'centralnotice-geotargeted' => 'Geo-objektiv',~~
	9624	+ 'centralnotice-geo' => 'Geo-objektiv',
9614	9625	'centralnotice-countries' => 'Shtetet',
9615	9626	'centralnotice-allocation' => 'Rregullimi',
9616	9627	'centralnotice-view-allocation' => 'Shikoni rregullimin e Stampës',
—	—	@@ -9990,7 +10001,7 @@
9991	10002	'centralnotice-banner-type' => 'Bannertyp:',
9992	10003	'centralnotice-banner-hidable' => 'Statisk/gömbar',
9993	10004	'centralnotice-banner-collapsible' => 'Hopfällbar',
9994		~~- 'centralnotice-geotargeted' => 'Geografiskt fokuserat',~~
	10005	+ 'centralnotice-geo' => 'Geografiskt fokuserat',
9995	10006	'centralnotice-countries' => 'Länder',
9996	10007	'centralnotice-allocation' => 'Tilldelning',
9997	10008	'centralnotice-view-allocation' => 'Visa bannertilldelning',
—	—	@@ -10607,7 +10618,7 @@
10608	10619	'centralnotice-banner-type' => 'Banner görnüşi:',
10609	10620	'centralnotice-banner-hidable' => 'Statik/Gizlenilýän',
10610	10621	'centralnotice-banner-collapsible' => 'Düýrlenýän',
10611		~~- 'centralnotice-geotargeted' => 'Geo-bellikli',~~
	10622	+ 'centralnotice-geo' => 'Geo-bellikli',
10612	10623	'centralnotice-countries' => 'Ýurtlar',
10613	10624	'centralnotice-allocation' => 'Ýerleşiş',
10614	10625	'centralnotice-view-allocation' => 'Bannerleriň ýerleşişini görkez',
—	—	@@ -10738,7 +10749,7 @@
10739	10750	'centralnotice-banner-type' => 'Uri ng bandera:',
10740	10751	'centralnotice-banner-hidable' => 'Hindi tumitinag/Maitatago',
10741	10752	'centralnotice-banner-collapsible' => 'Maititiklop',
10742		~~- 'centralnotice-geotargeted' => 'Puntiryang heograpiya',~~
	10753	+ 'centralnotice-geo' => 'Puntiryang heograpiya',
10743	10754	'centralnotice-countries' => 'Mga bansa',
10744	10755	'centralnotice-allocation' => 'Paglalaan',
10745	10756	'centralnotice-view-allocation' => 'Tingnan ang kabahagi ng bandera',
—	—	@@ -10886,7 +10897,7 @@
10887	10898	'centralnotice-banner-type' => 'Afiş türü:',
10888	10899	'centralnotice-banner-hidable' => 'Statik/Gizlenebilir',
10889	10900	'centralnotice-banner-collapsible' => 'Daralabilir',
10890		~~- 'centralnotice-geotargeted' => 'Geo-hedefli',~~
	10901	+ 'centralnotice-geo' => 'Geo-hedefli',
10891	10902	'centralnotice-countries' => 'Ülkeler',
10892	10903	'centralnotice-allocation' => 'Tahsis',
10893	10904	'centralnotice-view-allocation' => 'Afiş tahsisini gör',
—	—	@@ -11009,7 +11020,7 @@
11010	11021	'centralnotice-banner-type' => 'Өлгенең төре:',
11011	11022	'centralnotice-banner-hidable' => 'Тикторышлы/ Ябылучан',
11012	11023	'centralnotice-banner-collapsible' => 'Ябылучан',
11013		~~- 'centralnotice-geotargeted' => 'Геоялгану',~~
	11024	+ 'centralnotice-geo' => 'Геоялгану',
11014	11025	'centralnotice-countries' => 'Илләр',
11015	11026	'centralnotice-allocation' => 'Таралу',
11016	11027	'centralnotice-view-allocation' => 'Өлгеләрнең таралуын карау',
—	—	@@ -11176,7 +11187,7 @@
11177	11188	'centralnotice-banner-type' => 'Тип банера:',
11178	11189	'centralnotice-banner-hidable' => 'Статичний / Приховуваний',
11179	11190	'centralnotice-banner-collapsible' => 'Що згортається',
11180		~~- 'centralnotice-geotargeted' => "Геоприв'язка",~~
	11191	+ 'centralnotice-geo' => "Геоприв'язка",
11181	11192	'centralnotice-countries' => 'Країни',
11182	11193	'centralnotice-allocation' => 'Розподіл',
11183	11194	'centralnotice-view-allocation' => 'Переглянути розміщення банера',
—	—	@@ -11310,7 +11321,7 @@
11311	11322	'centralnotice-banner-type' => 'Tipo de banner:',
11312	11323	'centralnotice-banner-hidable' => 'Statico/Che se sara',
11313	11324	'centralnotice-banner-collapsible' => 'Che se sara',
11314		~~- 'centralnotice-geotargeted' => 'Geolocalisà',~~
	11325	+ 'centralnotice-geo' => 'Geolocalisà',
11315	11326	'centralnotice-countries' => 'Paesi',
11316	11327	'centralnotice-allocation' => 'Alocassion',
11317	11328	'centralnotice-view-allocation' => 'Varda la disposission dei banner',
—	—	@@ -11512,7 +11523,7 @@
11513	11524	'centralnotice-banner-fundraising' => 'Đây là một biểu ngữ gây quỹ',
11514	11525	'centralnotice-banner-fundraising-help' => 'Tạo một thẻ neo trong phần chính của biểu ngữ có thuộc tính id="cn_fundraising_link" và nhập tên của ít nhất một trang đích ở dưới, thí dụ “JimmyAppeal01”. Thuộc tính href của liên kết sẽ được biên soạn tự động.',
11515	11526	'centralnotice-banner-landing-pages' => 'Các trang đích (định giới bằng dấu phẩy):',
11516		~~- 'centralnotice-geotargeted' => 'Mục tiêu địa lý',~~
	11527	+ 'centralnotice-geo' => 'Mục tiêu địa lý',
11517	11528	'centralnotice-countries' => 'Quốc gia',
11518	11529	'centralnotice-allocation' => 'Phân bổ',
11519	11530	'centralnotice-view-allocation' => 'Xem cách phân phối bảng',
—	—	@@ -11825,7 +11836,7 @@
11826	11837	'centralnotice-banner-collapsible' => '可收缩',
11827	11838	'centralnotice-banner-fundraising' => '这是一个筹款横幅',
11828	11839	'centralnotice-banner-landing-pages' => '登录页（逗号分隔）：',
11829		~~- 'centralnotice-geotargeted' => '已地理定位的',~~
	11840	+ 'centralnotice-geo' => '已地理定位的',
11830	11841	'centralnotice-countries' => '国家',
11831	11842	'centralnotice-allocation' => '配额',
11832	11843	'centralnotice-view-allocation' => '察看横幅配额',
—	—	@@ -11968,7 +11979,7 @@
11969	11980	'centralnotice-banner-type' => '橫幅類型：',
11970	11981	'centralnotice-banner-hidable' => '靜態可隱藏',
11971	11982	'centralnotice-banner-collapsible' => '可摺疊',
11972		~~- 'centralnotice-geotargeted' => '已地理定位的',~~
	11983	+ 'centralnotice-geo' => '已地理定位的',
11973	11984	'centralnotice-countries' => '國家',
11974	11985	'centralnotice-allocation' => '分配',
11975	11986	'centralnotice-view-allocation' => '查看橫幅分配',
Index: trunk/extensions/CentralNotice/CentralNotice.db.php
—	—	@@ -165,17 +165,15 @@
166	166	$campaign['languages'] = implode( ", ", $languages );
167	167	$campaign['countries'] = implode( ", ", $geo_countries );
168	168
169		~~- $banners = CentralNoticeDB::getCampaignBanners( $row->not_id );~~
170		~~- // Throw out the stuff we don't need for campaign logging~~
171		~~- foreach ( $banners as $key => $row ) {~~
172		~~- unset( $banners[$key]['display_anon'] );~~
173		~~- unset( $banners[$key]['display_account'] );~~
174		~~- unset( $banners[$key]['fundraising'] );~~
175		~~- unset( $banners[$key]['landing_pages'] );~~
176		~~- unset( $banners[$key]['campaign'] );~~
	169	+ $bannersIn = CentralNoticeDB::getCampaignBanners( $row->not_id );
	170	+ $bannersOut = array();
	171	+ // All we want are the banner names and weights
	172	+ foreach ( $bannersIn as $key => $row ) {
	173	+ $outKey = $bannersIn[$key]['name'];
	174	+ $bannersOut[$outKey] = $bannersIn[$key]['weight'];
177	175	}
178	176	// Encode into a JSON string for storage
179		~~- $campaign['banners'] = FormatJson::encode( $banners );~~
	177	+ $campaign['banners'] = FormatJson::encode( $bannersOut );
180	178	}
181	179
182	180	return $campaign;
Index: trunk/extensions/CentralNotice/centralnotice.js
—	—	@@ -1,3 +1,17 @@
	2	+function toggleDisplay( logId ) {
	3	+ var thisCollapsed = document.getElementById( 'cn-collapsed-'+logId );
	4	+ var thisUncollapsed = document.getElementById( 'cn-uncollapsed-'+logId );
	5	+ var thisDetails = document.getElementById( 'cn-log-details-'+logId );
	6	+ if ( thisCollapsed.style.display == "none" ) {
	7	+ thisUncollapsed.style.display = "none";
	8	+ thisCollapsed.style.display = "block";
	9	+ thisDetails.style.display = "none";
	10	+ } else {
	11	+ thisCollapsed.style.display = "none";
	12	+ thisUncollapsed.style.display = "block";
	13	+ thisDetails.style.display = "table-row";
	14	+ }
	15	+}
2	16	function selectProjects( selectAll ) {
3	17	var selectBox = document.getElementById('projects[]');
4	18	var firstSelect = selectBox.options.length - 1;

Follow-up revisions

Revision	Commit summary	Author	Date
r92073	follow up to r92037, fixing redundant qqq message	kaldari	18:13, 13 July 2011
r92224	follow-up to r92037 - making log details more localizable	kaldari	01:00, 15 July 2011

Comments

#Comment by Siebrand (talk | contribs) 09:25, 13 July 2011

Duplicate keys in message documentation:

+        'centralnotice-multiple-languages' => '$1 is the number of languages in which the
notice is available. It is always greater than 3. This message is in the column
"languages" in the table.',
+        'centralnotice-multiple-languages' => '$1 is the number of countries in which the
notice is available.',

#Comment by Kaldari (talk | contribs) 18:13, 13 July 2011

fixed in r92073

#Comment by Awjrichards (talk | contribs) 21:53, 14 July 2011

You might consider un-hardcoding styling in showInitialSettings() and showChanges()

#Comment by Kaldari (talk | contribs) 01:01, 15 July 2011

Done in r92224.

#Comment by Seb35 (talk | contribs) 01:12, 24 July 2011

The message key 'centralnotice-banners-changed' has been introduced here but is (still) not used.

#Comment by Kaldari (talk | contribs) 01:27, 29 July 2011

Fixed in r93443.

Status & tagging log

21:53, 14 July 2011 Awjrichards (talk | contribs) changed the status of r92037 [removed: new added: ok]
21:25, 13 July 2011 Siebrand (talk | contribs) changed the status of r92037 [removed: fixme added: new]
09:25, 13 July 2011 Siebrand (talk | contribs) changed the status of r92037 [removed: new added: fixme]