Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-07-17 00:49:20 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-07-17 00:49:20 +0300
commitb0546878bd83d5ca36d43a8db8ac903d8548dec1 (patch)
tree6426400bbe899b0add2214bb5e5ae7761a0b3bd5 /plugins/VisitTime
parentb9c953e43758815f016e11b96c9e7f6a303a8691 (diff)
Use localized format to display hour in Visits per time reports (#11747)
* Use localized format to display hour in Visits per time reports * updates cldr data * update test files
Diffstat (limited to 'plugins/VisitTime')
-rw-r--r--plugins/VisitTime/functions.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/VisitTime/functions.php b/plugins/VisitTime/functions.php
index 5a9162c6ed..14625ceebf 100644
--- a/plugins/VisitTime/functions.php
+++ b/plugins/VisitTime/functions.php
@@ -9,11 +9,20 @@
namespace Piwik\Plugins\VisitTime;
+use Piwik\Container\StaticContainer;
+use Piwik\Date;
use Piwik\Piwik;
function getTimeLabel($label)
{
- return sprintf(Piwik::translate('Intl_NHoursShort'), $label);
+ $date = Date::factory(mktime($label));
+ $dateTimeProvider = StaticContainer::get('Piwik\Intl\Data\Provider\DateTimeFormatProvider');
+
+ if ($dateTimeProvider->uses12HourClock()) {
+ return $date->getLocalized(Piwik::translate('Intl_Format_Hour_12'));
+ }
+
+ return $date->getLocalized(Piwik::translate('Intl_Format_Hour_24'));
}
/**