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,16 +9,19 @@
*/
namespace Piwik\Plugins\LanguagesManager;
use Piwik\Common;
use Piwik\Db;
use Piwik\Development;
use Piwik\Filesystem;
use Piwik\Piwik;
use Piwik\Cache as PiwikCache;
use Piwik\Plugin\Manager as PluginManager;
use Piwik\Translation\Loader\DevelopmentLoader;
/**
* The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences.
*
* "getTranslationsForLanguage" will return all translation strings for a given language,
* so you can leverage Piwik translations in your application (and automatically benefit from the <a href='http://piwik.org/translations/' target='_blank'>40+ translations</a>!).
* so you can leverage Piwik translations in your application (and automatically benefit from the <a href='http://piwik.org/translations/' rel='noreferrer' target='_blank'>40+ translations</a>!).
* This is mostly useful to developers who integrate Piwik API results in their own application.
*
* You can also request the default language to load for a user via "getLanguageForUser",
@ -47,7 +50,7 @@ class API extends \Piwik\Plugin\API
/**
* Return array of available languages
*
* @return array Arry of strings, each containing its ISO language code
* @return array Array of strings, each containing its ISO language code
*/
public function getAvailableLanguages()
{
@ -65,6 +68,8 @@ class API extends \Piwik\Plugin\API
}
}
$this->enableDevelopmentLanguageInDevEnvironment($languages);
/**
* Hook called after loading available language files.
*
@ -90,7 +95,7 @@ class API extends \Piwik\Plugin\API
// merge with plugin translations if any
$pluginFiles = glob(sprintf('%s/plugins/*/lang/en.json', PIWIK_INCLUDE_PATH));
foreach ($pluginFiles AS $file) {
foreach ($pluginFiles as $file) {
$data = file_get_contents($file);
$pluginTranslations = json_decode($data, true);
@ -105,7 +110,7 @@ class API extends \Piwik\Plugin\API
// merge with plugin translations if any
$pluginFiles = glob(sprintf('%s/plugins/*/lang/%s.json', PIWIK_INCLUDE_PATH, $filename));
foreach ($pluginFiles AS $file) {
foreach ($pluginFiles as $file) {
$data = file_get_contents($file);
$pluginTranslations = json_decode($data, true);
@ -123,14 +128,19 @@ class API extends \Piwik\Plugin\API
}
return $res;
};
// Skip languages not having Intl translations
if (empty($translations['Intl'])) {
continue;
}
$translationStringsDone = $intersect($englishTranslation, $translations);
$percentageComplete = count($translationStringsDone, COUNT_RECURSIVE) / count($englishTranslation, COUNT_RECURSIVE);
$percentageComplete = round(100 * $percentageComplete, 0);
$languageInfo = array('code' => $filename,
'name' => $translations['General']['OriginalLanguageName'],
'english_name' => $translations['General']['EnglishLanguageName'],
'name' => $translations['Intl']['OriginalLanguageName'],
'english_name' => $translations['Intl']['EnglishLanguageName'],
'translators' => $translations['General']['TranslatorName'],
'translators_email' => $translations['General']['TranslatorEmail'],
'percentage_complete' => $percentageComplete . '%',
);
$languagesInfo[] = $languageInfo;
@ -171,6 +181,17 @@ class API extends \Piwik\Plugin\API
);
}
}
foreach (PluginManager::getInstance()->getLoadedPluginsName() as $pluginName) {
$translations = $this->getPluginTranslationsForLanguage($pluginName, $languageCode);
if (!empty($translations)) {
foreach ($translations as $keys) {
$languageInfo[] = $keys;
}
}
}
return $languageInfo;
}
@ -217,12 +238,20 @@ class API extends \Piwik\Plugin\API
*/
public function getLanguageForUser($login)
{
if($login == 'anonymous') {
if ($login == 'anonymous') {
return false;
}
Piwik::checkUserHasSuperUserAccessOrIsTheUser($login);
return Db::fetchOne('SELECT language FROM ' . Common::prefixTable('user_language') .
' WHERE login = ? ', array($login));
$lang = $this->getModel()->getLanguageForUser($login);
return $lang;
}
private function getModel()
{
return new Model();
}
/**
@ -236,35 +265,98 @@ class API extends \Piwik\Plugin\API
{
Piwik::checkUserHasSuperUserAccessOrIsTheUser($login);
Piwik::checkUserIsNotAnonymous();
if (!$this->isLanguageAvailable($languageCode)) {
return false;
}
$paramsBind = array($login, $languageCode, $languageCode);
Db::query('INSERT INTO ' . Common::prefixTable('user_language') .
' (login, language)
VALUES (?,?)
ON DUPLICATE KEY UPDATE language=?',
$paramsBind);
$this->getModel()->setLanguageForUser($login, $languageCode);
return true;
}
/**
* Returns whether the user uses 12 hour clock
*
* @param string $login
* @return string
*/
public function uses12HourClockForUser($login)
{
if ($login == 'anonymous') {
return false;
}
Piwik::checkUserHasSuperUserAccessOrIsTheUser($login);
$lang = $this->getModel()->uses12HourClock($login);
return $lang;
}
/**
* Returns whether the user uses 12 hour clock
*
* @param string $login
* @param bool $use12HourClock
* @return string
*/
public function set12HourClockForUser($login, $use12HourClock)
{
if ($login == 'anonymous') {
return false;
}
Piwik::checkUserHasSuperUserAccessOrIsTheUser($login);
$lang = $this->getModel()->set12HourClock($login, $use12HourClock);
return $lang;
}
private function loadAvailableLanguages()
{
if (!is_null($this->availableLanguageNames)) {
return;
}
$filenames = $this->getAvailableLanguages();
$languagesInfo = array();
foreach ($filenames as $filename) {
$data = file_get_contents(PIWIK_INCLUDE_PATH . "/lang/$filename.json");
$translations = json_decode($data, true);
$languagesInfo[] = array(
'code' => $filename,
'name' => $translations['General']['OriginalLanguageName'],
'english_name' => $translations['General']['EnglishLanguageName']
);
$cacheId = 'availableLanguages';
$cache = PiwikCache::getEagerCache();
if ($cache->contains($cacheId)) {
$languagesInfo = $cache->fetch($cacheId);
} else {
$languages = $this->getAvailableLanguages();
$languagesInfo = array();
foreach ($languages as $languageCode) {
$data = @file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Intl/lang/$languageCode.json");
// Skip languages not having Intl translations
if (empty($data)) {
continue;
}
$translations = json_decode($data, true);
$languagesInfo[] = array(
'code' => $languageCode,
'name' => $translations['Intl']['OriginalLanguageName'],
'english_name' => $translations['Intl']['EnglishLanguageName']
);
}
$cache->save($cacheId, $languagesInfo);
}
$this->availableLanguageNames = $languagesInfo;
}
private function enableDevelopmentLanguageInDevEnvironment(&$languages)
{
if (!Development::isEnabled()) {
$key = array_search(DevelopmentLoader::LANGUAGE_ID, $languages);
if ($key) {
unset($languages[$key]);
}
}
}
}