coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
www/analytics/plugins/UserCountry/functions.php
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
@ -42,7 +42,7 @@ function continentTranslate($label)
if ($label == 'unk' || $label == '') {
return Piwik::translate('General_Unknown');
}
return Piwik::translate('UserCountry_continent_' . $label);
return Piwik::translate('Intl_Continent_' . $label);
}
/**
@ -56,7 +56,24 @@ function countryTranslate($label)
if ($label == Visit::UNKNOWN_CODE || $label == '') {
return Piwik::translate('General_Unknown');
}
return Piwik::translate('UserCountry_country_' . $label);
// Try to get name from Intl plugin
$key = 'Intl_Country_' . strtoupper($label);
$country = Piwik::translate($key);
if ($country != $key) {
return $country;
}
// Handle special country codes
$key = 'UserCountry_country_' . $label;
$country = Piwik::translate($key);
if ($country != $key) {
return $country;
}
return Piwik::translate('General_Unknown');
}
/**