| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php |
| — | — | @@ -103,10 +103,9 @@ |
| 104 | 104 | $egFundraiserStatisticsMaximum = 10000; |
| 105 | 105 | |
| 106 | 106 | // Cache timeout for fundraiser statistics, in seconds |
| 107 | | -$egFundraiserStatisticsCacheTimeout = 300; // 5 minutes |
| | 107 | +$egFundraiserStatisticsCacheTimeout = 900; // 15 minutes |
| 108 | 108 | |
| 109 | 109 | |
| 110 | | - |
| 111 | 110 | $wgContributionTrackingStatisticsViewWeeks = 3; |
| 112 | 111 | |
| 113 | 112 | $wgHooks['ParserFirstCallInit'][] = 'efContributionReportingSetup'; |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 114 | 113 | Merged /trunk/extensions/ContributionReporting/ContributionReporting.php:r103626 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionTrackingStatistics_body.php |
| — | — | @@ -251,13 +251,9 @@ |
| 252 | 252 | ); |
| 253 | 253 | |
| 254 | 254 | foreach ( $res as $row ) { |
| 255 | | - $result[] = array( |
| 256 | | - $row[0], |
| 257 | | - $row[1], |
| 258 | | - $row[2], |
| 259 | | - $row[3], |
| 260 | | - $row[4] |
| 261 | | - ); |
| | 255 | + foreach( $row as $key => $value ) { |
| | 256 | + $result[] = $value; |
| | 257 | + } |
| 262 | 258 | } |
| 263 | 259 | return $result; |
| 264 | 260 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionTrackingStatistics_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 265 | 261 | Merged /trunk/extensions/ContributionReporting/ContributionTrackingStatistics_body.php:r103460,103519,103626 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php |
| — | — | @@ -22,7 +22,12 @@ |
| 23 | 23 | if ( $wgRequest->wasPosted() ) { |
| 24 | 24 | $showYear[$fundraiser['id']] = $wgRequest->getCheck( 'toogle'.$fundraiser['id'] ); |
| 25 | 25 | } else { |
| 26 | | - $showYear[$fundraiser['id']] = true; |
| | 26 | + // By default, show only the fundraising years after 2008 |
| | 27 | + if ( intval( $fundraiser['id'] ) > 2008 ) { |
| | 28 | + $showYear[$fundraiser['id']] = true; |
| | 29 | + } else { |
| | 30 | + $showYear[$fundraiser['id']] = false; |
| | 31 | + } |
| 27 | 32 | } |
| 28 | 33 | } |
| 29 | 34 | |
| — | — | @@ -205,8 +210,9 @@ |
| 206 | 211 | } |
| 207 | 212 | $wgOut->addHTML( Xml::openElement( 'div', array( 'id' => 'configholder' ) ) ); |
| 208 | 213 | $wgOut->addHTML( $years ); |
| 209 | | - $wgOut->addHTML( wfMsg( 'fundraiserstats-time-zone' ).'<br/>' ); |
| 210 | | - $wgOut->addHTML( ' '.Xml::listDropDown( 'timezone', $this->dropDownList( range ( -12, 14, 1 ) ), '', $this->timezone, '', 1 ).' '.wfMsg( 'fundraiserstats-utc' ) ); |
| | 214 | + // TODO: Fix timezone feature to work with caching correctly. |
| | 215 | + // $wgOut->addHTML( wfMsg( 'fundraiserstats-time-zone' ).'<br/>' ); |
| | 216 | + // $wgOut->addHTML( ' '.Xml::listDropDown( 'timezone', $this->dropDownList( range ( -12, 14, 1 ) ), '', $this->timezone, '', 1 ).' '.wfMsg( 'fundraiserstats-utc' ) ); |
| 211 | 217 | $wgOut->addHTML( Xml::closeElement( 'div' ) ); |
| 212 | 218 | |
| 213 | 219 | $wgOut->addHTML( Xml::closeElement( 'form' ) ); |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 214 | 220 | Merged /trunk/extensions/ContributionReporting/FundraiserStatistics_body.php:r103626 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.i18n.php |
| — | — | @@ -2521,6 +2521,7 @@ |
| 2522 | 2522 | /** Hungarian (Magyar) |
| 2523 | 2523 | * @author Bdamokos |
| 2524 | 2524 | * @author Dani |
| | 2525 | + * @author Dj |
| 2525 | 2526 | * @author Enbéká |
| 2526 | 2527 | * @author Glanthor Reviol |
| 2527 | 2528 | * @author Misibacsi |
| — | — | @@ -2592,6 +2593,7 @@ |
| 2593 | 2594 | 'fundraiserstats-tab-averages' => 'Átlagosan (USD)', |
| 2594 | 2595 | 'fundraiserstats-tab-maximums' => 'Maximum (USD)', |
| 2595 | 2596 | 'fundraiserstats-tab-ytd' => 'Ebben az évben a mai napig (USD)', |
| | 2597 | + 'fundraiserstats-time-zone' => 'Időzóna:', |
| 2596 | 2598 | ); |
| 2597 | 2599 | |
| 2598 | 2600 | /** Interlingua (Interlingua) |
| — | — | @@ -3588,7 +3590,7 @@ |
| 3589 | 3591 | 'contribstats-template' => 'Шаблон', |
| 3590 | 3592 | 'contribstats-nodata' => 'Нема внесено податоци', |
| 3591 | 3593 | 'contribstats-landingpage' => 'Целна страница', |
| 3592 | | - 'contribstats-donatepage' => 'Страница за донирање', |
| | 3594 | + 'contribstats-donatepage' => 'Страница за дарување', |
| 3593 | 3595 | 'contribstats-average' => 'Просечно', |
| 3594 | 3596 | 'contribstats-imperfect-data' => 'Овие податоци не се апсолутно точни бидејќи следењето на дарители без да се користи следење на сесии има свои ограничувања.', |
| 3595 | 3597 | 'contribstats-paypal-donations' => 'Прилози преку PayPal', |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3596 | 3598 | Merged /trunk/extensions/ContributionReporting/ContributionReporting.i18n.php:r103371,103460,103519,103626 |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3597 | 3599 | Merged /trunk/extensions/ContributionReporting:r103371,103460,103519,103626 |