update Piwik to version 2.16 (fixes #91)
This commit is contained in:
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - Open source web analytics
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
|
|
@ -15,6 +15,8 @@ use Piwik\Period;
|
|||
*/
|
||||
class Year extends Period
|
||||
{
|
||||
const PERIOD_ID = 4;
|
||||
|
||||
protected $label = 'year';
|
||||
|
||||
/**
|
||||
|
|
@ -35,7 +37,7 @@ class Year extends Period
|
|||
public function getLocalizedLongString()
|
||||
{
|
||||
//"2009"
|
||||
$out = $this->getDateStart()->getLocalized("%longYear%");
|
||||
$out = $this->getDateStart()->getLocalized(Date::DATE_FORMAT_YEAR);
|
||||
return $out;
|
||||
}
|
||||
|
||||
|
|
@ -58,6 +60,7 @@ class Year extends Period
|
|||
if ($this->subperiodsProcessed) {
|
||||
return;
|
||||
}
|
||||
|
||||
parent::generate();
|
||||
|
||||
$year = $this->date->toString("Y");
|
||||
|
|
@ -75,13 +78,25 @@ class Year extends Period
|
|||
* @param string $format
|
||||
* @return array
|
||||
*/
|
||||
function toString($format = 'ignored')
|
||||
public function toString($format = 'ignored')
|
||||
{
|
||||
$this->generate();
|
||||
|
||||
$stringMonth = array();
|
||||
foreach ($this->subperiods as $month) {
|
||||
$stringMonth[] = $month->getDateStart()->toString("Y") . "-" . $month->getDateStart()->toString("m") . "-01";
|
||||
}
|
||||
|
||||
return $stringMonth;
|
||||
}
|
||||
|
||||
public function getImmediateChildPeriodLabel()
|
||||
{
|
||||
return 'month';
|
||||
}
|
||||
|
||||
public function getParentPeriodLabel()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue