update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -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
@ -9,13 +9,15 @@
namespace Piwik\Period;
use Exception;
use Piwik\Date;
use Piwik\Period;
use Piwik\Piwik;
/**
*/
class Day extends Period
{
const PERIOD_ID = 1;
protected $label = 'day';
/**
@ -37,8 +39,8 @@ class Day extends Period
public function getLocalizedShortString()
{
//"Mon 15 Aug"
$date = $this->getDateStart();
$out = $date->getLocalized(Piwik::translate('CoreHome_ShortDateFormat'));
$date = $this->getDateStart();
$out = $date->getLocalized(Date::DATE_FORMAT_DAY_MONTH);
return $out;
}
@ -50,9 +52,8 @@ class Day extends Period
public function getLocalizedLongString()
{
//"Mon 15 Aug"
$date = $this->getDateStart();
$template = Piwik::translate('CoreHome_DateFormat');
$out = $date->getLocalized($template);
$date = $this->getDateStart();
$out = $date->getLocalized(Date::DATE_FORMAT_LONG);
return $out;
}
@ -99,4 +100,14 @@ class Day extends Period
{
return $this->toString();
}
public function getImmediateChildPeriodLabel()
{
return null;
}
public function getParentPeriodLabel()
{
return 'week';
}
}