http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59753
Revision: 59753
Author: tomasz
Date: 2009-12-05 03:22:24 +0000 (Sat, 05 Dec 2009)
Log Message:
-----------
picking up r59750, 59165, 59751, 59752 and new translations.
Modified Paths:
--------------
branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.i18n.php
branches/wmf-deployment/extensions/ContributionReporting/ContributionStatistics_body.php
branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.js
branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.php
Property Changed:
----------------
branches/wmf-deployment/extensions/ContributionReporting/
Property changes on: branches/wmf-deployment/extensions/ContributionReporting
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/ContributionReporting:51646
/trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59176,59690
/trunk/extensions/ContributionTracking:58684
/trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/extensions/ContributionReporting:51646
/trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59165-59752
/trunk/extensions/ContributionTracking:58684
/trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816
Modified:
branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.i18n.php
===================================================================
---
branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.i18n.php
2009-12-05 03:16:30 UTC (rev 59752)
+++
branches/wmf-deployment/extensions/ContributionReporting/ContributionReporting.i18n.php
2009-12-05 03:22:24 UTC (rev 59753)
@@ -383,6 +383,9 @@
'contribstats-conversion' => 'Узровень канвэрсіі (%)',
'contribstats-template' => 'Шаблён',
'contribstats-nodata' => 'Зьвесткі не пададзеныя',
+ 'contribstats-landingpage' => 'Прывітальная старонка',
+ 'contribstats-donatepage' => 'Старонка ахвяраваньняў',
+ 'contribstats-average' => 'Сярэдняе',
'fundraiserstatistics' => 'Статыстыка сабраных ахвяраваньняў',
'fundraiserstats-date' => 'Дата',
'fundraiserstats-day' => 'Дзень $1 з $2',
@@ -472,10 +475,11 @@
'contribstats-avg' => 'Keitat (SUA)',
'contribstats-percentage-ytd' => 'Dregantad (er bl.-mañ)',
'contribstats-total-ytd' => 'Hollad (er bloaz-mañ)',
- 'contribstats-day-totals' => 'Hollad evit hiziv',
+ 'contribstats-day-totals' => 'Hollad an deiz',
'contribstats-week' => 'Sizhun',
'contribstats-clicks' => 'Klikoù',
'contribstats-template' => 'Patrom',
+ 'fundraiserstats-tab-totals' => 'Hollad (dollaroù SUA)',
);
/** Bosnian (Bosanski)
@@ -643,6 +647,9 @@
'contribstats-conversion' => 'Konverzní poměr (%)',
'contribstats-template' => 'Šablona',
'contribstats-nodata' => 'Údaje nejsou k dispozici',
+ 'contribstats-landingpage' => 'Cílová stránka',
+ 'contribstats-donatepage' => 'Přispívací stránka',
+ 'contribstats-average' => 'Průměr',
'fundraiserstatistics' => 'Statistika příspěvkové kampaně',
'fundraiserstats-date' => 'Datum',
'fundraiserstats-day' => '$2, $1. den',
@@ -719,6 +726,7 @@
/** German (Deutsch)
* @author Imre
+ * @author MF-Warburg
* @author Metalhead64
* @author Omnipaedista
* @author Purodha
@@ -766,6 +774,8 @@
'contribstats-conversion' => 'Umrechnungskurs (%)',
'contribstats-template' => 'Vorlage',
'contribstats-nodata' => 'Keine Daten vorhanden',
+ 'contribstats-donatepage' => 'Spenden-Seite',
+ 'contribstats-average' => 'Durchschnitt',
'fundraiserstatistics' => 'Spendenstatistiken',
'fundraiserstats-date' => 'Datum',
'fundraiserstats-day' => 'Tag $1 von $2',
@@ -1090,28 +1100,49 @@
* @author Pikne
*/
$messages['et'] = array(
- 'contributionhistory' => 'Redigeerimise ajalugu',
+ 'contributiontotal' => 'Annetamise kogusumma',
+ 'contributionhistory' => 'Annetamise ajalugu',
+ 'contrib-hist-header' => 'Reaalajas kommentaarid annetajatelt üle
maailma',
'contrib-hist-name' => 'Nimi',
'contrib-hist-date' => 'Kellaaeg ja kuupäev',
+ 'contrib-hist-amount' => 'Summa',
'contrib-hist-next' => 'Varasemad annetused',
'contrib-hist-previous' => 'Värskemad annetused',
'contrib-hist-anonymous' => 'Anonüümne',
- 'contributionstatistics' => 'Redigeerimise arvandmed',
- 'contribstats-desc' => 'Kuvab Wikimedia Sihtasutusele tehtud koostöö
arvandmed.',
+ 'contributionstatistics' => 'Annetamise arvandmed',
+ 'contribstats-desc' => 'Kuvab arvandmed Wikimedia Sihtasutusele tehtud
annetuste kohta.',
+ 'contribstats-daily-totals' => '{{PLURAL:$1|Tänane kogusumma|Viimase $1
päeva kogusummad}}',
+ 'contribstats-monthly-totals' => '{{PLURAL:$1|Selle kuu
kogusumma|Viimase $1 kuu kogusummad}}',
+ 'contribstats-month-range-totals' => '{{PLURAL:$1|Ühe kuu kogusumma|$1
kuu kogusummad}}',
+ 'contribstats-contribution-range-breakdown' => 'Annetuste jaotumine
summati ($1–$2)',
+ 'contribstats-currency-totals' => 'Eelarveaasta $1 kogusummad
vääringuti',
+ 'contribstats-contribution-breakdown' => 'Eelarveaasta $1 annetuste
jaotumine summati',
'contribstats-day' => 'Päev',
'contribstats-month' => 'Kuu',
'contribstats-currency' => 'Rahaühik',
- 'contribstats-amount' => 'Hulk (USD)',
- 'contribstats-contributions' => 'Annetused',
- 'contribstats-total' => 'Summa (USD)',
+ 'contribstats-amount' => 'Summa (USD)',
+ 'contribstats-contributions' => 'Annetusi',
+ 'contribstats-total' => 'Kokku (USD)',
'contribstats-avg' => 'Keskmine (USD)',
- 'contribstats-max' => 'Maksimum (USD)',
+ 'contribstats-max' => 'Suurim annetus',
+ 'contribstats-percentage-ytd' => 'Protsent (sel aastal)',
+ 'contribstats-total-ytd' => 'Kokku (sel aastal)',
'contribstats-value-exactly' => 'Täpselt $1',
'contribstats-value-under' => 'Alla $1',
- 'contribstats-value-from' => '$1 - $2',
+ 'contribstats-value-from' => '$1 – $2',
'contribstats-value-over' => 'Üle $1',
+ 'contributiontrackingstatistics' => 'Annetamise jälgimisarvandmed',
+ 'contribstats-day-totals' => 'Päeva kogusumma',
+ 'contribstats-clicks' => 'Klõpse',
+ 'contribstats-donations' => 'Annetusi',
+ 'contribstats-conversion' => 'Annetusmäär (%)',
+ 'contribstats-template' => 'Mall',
+ 'contribstats-donatepage' => 'Annetamislehekülg',
+ 'contribstats-average' => 'Keskmine',
+ 'fundraiserstatistics' => 'Korjanduse arvandmed',
'fundraiserstats-date' => 'Kuupäev',
- 'fundraiserstats-contributions' => 'Annetused',
+ 'fundraiserstats-day' => '$1. päev ($2)',
+ 'fundraiserstats-contributions' => 'Annetusi',
'fundraiserstats-total' => 'Kokku (USD)',
'fundraiserstats-avg' => 'Keskmine (USD)',
'fundraiserstats-max' => 'Maksimum (USD)',
@@ -1119,6 +1150,7 @@
'fundraiserstats-tab-contributions' => 'Annetuste hulk',
'fundraiserstats-tab-averages' => 'Keskmised (USD)',
'fundraiserstats-tab-maximums' => 'Maksimumid (USD)',
+ 'specialpages-group-contribution' => 'Annetamine / korjandused',
);
/** Basque (Euskara)
@@ -1252,6 +1284,8 @@
'contribstats-clicks' => 'Klikkaukset',
'contribstats-donations' => 'Lahjoitukset',
'contribstats-template' => 'Malline',
+ 'contribstats-donatepage' => 'Lahjoitussivu',
+ 'contribstats-average' => 'Keskiarvo',
'fundraiserstatistics' => 'Rahankeräyksen tilastoja',
'fundraiserstats-date' => 'Päiväys',
'fundraiserstats-day' => 'Päivä $1 / $2',
@@ -1878,6 +1912,7 @@
'contribstats-value-from' => 'Inter $1 - $2',
'contribstats-value-over' => 'Plu kam $1',
'contribstats-week' => 'Semano',
+ 'contribstats-template' => 'Shablono',
'fundraiserstats-date' => 'Dato',
'fundraiserstats-day' => 'Dio $1 di $2',
);
@@ -2677,6 +2712,7 @@
);
/** Norwegian Nynorsk (Norsk (nynorsk))
+ * @author Gunnernett
* @author Harald Khan
*/
$messages['nn'] = array(
@@ -2713,6 +2749,17 @@
'contribstats-value-under' => 'Under $1',
'contribstats-value-from' => 'Frå $1–$2',
'contribstats-value-over' => 'Over $1',
+ 'contributiontrackingstatistics' => 'Gåvestatistikk',
+ 'contribstats-day-totals' => 'Totalt for dagen',
+ 'contribstats-week' => 'Veke',
+ 'contribstats-weekly-totals' => '{{PLURAL:$1|Totalt denne
veka|Vekesummar for dei seinaste $1 vekene}}',
+ 'contribstats-clicks' => 'Klikk',
+ 'contribstats-donations' => 'Gåver',
+ 'contribstats-conversion' => 'Konverteringsgrad (%)',
+ 'contribstats-template' => 'Mal',
+ 'contribstats-nodata' => 'Ingen data oppgjeve',
+ 'contribstats-donatepage' => 'Side for å gje gåver',
+ 'contribstats-average' => 'Gjennomsnitt',
'fundraiserstatistics' => 'Innsamlingsstatistikk',
'fundraiserstats-date' => 'Dato',
'fundraiserstats-day' => 'Dag $1 av $2',
@@ -3278,6 +3325,9 @@
'contribstats-conversion' => 'Konverzný kurz (%)',
'contribstats-template' => 'Šablóna',
'contribstats-nodata' => 'Neboli poskytnuté žiadne údaje',
+ 'contribstats-landingpage' => 'Cieľová stránka',
+ 'contribstats-donatepage' => 'Stránka darov',
+ 'contribstats-average' => 'Priemer',
'fundraiserstatistics' => 'Štatistika fundraisingu',
'fundraiserstats-date' => 'Dátum',
'fundraiserstats-day' => 'Deň $1 z $2',
@@ -3443,6 +3493,7 @@
'contribstats-clicks' => 'నొక్కులు',
'contribstats-donations' => 'విరాళాలు',
'contribstats-template' => 'మూస',
+ 'contribstats-average' => 'సగటు',
'fundraiserstatistics' => 'నిధుల సేకరణ గణాంకాలు',
'fundraiserstats-date' => 'తేదీ',
'fundraiserstats-contributions' => 'దాతలు',
Modified:
branches/wmf-deployment/extensions/ContributionReporting/ContributionStatistics_body.php
===================================================================
---
branches/wmf-deployment/extensions/ContributionReporting/ContributionStatistics_body.php
2009-12-05 03:16:30 UTC (rev 59752)
+++
branches/wmf-deployment/extensions/ContributionReporting/ContributionStatistics_body.php
2009-12-05 03:22:24 UTC (rev 59753)
@@ -244,7 +244,7 @@
$factor = $numContributions > 0 ? 100.0 / $numContributions : 0;
$list = array(
- wfMsg( 'contribstats-value-exactly',
$wgLang->formatNum( 30 ) ) => array( 30 ),
+ wfMsg( 'contribstats-value-exactly',
$wgLang->formatNum( 35 ) ) => array( 35 ),
wfMsg( 'contribstats-value-exactly',
$wgLang->formatNum( 75 ) ) => array( 75 ),
wfMsg( 'contribstats-value-exactly',
$wgLang->formatNum( 100 ) ) => array( 100 ),
wfMsg( 'contribstats-value-under', $wgLang->formatNum(
99.99 ) ) => array( 0, 99.99 ),
@@ -414,9 +414,9 @@
// Merge null and USD
$totals['USD'][1] += $totals[null][1];
$totals['USD'][2] += $totals[null][2];
- $totals['USD'][3] = ( $totals['USD'][3] +
$totals[null][3] ) / 2;
- $totals['USD'][4] = min( $totals['USD'][4],
$totals[null][4] );
- $totals['USD'][5] = max( $totals['USD'][5],
$totals[null][5] );
+ $totals['USD'][3] = ( $totals[null][3] == 0 ) ?
$totals['USD'][3] : ( $totals['USD'][3] + $totals[null][3] ) / 2;
+ $totals['USD'][4] = max( $totals['USD'][4],
$totals[null][4] );
+ /* $totals['USD'][5] = min( $totals['USD'][5],
$totals[null][5] ); */
unset( $totals[null] );
}
Modified:
branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.js
===================================================================
--- branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.js
2009-12-05 03:16:30 UTC (rev 59752)
+++ branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.js
2009-12-05 03:22:24 UTC (rev 59753)
@@ -3,6 +3,7 @@
sendReq("cc-reporting.php?load=1&utm_src=" +
document.payment.utm_source.value);
}
+//replace "validate_form" call with this
submitForm = function(){
sendReq("cc-reporting.php?submit=1&utm_src="+
document.payment.utm_source.value);
return validate_form(document.payment);
Modified:
branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.php
===================================================================
--- branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.php
2009-12-05 03:16:30 UTC (rev 59752)
+++ branches/wmf-deployment/extensions/ContributionReporting/cc-reporting.php
2009-12-05 03:22:24 UTC (rev 59753)
@@ -1,4 +1,6 @@
<?php
+
+//handle request
if(isset ($_REQUEST['load'])){
handleLoad();
}
@@ -6,30 +8,41 @@
handleSubmit();
}
+//handle load
function handleLoad(){
$cc_id = randomCookie();
- if(!isset($_COOKIE['cc-cookie'])){
- $cc_id = $_REQUEST['cc-cookie'];
+ //already have a cookie? use it, else set randomly generated one
+ if(isset($_COOKIE['cc-cookie'])){
+ $cc_id = $_COOKIE['cc-cookie'];
}
else{
//set cookie to expire in maybe about a year or so... 300 days
setcookie('cc-cookie', $cc_id, time() + (60 * 60 * 24 * 300),
'/', "payments.wikimedia.org");
}
- //if not exist insert into DB
- //via REQUEST['utm_src']
+ //add into DB
+ $cc_id = addslashes($cc_id);
+ $utm_src = isset($_REQUEST['utm_src']) ?
+ addslashes($_REQUEST['utm_src']) : "unknown";
+ $sql = "INSERT IGNORE INTO cc-track (cookie_id, utm_src, contribs)
VALUES ('$cc_id','$utm_src', 0)";
}
+//handle submit
function handleSubmit(){
+
+ //for people with cookies turned off, track them via "NULL" cookie
$cc_id = "NULL";
if(isset($_COOKIE['cc-cookie'])){
$cc_id = $_COOKIE['cc-cookie'];
}
- //donations++
+ //update in DB
+ $cc_id = addslashes($cc_id);
+ $sql = "UPDATE cc-track SET contribs=contribs+1 WHERE cookie_id =
'$cc_id'";
}
+//random cookie
function randomCookie(){
return md5(mt_rand() + time());
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
