diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-10-09 08:03:35 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-10-09 08:03:35 +0400 |
| commit | 81ccb29b440e98ed9147e84781df0fce34ee6542 (patch) | |
| tree | 378a809d208f6a2cc188489017b87a98501023f2 | |
| parent | 98935b7cca73c74dac77d3661239a2055e6b8f8f (diff) | |
Refs #4202 removing functions Piwik_Translate and Piwik_TranslateException
147 files changed, 1295 insertions, 1230 deletions
diff --git a/core/API/Proxy.php b/core/API/Proxy.php index 80810c3c31..43d07bc25f 100644 --- a/core/API/Proxy.php +++ b/core/API/Proxy.php @@ -332,7 +332,7 @@ class Proxy } } } catch (Exception $e) { - throw new Exception(Piwik_TranslateException('General_PleaseSpecifyValue', array($name))); + throw new Exception(Piwik::translateException('General_PleaseSpecifyValue', array($name))); } $finalParameters[] = $requestValue; } @@ -398,7 +398,7 @@ class Proxy private function checkMethodExists($className, $methodName) { if (!$this->isMethodAvailable($className, $methodName)) { - throw new Exception(Piwik_TranslateException('General_ExceptionMethodNotFound', array($methodName, $className))); + throw new Exception(Piwik::translateException('General_ExceptionMethodNotFound', array($methodName, $className))); } } diff --git a/core/Access.php b/core/Access.php index 7ee7128f27..cb3568c2f7 100644 --- a/core/Access.php +++ b/core/Access.php @@ -329,7 +329,7 @@ class Access public function checkUserIsSuperUser() { if (!$this->isSuperUser()) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionPrivilege', array("'superuser'"))); + throw new NoAccessException(Piwik::translateException('General_ExceptionPrivilege', array("'superuser'"))); } } @@ -345,7 +345,7 @@ class Access } $idSitesAccessible = $this->getSitesIdWithAdminAccess(); if (count($idSitesAccessible) == 0) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('admin'))); + throw new NoAccessException(Piwik::translateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('admin'))); } } @@ -361,7 +361,7 @@ class Access } $idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess(); if (count($idSitesAccessible) == 0) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('view'))); + throw new NoAccessException(Piwik::translateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('view'))); } } @@ -381,7 +381,7 @@ class Access $idSitesAccessible = $this->getSitesIdWithAdminAccess(); foreach ($idSites as $idsite) { if (!in_array($idsite, $idSitesAccessible)) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAccessWebsite', array("'admin'", $idsite))); + throw new NoAccessException(Piwik::translateException('General_ExceptionPrivilegeAccessWebsite', array("'admin'", $idsite))); } } } @@ -402,7 +402,7 @@ class Access $idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess(); foreach ($idSites as $idsite) { if (!in_array($idsite, $idSitesAccessible)) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idsite))); + throw new NoAccessException(Piwik::translateException('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idsite))); } } } diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php index 1589757187..a65cba65cf 100644 --- a/core/ArchiveProcessor/Rules.php +++ b/core/ArchiveProcessor/Rules.php @@ -175,7 +175,7 @@ class Rules { $timeToLiveSeconds = (int)$timeToLiveSeconds; if ($timeToLiveSeconds <= 0) { - throw new Exception(Piwik_TranslateException('General_ExceptionInvalidArchiveTimeToLive')); + throw new Exception(Piwik::translateException('General_ExceptionInvalidArchiveTimeToLive')); } Option::set(self::OPTION_TODAY_ARCHIVE_TTL, $timeToLiveSeconds, $autoLoad = true); } diff --git a/core/Config.php b/core/Config.php index 4926bbda30..ffc095d038 100644 --- a/core/Config.php +++ b/core/Config.php @@ -225,12 +225,12 @@ class Config // read defaults from global.ini.php if (!is_readable($this->pathGlobal) && $reportError) { - Piwik_ExitWithMessage(Piwik_TranslateException('General_ExceptionConfigurationFileNotFound', array($this->pathGlobal))); + Piwik_ExitWithMessage(Piwik::translateException('General_ExceptionConfigurationFileNotFound', array($this->pathGlobal))); } $this->configGlobal = _parse_ini_file($this->pathGlobal, true); if (empty($this->configGlobal) && $reportError) { - Piwik_ExitWithMessage(Piwik_TranslateException('General_ExceptionUnreadableFileDisabledMethod', array($this->pathGlobal, "parse_ini_file()"))); + Piwik_ExitWithMessage(Piwik::translateException('General_ExceptionUnreadableFileDisabledMethod', array($this->pathGlobal, "parse_ini_file()"))); } if ($reportError) { @@ -238,14 +238,14 @@ class Config } $this->configLocal = _parse_ini_file($this->pathLocal, true); if (empty($this->configLocal) && $reportError) { - Piwik_ExitWithMessage(Piwik_TranslateException('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()"))); + Piwik_ExitWithMessage(Piwik::translateException('General_ExceptionUnreadableFileDisabledMethod', array($this->pathLocal, "parse_ini_file()"))); } } public function checkLocalConfigFound() { if (!is_readable($this->pathLocal)) { - throw new Exception(Piwik_TranslateException('General_ExceptionConfigurationFileNotFound', array($this->pathLocal))); + throw new Exception(Piwik::translateException('General_ExceptionConfigurationFileNotFound', array($this->pathLocal))); } } @@ -507,7 +507,7 @@ class Config if ($output !== false) { $success = @file_put_contents($pathLocal, $output); if (!$success) { - throw new Exception(Piwik_Translate('General_ConfigFileIsNotWritable', array("(config/config.ini.php)", ""))); + throw new Exception(Piwik::translate('General_ConfigFileIsNotWritable', array("(config/config.ini.php)", ""))); } } diff --git a/core/Controller.php b/core/Controller.php index c5ba494684..5eb739a937 100644 --- a/core/Controller.php +++ b/core/Controller.php @@ -472,8 +472,8 @@ abstract class Controller $validHost = Config::getInstance()->General['trusted_hosts'][0]; $invalidHost = Common::sanitizeInputValue($_SERVER['HTTP_HOST']); - $emailSubject = rawurlencode(Piwik_Translate('CoreHome_InjectedHostEmailSubject', $invalidHost)); - $emailBody = rawurlencode(Piwik_Translate('CoreHome_InjectedHostEmailBody')); + $emailSubject = rawurlencode(Piwik::translate('CoreHome_InjectedHostEmailSubject', $invalidHost)); + $emailBody = rawurlencode(Piwik::translate('CoreHome_InjectedHostEmailBody')); $superUserEmail = Piwik::getSuperUserEmail(); $mailToUrl = "mailto:$superUserEmail?subject=$emailSubject&body=$emailBody"; @@ -492,14 +492,14 @@ abstract class Controller )) . "#trustedHostsSection"; - $warningStart = Piwik_Translate('CoreHome_InjectedHostWarningIntro', array( + $warningStart = Piwik::translate('CoreHome_InjectedHostWarningIntro', array( '<strong>' . $invalidUrl . '</strong>', '<strong>' . $validUrl . '</strong>' )) . ' <br/>'; if (Piwik::isUserIsSuperUser()) { $view->invalidHostMessage = $warningStart . ' ' - . Piwik_Translate('CoreHome_InjectedHostSuperUserWarning', array( + . Piwik::translate('CoreHome_InjectedHostSuperUserWarning', array( "<a href=\"$changeTrustedHostsUrl\">", $invalidHost, '</a>', @@ -509,7 +509,7 @@ abstract class Controller )); } else { $view->invalidHostMessage = $warningStart . ' ' - . Piwik_Translate('CoreHome_InjectedHostNonSuperUserWarning', array( + . Piwik::translate('CoreHome_InjectedHostNonSuperUserWarning', array( "<br/><a href=\"$validUrl\">", '</a>', $mailLinkStart, @@ -546,12 +546,12 @@ abstract class Controller throw new Exception("Period must be one of: " . implode(",", $availablePeriods)); } $periodNames = array( - 'day' => array('singular' => Piwik_Translate('CoreHome_PeriodDay'), 'plural' => Piwik_Translate('CoreHome_PeriodDays')), - 'week' => array('singular' => Piwik_Translate('CoreHome_PeriodWeek'), 'plural' => Piwik_Translate('CoreHome_PeriodWeeks')), - 'month' => array('singular' => Piwik_Translate('CoreHome_PeriodMonth'), 'plural' => Piwik_Translate('CoreHome_PeriodMonths')), - 'year' => array('singular' => Piwik_Translate('CoreHome_PeriodYear'), 'plural' => Piwik_Translate('CoreHome_PeriodYears')), + 'day' => array('singular' => Piwik::translate('CoreHome_PeriodDay'), 'plural' => Piwik::translate('CoreHome_PeriodDays')), + 'week' => array('singular' => Piwik::translate('CoreHome_PeriodWeek'), 'plural' => Piwik::translate('CoreHome_PeriodWeeks')), + 'month' => array('singular' => Piwik::translate('CoreHome_PeriodMonth'), 'plural' => Piwik::translate('CoreHome_PeriodMonths')), + 'year' => array('singular' => Piwik::translate('CoreHome_PeriodYear'), 'plural' => Piwik::translate('CoreHome_PeriodYears')), // Note: plural is not used for date range - 'range' => array('singular' => Piwik_Translate('General_DateRangeInPeriodList'), 'plural' => Piwik_Translate('General_DateRangeInPeriodList')), + 'range' => array('singular' => Piwik::translate('General_DateRangeInPeriodList'), 'plural' => Piwik::translate('General_DateRangeInPeriodList')), ); $found = array_search($currentPeriod, $availablePeriods); @@ -610,8 +610,8 @@ abstract class Controller if (!empty($currentLogin) && $currentLogin != 'anonymous' ) { - $errorMessage = sprintf(Piwik_Translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . Piwik::getSuperUserEmail() . "?subject=Access to Piwik for user $currentLogin'>", "</a>"); - $errorMessage .= "<br /><br /> <b><a href='index.php?module=" . Registry::get('auth')->getName() . "&action=logout'>› " . Piwik_Translate('General_Logout') . "</a></b><br />"; + $errorMessage = sprintf(Piwik::translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . Piwik::getSuperUserEmail() . "?subject=Access to Piwik for user $currentLogin'>", "</a>"); + $errorMessage .= "<br /><br /> <b><a href='index.php?module=" . Registry::get('auth')->getName() . "&action=logout'>› " . Piwik::translate('General_Logout') . "</a></b><br />"; Piwik_ExitWithMessage($errorMessage, false, true); } @@ -701,7 +701,7 @@ abstract class Controller protected function checkTokenInUrl() { if (Common::getRequestVar('token_auth', false) != Piwik::getCurrentUserTokenAuth()) { - throw new NoAccessException(Piwik_TranslateException('General_ExceptionInvalidToken')); + throw new NoAccessException(Piwik::translateException('General_ExceptionInvalidToken')); } } @@ -771,10 +771,10 @@ abstract class Controller $titleEvolutionPercent = '+' . $titleEvolutionPercent; } - $title = Piwik_Translate('General_EvolutionSummaryGeneric', array( - Piwik_Translate('General_NVisits', $currentValue), + $title = Piwik::translate('General_EvolutionSummaryGeneric', array( + Piwik::translate('General_NVisits', $currentValue), $date, - Piwik_Translate('General_NVisits', $pastValue), + Piwik::translate('General_NVisits', $pastValue), $pastDate, $titleEvolutionPercent )); diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php index 2facfeeac8..75849258e5 100644 --- a/core/Controller/Admin.php +++ b/core/Controller/Admin.php @@ -71,11 +71,11 @@ abstract class Admin extends Controller $pluginsLink = Url::getCurrentQueryStringWithParametersModified(array( 'module' => 'CorePluginsAdmin', 'action' => 'plugins' )); - $view->invalidPluginsWarning = Piwik_Translate('CoreAdminHome_InvalidPluginsWarning', array( + $view->invalidPluginsWarning = Piwik::translate('CoreAdminHome_InvalidPluginsWarning', array( self::getPiwikVersion(), '<strong>' . implode('</strong>, <strong>', $missingPlugins) . '</strong>')) . '<br/>' - . Piwik_Translate('CoreAdminHome_InvalidPluginsYouCanUninstall', array( + . Piwik::translate('CoreAdminHome_InvalidPluginsYouCanUninstall', array( '<a href="' . $pluginsLink . '"/>', '</a>' )); diff --git a/core/DataTable/Filter/BeautifyRangeLabels.php b/core/DataTable/Filter/BeautifyRangeLabels.php index cfa2122351..3fe02effe7 100644 --- a/core/DataTable/Filter/BeautifyRangeLabels.php +++ b/core/DataTable/Filter/BeautifyRangeLabels.php @@ -11,6 +11,7 @@ namespace Piwik\DataTable\Filter; use Piwik\DataTable; +use Piwik\Piwik; /** * A DataTable filter that replaces range label columns with prettier, @@ -102,7 +103,7 @@ class BeautifyRangeLabels extends ColumnCallbackReplace } else { // if no lower bound can be found, this isn't a valid range. in this case // we assume its a translation key and try to translate it. - return Piwik_Translate(trim($value)); + return Piwik::translate(trim($value)); } } } diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php index 0a7ef49dc7..48647939aa 100644 --- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php +++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php @@ -13,6 +13,7 @@ namespace Piwik\DataTable\Filter; use Piwik\DataTable\Filter; use Piwik\DataTable; use Piwik\DataTable\Manager; +use Piwik\Piwik; /** * @@ -29,7 +30,7 @@ class ReplaceSummaryRowLabel extends Filter { parent::__construct($table); if (is_null($newLabel)) { - $newLabel = Piwik_Translate('General_Others'); + $newLabel = Piwik::translate('General_Others'); } $this->newLabel = $newLabel; } diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 2ffeb913e4..f683e01696 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -209,7 +209,7 @@ abstract class Renderer } catch (Exception $e) { $availableRenderers = implode(', ', self::getRenderers()); @header('Content-Type: text/plain; charset=utf-8'); - throw new Exception(Piwik_TranslateException('General_ExceptionInvalidRendererFormat', array($className, $availableRenderers))); + throw new Exception(Piwik::translateException('General_ExceptionInvalidRendererFormat', array($className, $availableRenderers))); } } diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index 692c61d8ef..583bf0edac 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -17,6 +17,7 @@ use Piwik\DataTable; use Piwik\Date; use Piwik\Period; use Piwik\Period\Range; +use Piwik\Piwik; use Piwik\ProxyHttp; /** @@ -215,7 +216,7 @@ class Csv extends Renderer } //if a metadata and a column have the same name make sure they dont overwrite if ($this->translateColumnNames) { - $name = Piwik_Translate('General_Metadata') . ': ' . $name; + $name = Piwik::translate('General_Metadata') . ': ' . $name; } else { $name = 'metadata_' . $name; } @@ -328,7 +329,7 @@ class Csv extends Renderer */ protected function renderHeader() { - $fileName = 'Piwik ' . Piwik_Translate('General_Export'); + $fileName = 'Piwik ' . Piwik::translate('General_Export'); $period = Common::getRequestVar('period', false); $date = Common::getRequestVar('date', false); @@ -374,7 +375,7 @@ class Csv extends Renderer && is_array(reset($value)) ) { foreach ($value as $level1Key => $level1Value) { - $inner = $name == 'goals' ? Piwik_Translate('Goals_GoalX', $level1Key) : $name . ' ' . $level1Key; + $inner = $name == 'goals' ? Piwik::translate('Goals_GoalX', $level1Key) : $name . ' ' . $level1Key; $columnNameTemplate = '%s (' . $inner . ')'; $this->flattenColumnArray($level1Value, $csvRow, $columnNameTemplate); diff --git a/core/Date.php b/core/Date.php index 1b0d31e4d6..b60e0963ff 100644 --- a/core/Date.php +++ b/core/Date.php @@ -67,7 +67,7 @@ class Date */ public static function factory($dateString, $timezone = null) { - $invalidDateException = new Exception(Piwik_TranslateException('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime")) . ": $dateString"); + $invalidDateException = new Exception(Piwik::translateException('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime")) . ": $dateString"); if ($dateString instanceof self) { $dateString = $dateString->toString(); } @@ -528,10 +528,10 @@ class Date $monthOfYear = $this->toString('n'); $patternToValue = array( "%day%" => $day, - "%shortMonth%" => Piwik_Translate('General_ShortMonth_' . $monthOfYear), - "%longMonth%" => Piwik_Translate('General_LongMonth_' . $monthOfYear), - "%shortDay%" => Piwik_Translate('General_ShortDay_' . $dayOfWeek), - "%longDay%" => Piwik_Translate('General_LongDay_' . $dayOfWeek), + "%shortMonth%" => Piwik::translate('General_ShortMonth_' . $monthOfYear), + "%longMonth%" => Piwik::translate('General_LongMonth_' . $monthOfYear), + "%shortDay%" => Piwik::translate('General_ShortDay_' . $dayOfWeek), + "%longDay%" => Piwik::translate('General_LongDay_' . $dayOfWeek), "%longYear%" => $this->toString('Y'), "%shortYear%" => $this->toString('y'), "%time%" => $this->toString('H:i:s') diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php index eb76b9f552..a436647129 100644 --- a/core/Db/Adapter/Mysqli.php +++ b/core/Db/Adapter/Mysqli.php @@ -13,6 +13,7 @@ namespace Piwik\Db\Adapter; use Exception; use Piwik\Config; use Piwik\Db\AdapterInterface; +use Piwik\Piwik; use Zend_Config; use Zend_Db_Adapter_Mysqli; @@ -62,7 +63,7 @@ class Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface $serverVersion = $this->getServerVersion(); $requiredVersion = Config::getInstance()->General['minimum_mysql_version']; if (version_compare($serverVersion, $requiredVersion) === -1) { - throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('MySQL', $serverVersion, $requiredVersion))); + throw new Exception(Piwik::translateException('General_ExceptionDatabaseVersion', array('MySQL', $serverVersion, $requiredVersion))); } } @@ -79,7 +80,7 @@ class Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface if (version_compare($serverVersion, '5.0.3') >= 0 && version_compare($clientVersion, '5.0.3') < 0 ) { - throw new Exception(Piwik_TranslateException('General_ExceptionIncompatibleClientServerVersions', array('MySQL', $clientVersion, $serverVersion))); + throw new Exception(Piwik::translateException('General_ExceptionIncompatibleClientServerVersions', array('MySQL', $clientVersion, $serverVersion))); } } diff --git a/core/Db/Adapter/Pdo/Mssql.php b/core/Db/Adapter/Pdo/Mssql.php index 1f218e20d7..17bb6fb6b9 100644 --- a/core/Db/Adapter/Pdo/Mssql.php +++ b/core/Db/Adapter/Pdo/Mssql.php @@ -15,6 +15,7 @@ use PDO; use PDOException; use Piwik\Config; use Piwik\Db\AdapterInterface; +use Piwik\Piwik; use Zend_Db; use Zend_Db_Adapter_Exception; use Zend_Db_Adapter_Pdo_Mssql; @@ -140,7 +141,7 @@ class Mssql extends Zend_Db_Adapter_Pdo_Mssql implements AdapterInterface $serverVersion = $this->getServerVersion(); $requiredVersion = Config::getInstance()->General['minimum_mssql_version']; if (version_compare($serverVersion, $requiredVersion) === -1) { - throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('MSSQL', $serverVersion, $requiredVersion))); + throw new Exception(Piwik::translateException('General_ExceptionDatabaseVersion', array('MSSQL', $serverVersion, $requiredVersion))); } } @@ -175,7 +176,7 @@ class Mssql extends Zend_Db_Adapter_Pdo_Mssql implements AdapterInterface if (version_compare($serverVersion, '10') >= 0 && version_compare($clientVersion, '10') < 0 ) { - throw new Exception(Piwik_TranslateException('General_ExceptionIncompatibleClientServerVersions', array('MSSQL', $clientVersion, $serverVersion))); + throw new Exception(Piwik::translateException('General_ExceptionIncompatibleClientServerVersions', array('MSSQL', $clientVersion, $serverVersion))); } } @@ -254,7 +255,7 @@ class Mssql extends Zend_Db_Adapter_Pdo_Mssql implements AdapterInterface $version = $this->_connection->getAttribute(PDO::ATTR_CLIENT_VERSION); $requiredVersion = Config::getInstance()->General['minimum_mssql_client_version']; if (version_compare($version['DriverVer'], $requiredVersion) === -1) { - throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('MSSQL', $version['DriverVer'], $requiredVersion))); + throw new Exception(Piwik::translateException('General_ExceptionDatabaseVersion', array('MSSQL', $version['DriverVer'], $requiredVersion))); } else { return $version['DriverVer']; } diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php index 03ddc9ccad..6d3d9641fc 100644 --- a/core/Db/Adapter/Pdo/Mysql.php +++ b/core/Db/Adapter/Pdo/Mysql.php @@ -15,6 +15,7 @@ use PDO; use PDOException; use Piwik\Config; use Piwik\Db\AdapterInterface; +use Piwik\Piwik; use Zend_Config; use Zend_Db_Adapter_Pdo_Mysql; use Zend_Db_Select; @@ -96,7 +97,7 @@ class Mysql extends Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface $serverVersion = $this->getServerVersion(); $requiredVersion = Config::getInstance()->General['minimum_mysql_version']; if (version_compare($serverVersion, $requiredVersion) === -1) { - throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('MySQL', $serverVersion, $requiredVersion))); + throw new Exception(Piwik::translateException('General_ExceptionDatabaseVersion', array('MySQL', $serverVersion, $requiredVersion))); } } @@ -113,7 +114,7 @@ class Mysql extends Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface if (version_compare($serverVersion, '5.0.3') >= 0 && version_compare($clientVersion, '5.0.3') < 0 ) { - throw new Exception(Piwik_TranslateException('General_ExceptionIncompatibleClientServerVersions', array('MySQL', $clientVersion, $serverVersion))); + throw new Exception(Piwik::translateException('General_ExceptionIncompatibleClientServerVersions', array('MySQL', $clientVersion, $serverVersion))); } } diff --git a/core/Db/Adapter/Pdo/Pgsql.php b/core/Db/Adapter/Pdo/Pgsql.php index 6b9b25ba19..64d3933ba3 100644 --- a/core/Db/Adapter/Pdo/Pgsql.php +++ b/core/Db/Adapter/Pdo/Pgsql.php @@ -15,6 +15,7 @@ use PDO; use PDOException; use Piwik\Config; use Piwik\Db\AdapterInterface; +use Piwik\Piwik; use Zend_Db_Adapter_Pdo_Pgsql; /** @@ -51,7 +52,7 @@ class Pgsql extends Zend_Db_Adapter_Pdo_Pgsql implements AdapterInterface $databaseVersion = $this->getServerVersion(); $requiredVersion = Config::getInstance()->General['minimum_pgsql_version']; if (version_compare($databaseVersion, $requiredVersion) === -1) { - throw new Exception(Piwik_TranslateException('General_ExceptionDatabaseVersion', array('PostgreSQL', $databaseVersion, $requiredVersion))); + throw new Exception(Piwik::translateException('General_ExceptionDatabaseVersion', array('PostgreSQL', $databaseVersion, $requiredVersion))); } } diff --git a/core/Filechecks.php b/core/Filechecks.php index 8798b78235..acf09fb840 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -117,7 +117,7 @@ class Filechecks } if (!class_exists('\\Piwik\\Manifest')) { - $messages[] = Piwik_Translate('General_WarningFileIntegrityNoManifest') . " If you are deploying Piwik from Git, this message is normal."; + $messages[] = Piwik::translate('General_WarningFileIntegrityNoManifest') . " If you are deploying Piwik from Git, this message is normal."; return $messages; } @@ -129,11 +129,11 @@ class Filechecks $file = PIWIK_INCLUDE_PATH . '/' . $path; if (!file_exists($file)) { - $messages[] = Piwik_Translate('General_ExceptionMissingFile', $file); + $messages[] = Piwik::translate('General_ExceptionMissingFile', $file); } else if (filesize($file) != $props[0]) { if (!$hasMd5 || in_array(substr($path, -4), array('.gif', '.ico', '.jpg', '.png', '.swf'))) { // files that contain binary data (e.g., images) must match the file size - $messages[] = Piwik_Translate('General_ExceptionFilesizeMismatch', array($file, $props[0], filesize($file))); + $messages[] = Piwik::translate('General_ExceptionFilesizeMismatch', array($file, $props[0], filesize($file))); } else { // convert end-of-line characters and re-test text files $content = @file_get_contents($file); @@ -141,11 +141,11 @@ class Filechecks if ((strlen($content) != $props[0]) || (@md5($content) !== $props[1]) ) { - $messages[] = Piwik_Translate('General_ExceptionFilesizeMismatch', array($file, $props[0], filesize($file))); + $messages[] = Piwik::translate('General_ExceptionFilesizeMismatch', array($file, $props[0], filesize($file))); } } } else if ($hasMd5file && (@md5_file($file) !== $props[1])) { - $messages[] = Piwik_Translate('General_ExceptionFileIntegrity', $file); + $messages[] = Piwik::translate('General_ExceptionFileIntegrity', $file); } } @@ -154,7 +154,7 @@ class Filechecks } if (!$hasMd5file) { - $messages[] = Piwik_Translate('General_WarningFileIntegrityNoMd5file'); + $messages[] = Piwik::translate('General_WarningFileIntegrityNoMd5file'); } return $messages; diff --git a/core/Http.php b/core/Http.php index ddd773999f..06feff3706 100644 --- a/core/Http.php +++ b/core/Http.php @@ -552,8 +552,8 @@ class Http && file_exists($outputPath) ) { throw new Exception( - Piwik_Translate('General_DownloadFail_FileExists', "'" . $outputPath . "'") - . ' ' . Piwik_Translate('General_DownloadPleaseRemoveExisting')); + Piwik::translate('General_DownloadFail_FileExists', "'" . $outputPath . "'") + . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting')); } // if we're starting a download, get the expected file size & save as an option @@ -578,7 +578,7 @@ class Http if ($expectedFileSize == 0) { Log::info("HEAD request for '%s' failed, got following: %s", $url, print_r($expectedFileSizeResult, true)); - throw new Exception(Piwik_Translate('General_DownloadFail_HttpRequestFail')); + throw new Exception(Piwik::translate('General_DownloadFail_HttpRequestFail')); } Option::set($downloadOption, $expectedFileSize); @@ -594,8 +594,8 @@ class Http $existingSize = file_exists($outputPath) ? filesize($outputPath) : 0; if ($existingSize >= $expectedFileSize) { throw new Exception( - Piwik_Translate('General_DownloadFail_FileExistsContinue', "'" . $outputPath . "'") - . ' ' . Piwik_Translate('General_DownloadPleaseRemoveExisting')); + Piwik::translate('General_DownloadFail_FileExistsContinue', "'" . $outputPath . "'") + . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting')); } // download a chunk of the file @@ -618,7 +618,7 @@ class Http Log::info("Failed to download range '%s-%s' of file from url '%s'. Got result: %s", $byteRange[0], $byteRange[1], $url, print_r($result, true)); - throw new Exception(Piwik_Translate('General_DownloadFail_HttpRequestFail')); + throw new Exception(Piwik::translate('General_DownloadFail_HttpRequestFail')); } // write chunk to file diff --git a/core/Metrics.php b/core/Metrics.php index 99704bcfb3..ea683df56f 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -235,16 +235,16 @@ class Metrics 'exit_rate' => 'General_ColumnExitRate' ); - $trans = array_map('Piwik_Translate', $trans); + $trans = array_map('Piwik::translate', $trans); - $dailySum = ' (' . Piwik_Translate('General_DailySum') . ')'; - $afterEntry = ' ' . Piwik_Translate('General_AfterEntry'); + $dailySum = ' (' . Piwik::translate('General_DailySum') . ')'; + $afterEntry = ' ' . Piwik::translate('General_AfterEntry'); - $trans['sum_daily_nb_uniq_visitors'] = Piwik_Translate('General_ColumnNbUniqVisitors') . $dailySum; - $trans['sum_daily_entry_nb_uniq_visitors'] = Piwik_Translate('General_ColumnUniqueEntrances') . $dailySum; - $trans['sum_daily_exit_nb_uniq_visitors'] = Piwik_Translate('General_ColumnUniqueExits') . $dailySum; - $trans['entry_nb_actions'] = Piwik_Translate('General_ColumnNbActions') . $afterEntry; - $trans['entry_sum_visit_length'] = Piwik_Translate('General_ColumnSumVisitLength') . $afterEntry; + $trans['sum_daily_nb_uniq_visitors'] = Piwik::translate('General_ColumnNbUniqVisitors') . $dailySum; + $trans['sum_daily_entry_nb_uniq_visitors'] = Piwik::translate('General_ColumnUniqueEntrances') . $dailySum; + $trans['sum_daily_exit_nb_uniq_visitors'] = Piwik::translate('General_ColumnUniqueExits') . $dailySum; + $trans['entry_nb_actions'] = Piwik::translate('General_ColumnNbActions') . $afterEntry; + $trans['entry_sum_visit_length'] = Piwik::translate('General_ColumnSumVisitLength') . $afterEntry; $trans = array_merge(self::getDefaultMetrics(), self::getDefaultProcessedMetrics(), $trans); @@ -258,7 +258,7 @@ class Metrics 'nb_uniq_visitors' => 'General_ColumnNbUniqVisitors', 'nb_actions' => 'General_ColumnNbActions', ); - $translations = array_map('Piwik_Translate', $translations); + $translations = array_map('Piwik::translate', $translations); return $translations; } @@ -271,7 +271,7 @@ class Metrics 'bounce_rate' => 'General_ColumnBounceRate', 'conversion_rate' => 'General_ColumnConversionRate', ); - return array_map('Piwik_Translate', $translations); + return array_map('Piwik::translate', $translations); } static public function getDefaultMetricsDocumentation() @@ -288,12 +288,12 @@ class Metrics 'nb_hits' => 'General_ColumnPageviewsDocumentation', 'exit_rate' => 'General_ColumnExitRateDocumentation' ); - return array_map('Piwik_Translate', $documentation); + return array_map('Piwik::translate', $documentation); } public static function getPercentVisitColumn() { - $percentVisitsLabel = str_replace(' ', ' ', Piwik_Translate('General_ColumnPercentageVisits')); + $percentVisitsLabel = str_replace(' ', ' ', Piwik::translate('General_ColumnPercentageVisits')); return $percentVisitsLabel; } }
\ No newline at end of file diff --git a/core/MetricsFormatter.php b/core/MetricsFormatter.php index b86453d682..29c2e71c49 100644 --- a/core/MetricsFormatter.php +++ b/core/MetricsFormatter.php @@ -78,15 +78,15 @@ class MetricsFormatter $seconds = round($seconds, $precision); if ($years > 0) { - $return = sprintf(Piwik_Translate('General_YearsDays'), $years, $days); + $return = sprintf(Piwik::translate('General_YearsDays'), $years, $days); } elseif ($days > 0) { - $return = sprintf(Piwik_Translate('General_DaysHours'), $days, $hours); + $return = sprintf(Piwik::translate('General_DaysHours'), $days, $hours); } elseif ($hours > 0) { - $return = sprintf(Piwik_Translate('General_HoursMinutes'), $hours, $minutes); + $return = sprintf(Piwik::translate('General_HoursMinutes'), $hours, $minutes); } elseif ($minutes > 0) { - $return = sprintf(Piwik_Translate('General_MinutesSeconds'), $minutes, $seconds); + $return = sprintf(Piwik::translate('General_MinutesSeconds'), $minutes, $seconds); } else { - $return = sprintf(Piwik_Translate('General_Seconds'), $seconds); + $return = sprintf(Piwik::translate('General_Seconds'), $seconds); } if ($isHtml) { return str_replace(' ', ' ', $return); diff --git a/core/Period.php b/core/Period.php index 5b5822dd09..4848086a04 100644 --- a/core/Period.php +++ b/core/Period.php @@ -77,7 +77,7 @@ abstract class Period break; default: - throw new Exception(Piwik_TranslateException('General_ExceptionInvalidPeriod', array($strPeriod, self::$errorAvailablePeriods))); + throw new Exception(Piwik::translateException('General_ExceptionInvalidPeriod', array($strPeriod, self::$errorAvailablePeriods))); break; } } diff --git a/core/Period/Day.php b/core/Period/Day.php index a53a5a49cb..61d2809ef6 100644 --- a/core/Period/Day.php +++ b/core/Period/Day.php @@ -12,6 +12,7 @@ namespace Piwik\Period; use Exception; use Piwik\Period; +use Piwik\Piwik; /** * @package Piwik @@ -42,7 +43,7 @@ class Day extends Period { //"Mon 15 Aug" $date = $this->getDateStart(); - $out = $date->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat')); + $out = $date->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); return $out; } @@ -55,7 +56,7 @@ class Day extends Period { //"Mon 15 Aug" $date = $this->getDateStart(); - $template = Piwik_Translate('CoreHome_DateFormat'); + $template = Piwik::translate('CoreHome_DateFormat'); $out = $date->getLocalized($template); return $out; } diff --git a/core/Period/Month.php b/core/Period/Month.php index 0650f44883..b7fbf04346 100644 --- a/core/Period/Month.php +++ b/core/Period/Month.php @@ -11,6 +11,7 @@ namespace Piwik\Period; use Piwik\Period; +use Piwik\Piwik; /** * @package Piwik @@ -29,7 +30,7 @@ class Month extends Period public function getLocalizedShortString() { //"Aug 09" - $out = $this->getDateStart()->getLocalized(Piwik_Translate('CoreHome_ShortMonthFormat')); + $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_ShortMonthFormat')); return $out; } @@ -41,7 +42,7 @@ class Month extends Period public function getLocalizedLongString() { //"August 2009" - $out = $this->getDateStart()->getLocalized(Piwik_Translate('CoreHome_LongMonthFormat')); + $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_LongMonthFormat')); return $out; } diff --git a/core/Period/Range.php b/core/Period/Range.php index 649d557381..3b7a429e48 100644 --- a/core/Period/Range.php +++ b/core/Period/Range.php @@ -14,6 +14,7 @@ use Exception; use Piwik\Common; use Piwik\Date; use Piwik\Period; +use Piwik\Piwik; /** * from a starting date to an ending date @@ -54,7 +55,7 @@ class Range extends Period //"30 Dec 08 - 26 Feb 09" $dateStart = $this->getDateStart(); $dateEnd = $this->getDateEnd(); - $template = Piwik_Translate('CoreHome_ShortDateFormatWithYear'); + $template = Piwik::translate('CoreHome_ShortDateFormatWithYear'); $shortDateStart = $dateStart->getLocalized($template); $shortDateEnd = $dateEnd->getLocalized($template); $out = "$shortDateStart - $shortDateEnd"; @@ -93,7 +94,7 @@ class Range extends Period */ public function getPrettyString() { - $out = Piwik_Translate('General_DateRangeFromTo', array($this->getDateStart()->toString(), $this->getDateEnd()->toString())); + $out = Piwik::translate('General_DateRangeFromTo', array($this->getDateStart()->toString(), $this->getDateEnd()->toString())); return $out; } @@ -218,7 +219,7 @@ class Range extends Period } $endDate = Date::factory($strDateEnd, $timezone); } else { - throw new Exception(Piwik_TranslateException('General_ExceptionInvalidDateRange', array($this->strDate, ' \'lastN\', \'previousN\', \'YYYY-MM-DD,YYYY-MM-DD\''))); + throw new Exception(Piwik::translateException('General_ExceptionInvalidDateRange', array($this->strDate, ' \'lastN\', \'previousN\', \'YYYY-MM-DD,YYYY-MM-DD\''))); } if ($this->strPeriod != 'range') { $this->fillArraySubPeriods($startDate, $endDate, $this->strPeriod); diff --git a/core/Period/Week.php b/core/Period/Week.php index e016da3ff5..aeb8640d3c 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -12,6 +12,7 @@ namespace Piwik\Period; use Piwik\Period; +use Piwik\Piwik; /** * @package Piwik @@ -33,7 +34,7 @@ class Week extends Period $dateStart = $this->getDateStart(); $dateEnd = $this->getDateEnd(); - $string = Piwik_Translate('CoreHome_ShortWeekFormat'); + $string = Piwik::translate('CoreHome_ShortWeekFormat'); $string = self::getTranslatedRange($string, $dateStart, $dateEnd); return $string; } @@ -45,9 +46,9 @@ class Week extends Period */ public function getLocalizedLongString() { - $format = Piwik_Translate('CoreHome_LongWeekFormat'); + $format = Piwik::translate('CoreHome_LongWeekFormat'); $string = self::getTranslatedRange($format, $this->getDateStart(), $this->getDateEnd()); - return Piwik_Translate('CoreHome_PeriodWeek') . " " . $string; + return Piwik::translate('CoreHome_PeriodWeek') . " " . $string; } /** @@ -73,7 +74,7 @@ class Week extends Period */ public function getPrettyString() { - $out = Piwik_Translate('General_DateRangeFromTo', + $out = Piwik::translate('General_DateRangeFromTo', array($this->getDateStart()->toString(), $this->getDateEnd()->toString()) ); diff --git a/core/Piwik.php b/core/Piwik.php index 3be8c765eb..9d5a551a0c 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -253,7 +253,7 @@ class Piwik Piwik::checkUserIsSuperUser(); } } catch (NoAccessException $e) { - throw new NoAccessException(Piwik_Translate('General_ExceptionCheckUserIsSuperUserOrTheUser', array($theUser))); + throw new NoAccessException(Piwik::translate('General_ExceptionCheckUserIsSuperUserOrTheUser', array($theUser))); } } @@ -293,7 +293,7 @@ class Piwik static public function checkUserIsNotAnonymous() { if (self::isUserIsAnonymous()) { - throw new NoAccessException(Piwik_Translate('General_YouMustBeLoggedIn')); + throw new NoAccessException(Piwik::translate('General_YouMustBeLoggedIn')); } } @@ -568,7 +568,7 @@ class Piwik && $l <= $loginMaximumLength && (preg_match('/^[A-Za-z0-9_.@+-]*$/D', $userLogin) > 0)) ) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidLoginFormat', array($loginMinimumLength, $loginMaximumLength))); + throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidLoginFormat', array($loginMinimumLength, $loginMaximumLength))); } } @@ -680,4 +680,50 @@ class Piwik Piwik::postEvent($eventName, $params, $pending, $plugins); } } + + /** + * Returns translated string or given message if translation is not found. + * + * @param string $string Translation string index + * @param array|string|int $args sprintf arguments + * @return string + * @api + */ + public static function translate($string, $args = array()) + { + if (!is_array($args)) { + $args = array($args); + } + + if (strpos($string, "_") !== false) { + list($plugin, $key) = explode("_", $string, 2); + if (isset($GLOBALS['Piwik_translations'][$plugin]) && isset($GLOBALS['Piwik_translations'][$plugin][$key])) { + $string = $GLOBALS['Piwik_translations'][$plugin][$key]; + } + } + if (count($args) == 0) { + return $string; + } + return vsprintf($string, $args); + } + + + /** + * Returns translated string or given message if translation is not found. + * This function does not throw any exception. Use it to translate exceptions. + * + * @param string $message Translation string index + * @param array $args sprintf arguments + * @return string + * @api + */ + public static function translateException($message, $args = array()) + { + try { + return Piwik::translate($message, $args); + } catch (Exception $e) { + return $message; + } + } + } diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index 789f485f0b..fc9e6808a6 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -12,6 +12,7 @@ namespace Piwik\Plugin; use Exception; use Piwik\Common; +use Piwik\Piwik; use Piwik\PluginsManager; use Piwik\Version; @@ -69,7 +70,7 @@ class MetadataLoader { $descriptionKey = $this->pluginName . '_PluginDescription'; return array( - 'description' => Piwik_Translate($descriptionKey), + 'description' => Piwik::translate($descriptionKey), 'homepage' => 'http://piwik.org/', 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index 18ac8f9c51..e3caba62e3 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -62,7 +62,7 @@ abstract class ReportRenderer @header('Content-Type: text/html; charset=utf-8'); throw new Exception( - Piwik_TranslateException( + Piwik::translateException( 'General_ExceptionInvalidReportRendererFormat', array($name, implode(', ', self::$availableReportRenderers)) ) @@ -215,8 +215,8 @@ abstract class ReportRenderer } $reportColumns = array( - 'label' => Piwik_Translate('General_Name'), - 'value' => Piwik_Translate('General_Value'), + 'label' => Piwik::translate('General_Name'), + 'value' => Piwik::translate('General_Value'), ); } diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php index 76a5d650c0..683904564f 100644 --- a/core/ReportRenderer/Pdf.php +++ b/core/ReportRenderer/Pdf.php @@ -12,6 +12,7 @@ namespace Piwik\ReportRenderer; use Piwik\Common; use Piwik\Filesystem; +use Piwik\Piwik; use Piwik\Plugins\API\API; use Piwik\ReportRenderer; use Piwik\TCPDF; @@ -153,7 +154,7 @@ class Pdf extends ReportRenderer public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment) { $reportTitle = $this->formatText($reportTitle); - $dateRange = $this->formatText(Piwik_Translate('General_DateRange') . " " . $prettyDate); + $dateRange = $this->formatText(Piwik::translate('General_DateRange') . " " . $prettyDate); // footer $this->TCPDF->SetFooterFont(array($this->reportFont, $this->reportFontStyle, $this->reportSimpleFontSize)); @@ -164,7 +165,7 @@ class Pdf extends ReportRenderer $this->TCPDF->AddPage(self::PORTRAIT); $this->TCPDF->AddFont($this->reportFont, '', '', false); $this->TCPDF->SetFont($this->reportFont, $this->reportFontStyle, $this->reportSimpleFontSize); - $this->TCPDF->Bookmark(Piwik_Translate('ScheduledReports_FrontPage')); + $this->TCPDF->Bookmark(Piwik::translate('ScheduledReports_FrontPage')); // logo $this->TCPDF->Image(API::getInstance()->getLogoUrl(true), $this->logoImagePosition[0], $this->logoImagePosition[1], 180 / $factor = 2, 0, $type = '', $link = '', $align = '', $resize = false, $dpi = 300); @@ -192,7 +193,7 @@ class Pdf extends ReportRenderer $this->TCPDF->Ln(); $this->TCPDF->SetFont($this->reportFont, '', $this->reportHeaderFontSize - 2); $this->TCPDF->SetTextColor($this->headerTextColor[0], $this->headerTextColor[1], $this->headerTextColor[2]); - $this->TCPDF->Write(1, $this->formatText(Piwik_Translate('ScheduledReports_CustomVisitorSegment') . ' ' . $segment['name'])); + $this->TCPDF->Write(1, $this->formatText(Piwik::translate('ScheduledReports_CustomVisitorSegment') . ' ' . $segment['name'])); } $this->TCPDF->Ln(8); @@ -300,7 +301,7 @@ class Pdf extends ReportRenderer $this->paintReportHeader(); if (!$this->reportHasData()) { - $this->paintMessage(Piwik_Translate('CoreHome_ThereIsNoDataForThisReport')); + $this->paintMessage(Piwik::translate('CoreHome_ThereIsNoDataForThisReport')); return; } diff --git a/core/Session.php b/core/Session.php index b9d1601e6f..76fd1ae99c 100644 --- a/core/Session.php +++ b/core/Session.php @@ -131,7 +131,7 @@ class Session extends Zend_Session $pathToSessions = Filechecks::getErrorMessageMissingPermissions(Filesystem::getPathToPiwikRoot() . '/tmp/sessions/'); $pathToSessions = SettingsPiwik::rewriteTmpPathWithHostname($pathToSessions); $message = sprintf("Error: %s %s %s\n<pre>Debug: the original error was \n%s</pre>", - Piwik_Translate('General_ExceptionUnableToStartSession'), + Piwik::translate('General_ExceptionUnableToStartSession'), $pathToSessions, $enableDbSessions, $e->getMessage() diff --git a/core/TCPDF.php b/core/TCPDF.php index 69b642a6d9..019d178a4b 100644 --- a/core/TCPDF.php +++ b/core/TCPDF.php @@ -39,7 +39,7 @@ class TCPDF extends \TCPDF if ($this->currentPageNo > 1) { $this->SetY(-15); $this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]); - $this->Cell(0, 10, $this->footerContent . Piwik_Translate('ScheduledReports_Pagination', array($this->getAliasNumPage(), $this->getAliasNbPages())), 0, false, 'C', 0, '', 0, false, 'T', 'M'); + $this->Cell(0, 10, $this->footerContent . Piwik::translate('ScheduledReports_Pagination', array($this->getAliasNumPage(), $this->getAliasNbPages())), 0, false, 'C', 0, '', 0, false, 'T', 'M'); } } diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index a60864ce47..3e3fcf874e 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -190,7 +190,7 @@ class GoalManager $match = ($matched == 0); break; default: - throw new Exception(Piwik_TranslateException('General_ExceptionInvalidGoalPattern', array($pattern_type))); + throw new Exception(Piwik::translateException('General_ExceptionInvalidGoalPattern', array($pattern_type))); break; } if ($match) { diff --git a/core/Translate.php b/core/Translate.php index 22b2193f17..c4d7f3d7e6 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -87,7 +87,7 @@ class Translate { $path = PIWIK_INCLUDE_PATH . '/lang/' . $language . '.json'; if (!Filesystem::isValidFilename($language) || !is_readable($path)) { - throw new Exception(Piwik_TranslateException('General_ExceptionLanguageFileNotFound', array($language))); + throw new Exception(Piwik::translateException('General_ExceptionLanguageFileNotFound', array($language))); } $data = file_get_contents($path); $translations = json_decode($data, true); diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php index ff173b03d7..b245b6a613 100644 --- a/core/Translate/Filter/ByBaseTranslations.php +++ b/core/Translate/Filter/ByBaseTranslations.php @@ -14,7 +14,7 @@ namespace Piwik\Translate\Filter; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class ByBaseTranslations extends FilterAbstract { diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php index 2a0069b795..2c9cbcca05 100644 --- a/core/Translate/Filter/ByParameterCount.php +++ b/core/Translate/Filter/ByParameterCount.php @@ -14,7 +14,7 @@ namespace Piwik\Translate\Filter; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class ByParameterCount extends FilterAbstract { diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php index be3f470aac..e0467f3d3d 100644 --- a/core/Translate/Filter/EmptyTranslations.php +++ b/core/Translate/Filter/EmptyTranslations.php @@ -14,7 +14,7 @@ namespace Piwik\Translate\Filter; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class EmptyTranslations extends FilterAbstract { diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php index 25c6853671..b5bf295890 100644 --- a/core/Translate/Filter/EncodedEntities.php +++ b/core/Translate/Filter/EncodedEntities.php @@ -16,7 +16,7 @@ use Piwik\Translate; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class EncodedEntities extends FilterAbstract { diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php index f72f32ce5a..250557ad02 100644 --- a/core/Translate/Filter/UnnecassaryWhitespaces.php +++ b/core/Translate/Filter/UnnecassaryWhitespaces.php @@ -14,7 +14,7 @@ namespace Piwik\Translate\Filter; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class UnnecassaryWhitespaces extends FilterAbstract { diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php index 160f09b1e9..8fff7033bb 100644 --- a/core/Translate/Validate/CoreTranslations.php +++ b/core/Translate/Validate/CoreTranslations.php @@ -16,7 +16,7 @@ use Piwik\Common; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class CoreTranslations extends ValidateAbstract { diff --git a/core/Translate/Validate/NoScripts.php b/core/Translate/Validate/NoScripts.php index c7751e81e4..c5e3ba1212 100644 --- a/core/Translate/Validate/NoScripts.php +++ b/core/Translate/Validate/NoScripts.php @@ -13,7 +13,7 @@ namespace Piwik\Translate\Validate; /** * @package Piwik - * @subpackage Piwik_Translate + * @subpackage Piwik::translate */ class NoScripts extends ValidateAbstract { diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php index 800bbf7d47..06d77df7d7 100644 --- a/core/Translate/Writer.php +++ b/core/Translate/Writer.php @@ -13,6 +13,7 @@ namespace Piwik\Translate; use Exception; use Piwik\Filesystem; +use Piwik\Piwik; use Piwik\PluginsManager; use Piwik\Translate\Filter\FilterAbstract; use Piwik\Translate\Validate\ValidateAbstract; @@ -21,7 +22,7 @@ use Piwik\Translate\Validate\ValidateAbstract; * Writes clean translations to file * * @package Piwik - * @package Piwik_Translate + * @package Piwik::translate */ class Writer { @@ -96,7 +97,7 @@ class Writer if (!in_array($pluginName, $installedPlugins)) { - throw new Exception(Piwik_TranslateException('General_ExceptionLanguageFileNotFound', array($pluginName))); + throw new Exception(Piwik::translateException('General_ExceptionLanguageFileNotFound', array($pluginName))); } $this->pluginName = $pluginName; @@ -111,7 +112,7 @@ class Writer public function setLanguage($language) { if (!preg_match('/^([a-z]{2,3}(-[a-z]{2,3})?)$/i', $language)) { - throw new Exception(Piwik_TranslateException('General_ExceptionLanguageFileNotFound', array($language))); + throw new Exception(Piwik::translateException('General_ExceptionLanguageFileNotFound', array($language))); } $this->language = strtolower($language); diff --git a/core/Twig.php b/core/Twig.php index d0a3ddea5b..369bdf6527 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -211,7 +211,7 @@ class Twig } try { - $stringTranslated = Piwik_Translate($stringToken, $aValues); + $stringTranslated = Piwik::translate($stringToken, $aValues); } catch (Exception $e) { $stringTranslated = $stringToken; } diff --git a/core/Updates/0.4.4.php b/core/Updates/0.4.4.php index ad70569c71..d17d5a200b 100644 --- a/core/Updates/0.4.4.php +++ b/core/Updates/0.4.4.php @@ -11,6 +11,7 @@ namespace Piwik\Updates; +use Piwik\Piwik; use Piwik\Updates; /** @@ -24,7 +25,7 @@ class Updates_0_4_4 extends Updates if (file_exists($obsoleteFile)) { $rc = @unlink($obsoleteFile); if (!$rc) { - throw new \Exception(Piwik_TranslateException('General_ExceptionUndeletableFile', array($obsoleteFile))); + throw new \Exception(Piwik::translateException('General_ExceptionUndeletableFile', array($obsoleteFile))); } } } diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index 9bf0a4b544..05d62e4cc8 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -435,7 +435,7 @@ class ViewDataTable * public function getReportDisplayProperties(&$properties) * { * $properties['Provider.getProvider'] = array( - * 'translations' => array('label' => Piwik_Translate('Provider_ColumnProvider')), + * 'translations' => array('label' => Piwik::translate('Provider_ColumnProvider')), * 'filter_limit' => 5 * ) * } @@ -709,11 +709,11 @@ class ViewDataTable $elapsedSeconds = time() - $date->getTimestamp(); $timeAgo = MetricsFormatter::getPrettyTimeFromSeconds($elapsedSeconds); - return Piwik_Translate('CoreHome_ReportGeneratedXAgo', $timeAgo); + return Piwik::translate('CoreHome_ReportGeneratedXAgo', $timeAgo); } $prettyDate = $date->getLocalized("%longYear%, %longMonth% %day%") . $date->toString('S'); - return Piwik_Translate('CoreHome_ReportGeneratedOn', $prettyDate); + return Piwik::translate('CoreHome_ReportGeneratedOn', $prettyDate); } /** @@ -1176,7 +1176,7 @@ class ViewDataTable if ($this->show_table) { $normalViewIcons['buttons'][] = array( 'id' => 'table', - 'title' => Piwik_Translate('General_DisplaySimpleTable'), + 'title' => Piwik::translate('General_DisplaySimpleTable'), 'icon' => 'plugins/Zeitgeist/images/table.png', ); } @@ -1184,7 +1184,7 @@ class ViewDataTable if ($this->show_table_all_columns) { $normalViewIcons['buttons'][] = array( 'id' => 'tableAllColumns', - 'title' => Piwik_Translate('General_DisplayTableWithMoreMetrics'), + 'title' => Piwik::translate('General_DisplayTableWithMoreMetrics'), 'icon' => 'plugins/Zeitgeist/images/table_more.png' ); } @@ -1198,7 +1198,7 @@ class ViewDataTable $normalViewIcons['buttons'][] = array( 'id' => 'tableGoals', - 'title' => Piwik_Translate('General_DisplayTableWithGoalMetrics'), + 'title' => Piwik::translate('General_DisplayTableWithGoalMetrics'), 'icon' => $icon ); } @@ -1206,16 +1206,16 @@ class ViewDataTable if ($this->show_ecommerce) { $normalViewIcons['buttons'][] = array( 'id' => 'ecommerceOrder', - 'title' => Piwik_Translate('General_EcommerceOrders'), + 'title' => Piwik::translate('General_EcommerceOrders'), 'icon' => 'plugins/Zeitgeist/images/ecommerceOrder.gif', - 'text' => Piwik_Translate('General_EcommerceOrders') + 'text' => Piwik::translate('General_EcommerceOrders') ); $normalViewIcons['buttons'][] = array( 'id' => 'ecommerceAbandonedCart', - 'title' => Piwik_Translate('General_AbandonedCarts'), + 'title' => Piwik::translate('General_AbandonedCarts'), 'icon' => 'plugins/Zeitgeist/images/ecommerceAbandonedCart.gif', - 'text' => Piwik_Translate('General_AbandonedCarts') + 'text' => Piwik::translate('General_AbandonedCarts') ); } @@ -1233,7 +1233,7 @@ class ViewDataTable if ($this->show_bar_chart) { $graphViewIcons['buttons'][] = array( 'id' => 'graphVerticalBar', - 'title' => Piwik_Translate('General_VBarGraph'), + 'title' => Piwik::translate('General_VBarGraph'), 'icon' => 'plugins/Zeitgeist/images/chart_bar.png' ); } @@ -1241,7 +1241,7 @@ class ViewDataTable if ($this->show_pie_chart) { $graphViewIcons['buttons'][] = array( 'id' => 'graphPie', - 'title' => Piwik_Translate('General_Piechart'), + 'title' => Piwik::translate('General_Piechart'), 'icon' => 'plugins/Zeitgeist/images/chart_pie.png' ); } @@ -1249,7 +1249,7 @@ class ViewDataTable if ($this->show_tag_cloud) { $graphViewIcons['buttons'][] = array( 'id' => 'cloud', - 'title' => Piwik_Translate('General_TagCloud'), + 'title' => Piwik::translate('General_TagCloud'), 'icon' => 'plugins/Zeitgeist/images/tagcloud.png' ); } @@ -1261,7 +1261,7 @@ class ViewDataTable foreach ($nonCoreVisualizationInfo as $format => $info) { $graphViewIcons['buttons'][] = array( 'id' => $format, - 'title' => Piwik_Translate($info['title']), + 'title' => Piwik::translate($info['title']), 'icon' => $info['table_icon'] ); } diff --git a/core/ViewDataTable/Graph.php b/core/ViewDataTable/Graph.php index 518fff6edf..f0d2f0006e 100644 --- a/core/ViewDataTable/Graph.php +++ b/core/ViewDataTable/Graph.php @@ -12,6 +12,7 @@ namespace Piwik\ViewDataTable; use Piwik\DataTable\Row; +use Piwik\Piwik; /** * This is an abstract visualization that should be the base of any 'graph' visualization. @@ -133,8 +134,8 @@ abstract class Graph extends Visualization parent::__construct($template); if ($view->show_goals) { - $view->translations['nb_conversions'] = Piwik_Translate('Goals_ColumnConversions'); - $view->translations['revenue'] = Piwik_Translate('General_TotalRevenue'); + $view->translations['nb_conversions'] = Piwik::translate('Goals_ColumnConversions'); + $view->translations['revenue'] = Piwik::translate('General_TotalRevenue'); } // TODO: this should not be required here. filter_limit should not be a view property, instead HtmlTable should use 'limit' or something, diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php index fbeeea0a89..9ae0fd66b7 100644 --- a/core/Visualization/Sparkline.php +++ b/core/Visualization/Sparkline.php @@ -12,6 +12,7 @@ namespace Piwik\Visualization; use Piwik\Common; +use Piwik\Piwik; use Piwik\View\ViewInterface; use Sparkline_Line; @@ -114,7 +115,7 @@ class Sparkline implements ViewInterface $min = $max = $last = null; $i = 0; - $toRemove = array('%', str_replace('%s', '', Piwik_Translate('General_Seconds'))); + $toRemove = array('%', str_replace('%s', '', Piwik::translate('General_Seconds'))); foreach ($this->values as $value) { // 50% and 50s should be plotted as 50 $value = str_replace($toRemove, '', $value); diff --git a/core/WidgetsList.php b/core/WidgetsList.php index 71a813b64f..9f65561aba 100644 --- a/core/WidgetsList.php +++ b/core/WidgetsList.php @@ -43,10 +43,10 @@ class WidgetsList $widgets = array(); foreach (self::$widgets as $key => $v) { - if (isset($widgets[Piwik_Translate($key)])) { - $v = array_merge($widgets[Piwik_Translate($key)], $v); + if (isset($widgets[Piwik::translate($key)])) { + $v = array_merge($widgets[Piwik::translate($key)], $v); } - $widgets[Piwik_Translate($key)] = $v; + $widgets[Piwik::translate($key)] = $v; } return $widgets; } @@ -118,7 +118,7 @@ class WidgetsList */ static public function add($widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array()) { - $widgetName = Piwik_Translate($widgetName); + $widgetName = Piwik::translate($widgetName); $widgetUniqueId = 'widget' . $controllerName . $controllerAction; foreach ($customParameters as $name => $value) { if (is_array($value)) { diff --git a/core/functions.php b/core/functions.php index 38fae1c387..8b32ab0b25 100644 --- a/core/functions.php +++ b/core/functions.php @@ -18,50 +18,6 @@ namespace { use Piwik\Menu\Top; /** - * Returns translated string or given message if translation is not found. - * - * @param string $string Translation string index - * @param array|string|int $args sprintf arguments - * @return string - * @api - */ - function Piwik_Translate($string, $args = array()) - { - if (!is_array($args)) { - $args = array($args); - } - - if (strpos($string, "_") !== false) { - list($plugin, $key) = explode("_", $string, 2); - if (isset($GLOBALS['Piwik_translations'][$plugin]) && isset($GLOBALS['Piwik_translations'][$plugin][$key])) { - $string = $GLOBALS['Piwik_translations'][$plugin][$key]; - } - } - if (count($args) == 0) { - return $string; - } - return vsprintf($string, $args); - } - - /** - * Returns translated string or given message if translation is not found. - * This function does not throw any exception. Use it to translate exceptions. - * - * @param string $message Translation string index - * @param array $args sprintf arguments - * @return string - * @api - */ - function Piwik_TranslateException($message, $args = array()) - { - try { - return Piwik_Translate($message, $args); - } catch (Exception $e) { - return $message; - } - } - - /** * Returns the AdminMenu * * @return Array diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 61cdb807c9..5f2265ef4c 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -3,6 +3,7 @@ use Piwik\ArchiveProcessor\Rules; use Piwik\Common; use Piwik\Config; use Piwik\Date; +use Piwik\Option; use Piwik\FrontController; use Piwik\Http; use Piwik\Piwik; diff --git a/plugins/API/API.php b/plugins/API/API.php index 41aeea28c4..1cc57b3551 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -105,7 +105,7 @@ class API $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_VisitorIP', 'segment' => 'visitIp', 'acceptedValues' => '13.54.122.1, etc.', @@ -115,7 +115,7 @@ class API ); $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_VisitorID', 'segment' => 'visitorId', 'acceptedValues' => '34c31e04394bdc63 - any 16 Hexadecimal chars ID, which can be fetched using the Tracking API function getVisitorId()', @@ -125,8 +125,8 @@ class API ); $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('General_Visit') . " ID", + 'category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('General_Visit') . " ID", 'segment' => 'visitId', 'acceptedValues' => 'Any integer.', 'sqlSegment' => 'log_visit.idvisit', @@ -134,14 +134,14 @@ class API ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_NbActions', 'segment' => 'actions', 'sqlSegment' => 'log_visit.visit_total_actions', ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_NbSearches', 'segment' => 'searches', 'sqlSegment' => 'log_visit.visit_total_searches', @@ -149,17 +149,17 @@ class API ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_ColumnVisitDuration', 'segment' => 'visitDuration', 'sqlSegment' => 'log_visit.visit_total_time', ); $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('General_VisitType'), + 'category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('General_VisitType'), 'segment' => 'visitorType', - 'acceptedValues' => 'new, returning, returningCustomer' . ". " . Piwik_Translate('General_VisitTypeExample', '"&segment=visitorType==returning,visitorType==returningCustomer"'), + 'acceptedValues' => 'new, returning, returningCustomer' . ". " . Piwik::translate('General_VisitTypeExample', '"&segment=visitorType==returning,visitorType==returningCustomer"'), 'sqlSegment' => 'log_visit.visitor_returning', 'sqlFilter' => function ($type) { return $type == "new" ? 0 : ($type == "returning" ? 1 : 2); @@ -167,21 +167,21 @@ class API ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_DaysSinceLastVisit', 'segment' => 'daysSinceLastVisit', 'sqlSegment' => 'log_visit.visitor_days_since_last', ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_DaysSinceFirstVisit', 'segment' => 'daysSinceFirstVisit', 'sqlSegment' => 'log_visit.visitor_days_since_first', ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_NumberOfVisits', 'segment' => 'visitCount', 'sqlSegment' => 'log_visit.visitor_count_visits', @@ -189,7 +189,7 @@ class API $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_VisitConvertedGoal', 'segment' => 'visitConverted', 'acceptedValues' => '0, 1', @@ -198,26 +198,26 @@ class API $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('General_EcommerceVisitStatusDesc'), + 'category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('General_EcommerceVisitStatusDesc'), 'segment' => 'visitEcommerceStatus', 'acceptedValues' => implode(", ", self::$visitEcommerceStatus) - . '. ' . Piwik_Translate('General_EcommerceVisitStatusEg', '"&segment=visitEcommerceStatus==ordered,visitEcommerceStatus==orderedThenAbandonedCart"'), + . '. ' . Piwik::translate('General_EcommerceVisitStatusEg', '"&segment=visitEcommerceStatus==ordered,visitEcommerceStatus==orderedThenAbandonedCart"'), 'sqlSegment' => 'log_visit.visit_goal_buyer', 'sqlFilter' => __NAMESPACE__ . '\API::getVisitEcommerceStatus', ); $segments[] = array( 'type' => 'metric', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_DaysSinceLastEcommerceOrder', 'segment' => 'daysSinceLastEcommerceOrder', 'sqlSegment' => 'log_visit.visitor_days_since_order', ); foreach ($segments as &$segment) { - $segment['name'] = Piwik_Translate($segment['name']); - $segment['category'] = Piwik_Translate($segment['category']); + $segment['name'] = Piwik::translate($segment['name']); + $segment['category'] = Piwik::translate($segment['category']); if ($_hideImplementationData) { unset($segment['sqlFilter']); @@ -269,7 +269,7 @@ class API $compare = $type * strcmp($row1[$column], $row2[$column]); // hack so that custom variables "page" are grouped together in the doc - if ($row1['category'] == Piwik_Translate('CustomVariables_CustomVariables') + if ($row1['category'] == Piwik::translate('CustomVariables_CustomVariables') && $row1['category'] == $row2['category'] ) { $compare = strcmp($row1['segment'], $row2['segment']); @@ -664,7 +664,7 @@ class Plugin extends \Piwik\Plugin public function addTopMenu() { $apiUrlParams = array('module' => 'API', 'action' => 'listAllAPI', 'segment' => false); - $tooltip = Piwik_Translate('API_TopLinkTooltip'); + $tooltip = Piwik::translate('API_TopLinkTooltip'); Piwik_AddTopMenu('General_API', $apiUrlParams, true, 7, $isHTML = false, $tooltip); diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index af7c271762..389666b4e3 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -199,16 +199,16 @@ class ProcessedReport static $order = null; if (is_null($order)) { $order = array( - Piwik_Translate('General_MultiSitesSummary'), - Piwik_Translate('VisitsSummary_VisitsSummary'), - Piwik_Translate('Goals_Ecommerce'), - Piwik_Translate('General_Actions'), - Piwik_Translate('Actions_SubmenuSitesearch'), - Piwik_Translate('Referrers_Referrers'), - Piwik_Translate('Goals_Goals'), - Piwik_Translate('General_Visitors'), - Piwik_Translate('DevicesDetection_DevicesDetection'), - Piwik_Translate('UserSettings_VisitorSettings'), + Piwik::translate('General_MultiSitesSummary'), + Piwik::translate('VisitsSummary_VisitsSummary'), + Piwik::translate('Goals_Ecommerce'), + Piwik::translate('General_Actions'), + Piwik::translate('Actions_SubmenuSitesearch'), + Piwik::translate('Referrers_Referrers'), + Piwik::translate('Goals_Goals'), + Piwik::translate('General_Visitors'), + Piwik::translate('DevicesDetection_DevicesDetection'), + Piwik::translate('UserSettings_VisitorSettings'), ); } return ($category = strcmp(array_search($a['category'], $order), array_search($b['category'], $order))) == 0 @@ -223,8 +223,8 @@ class ProcessedReport private function addApiGetMetdata(&$availableReports) { $metadata = array( - 'category' => Piwik_Translate('General_API'), - 'name' => Piwik_Translate('General_MainMetrics'), + 'category' => Piwik::translate('General_API'), + 'name' => Piwik::translate('General_MainMetrics'), 'module' => 'API', 'action' => 'get', 'metrics' => array(), diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index f97c1333a4..9f904d7409 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -15,6 +15,7 @@ use Piwik\ArchiveProcessor; use Piwik\Common; use Piwik\Db; use Piwik\MetricsFormatter; +use Piwik\Piwik; use Piwik\SegmentExpression; use Piwik\Site; use Piwik\Tracker\Action; @@ -39,12 +40,12 @@ class Actions extends \Piwik\Plugin parent::__construct(); $this->columnTranslations = array( - 'nb_hits' => Piwik_Translate('General_ColumnPageviews'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviews'), - 'avg_time_on_page' => Piwik_Translate('General_ColumnAverageTimeOnPage'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRate'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRate'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTime'), + 'nb_hits' => Piwik::translate('General_ColumnPageviews'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), + 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), + 'exit_rate' => Piwik::translate('General_ColumnExitRate'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime'), ); } @@ -211,65 +212,65 @@ class Actions extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('General_Actions') . ' - ' . Piwik_Translate('General_MainMetrics'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('General_Actions') . ' - ' . Piwik::translate('General_MainMetrics'), 'module' => 'Actions', 'action' => 'get', 'metrics' => array( - 'nb_pageviews' => Piwik_Translate('General_ColumnPageviews'), - 'nb_uniq_pageviews' => Piwik_Translate('General_ColumnUniquePageviews'), - 'nb_downloads' => Piwik_Translate('General_Downloads'), - 'nb_uniq_downloads' => Piwik_Translate('Actions_ColumnUniqueDownloads'), - 'nb_outlinks' => Piwik_Translate('General_Outlinks'), - 'nb_uniq_outlinks' => Piwik_Translate('Actions_ColumnUniqueOutlinks'), - 'nb_searches' => Piwik_Translate('Actions_ColumnSearches'), - 'nb_keywords' => Piwik_Translate('Actions_ColumnSiteSearchKeywords'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTime'), + 'nb_pageviews' => Piwik::translate('General_ColumnPageviews'), + 'nb_uniq_pageviews' => Piwik::translate('General_ColumnUniquePageviews'), + 'nb_downloads' => Piwik::translate('General_Downloads'), + 'nb_uniq_downloads' => Piwik::translate('Actions_ColumnUniqueDownloads'), + 'nb_outlinks' => Piwik::translate('General_Outlinks'), + 'nb_uniq_outlinks' => Piwik::translate('Actions_ColumnUniqueOutlinks'), + 'nb_searches' => Piwik::translate('Actions_ColumnSearches'), + 'nb_keywords' => Piwik::translate('Actions_ColumnSiteSearchKeywords'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime'), ), 'metricsDocumentation' => array( - 'nb_pageviews' => Piwik_Translate('General_ColumnPageviewsDocumentation'), - 'nb_uniq_pageviews' => Piwik_Translate('General_ColumnUniquePageviewsDocumentation'), - 'nb_downloads' => Piwik_Translate('Actions_ColumnClicksDocumentation'), - 'nb_uniq_downloads' => Piwik_Translate('Actions_ColumnUniqueClicksDocumentation'), - 'nb_outlinks' => Piwik_Translate('Actions_ColumnClicksDocumentation'), - 'nb_uniq_outlinks' => Piwik_Translate('Actions_ColumnUniqueClicksDocumentation'), - 'nb_searches' => Piwik_Translate('Actions_ColumnSearchesDocumentation'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTimeDocumentation'), -// 'nb_keywords' => Piwik_Translate('Actions_ColumnSiteSearchKeywords'), + 'nb_pageviews' => Piwik::translate('General_ColumnPageviewsDocumentation'), + 'nb_uniq_pageviews' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'), + 'nb_downloads' => Piwik::translate('Actions_ColumnClicksDocumentation'), + 'nb_uniq_downloads' => Piwik::translate('Actions_ColumnUniqueClicksDocumentation'), + 'nb_outlinks' => Piwik::translate('Actions_ColumnClicksDocumentation'), + 'nb_uniq_outlinks' => Piwik::translate('Actions_ColumnUniqueClicksDocumentation'), + 'nb_searches' => Piwik::translate('Actions_ColumnSearchesDocumentation'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTimeDocumentation'), +// 'nb_keywords' => Piwik::translate('Actions_ColumnSiteSearchKeywords'), ), 'processedMetrics' => false, 'order' => 1 ); $metrics = array( - 'nb_hits' => Piwik_Translate('General_ColumnPageviews'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviews'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRate'), - 'avg_time_on_page' => Piwik_Translate('General_ColumnAverageTimeOnPage'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRate'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTime') + 'nb_hits' => Piwik::translate('General_ColumnPageviews'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), + 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'), + 'exit_rate' => Piwik::translate('General_ColumnExitRate'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime') ); $documentation = array( - 'nb_hits' => Piwik_Translate('General_ColumnPageviewsDocumentation'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviewsDocumentation'), - 'bounce_rate' => Piwik_Translate('General_ColumnPageBounceRateDocumentation'), - 'avg_time_on_page' => Piwik_Translate('General_ColumnAverageTimeOnPageDocumentation'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRateDocumentation'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTimeDocumentation'), + 'nb_hits' => Piwik::translate('General_ColumnPageviewsDocumentation'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'), + 'bounce_rate' => Piwik::translate('General_ColumnPageBounceRateDocumentation'), + 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPageDocumentation'), + 'exit_rate' => Piwik::translate('General_ColumnExitRateDocumentation'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTimeDocumentation'), ); // pages report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_PageUrls'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_PageUrls'), 'module' => 'Actions', 'action' => 'getPageUrls', - 'dimension' => Piwik_Translate('Actions_ColumnPageURL'), + 'dimension' => Piwik::translate('Actions_ColumnPageURL'), 'metrics' => $metrics, 'metricsDocumentation' => $documentation, - 'documentation' => Piwik_Translate('Actions_PagesReportDocumentation', '<br />') - . '<br />' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_PagesReportDocumentation', '<br />') + . '<br />' . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getPageUrls', 'order' => 2 @@ -277,23 +278,23 @@ class Actions extends \Piwik\Plugin // entry pages report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_SubmenuPagesEntry'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_SubmenuPagesEntry'), 'module' => 'Actions', 'action' => 'getEntryPageUrls', - 'dimension' => Piwik_Translate('Actions_ColumnPageURL'), + 'dimension' => Piwik::translate('Actions_ColumnPageURL'), 'metrics' => array( - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrances'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBounces'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRate'), + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrances'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBounces'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), ), 'metricsDocumentation' => array( - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrancesDocumentation'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBouncesDocumentation'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRateForPageDocumentation') + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrancesDocumentation'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBouncesDocumentation'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRateForPageDocumentation') ), - 'documentation' => Piwik_Translate('Actions_EntryPagesReportDocumentation', '<br />') - . ' ' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_EntryPagesReportDocumentation', '<br />') + . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getEntryPageUrls', 'order' => 3 @@ -301,23 +302,23 @@ class Actions extends \Piwik\Plugin // exit pages report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_SubmenuPagesExit'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_SubmenuPagesExit'), 'module' => 'Actions', 'action' => 'getExitPageUrls', - 'dimension' => Piwik_Translate('Actions_ColumnPageURL'), + 'dimension' => Piwik::translate('Actions_ColumnPageURL'), 'metrics' => array( - 'exit_nb_visits' => Piwik_Translate('General_ColumnExits'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviews'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRate') + 'exit_nb_visits' => Piwik::translate('General_ColumnExits'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), + 'exit_rate' => Piwik::translate('General_ColumnExitRate') ), 'metricsDocumentation' => array( - 'exit_nb_visits' => Piwik_Translate('General_ColumnExitsDocumentation'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviewsDocumentation'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRateDocumentation') + 'exit_nb_visits' => Piwik::translate('General_ColumnExitsDocumentation'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'), + 'exit_rate' => Piwik::translate('General_ColumnExitRateDocumentation') ), - 'documentation' => Piwik_Translate('Actions_ExitPagesReportDocumentation', '<br />') - . ' ' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_ExitPagesReportDocumentation', '<br />') + . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getExitPageUrls', 'order' => 4 @@ -325,14 +326,14 @@ class Actions extends \Piwik\Plugin // page titles report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_SubmenuPageTitles'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_SubmenuPageTitles'), 'module' => 'Actions', 'action' => 'getPageTitles', - 'dimension' => Piwik_Translate('Actions_ColumnPageName'), + 'dimension' => Piwik::translate('Actions_ColumnPageName'), 'metrics' => $metrics, 'metricsDocumentation' => $documentation, - 'documentation' => Piwik_Translate('Actions_PageTitlesReportDocumentation', array('<br />', htmlentities('<title>'))), + 'documentation' => Piwik::translate('Actions_PageTitlesReportDocumentation', array('<br />', htmlentities('<title>'))), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getPageTitles', 'order' => 5, @@ -341,23 +342,23 @@ class Actions extends \Piwik\Plugin // entry page titles report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_EntryPageTitles'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_EntryPageTitles'), 'module' => 'Actions', 'action' => 'getEntryPageTitles', - 'dimension' => Piwik_Translate('Actions_ColumnPageName'), + 'dimension' => Piwik::translate('Actions_ColumnPageName'), 'metrics' => array( - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrances'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBounces'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRate'), + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrances'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBounces'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), ), 'metricsDocumentation' => array( - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrancesDocumentation'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBouncesDocumentation'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRateForPageDocumentation') + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrancesDocumentation'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBouncesDocumentation'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRateForPageDocumentation') ), - 'documentation' => Piwik_Translate('Actions_ExitPageTitlesReportDocumentation', '<br />') - . ' ' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_ExitPageTitlesReportDocumentation', '<br />') + . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getEntryPageTitles', 'order' => 6 @@ -365,48 +366,48 @@ class Actions extends \Piwik\Plugin // exit page titles report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('Actions_ExitPageTitles'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('Actions_ExitPageTitles'), 'module' => 'Actions', 'action' => 'getExitPageTitles', - 'dimension' => Piwik_Translate('Actions_ColumnPageName'), + 'dimension' => Piwik::translate('Actions_ColumnPageName'), 'metrics' => array( - 'exit_nb_visits' => Piwik_Translate('General_ColumnExits'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviews'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRate') + 'exit_nb_visits' => Piwik::translate('General_ColumnExits'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), + 'exit_rate' => Piwik::translate('General_ColumnExitRate') ), 'metricsDocumentation' => array( - 'exit_nb_visits' => Piwik_Translate('General_ColumnExitsDocumentation'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviewsDocumentation'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRateDocumentation') + 'exit_nb_visits' => Piwik::translate('General_ColumnExitsDocumentation'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviewsDocumentation'), + 'exit_rate' => Piwik::translate('General_ColumnExitRateDocumentation') ), - 'documentation' => Piwik_Translate('Actions_EntryPageTitlesReportDocumentation', '<br />') - . ' ' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_EntryPageTitlesReportDocumentation', '<br />') + . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getExitPageTitles', 'order' => 7 ); $documentation = array( - 'nb_visits' => Piwik_Translate('Actions_ColumnUniqueClicksDocumentation'), - 'nb_hits' => Piwik_Translate('Actions_ColumnClicksDocumentation') + 'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicksDocumentation'), + 'nb_hits' => Piwik::translate('Actions_ColumnClicksDocumentation') ); // outlinks report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('General_Outlinks'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('General_Outlinks'), 'module' => 'Actions', 'action' => 'getOutlinks', - 'dimension' => Piwik_Translate('Actions_ColumnClickedURL'), + 'dimension' => Piwik::translate('Actions_ColumnClickedURL'), 'metrics' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnUniqueClicks'), - 'nb_hits' => Piwik_Translate('Actions_ColumnClicks') + 'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicks'), + 'nb_hits' => Piwik::translate('Actions_ColumnClicks') ), 'metricsDocumentation' => $documentation, - 'documentation' => Piwik_Translate('Actions_OutlinksReportDocumentation') . ' ' - . Piwik_Translate('Actions_OutlinkDocumentation') . '<br />' - . Piwik_Translate('General_UsePlusMinusIconsDocumentation'), + 'documentation' => Piwik::translate('Actions_OutlinksReportDocumentation') . ' ' + . Piwik::translate('Actions_OutlinkDocumentation') . '<br />' + . Piwik::translate('General_UsePlusMinusIconsDocumentation'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getOutlinks', 'order' => 8, @@ -414,17 +415,17 @@ class Actions extends \Piwik\Plugin // downloads report $reports[] = array( - 'category' => Piwik_Translate('General_Actions'), - 'name' => Piwik_Translate('General_Downloads'), + 'category' => Piwik::translate('General_Actions'), + 'name' => Piwik::translate('General_Downloads'), 'module' => 'Actions', 'action' => 'getDownloads', - 'dimension' => Piwik_Translate('Actions_ColumnDownloadURL'), + 'dimension' => Piwik::translate('Actions_ColumnDownloadURL'), 'metrics' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnUniqueDownloads'), - 'nb_hits' => Piwik_Translate('General_Downloads') + 'nb_visits' => Piwik::translate('Actions_ColumnUniqueDownloads'), + 'nb_hits' => Piwik::translate('General_Downloads') ), 'metricsDocumentation' => $documentation, - 'documentation' => Piwik_Translate('Actions_DownloadsReportDocumentation', '<br />'), + 'documentation' => Piwik::translate('Actions_DownloadsReportDocumentation', '<br />'), 'processedMetrics' => false, 'actionToLoadSubTables' => 'getDownloads', 'order' => 9, @@ -433,42 +434,42 @@ class Actions extends \Piwik\Plugin if ($this->isSiteSearchEnabled()) { // Search Keywords $reports[] = array( - 'category' => Piwik_Translate('Actions_SubmenuSitesearch'), - 'name' => Piwik_Translate('Actions_WidgetSearchKeywords'), + 'category' => Piwik::translate('Actions_SubmenuSitesearch'), + 'name' => Piwik::translate('Actions_WidgetSearchKeywords'), 'module' => 'Actions', 'action' => 'getSiteSearchKeywords', - 'dimension' => Piwik_Translate('General_ColumnKeyword'), + 'dimension' => Piwik::translate('General_ColumnKeyword'), 'metrics' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearches'), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearch'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExits'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearches'), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExits'), ), 'metricsDocumentation' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearchesDocumentation'), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearchDocumentation'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExitsDocumentation'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearchesDocumentation'), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearchDocumentation'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExitsDocumentation'), ), - 'documentation' => Piwik_Translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik_Translate('Actions_SiteSearchIntro') . '<br/><br/>' - . '<a href="http://piwik.org/docs/site-search/" target="_blank">' . Piwik_Translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>', + 'documentation' => Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>' + . '<a href="http://piwik.org/docs/site-search/" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>', 'processedMetrics' => false, 'order' => 15 ); // No Result Search Keywords $reports[] = array( - 'category' => Piwik_Translate('Actions_SubmenuSitesearch'), - 'name' => Piwik_Translate('Actions_WidgetSearchNoResultKeywords'), + 'category' => Piwik::translate('Actions_SubmenuSitesearch'), + 'name' => Piwik::translate('Actions_WidgetSearchNoResultKeywords'), 'module' => 'Actions', 'action' => 'getSiteSearchNoResultKeywords', - 'dimension' => Piwik_Translate('Actions_ColumnNoResultKeyword'), + 'dimension' => Piwik::translate('Actions_ColumnNoResultKeyword'), 'metrics' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearches'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExits'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearches'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExits'), ), 'metricsDocumentation' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearchesDocumentation'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExitsDocumentation'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearchesDocumentation'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExitsDocumentation'), ), - 'documentation' => Piwik_Translate('Actions_SiteSearchIntro') . '<br /><br />' . Piwik_Translate('Actions_SiteSearchKeywordsNoResultDocumentation'), + 'documentation' => Piwik::translate('Actions_SiteSearchIntro') . '<br /><br />' . Piwik::translate('Actions_SiteSearchKeywordsNoResultDocumentation'), 'processedMetrics' => false, 'order' => 16 ); @@ -476,42 +477,42 @@ class Actions extends \Piwik\Plugin if (self::isCustomVariablesPluginsEnabled()) { // Search Categories $reports[] = array( - 'category' => Piwik_Translate('Actions_SubmenuSitesearch'), - 'name' => Piwik_Translate('Actions_WidgetSearchCategories'), + 'category' => Piwik::translate('Actions_SubmenuSitesearch'), + 'name' => Piwik::translate('Actions_WidgetSearchCategories'), 'module' => 'Actions', 'action' => 'getSiteSearchCategories', - 'dimension' => Piwik_Translate('Actions_ColumnSearchCategory'), + 'dimension' => Piwik::translate('Actions_ColumnSearchCategory'), 'metrics' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearches'), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearch'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExits'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearches'), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExits'), ), 'metricsDocumentation' => array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearchesDocumentation'), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearchDocumentation'), - 'exit_rate' => Piwik_Translate('Actions_ColumnSearchExitsDocumentation'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearchesDocumentation'), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearchDocumentation'), + 'exit_rate' => Piwik::translate('Actions_ColumnSearchExitsDocumentation'), ), - 'documentation' => Piwik_Translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik_Translate('Actions_SiteSearchCategories2'), + 'documentation' => Piwik::translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik::translate('Actions_SiteSearchCategories2'), 'processedMetrics' => false, 'order' => 17 ); } - $documentation = Piwik_Translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik_Translate('General_UsePlusMinusIconsDocumentation'); + $documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation'); // Pages URLs following Search $reports[] = array( - 'category' => Piwik_Translate('Actions_SubmenuSitesearch'), - 'name' => Piwik_Translate('Actions_WidgetPageUrlsFollowingSearch'), + 'category' => Piwik::translate('Actions_SubmenuSitesearch'), + 'name' => Piwik::translate('Actions_WidgetPageUrlsFollowingSearch'), 'module' => 'Actions', 'action' => 'getPageUrlsFollowingSiteSearch', - 'dimension' => Piwik_Translate('General_ColumnDestinationPage'), + 'dimension' => Piwik::translate('General_ColumnDestinationPage'), 'metrics' => array( - 'nb_hits_following_search' => Piwik_Translate('General_ColumnViewedAfterSearch'), - 'nb_hits' => Piwik_Translate('General_ColumnTotalPageviews'), + 'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearch'), + 'nb_hits' => Piwik::translate('General_ColumnTotalPageviews'), ), 'metricsDocumentation' => array( - 'nb_hits_following_search' => Piwik_Translate('General_ColumnViewedAfterSearchDocumentation'), - 'nb_hits' => Piwik_Translate('General_ColumnPageviewsDocumentation'), + 'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearchDocumentation'), + 'nb_hits' => Piwik::translate('General_ColumnPageviewsDocumentation'), ), 'documentation' => $documentation, 'processedMetrics' => false, @@ -519,18 +520,18 @@ class Actions extends \Piwik\Plugin ); // Pages Titles following Search $reports[] = array( - 'category' => Piwik_Translate('Actions_SubmenuSitesearch'), - 'name' => Piwik_Translate('Actions_WidgetPageTitlesFollowingSearch'), + 'category' => Piwik::translate('Actions_SubmenuSitesearch'), + 'name' => Piwik::translate('Actions_WidgetPageTitlesFollowingSearch'), 'module' => 'Actions', 'action' => 'getPageTitlesFollowingSiteSearch', - 'dimension' => Piwik_Translate('General_ColumnDestinationPage'), + 'dimension' => Piwik::translate('General_ColumnDestinationPage'), 'metrics' => array( - 'nb_hits_following_search' => Piwik_Translate('General_ColumnViewedAfterSearch'), - 'nb_hits' => Piwik_Translate('General_ColumnTotalPageviews'), + 'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearch'), + 'nb_hits' => Piwik::translate('General_ColumnTotalPageviews'), ), 'metricsDocumentation' => array( - 'nb_hits_following_search' => Piwik_Translate('General_ColumnViewedAfterSearchDocumentation'), - 'nb_hits' => Piwik_Translate('General_ColumnPageviewsDocumentation'), + 'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearchDocumentation'), + 'nb_hits' => Piwik::translate('General_ColumnPageviewsDocumentation'), ), 'documentation' => $documentation, 'processedMetrics' => false, @@ -725,12 +726,12 @@ class Actions extends \Piwik\Plugin { // add common translations $result['translations'] += array( - 'nb_hits' => Piwik_Translate('General_ColumnPageviews'), - 'nb_visits' => Piwik_Translate('General_ColumnUniquePageviews'), - 'avg_time_on_page' => Piwik_Translate('General_ColumnAverageTimeOnPage'), - 'bounce_rate' => Piwik_Translate('General_ColumnBounceRate'), - 'exit_rate' => Piwik_Translate('General_ColumnExitRate'), - 'avg_time_generation' => Piwik_Translate('General_ColumnAverageGenerationTime'), + 'nb_hits' => Piwik::translate('General_ColumnPageviews'), + 'nb_visits' => Piwik::translate('General_ColumnUniquePageviews'), + 'avg_time_on_page' => Piwik::translate('General_ColumnAverageTimeOnPage'), + 'bounce_rate' => Piwik::translate('General_ColumnBounceRate'), + 'exit_rate' => Piwik::translate('General_ColumnExitRate'), + 'avg_time_generation' => Piwik::translate('General_ColumnAverageGenerationTime'), ); // prettify avg_time_on_page column @@ -749,7 +750,7 @@ class Actions extends \Piwik\Plugin return false; } - return Piwik_Translate("Actions_AvgGenerationTimeTooltip", array( + return Piwik::translate("Actions_AvgGenerationTimeTooltip", array( $hits, "<br />", MetricsFormatter::getPrettyTimeFromSeconds($min), @@ -770,7 +771,7 @@ class Actions extends \Piwik\Plugin public function getDisplayPropertiesForPageUrls() { $result = array( - 'translations' => array('label' => Piwik_Translate('Actions_ColumnPageURL')), + 'translations' => array('label' => Piwik::translate('Actions_ColumnPageURL')), 'columns_to_display' => array('label', 'nb_hits', 'nb_visits', 'bounce_rate', 'avg_time_on_page', 'exit_rate', 'avg_time_generation'), ); @@ -791,15 +792,15 @@ class Actions extends \Piwik\Plugin )); $result = array( - 'translations' => array('label' => Piwik_Translate('Actions_ColumnEntryPageURL'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBounces'), - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrances')), + 'translations' => array('label' => Piwik::translate('Actions_ColumnEntryPageURL'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBounces'), + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrances')), 'columns_to_display' => array('label', 'entry_nb_visits', 'entry_bounce_count', 'bounce_rate'), 'filter_sort_column' => 'entry_nb_visits', 'filter_sort_order' => 'desc', - 'title' => Piwik_Translate('Actions_SubmenuPagesEntry'), + 'title' => Piwik::translate('Actions_SubmenuPagesEntry'), 'related_reports' => array( - 'Actions.getEntryPageTitles' => Piwik_Translate('Actions_EntryPageTitles') + 'Actions.getEntryPageTitles' => Piwik::translate('Actions_EntryPageTitles') ), 'self_url' => $reportUrl ); @@ -820,14 +821,14 @@ class Actions extends \Piwik\Plugin )); $result = array( - 'translations' => array('label' => Piwik_Translate('Actions_ColumnExitPageURL'), - 'exit_nb_visits' => Piwik_Translate('General_ColumnExits')), + 'translations' => array('label' => Piwik::translate('Actions_ColumnExitPageURL'), + 'exit_nb_visits' => Piwik::translate('General_ColumnExits')), 'columns_to_display' => array('label', 'exit_nb_visits', 'nb_visits', 'exit_rate'), 'filter_sort_column' => 'exit_nb_visits', 'filter_sort_order' => 'desc', - 'title' => Piwik_Translate('Actions_SubmenuPagesExit'), + 'title' => Piwik::translate('Actions_SubmenuPagesExit'), 'related_reports' => array( - 'Actions.getExitPageTitles' => Piwik_Translate('Actions_ExitPageTitles') + 'Actions.getExitPageTitles' => Piwik::translate('Actions_ExitPageTitles') ), 'self_url' => $reportUrl, ); @@ -841,9 +842,9 @@ class Actions extends \Piwik\Plugin private function addSiteSearchDisplayProperties(&$result) { $result['translations'] += array( - 'nb_visits' => Piwik_Translate('Actions_ColumnSearches'), - 'exit_rate' => str_replace("% ", "% ", Piwik_Translate('Actions_ColumnSearchExits')), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearch') + 'nb_visits' => Piwik::translate('Actions_ColumnSearches'), + 'exit_rate' => str_replace("% ", "% ", Piwik::translate('Actions_ColumnSearchExits')), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch') ); $result['show_bar_chart'] = false; $result['show_table_all_columns'] = false; @@ -852,7 +853,7 @@ class Actions extends \Piwik\Plugin public function getDisplayPropertiesForSiteSearchKeywords() { $result = array( - 'translations' => array('label' => Piwik_Translate('General_ColumnKeyword')), + 'translations' => array('label' => Piwik::translate('General_ColumnKeyword')), 'columns_to_display' => array('label', 'nb_visits', 'nb_pages_per_search', 'exit_rate'), ); @@ -864,7 +865,7 @@ class Actions extends \Piwik\Plugin public function getDisplayPropertiesForSiteSearchNoResultKeywords() { $result = array( - 'translations' => array('label', Piwik_Translate('Actions_ColumnNoResultKeyword')), + 'translations' => array('label', Piwik::translate('Actions_ColumnNoResultKeyword')), 'columns_to_display' => array('label', 'nb_visits', 'exit_rate') ); @@ -877,9 +878,9 @@ class Actions extends \Piwik\Plugin { return array( 'translations' => array( - 'label' => Piwik_Translate('Actions_ColumnSearchCategory'), - 'nb_visits' => Piwik_Translate('Actions_ColumnSearches'), - 'nb_pages_per_search' => Piwik_Translate('Actions_ColumnPagesPerSearch') + 'label' => Piwik::translate('Actions_ColumnSearchCategory'), + 'nb_visits' => Piwik::translate('Actions_ColumnSearches'), + 'nb_pages_per_search' => Piwik::translate('Actions_ColumnPagesPerSearch') ), 'columns_to_display' => array('label', 'nb_visits', 'nb_pages_per_search'), 'show_table_all_columns' => false, @@ -894,19 +895,19 @@ class Actions extends \Piwik\Plugin public function getDisplayPropertiesForGetPageUrlsOrTitlesFollowingSiteSearch($isTitle) { - $title = $isTitle ? Piwik_Translate('Actions_WidgetPageTitlesFollowingSearch') - : Piwik_Translate('Actions_WidgetPageUrlsFollowingSearch'); + $title = $isTitle ? Piwik::translate('Actions_WidgetPageTitlesFollowingSearch') + : Piwik::translate('Actions_WidgetPageUrlsFollowingSearch'); $relatedReports = array( - 'Actions.getPageTitlesFollowingSiteSearch' => Piwik_Translate('Actions_WidgetPageTitlesFollowingSearch'), - 'Actions.getPageUrlsFollowingSiteSearch' => Piwik_Translate('Actions_WidgetPageUrlsFollowingSearch'), + 'Actions.getPageTitlesFollowingSiteSearch' => Piwik::translate('Actions_WidgetPageTitlesFollowingSearch'), + 'Actions.getPageUrlsFollowingSiteSearch' => Piwik::translate('Actions_WidgetPageUrlsFollowingSearch'), ); $result = array( 'translations' => array( - 'label' => Piwik_Translate('General_ColumnDestinationPage'), - 'nb_hits_following_search' => Piwik_Translate('General_ColumnViewedAfterSearch'), - 'nb_hits' => Piwik_Translate('General_ColumnTotalPageviews') + 'label' => Piwik::translate('General_ColumnDestinationPage'), + 'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearch'), + 'nb_hits' => Piwik::translate('General_ColumnTotalPageviews') ), 'columns_to_display' => array('label', 'nb_hits_following_search', 'nb_hits'), 'filter_sort_column' => 'nb_hits_following_search', @@ -932,13 +933,13 @@ class Actions extends \Piwik\Plugin )); $result = array( - 'translations' => array('label' => Piwik_Translate('Actions_ColumnPageName')), + 'translations' => array('label' => Piwik::translate('Actions_ColumnPageName')), 'columns_to_display' => array('label', 'nb_hits', 'nb_visits', 'bounce_rate', 'avg_time_on_page', 'exit_rate', 'avg_time_generation'), - 'title' => Piwik_Translate('Actions_SubmenuPageTitles'), + 'title' => Piwik::translate('Actions_SubmenuPageTitles'), 'related_reports' => array( - 'Actions.getEntryPageTitles' => Piwik_Translate('Actions_EntryPageTitles'), - 'Actions.getExitPageTitles' => Piwik_Translate('Actions_ExitPageTitles'), + 'Actions.getEntryPageTitles' => Piwik::translate('Actions_EntryPageTitles'), + 'Actions.getExitPageTitles' => Piwik::translate('Actions_ExitPageTitles'), ), 'self_url' => $reportUrl ); @@ -956,15 +957,15 @@ class Actions extends \Piwik\Plugin $result = array( 'translations' => array( - 'label' => Piwik_Translate('Actions_ColumnEntryPageTitle'), - 'entry_bounce_count' => Piwik_Translate('General_ColumnBounces'), - 'entry_nb_visits' => Piwik_Translate('General_ColumnEntrances'), + 'label' => Piwik::translate('Actions_ColumnEntryPageTitle'), + 'entry_bounce_count' => Piwik::translate('General_ColumnBounces'), + 'entry_nb_visits' => Piwik::translate('General_ColumnEntrances'), ), 'columns_to_display' => array('label', 'entry_nb_visits', 'entry_bounce_count', 'bounce_rate'), - 'title' => Piwik_Translate('Actions_EntryPageTitles'), + 'title' => Piwik::translate('Actions_EntryPageTitles'), 'related_reports' => array( - 'Actions.getPageTitles' => Piwik_Translate('Actions_SubmenuPageTitles'), - "Actions.$entryPageUrlAction" => Piwik_Translate('Actions_SubmenuPagesEntry') + 'Actions.getPageTitles' => Piwik::translate('Actions_SubmenuPageTitles'), + "Actions.$entryPageUrlAction" => Piwik::translate('Actions_SubmenuPagesEntry') ), ); @@ -981,14 +982,14 @@ class Actions extends \Piwik\Plugin $result = array( 'translations' => array( - 'label' => Piwik_Translate('Actions_ColumnExitPageTitle'), - 'exit_nb_visits' => Piwik_Translate('General_ColumnExits'), + 'label' => Piwik::translate('Actions_ColumnExitPageTitle'), + 'exit_nb_visits' => Piwik::translate('General_ColumnExits'), ), 'columns_to_display' => array('label', 'exit_nb_visits', 'nb_visits', 'exit_rate'), - 'title' => Piwik_Translate('Actions_ExitPageTitles'), + 'title' => Piwik::translate('Actions_ExitPageTitles'), 'related_reports' => array( - 'Actions.getPageTitles' => Piwik_Translate('Actions_SubmenuPageTitles'), - "Actions.$exitPageUrlAction" => Piwik_Translate('Actions_SubmenuPagesExit'), + 'Actions.getPageTitles' => Piwik::translate('Actions_SubmenuPageTitles'), + "Actions.$exitPageUrlAction" => Piwik::translate('Actions_SubmenuPagesExit'), ), ); @@ -1002,9 +1003,9 @@ class Actions extends \Piwik\Plugin { $result = array( 'translations' => array( - 'label' => Piwik_Translate('Actions_ColumnDownloadURL'), - 'nb_visits' => Piwik_Translate('Actions_ColumnUniqueDownloads'), - 'nb_hits' => Piwik_Translate('General_Downloads'), + 'label' => Piwik::translate('Actions_ColumnDownloadURL'), + 'nb_visits' => Piwik::translate('Actions_ColumnUniqueDownloads'), + 'nb_hits' => Piwik::translate('General_Downloads'), ), 'columns_to_display' => array('label', 'nb_visits', 'nb_hits'), 'show_exclude_low_population' => false @@ -1019,9 +1020,9 @@ class Actions extends \Piwik\Plugin { $result = array( 'translations' => array( - 'label' => Piwik_Translate('Actions_ColumnClickedURL'), - 'nb_visits' => Piwik_Translate('Actions_ColumnUniqueClicks'), - 'nb_hits' => Piwik_Translate('Actions_ColumnClicks'), + 'label' => Piwik::translate('Actions_ColumnClickedURL'), + 'nb_visits' => Piwik::translate('Actions_ColumnUniqueClicks'), + 'nb_hits' => Piwik::translate('Actions_ColumnClicks'), ), 'columns_to_display' => array('label', 'nb_visits', 'nb_hits'), 'show_exclude_low_population' => false diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index fae4380d68..dbe536c916 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -15,6 +15,7 @@ use Piwik\Config; use Piwik\DataTable\Row; use Piwik\DataTable; use Piwik\Metrics; +use Piwik\Piwik; use Piwik\Tracker\Action; use Zend_Db_Statement; @@ -430,8 +431,8 @@ class ArchivingHelper static public function getUnknownActionName($type) { if (empty(self::$defaultActionNameWhenNotDefined)) { - self::$defaultActionNameWhenNotDefined = Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageName')); - self::$defaultActionUrlWhenNotDefined = Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageURL')); + self::$defaultActionNameWhenNotDefined = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageName')); + self::$defaultActionUrlWhenNotDefined = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL')); } if ($type == Action::TYPE_ACTION_NAME) { return self::$defaultActionNameWhenNotDefined; diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index f3035e1318..d4c70e7430 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\Actions; +use Piwik\Piwik; use Piwik\View; use Piwik\ViewDataTable; @@ -27,21 +28,21 @@ class Controller extends \Piwik\Controller public function indexPageUrls($fetch = false) { return View::singleReport( - Piwik_Translate('General_Pages'), + Piwik::translate('General_Pages'), $this->getPageUrls(true), $fetch); } public function indexEntryPageUrls($fetch = false) { return View::singleReport( - Piwik_Translate('Actions_SubmenuPagesEntry'), + Piwik::translate('Actions_SubmenuPagesEntry'), $this->getEntryPageUrls(true), $fetch); } public function indexExitPageUrls($fetch = false) { return View::singleReport( - Piwik_Translate('Actions_SubmenuPagesExit'), + Piwik::translate('Actions_SubmenuPagesExit'), $this->getExitPageUrls(true), $fetch); } @@ -64,21 +65,21 @@ class Controller extends \Piwik\Controller public function indexPageTitles($fetch = false) { return View::singleReport( - Piwik_Translate('Actions_SubmenuPageTitles'), + Piwik::translate('Actions_SubmenuPageTitles'), $this->getPageTitles(true), $fetch); } public function indexDownloads($fetch = false) { return View::singleReport( - Piwik_Translate('General_Downloads'), + Piwik::translate('General_Downloads'), $this->getDownloads(true), $fetch); } public function indexOutlinks($fetch = false) { return View::singleReport( - Piwik_Translate('General_Outlinks'), + Piwik::translate('General_Outlinks'), $this->getOutlinks(true), $fetch); } diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index 6f4b603b79..b18a2264f9 100755 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -283,7 +283,7 @@ class API private function checkUserCanModifyOrDelete($idSite, $annotation) { if (!$annotation['canEditOrDelete']) { - throw new Exception(Piwik_Translate('Annotations_YouCannotModifyThisNote')); + throw new Exception(Piwik::translate('Annotations_YouCannotModifyThisNote')); } } diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index 2cfe7d04ba..2e545242ec 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\Annotations; use Piwik\API\Request; use Piwik\Common; +use Piwik\Piwik; use Piwik\View; /** @@ -73,7 +74,7 @@ class Controller extends \Piwik\Controller $view->startDate = $startDate->toString(); $view->endDate = $endDate->toString(); - $dateFormat = Piwik_Translate('CoreHome_ShortDateFormatWithYear'); + $dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear'); $view->startDatePretty = $startDate->getLocalized($dateFormat); $view->endDatePretty = $endDate->getLocalized($dateFormat); diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php index 6996119091..0fe17f0cb0 100644 --- a/plugins/AnonymizeIP/AnonymizeIP.php +++ b/plugins/AnonymizeIP/AnonymizeIP.php @@ -13,6 +13,7 @@ namespace Piwik\Plugins\AnonymizeIP; use Piwik\Common; use Piwik\Config; use Piwik\IP; +use Piwik\Piwik; use Piwik\Version; /** @@ -28,7 +29,7 @@ class AnonymizeIP extends \Piwik\Plugin public function getInformation() { return array( - 'description' => Piwik_Translate('AnonymizeIP_PluginDescription'), + 'description' => Piwik::translate('AnonymizeIP_PluginDescription'), 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', 'version' => Version::VERSION, diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index 98eec48feb..63053b7ca9 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -184,7 +184,7 @@ class Controller extends \Piwik\Controller if (Common::getRequestVar('widget', false) && Piwik::isUserIsSuperUser() ) { - $view->footerMessage = Piwik_Translate('CoreHome_OnlyForAdmin'); + $view->footerMessage = Piwik::translate('CoreHome_OnlyForAdmin'); } echo $view->render(); } @@ -195,8 +195,8 @@ class Controller extends \Piwik\Controller public function getPromoVideo() { $view = new View('@CoreHome/getPromoVideo'); - $view->shareText = Piwik_Translate('CoreHome_SharePiwikShort'); - $view->shareTextLong = Piwik_Translate('CoreHome_SharePiwikLong'); + $view->shareText = Piwik::translate('CoreHome_SharePiwikShort'); + $view->shareTextLong = Piwik::translate('CoreHome_SharePiwikLong'); $view->promoVideoUrl = 'http://www.youtube.com/watch?v=OslfF_EH81g'; echo $view->render(); } diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php index 5cb54b0fc4..18a0f6d6ec 100644 --- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CoreHome\DataTableRowAction; use Piwik\Common; +use Piwik\Piwik; use Piwik\ViewDataTable; /** @@ -67,7 +68,7 @@ class MultiRowEvolution extends RowEvolution $view->selectedMetric = $this->metric; $view->availableRecordsText = $this->dimension . ': ' - . Piwik_Translate('RowEvolution_ComparingRecords', array(count($this->availableMetrics))); + . Piwik::translate('RowEvolution_ComparingRecords', array(count($this->availableMetrics))); return parent::renderPopover($controller, $view); } diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 4190db95e7..9a3aec75f0 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -16,6 +16,7 @@ use Piwik\API\ResponseBuilder; use Piwik\Common; use Piwik\Date; use Piwik\Metrics; +use Piwik\Piwik; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz; use Piwik\Url; use Piwik\ViewDataTable; @@ -123,12 +124,12 @@ class RowEvolution $view->metrics = $this->getMetricsToggles(); // available metrics text - $metricsText = Piwik_Translate('RowEvolution_AvailableMetrics'); + $metricsText = Piwik::translate('RowEvolution_AvailableMetrics'); $popoverTitle = ''; if ($this->rowLabel) { $icon = $this->rowIcon ? '<img src="' . $this->rowIcon . '" alt="">' : ''; $rowLabel = str_replace('/', '<wbr>/', str_replace('&', '<wbr>&', $this->rowLabel)); - $metricsText = sprintf(Piwik_Translate('RowEvolution_MetricsFor'), $this->dimension . ': ' . $icon . ' ' . $rowLabel); + $metricsText = sprintf(Piwik::translate('RowEvolution_MetricsFor'), $this->dimension . ': ' . $icon . ' ' . $rowLabel); $popoverTitle = $icon . ' ' . $rowLabel; } @@ -229,7 +230,7 @@ class RowEvolution $min .= $unit; $max .= $unit; - $details = Piwik_Translate('RowEvolution_MetricBetweenText', array($min, $max)); + $details = Piwik::translate('RowEvolution_MetricBetweenText', array($min, $max)); if ($change !== false) { $lowerIsBetter = Metrics::isLowerValueBetter($metric); @@ -248,7 +249,7 @@ class RowEvolution . ($changeImage ? '<img src="plugins/MultiSites/images/' . $changeImage . '.png" /> ' : '') . $change . '</span>'; - $details .= ', ' . Piwik_Translate('RowEvolution_MetricChangeText', $change); + $details .= ', ' . Piwik::translate('RowEvolution_MetricChangeText', $change); } $newMetric = array( diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 5814ee25d5..f4f4bdf332 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -78,7 +78,7 @@ class Controller extends \Piwik\Controller\Admin $nonce = Common::getRequestVar('nonce', null, 'string'); if (!Nonce::verifyNonce(static::INSTALL_NONCE, $nonce)) { - throw new \Exception(Piwik_Translate('General_ExceptionNonceMismatch')); + throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch')); } Nonce::discardNonce(static::INSTALL_NONCE); @@ -234,13 +234,13 @@ class Controller extends \Piwik\Controller\Admin foreach ($plugins as $pluginName => &$plugin) { if (!isset($plugin['info'])) { $description = '<strong><em>' - . Piwik_Translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion())) + . Piwik::translate('CorePluginsAdmin_PluginNotCompatibleWith', array($pluginName, self::getPiwikVersion())) . '</strong> <br/> ' - . Piwik_Translate('CorePluginsAdmin_PluginAskDevToUpdate') + . Piwik::translate('CorePluginsAdmin_PluginAskDevToUpdate') . '</em>'; $plugin['info'] = array( 'description' => $description, - 'version' => Piwik_Translate('General_Unknown'), + 'version' => Piwik::translate('General_Unknown'), 'theme' => false, ); } @@ -289,7 +289,7 @@ class Controller extends \Piwik\Controller\Admin $nonce = Common::getRequestVar('nonce', null, 'string'); if (!Nonce::verifyNonce($nonceName, $nonce)) { - throw new \Exception(Piwik_Translate('General_ExceptionNonceMismatch')); + throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch')); } Nonce::discardNonce($nonceName); @@ -327,7 +327,7 @@ class Controller extends \Piwik\Controller\Admin $path = Filesystem::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/'; $messagePermissions = Filechecks::getErrorMessageMissingPermissions($path); - $messageIntro = Piwik_Translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ", + $messageIntro = Piwik::translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ", $pluginName); $exitMessage = $messageIntro . "<br/><br/>" . $messagePermissions; Piwik_ExitWithMessage($exitMessage, $optionalTrace = false, $optionalLinks = false, $optionalLinkBack = true); diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php index f5aa54aed2..b1fe58b414 100644 --- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php +++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php @@ -72,11 +72,11 @@ class CorePluginsAdmin extends \Piwik\Plugin } Piwik_AddAdminSubMenu('CorePluginsAdmin_MenuPlatform', null, "", !Piwik::isUserIsAnonymous(), $order = 15); - Piwik_AddAdminSubMenu('CorePluginsAdmin_MenuPlatform', Piwik_Translate('General_Plugins') . $pluginsUpdateMessage, + Piwik_AddAdminSubMenu('CorePluginsAdmin_MenuPlatform', Piwik::translate('General_Plugins') . $pluginsUpdateMessage, array('module' => 'CorePluginsAdmin', 'action' => 'plugins', 'activated' => ''), Piwik::isUserIsSuperUser(), $order = 1); - Piwik_AddAdminSubMenu('CorePluginsAdmin_MenuPlatform', Piwik_Translate('CorePluginsAdmin_Themes') . $themesUpdateMessage, + Piwik_AddAdminSubMenu('CorePluginsAdmin_MenuPlatform', Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage, array('module' => 'CorePluginsAdmin', 'action' => 'themes', 'activated' => ''), Piwik::isUserIsSuperUser(), $order = 3); diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php index efdb890fd3..024a1e519f 100644 --- a/plugins/CorePluginsAdmin/Marketplace.php +++ b/plugins/CorePluginsAdmin/Marketplace.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Piwik\Date; +use Piwik\Piwik; use Piwik\PluginsManager; /** @@ -44,7 +45,7 @@ class Marketplace $plugins = $this->client->searchForPlugins('', $query, $sort); } - $dateFormat = Piwik_Translate('CoreHome_ShortDateFormatWithYear'); + $dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear'); foreach ($plugins as &$plugin) { $plugin['canBeUpdated'] = $this->hasPluginUpdate($plugin); diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index b517b91b73..251cb1c4fa 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\CorePluginsAdmin; use Piwik\Filechecks; use Piwik\Filesystem; +use Piwik\Piwik; use Piwik\SettingsPiwik; use Piwik\Unzip; @@ -110,11 +111,11 @@ class PluginInstaller $this->removeFolderIfExists($pathExtracted); if (0 == ($pluginFiles = $archive->extract($pathExtracted))) { - throw new PluginInstallerException(Piwik_TranslateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); + throw new PluginInstallerException(Piwik::translateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); } if (0 == count($pluginFiles)) { - throw new PluginInstallerException(Piwik_TranslateException('Plugin Zip File Is Empty')); + throw new PluginInstallerException(Piwik::translateException('Plugin Zip File Is Empty')); } } diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index d2474acf68..f52e10416a 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -79,12 +79,12 @@ class Controller extends \Piwik\Controller $url = self::getLatestZipUrl($this->newVersion); $steps = array( - array('oneClick_Download', Piwik_Translate('CoreUpdater_DownloadingUpdateFromX', $url)), - array('oneClick_Unpack', Piwik_Translate('CoreUpdater_UnpackingTheUpdate')), - array('oneClick_Verify', Piwik_Translate('CoreUpdater_VerifyingUnpackedFiles')), - array('oneClick_CreateConfigFileBackup', Piwik_Translate('CoreUpdater_CreatingBackupOfConfigurationFile', self::CONFIG_FILE_BACKUP)), - array('oneClick_Copy', Piwik_Translate('CoreUpdater_InstallingTheLatestVersion')), - array('oneClick_Finished', Piwik_Translate('CoreUpdater_PiwikUpdatedSuccessfully')), + array('oneClick_Download', Piwik::translate('CoreUpdater_DownloadingUpdateFromX', $url)), + array('oneClick_Unpack', Piwik::translate('CoreUpdater_UnpackingTheUpdate')), + array('oneClick_Verify', Piwik::translate('CoreUpdater_VerifyingUnpackedFiles')), + array('oneClick_CreateConfigFileBackup', Piwik::translate('CoreUpdater_CreatingBackupOfConfigurationFile', self::CONFIG_FILE_BACKUP)), + array('oneClick_Copy', Piwik::translate('CoreUpdater_InstallingTheLatestVersion')), + array('oneClick_Finished', Piwik::translate('CoreUpdater_PiwikUpdatedSuccessfully')), ); $errorMessage = false; @@ -123,7 +123,7 @@ class Controller extends \Piwik\Controller { $newVersion = UpdateCheck::isNewestVersionAvailable(); if (!$newVersion) { - throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionAlreadyLatestVersion', Version::VERSION)); + throw new Exception(Piwik::translateException('CoreUpdater_ExceptionAlreadyLatestVersion', Version::VERSION)); } return $newVersion; } @@ -155,11 +155,11 @@ class Controller extends \Piwik\Controller $archive = Unzip::factory('PclZip', $this->pathPiwikZip); if (0 == ($archive_files = $archive->extract($pathExtracted))) { - throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); + throw new Exception(Piwik::translateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); } if (0 == count($archive_files)) { - throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionArchiveEmpty')); + throw new Exception(Piwik::translateException('CoreUpdater_ExceptionArchiveEmpty')); } unlink($this->pathPiwikZip); } @@ -175,7 +175,7 @@ class Controller extends \Piwik\Controller ); foreach ($someExpectedFiles as $file) { if (!is_file($this->pathRootExtractedPiwik . $file)) { - throw new Exception(Piwik_TranslateException('CoreUpdater_ExceptionArchiveIncomplete', $file)); + throw new Exception(Piwik::translateException('CoreUpdater_ExceptionArchiveIncomplete', $file)); } } } @@ -306,7 +306,7 @@ class Controller extends \Piwik\Controller // handle case of existing database with no tables if (!DbHelper::isInstalled()) { - $this->errorMessages[] = Piwik_Translate('CoreUpdater_EmptyDatabaseError', Config::getInstance()->database['dbname']); + $this->errorMessages[] = Piwik::translate('CoreUpdater_EmptyDatabaseError', Config::getInstance()->database['dbname']); $this->coreError = true; $currentVersion = 'N/A'; } else { @@ -330,7 +330,7 @@ class Controller extends \Piwik\Controller $integrityInfo = Filechecks::getFileIntegrityInformation(); if (isset($integrityInfo[1])) { if ($integrityInfo[0] == false) { - $this->warningMessages[] = Piwik_Translate('General_FileIntegrityWarningExplanation'); + $this->warningMessages[] = Piwik::translate('General_FileIntegrityWarningExplanation'); } $this->warningMessages = array_merge($this->warningMessages, array_slice($integrityInfo, 1)); } diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php index 7c1a638f9a..cc6022f83c 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator.php @@ -16,6 +16,7 @@ use Piwik\Common; use Piwik\DataTable; use Piwik\Metrics; +use Piwik\Piwik; use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator\Chart; require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php'; @@ -86,7 +87,7 @@ class JqplotDataGenerator // if addTotalRow was called in GenerateGraphHTML, add a row containing totals of // different metrics if ($this->properties['visualization_properties']->add_total_row) { - $dataTable->queueFilter('AddSummaryRow', array(0, Piwik_Translate('General_Total'), null, false)); + $dataTable->queueFilter('AddSummaryRow', array(0, Piwik::translate('General_Total'), null, false)); } $dataTable->applyQueuedFilters(); diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index 223c1fb9d4..5135994309 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -236,15 +236,15 @@ class HtmlTable extends Visualization $view->show_exclude_low_population = true; $view->show_goals = true; $view->translations += array( - 'nb_conversions' => Piwik_Translate('Goals_ColumnConversions'), - 'conversion_rate' => Piwik_Translate('General_ColumnConversionRate'), - 'revenue' => Piwik_Translate('General_ColumnRevenue'), - 'revenue_per_visit' => Piwik_Translate('General_ColumnValuePerVisit'), + 'nb_conversions' => Piwik::translate('Goals_ColumnConversions'), + 'conversion_rate' => Piwik::translate('General_ColumnConversionRate'), + 'revenue' => Piwik::translate('General_ColumnRevenue'), + 'revenue_per_visit' => Piwik::translate('General_ColumnValuePerVisit'), ); - $view->metrics_documentation['nb_visits'] = Piwik_Translate('Goals_ColumnVisits'); + $view->metrics_documentation['nb_visits'] = Piwik::translate('Goals_ColumnVisits'); if (Common::getRequestVar('documentationForGoalsPage', 0, 'int') == 1) { // TODO: should not use query parameter - $view->documentation = Piwik_Translate('Goals_ConversionByTypeReportDocumentation', + $view->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation', array('<br />', '<br />', '<a href="http://piwik.org/docs/tracking-goals-web-analytics/" target="_blank">', '</a>')); } @@ -312,23 +312,23 @@ class HtmlTable extends Visualization ); $view->translations += array( - 'goal_ecommerceOrder_conversion_rate' => Piwik_Translate('Goals_ConversionRate', Piwik_Translate('Goals_EcommerceOrder')), - 'goal_ecommerceOrder_nb_conversions' => Piwik_Translate('General_EcommerceOrders'), - 'goal_ecommerceOrder_revenue' => Piwik_Translate('General_TotalRevenue'), - 'goal_ecommerceOrder_revenue_per_visit' => Piwik_Translate('General_ColumnValuePerVisit'), - 'goal_ecommerceOrder_avg_order_revenue' => Piwik_Translate('General_AverageOrderValue'), - 'goal_ecommerceOrder_items' => Piwik_Translate('General_PurchasedProducts') + 'goal_ecommerceOrder_conversion_rate' => Piwik::translate('Goals_ConversionRate', Piwik::translate('Goals_EcommerceOrder')), + 'goal_ecommerceOrder_nb_conversions' => Piwik::translate('General_EcommerceOrders'), + 'goal_ecommerceOrder_revenue' => Piwik::translate('General_TotalRevenue'), + 'goal_ecommerceOrder_revenue_per_visit' => Piwik::translate('General_ColumnValuePerVisit'), + 'goal_ecommerceOrder_avg_order_revenue' => Piwik::translate('General_AverageOrderValue'), + 'goal_ecommerceOrder_items' => Piwik::translate('General_PurchasedProducts') ); - $goalName = Piwik_Translate('General_EcommerceOrders'); + $goalName = Piwik::translate('General_EcommerceOrders'); $view->metrics_documentation += array( - 'goal_ecommerceOrder_conversion_rate' => Piwik_Translate('Goals_ColumnConversionRateDocumentation', $goalName), - 'goal_ecommerceOrder_nb_conversions' => Piwik_Translate('Goals_ColumnConversionsDocumentation', $goalName), - 'goal_ecommerceOrder_revenue' => Piwik_Translate('Goals_ColumnRevenueDocumentation', $goalName), - 'goal_ecommerceOrder_revenue_per_visit' => Piwik_Translate('Goals_ColumnAverageOrderRevenueDocumentation', $goalName), - 'goal_ecommerceOrder_avg_order_revenue' => Piwik_Translate('Goals_ColumnAverageOrderRevenueDocumentation', $goalName), - 'goal_ecommerceOrder_items' => Piwik_Translate('Goals_ColumnPurchasedProductsDocumentation', $goalName), - 'revenue_per_visit' => Piwik_Translate('Goals_ColumnRevenuePerVisitDocumentation', $goalName) + 'goal_ecommerceOrder_conversion_rate' => Piwik::translate('Goals_ColumnConversionRateDocumentation', $goalName), + 'goal_ecommerceOrder_nb_conversions' => Piwik::translate('Goals_ColumnConversionsDocumentation', $goalName), + 'goal_ecommerceOrder_revenue' => Piwik::translate('Goals_ColumnRevenueDocumentation', $goalName), + 'goal_ecommerceOrder_revenue_per_visit' => Piwik::translate('Goals_ColumnAverageOrderRevenueDocumentation', $goalName), + 'goal_ecommerceOrder_avg_order_revenue' => Piwik::translate('Goals_ColumnAverageOrderRevenueDocumentation', $goalName), + 'goal_ecommerceOrder_items' => Piwik::translate('Goals_ColumnPurchasedProductsDocumentation', $goalName), + 'revenue_per_visit' => Piwik::translate('Goals_ColumnRevenuePerVisitDocumentation', $goalName) ); } @@ -343,14 +343,14 @@ class HtmlTable extends Visualization $column = "goal_{$goal['idgoal']}_conversion_rate"; $view->columns_to_display[] = $column; - $view->translations[$column] = Piwik_Translate('Goals_ConversionRate', $goal['name']); + $view->translations[$column] = Piwik::translate('Goals_ConversionRate', $goal['name']); $view->metrics_documentation[$column] - = Piwik_Translate('Goals_ColumnConversionRateDocumentation', $goal['quoted_name'] ? : $goal['name']); + = Piwik::translate('Goals_ColumnConversionRateDocumentation', $goal['quoted_name'] ? : $goal['name']); } $view->columns_to_display[] = 'revenue_per_visit'; $view->metrics_documentation['revenue_per_visit'] = - Piwik_Translate('Goals_ColumnRevenuePerVisitDocumentation', Piwik_Translate('Goals_EcommerceAndGoalsMenu')); + Piwik::translate('Goals_ColumnRevenuePerVisitDocumentation', Piwik::translate('Goals_EcommerceAndGoalsMenu')); } private function setPropertiesForGoals($view, $idSite, $idGoals) @@ -389,20 +389,20 @@ class HtmlTable extends Visualization $quotedGoalName = $allGoals[$idGoal]['quoted_name'] ? : $goalName; $view->translations += array( - 'goal_' . $idGoal . '_nb_conversions' => Piwik_Translate('Goals_Conversions', $goalName), - 'goal_' . $idGoal . '_conversion_rate' => Piwik_Translate('Goals_ConversionRate', $goalName), + 'goal_' . $idGoal . '_nb_conversions' => Piwik::translate('Goals_Conversions', $goalName), + 'goal_' . $idGoal . '_conversion_rate' => Piwik::translate('Goals_ConversionRate', $goalName), 'goal_' . $idGoal . '_revenue' => - Piwik_Translate('%s ' . Piwik_Translate('General_ColumnRevenue'), $goalName), + Piwik::translate('%s ' . Piwik::translate('General_ColumnRevenue'), $goalName), 'goal_' . $idGoal . '_revenue_per_visit' => - Piwik_Translate('%s ' . Piwik_Translate('General_ColumnValuePerVisit'), $goalName), + Piwik::translate('%s ' . Piwik::translate('General_ColumnValuePerVisit'), $goalName), ); $view->metrics_documentation += array( - 'goal_' . $idGoal . '_nb_conversions' => Piwik_Translate('Goals_ColumnConversionsDocumentation', $quotedGoalName), - 'goal_' . $idGoal . '_conversion_rate' => Piwik_Translate('Goals_ColumnConversionRateDocumentation', $quotedGoalName), - 'goal_' . $idGoal . '_revenue' => Piwik_Translate('Goals_ColumnRevenueDocumentation', $quotedGoalName), + 'goal_' . $idGoal . '_nb_conversions' => Piwik::translate('Goals_ColumnConversionsDocumentation', $quotedGoalName), + 'goal_' . $idGoal . '_conversion_rate' => Piwik::translate('Goals_ColumnConversionRateDocumentation', $quotedGoalName), + 'goal_' . $idGoal . '_revenue' => Piwik::translate('Goals_ColumnRevenueDocumentation', $quotedGoalName), 'goal_' . $idGoal . '_revenue_per_visit' => - Piwik_Translate('Goals_ColumnRevenuePerVisitDocumentation', Piwik_Translate('Goals_EcommerceAndGoalsMenu')), + Piwik::translate('Goals_ColumnRevenuePerVisitDocumentation', Piwik::translate('Goals_EcommerceAndGoalsMenu')), ); } @@ -418,7 +418,7 @@ class HtmlTable extends Visualization if (Site::isEcommerceEnabledFor($idSite)) { $ecommerceGoal = array( 'idgoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER, - 'name' => Piwik_Translate('Goals_EcommerceOrder'), + 'name' => Piwik::translate('Goals_EcommerceOrder'), 'quoted_name' => false ); $allGoals[$ecommerceGoal['idgoal']] = $ecommerceGoal; diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 5bd918f14d..8c87124099 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -14,6 +14,7 @@ use Piwik\Archive; use Piwik\DataTable; use Piwik\Date; use Piwik\Metrics; +use Piwik\Piwik; use Piwik\Tracker\Action; /** @@ -114,7 +115,7 @@ class API } $dataTable->queueFilter('ColumnCallbackReplace', array('label', function ($label) { return $label == \Piwik\Plugins\CustomVariables\Archiver::LABEL_CUSTOM_VALUE_NOT_DEFINED - ? Piwik_Translate('General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) + ? Piwik::translate('General_NotDefined', Piwik::translate('CustomVariables_ColumnCustomVariableValue')) : $label; })); return $dataTable; diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php index 449349dd2c..458b5da629 100644 --- a/plugins/CustomVariables/Controller.php +++ b/plugins/CustomVariables/Controller.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\CustomVariables; +use Piwik\Piwik; use Piwik\View; use Piwik\ViewDataTable; @@ -21,7 +22,7 @@ class Controller extends \Piwik\Controller public function index($fetch = false) { return View::singleReport( - Piwik_Translate('CustomVariables_CustomVariables'), + Piwik::translate('CustomVariables_CustomVariables'), $this->getCustomVariables(true), $fetch); } diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index b57a716bd5..b6a5e72fd6 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CustomVariables; use Piwik\ArchiveProcessor; +use Piwik\Piwik; use Piwik\Tracker; use Piwik\WidgetsList; @@ -59,23 +60,23 @@ class CustomVariables extends \Piwik\Plugin */ public function getReportMetadata(&$reports) { - $documentation = Piwik_Translate('CustomVariables_CustomVariablesReportDocumentation', + $documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', array('<br />', '<a href="http://piwik.org/docs/custom-variables/" target="_blank">', '</a>')); - $reports[] = array('category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('CustomVariables_CustomVariables'), + $reports[] = array('category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('CustomVariables_CustomVariables'), 'module' => 'CustomVariables', 'action' => 'getCustomVariables', 'actionToLoadSubTables' => 'getCustomVariablesValuesFromNameId', - 'dimension' => Piwik_Translate('CustomVariables_ColumnCustomVariableName'), + 'dimension' => Piwik::translate('CustomVariables_ColumnCustomVariableName'), 'documentation' => $documentation, 'order' => 10); - $reports[] = array('category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('CustomVariables_CustomVariables'), + $reports[] = array('category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('CustomVariables_CustomVariables'), 'module' => 'CustomVariables', 'action' => 'getCustomVariablesValuesFromNameId', - 'dimension' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue'), + 'dimension' => Piwik::translate('CustomVariables_ColumnCustomVariableValue'), 'documentation' => $documentation, 'isSubtableReport' => true, 'order' => 15); @@ -87,32 +88,32 @@ class CustomVariables extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', - 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableName') . ' ' . $i - . ' (' . Piwik_Translate('CustomVariables_ScopeVisit') . ')', + 'name' => Piwik::translate('CustomVariables_ColumnCustomVariableName') . ' ' . $i + . ' (' . Piwik::translate('CustomVariables_ScopeVisit') . ')', 'segment' => 'customVariableName' . $i, 'sqlSegment' => 'log_visit.custom_var_k' . $i, ); $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', - 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue') . ' ' . $i - . ' (' . Piwik_Translate('CustomVariables_ScopeVisit') . ')', + 'name' => Piwik::translate('CustomVariables_ColumnCustomVariableValue') . ' ' . $i + . ' (' . Piwik::translate('CustomVariables_ScopeVisit') . ')', 'segment' => 'customVariableValue' . $i, 'sqlSegment' => 'log_visit.custom_var_v' . $i, ); $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', - 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableName') . ' ' . $i - . ' (' . Piwik_Translate('CustomVariables_ScopePage') . ')', + 'name' => Piwik::translate('CustomVariables_ColumnCustomVariableName') . ' ' . $i + . ' (' . Piwik::translate('CustomVariables_ScopePage') . ')', 'segment' => 'customVariablePageName' . $i, 'sqlSegment' => 'log_link_visit_action.custom_var_k' . $i, ); $segments[] = array( 'type' => 'dimension', 'category' => 'CustomVariables_CustomVariables', - 'name' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue') . ' ' . $i - . ' (' . Piwik_Translate('CustomVariables_ScopePage') . ')', + 'name' => Piwik::translate('CustomVariables_ColumnCustomVariableValue') . ' ' . $i + . ' (' . Piwik::translate('CustomVariables_ScopePage') . ')', 'segment' => 'customVariablePageValue' . $i, 'sqlSegment' => 'log_link_visit_action.custom_var_v' . $i, ); @@ -124,8 +125,8 @@ class CustomVariables extends \Piwik\Plugin */ public function getReportsWithGoalMetrics(&$dimensions) { - $dimensions[] = array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('CustomVariables_CustomVariables'), + $dimensions[] = array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('CustomVariables_CustomVariables'), 'module' => 'CustomVariables', 'action' => 'getCustomVariables', ); @@ -159,7 +160,7 @@ class CustomVariables extends \Piwik\Plugin private function getDisplayPropertiesForGetCustomVariables() { - $footerMessage = Piwik_Translate('CustomVariables_TrackingHelp', + $footerMessage = Piwik::translate('CustomVariables_TrackingHelp', array('<a target="_blank" href="http://piwik.org/docs/custom-variables/">', '</a>')); return array( @@ -168,7 +169,7 @@ class CustomVariables extends \Piwik\Plugin 'filter_sort_order' => 'desc', 'show_goals' => true, 'subtable_controller_action' => 'getCustomVariablesValuesFromNameId', - 'translations' => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableName')), + 'translations' => array('label' => Piwik::translate('CustomVariables_ColumnCustomVariableName')), 'show_footer_message' => $footerMessage ); } @@ -182,7 +183,7 @@ class CustomVariables extends \Piwik\Plugin 'show_goals' => true, 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) + 'translations' => array('label' => Piwik::translate('CustomVariables_ColumnCustomVariableValue')) ); } } diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 8a9915051b..c1f3c58f59 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -120,7 +120,7 @@ class DBStats extends \Piwik\Plugin $translateSummaryLabel = function ($value) use ($valueToTranslationStr) { return isset($valueToTranslationStr[$value]) - ? Piwik_Translate($valueToTranslationStr[$value]) + ? Piwik::translate($valueToTranslationStr[$value]) : $value; }; @@ -148,9 +148,9 @@ class DBStats extends \Piwik\Plugin $this->addBaseDisplayProperties($result); $this->addPresentationFilters($result); - $result['title'] = Piwik_Translate('DBStats_MetricTables'); + $result['title'] = Piwik::translate('DBStats_MetricTables'); $result['related_reports'] = array( - 'DBStats.getMetricDataSummaryByYear' => Piwik_Translate('DBStats_MetricDataByYear') + 'DBStats.getMetricDataSummaryByYear' => Piwik::translate('DBStats_MetricDataByYear') ); return $result; @@ -162,10 +162,10 @@ class DBStats extends \Piwik\Plugin $this->addBaseDisplayProperties($result); $this->addPresentationFilters($result); - $result['translations']['label'] = Piwik_Translate('CoreHome_PeriodYear'); - $result['title'] = Piwik_Translate('DBStats_MetricDataByYear'); + $result['translations']['label'] = Piwik::translate('CoreHome_PeriodYear'); + $result['title'] = Piwik::translate('DBStats_MetricDataByYear'); $result['related_reports'] = array( - 'DBStats.getMetricDataSummary' => Piwik_Translate('DBStats_MetricTables') + 'DBStats.getMetricDataSummary' => Piwik::translate('DBStats_MetricTables') ); return $result; @@ -177,9 +177,9 @@ class DBStats extends \Piwik\Plugin $this->addBaseDisplayProperties($result); $this->addPresentationFilters($result); - $result['title'] = Piwik_Translate('DBStats_ReportTables'); + $result['title'] = Piwik::translate('DBStats_ReportTables'); $result['related_reports'] = array( - 'DBStats.getReportDataSummaryByYear' => Piwik_Translate('DBStats_ReportDataByYear') + 'DBStats.getReportDataSummaryByYear' => Piwik::translate('DBStats_ReportDataByYear') ); return $result; @@ -191,10 +191,10 @@ class DBStats extends \Piwik\Plugin $this->addBaseDisplayProperties($result); $this->addPresentationFilters($result); - $result['translations']['label'] = Piwik_Translate('CoreHome_PeriodYear'); - $result['title'] = Piwik_Translate('DBStats_ReportDataByYear'); + $result['translations']['label'] = Piwik::translate('CoreHome_PeriodYear'); + $result['title'] = Piwik::translate('DBStats_ReportDataByYear'); $result['related_reports'] = array( - 'DBStats.getReportDataSummary' => Piwik_Translate('DBStats_ReportTables') + 'DBStats.getReportDataSummary' => Piwik::translate('DBStats_ReportTables') ); return $result; @@ -208,7 +208,7 @@ class DBStats extends \Piwik\Plugin $sizeColumns = array('estimated_size')); $result['filter_sort_order'] = 'asc'; - $result['translations']['label'] = Piwik_Translate('General_Report'); + $result['translations']['label'] = Piwik::translate('General_Report'); // this report table has some extra columns that shouldn't be shown if ($viewDataTable == 'table') { @@ -228,7 +228,7 @@ class DBStats extends \Piwik\Plugin $sizeColumns = array('estimated_size')); $result['filter_sort_order'] = 'asc'; - $result['translations']['label'] = Piwik_Translate('General_Metric'); + $result['translations']['label'] = Piwik::translate('General_Metric'); $this->setIndividualSummaryFooterMessage($result); @@ -261,14 +261,14 @@ class DBStats extends \Piwik\Plugin $properties['visualization_properties']['table']['disable_row_evolution'] = true; $properties['visualization_properties']['table']['highlight_summary_row'] = true; $properties['translations'] = array( - 'label' => Piwik_Translate('DBStats_Table'), - 'year' => Piwik_Translate('CoreHome_PeriodYear'), - 'data_size' => Piwik_Translate('DBStats_DataSize'), - 'index_size' => Piwik_Translate('DBStats_IndexSize'), - 'total_size' => Piwik_Translate('DBStats_TotalSize'), - 'row_count' => Piwik_Translate('DBStats_RowCount'), - 'percent_total' => '% ' . Piwik_Translate('DBStats_DBSize'), - 'estimated_size' => Piwik_Translate('DBStats_EstimatedSize') + 'label' => Piwik::translate('DBStats_Table'), + 'year' => Piwik::translate('CoreHome_PeriodYear'), + 'data_size' => Piwik::translate('DBStats_DataSize'), + 'index_size' => Piwik::translate('DBStats_IndexSize'), + 'total_size' => Piwik::translate('DBStats_TotalSize'), + 'row_count' => Piwik::translate('DBStats_RowCount'), + 'percent_total' => '% ' . Piwik::translate('DBStats_DBSize'), + 'estimated_size' => Piwik::translate('DBStats_EstimatedSize') ); } @@ -295,7 +295,7 @@ class DBStats extends \Piwik\Plugin if ($viewDataTable == 'table') { // add summary row only if displaying a table $properties['filters'][] = array( - 'AddSummaryRow', array(0, Piwik_Translate('General_Total'), 'label', false), $isPriority = true); + 'AddSummaryRow', array(0, Piwik::translate('General_Total'), 'label', false), $isPriority = true); // add percentage column if desired if ($addPercentColumn @@ -326,7 +326,7 @@ class DBStats extends \Piwik\Plugin $runPrettySizeFilterBeforeGeneric = true; } else { $properties['columns_to_display'] = array('label', 'row_count'); - $properties['y_axis_unit'] = ' ' . Piwik_Translate('General_Rows'); + $properties['y_axis_unit'] = ' ' . Piwik::translate('General_Rows'); $properties['filter_sort_column'] = 'row_count'; $properties['filter_sort_order'] = 'desc'; @@ -360,7 +360,7 @@ class DBStats extends \Piwik\Plugin { $lastGenerated = self::getDateOfLastCachingRun(); if ($lastGenerated !== false) { - $result['show_footer_message'] = Piwik_Translate('Mobile_LastUpdated', $lastGenerated); + $result['show_footer_message'] = Piwik::translate('Mobile_LastUpdated', $lastGenerated); } } } diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php index 1330eacef6..a6acf6c26a 100644 --- a/plugins/Dashboard/API.php +++ b/plugins/Dashboard/API.php @@ -70,7 +70,7 @@ class API $defaultLayout = $this->dashboard->getDefaultLayout(); $defaultLayout = $this->dashboard->decodeLayout($defaultLayout); - $defaultDashboard = array('name' => Piwik_Translate('Dashboard_Dashboard'), 'layout' => $defaultLayout); + $defaultDashboard = array('name' => Piwik::translate('Dashboard_Dashboard'), 'layout' => $defaultLayout); $widgets = $this->getExistingWidgetsWithinDashboard($defaultDashboard); diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 12318cfcd3..6311043d99 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -109,7 +109,7 @@ class Dashboard extends \Piwik\Plugin foreach ($dashboards AS &$dashboard) { if (empty($dashboard['name'])) { - $dashboard['name'] = Piwik_Translate('Dashboard_DashboardOf', $login); + $dashboard['name'] = Piwik::translate('Dashboard_DashboardOf', $login); if ($nameless > 1) { $dashboard['name'] .= " ($nameless)"; } @@ -219,7 +219,7 @@ class Dashboard extends \Piwik\Plugin $tooltip = false; try { $idSite = Common::getRequestVar('idSite'); - $tooltip = Piwik_Translate('Dashboard_TopLinkTooltip', Site::getNameFor($idSite)); + $tooltip = Piwik::translate('Dashboard_TopLinkTooltip', Site::getNameFor($idSite)); } catch (Exception $ex) { // if no idSite parameter, show no tooltip } diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index a2f2c60de3..01075107ec 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -17,6 +17,7 @@ use Piwik\ArchiveProcessor; use Piwik\Common; use Piwik\Config; use Piwik\Db; +use Piwik\Piwik; use Piwik\WidgetsList; use UserAgentParserEnhanced; @@ -31,7 +32,7 @@ class DevicesDetection extends \Piwik\Plugin public function getInformation() { return array( - 'description' => "[Beta Plugin] " . Piwik_Translate("DevicesDetection_PluginDescription"), + 'description' => "[Beta Plugin] " . Piwik::translate("DevicesDetection_PluginDescription"), 'author' => 'Piwik PRO', 'author_homepage' => 'http://piwik.pro', 'version' => '1.14', @@ -46,12 +47,12 @@ class DevicesDetection extends \Piwik\Plugin { parent::__construct(); $this->osRelatedReports = array( - 'DevicesDetection.getOsFamilies' => Piwik_Translate('DevicesDetection_OperatingSystemFamilies'), - 'DevicesDetection.getOsVersions' => Piwik_Translate('DevicesDetection_OperatingSystemVersions') + 'DevicesDetection.getOsFamilies' => Piwik::translate('DevicesDetection_OperatingSystemFamilies'), + 'DevicesDetection.getOsVersions' => Piwik::translate('DevicesDetection_OperatingSystemVersions') ); $this->browserRelatedReports = array( - 'DevicesDetection.getBrowserFamilies' => Piwik_Translate('DevicesDetection_BrowsersFamily'), - 'DevicesDetection.getBrowserVersions' => Piwik_Translate('DevicesDetection_BrowserVersions') + 'DevicesDetection.getBrowserFamilies' => Piwik::translate('DevicesDetection_BrowsersFamily'), + 'DevicesDetection.getBrowserVersions' => Piwik::translate('DevicesDetection_BrowserVersions') ); } @@ -188,7 +189,7 @@ class DevicesDetection extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => $columnName, 'segment' => $segment, 'acceptedValues' => $acceptedValues, @@ -207,16 +208,16 @@ class DevicesDetection extends \Piwik\Plugin continue; $report = array( - 'category' => Piwik_Translate($category), - 'name' => Piwik_Translate($name), + 'category' => Piwik::translate($category), + 'name' => Piwik::translate($name), 'module' => $apiModule, 'action' => $apiAction, - 'dimension' => Piwik_Translate($columnName), + 'dimension' => Piwik::translate($columnName), 'order' => $i++ ); $translation = $name . 'Documentation'; - $translated = Piwik_Translate($translation, '<br />'); + $translated = Piwik::translate($translation, '<br />'); if ($translated != $translation) { $report['documentation'] = $translated; } @@ -308,7 +309,7 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelTypes")) + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelTypes")) ); } @@ -317,7 +318,7 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelBrands")) + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelBrands")) ); } @@ -326,7 +327,7 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelModels")) + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelModels")) ); } @@ -335,8 +336,8 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelSystemFamily")), - 'title' => Piwik_Translate('DevicesDetection_OperatingSystemFamilies'), + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelSystemFamily")), + 'title' => Piwik::translate('DevicesDetection_OperatingSystemFamilies'), 'related_reports' => $this->getOsRelatedReports() ); } @@ -346,8 +347,8 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelSystemVersion")), - 'title' => Piwik_Translate('DevicesDetection_OperatingSystemVersions'), + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelSystemVersion")), + 'title' => Piwik::translate('DevicesDetection_OperatingSystemVersions'), 'related_reports' => $this->getOsRelatedReports() ); } @@ -357,8 +358,8 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelBrowserFamily")), - 'title' => Piwik_Translate('DevicesDetection_BrowsersFamily'), + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelBrowserFamily")), + 'title' => Piwik::translate('DevicesDetection_BrowsersFamily'), 'related_reports' => $this->getBrowserRelatedReports() ); } @@ -368,7 +369,7 @@ class DevicesDetection extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate("DevicesDetection_dataTableLabelBrowserVersion")), + 'translations' => array('label' => Piwik::translate("DevicesDetection_dataTableLabelBrowserVersion")), 'related_reports' => $this->getBrowserRelatedReports() ); } @@ -376,16 +377,16 @@ class DevicesDetection extends \Piwik\Plugin private function getOsRelatedReports() { return array( - 'DevicesDetection.getOsFamilies' => Piwik_Translate('DevicesDetection_OperatingSystemFamilies'), - 'DevicesDetection.getOsVersions' => Piwik_Translate('DevicesDetection_OperatingSystemVersions') + 'DevicesDetection.getOsFamilies' => Piwik::translate('DevicesDetection_OperatingSystemFamilies'), + 'DevicesDetection.getOsVersions' => Piwik::translate('DevicesDetection_OperatingSystemVersions') ); } private function getBrowserRelatedReports() { return array( - 'DevicesDetection.getBrowserFamilies' => Piwik_Translate('DevicesDetection_BrowsersFamily'), - 'DevicesDetection.getBrowserVersions' => Piwik_Translate('DevicesDetection_BrowserVersions') + 'DevicesDetection.getBrowserFamilies' => Piwik::translate('DevicesDetection_BrowsersFamily'), + 'DevicesDetection.getBrowserVersions' => Piwik::translate('DevicesDetection_BrowserVersions') ); } } diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 56be9c7a0e..0d056241f2 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\DevicesDetection; +use Piwik\Piwik; use UserAgentParserEnhanced; function getBrandLogo($label) @@ -30,7 +31,7 @@ function getBrowserFamilyFullNameExtended($label) return $name; } } - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } function getBrowserFamilyLogoExtended($label) @@ -50,7 +51,7 @@ function getBrowserNameExtended($label) if (array_key_exists($short, UserAgentParserEnhanced::$browsers)) { return trim(ucfirst(UserAgentParserEnhanced::$browsers[$short]) . ' ' . $ver); } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } @@ -69,7 +70,7 @@ function getDeviceBrandLabel($label) if (array_key_exists($label, UserAgentParserEnhanced::$deviceBrands)) { return ucfirst(UserAgentParserEnhanced::$deviceBrands[$label]); } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } @@ -78,7 +79,7 @@ function getDeviceTypeLabel($label) if (isset(UserAgentParserEnhanced::$deviceTypes[$label])) { return UserAgentParserEnhanced::$deviceTypes[$label]; } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } @@ -104,7 +105,7 @@ function getDeviceTypeLogo($label) function getModelName($label) { if (!$label) { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $label; } @@ -116,7 +117,7 @@ function getOSFamilyFullNameExtended($label) return $name; } } - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } function getOsFamilyLogoExtended($label) @@ -139,7 +140,7 @@ function getOsFullNameExtended($label) return $name; } } - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php index 68320fc9eb..7c0708c9d7 100644 --- a/plugins/ExampleRssWidget/Controller.php +++ b/plugins/ExampleRssWidget/Controller.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\ExampleRssWidget; use Exception; +use Piwik\Piwik; /** * @@ -49,7 +50,7 @@ class Controller extends \Piwik\Controller protected function error($e) { echo '<div class="pk-emptyDataTable">' - . Piwik_Translate('General_ErrorRequest') + . Piwik::translate('General_ErrorRequest') . ' - ' . $e->getMessage() . '</div>'; } } diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php index b7ce4e8b49..ee2f37f637 100644 --- a/plugins/Feedback/Controller.php +++ b/plugins/Feedback/Controller.php @@ -54,16 +54,16 @@ class Controller extends \Piwik\Controller || strpos($email, 'probe@') !== false || strpos($body, '<probe') !== false ) { - throw new Exception(Piwik_TranslateException('Feedback_ExceptionBodyLength', array($minimumBodyLength))); + throw new Exception(Piwik::translateException('Feedback_ExceptionBodyLength', array($minimumBodyLength))); } if (!Piwik::isValidEmailString($email)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidEmail')); + throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidEmail')); } if (preg_match('/https?:/i', $body)) { - throw new Exception(Piwik_TranslateException('Feedback_ExceptionNoUrls')); + throw new Exception(Piwik::translateException('Feedback_ExceptionNoUrls')); } if (!Nonce::verifyNonce('Feedback.sendFeedback', $nonce)) { - throw new Exception(Piwik_TranslateException('General_ExceptionNonceMismatch')); + throw new Exception(Piwik::translateException('General_ExceptionNonceMismatch')); } Nonce::discardNonce('Feedback.sendFeedback'); diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php index e48b416c37..f59e988a24 100644 --- a/plugins/Feedback/Feedback.php +++ b/plugins/Feedback/Feedback.php @@ -9,6 +9,7 @@ * @package Feedback */ namespace Piwik\Plugins\Feedback; +use Piwik\Piwik; /** @@ -39,7 +40,7 @@ class Feedback extends \Piwik\Plugin true, $order = 20, $isHTML = false, - $tooltip = Piwik_Translate('Feedback_TopLinkTooltip') + $tooltip = Piwik::translate('Feedback_TopLinkTooltip') ); } diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 3522b087e0..d61af04626 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -175,7 +175,7 @@ class API if ($patternType == 'exact' && substr($pattern, 0, 4) != 'http' ) { - throw new Exception(Piwik_TranslateException('Goals_ExceptionInvalidMatchingString', array("http:// or https://", "http://www.yourwebsite.com/newsletter/subscribed.html"))); + throw new Exception(Piwik::translateException('Goals_ExceptionInvalidMatchingString', array("http:// or https://", "http://www.yourwebsite.com/newsletter/subscribed.html"))); } } @@ -249,9 +249,9 @@ class API 'Goals_ItemsCategory' => '_pkc', ); $reportToNotDefinedString = array( - 'Goals_ItemsSku' => Piwik_Translate('General_NotDefined', Piwik_Translate('Goals_ProductSKU')), // Note: this should never happen - 'Goals_ItemsName' => Piwik_Translate('General_NotDefined', Piwik_Translate('Goals_ProductName')), - 'Goals_ItemsCategory' => Piwik_Translate('General_NotDefined', Piwik_Translate('Goals_ProductCategory')) + 'Goals_ItemsSku' => Piwik::translate('General_NotDefined', Piwik::translate('Goals_ProductSKU')), // Note: this should never happen + 'Goals_ItemsName' => Piwik::translate('General_NotDefined', Piwik::translate('Goals_ProductName')), + 'Goals_ItemsCategory' => Piwik::translate('General_NotDefined', Piwik::translate('Goals_ProductCategory')) ); $notDefinedStringPretty = $reportToNotDefinedString[$recordName]; $customVarNameToLookFor = $mapping[$recordName]; @@ -526,7 +526,7 @@ class API $dataTable->queueFilter('Sort', array('label', 'asc', true)); $dataTable->queueFilter( - 'BeautifyRangeLabels', array(Piwik_Translate('General_OneDay'), Piwik_Translate('General_NDays'))); + 'BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays'))); return $dataTable; } @@ -550,7 +550,7 @@ class API $dataTable->queueFilter('Sort', array('label', 'asc', true)); $dataTable->queueFilter( - 'BeautifyRangeLabels', array(Piwik_Translate('General_OneVisit'), Piwik_Translate('General_NVisits'))); + 'BeautifyRangeLabels', array(Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits'))); return $dataTable; } diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 522d97b28f..ffffc8173e 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -110,7 +110,7 @@ class Controller extends \Piwik\Controller { $view = new View('@Goals/getGoalReportView'); if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) { - $goalDefinition['name'] = Piwik_Translate('Goals_Ecommerce'); + $goalDefinition['name'] = Piwik::translate('Goals_Ecommerce'); $goalDefinition['allow_multiple'] = true; $ecommerce = $view->ecommerce = true; } else { @@ -260,10 +260,10 @@ class Controller extends \Piwik\Controller if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) { $nameToLabel['nb_conversions'] = 'General_EcommerceOrders'; } elseif ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART) { - $nameToLabel['nb_conversions'] = Piwik_Translate('General_VisitsWith', Piwik_Translate('Goals_AbandonedCart')); + $nameToLabel['nb_conversions'] = Piwik::translate('General_VisitsWith', Piwik::translate('Goals_AbandonedCart')); $nameToLabel['conversion_rate'] = $nameToLabel['nb_conversions']; - $nameToLabel['revenue'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_ColumnRevenue')); - $nameToLabel['items'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('Goals_Products')); + $nameToLabel['revenue'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ColumnRevenue')); + $nameToLabel['items'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('Goals_Products')); } $selectableColumns = array('nb_conversions', 'conversion_rate', 'revenue'); @@ -277,14 +277,14 @@ class Controller extends \Piwik\Controller // find the right translation for this column, eg. find 'revenue' if column is Goal_1_revenue foreach ($nameToLabel as $metric => $metricTranslation) { if (strpos($columnName, $metric) !== false) { - $columnTranslation = Piwik_Translate($metricTranslation); + $columnTranslation = Piwik::translate($metricTranslation); break; } } if (!empty($idGoal) && isset($this->goals[$idGoal])) { $goalName = $this->goals[$idGoal]['name']; - $columnTranslation = "$columnTranslation (" . Piwik_Translate('Goals_GoalX', "$goalName") . ")"; + $columnTranslation = "$columnTranslation (" . Piwik::translate('Goals_GoalX', "$goalName") . ")"; } $view->translations[$columnName] = $columnTranslation; } @@ -292,7 +292,7 @@ class Controller extends \Piwik\Controller $view->visualization_properties->selectable_columns = $selectableColumns; $langString = $idGoal ? 'Goals_SingleGoalOverviewDocumentation' : 'Goals_GoalsOverviewDocumentation'; - $view->documentation = Piwik_Translate($langString, '<br />'); + $view->documentation = Piwik::translate($langString, '<br />'); return $this->renderView($view, $fetch); } @@ -440,7 +440,7 @@ class Controller extends \Piwik\Controller $allReports = Goals::getReportsWithGoalMetrics(); foreach ($allReports as $category => $reports) { - $categoryText = Piwik_Translate('Goals_ViewGoalsBy', $category); + $categoryText = Piwik::translate('Goals_ViewGoalsBy', $category); foreach ($reports as $report) { $customParams['viewDataTable'] = 'tableGoals'; if (in_array($report['action'], array('getVisitsUntilConversion', 'getDaysToConversion'))) { diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 847fabd7ad..8e7955c75c 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -28,7 +28,7 @@ class Goals extends \Piwik\Plugin { public function getInformation() { - $suffix = Piwik_Translate('SitesManager_PiwikOffersEcommerceAnalytics', + $suffix = Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics', array('<a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">', '</a>')); $info = parent::getInformation(); $info['description'] .= ' ' . $suffix; @@ -127,25 +127,25 @@ class Goals extends \Piwik\Plugin // These metrics will also be available for some reports, for each goal // Example: Conversion rate for Goal 2 for the keyword 'piwik' $goalProcessedMetrics = array( - 'revenue_per_visit' => Piwik_Translate('General_ColumnValuePerVisit'), + 'revenue_per_visit' => Piwik::translate('General_ColumnValuePerVisit'), ); $goalMetrics = array( - 'nb_conversions' => Piwik_Translate('Goals_ColumnConversions'), - 'nb_visits_converted' => Piwik_Translate('General_ColumnVisitsWithConversions'), - 'conversion_rate' => Piwik_Translate('General_ColumnConversionRate'), - 'revenue' => Piwik_Translate('General_ColumnRevenue') + 'nb_conversions' => Piwik::translate('Goals_ColumnConversions'), + 'nb_visits_converted' => Piwik::translate('General_ColumnVisitsWithConversions'), + 'conversion_rate' => Piwik::translate('General_ColumnConversionRate'), + 'revenue' => Piwik::translate('General_ColumnRevenue') ); $conversionReportMetrics = array( - 'nb_conversions' => Piwik_Translate('Goals_ColumnConversions') + 'nb_conversions' => Piwik::translate('Goals_ColumnConversions') ); // General Goal metrics: conversions, conv rate, revenue - $goalsCategory = Piwik_Translate('Goals_Goals'); + $goalsCategory = Piwik::translate('Goals_Goals'); $reports[] = array( 'category' => $goalsCategory, - 'name' => Piwik_Translate('Goals_Goals'), + 'name' => Piwik::translate('Goals_Goals'), 'module' => 'Goals', 'action' => 'get', 'metrics' => $goalMetrics, @@ -161,10 +161,10 @@ class Goals extends \Piwik\Plugin // Add overall visits to conversion report $reports[] = array( 'category' => $goalsCategory, - 'name' => Piwik_Translate('Goals_VisitsUntilConv'), + 'name' => Piwik::translate('Goals_VisitsUntilConv'), 'module' => 'Goals', 'action' => 'getVisitsUntilConversion', - 'dimension' => Piwik_Translate('Goals_VisitsUntilConv'), + 'dimension' => Piwik::translate('Goals_VisitsUntilConv'), 'constantRowsCount' => true, 'parameters' => array(), 'metrics' => $conversionReportMetrics, @@ -174,10 +174,10 @@ class Goals extends \Piwik\Plugin // Add overall days to conversion report $reports[] = array( 'category' => $goalsCategory, - 'name' => Piwik_Translate('Goals_DaysToConv'), + 'name' => Piwik::translate('Goals_DaysToConv'), 'module' => 'Goals', 'action' => 'getDaysToConversion', - 'dimension' => Piwik_Translate('Goals_DaysToConv'), + 'dimension' => Piwik::translate('Goals_DaysToConv'), 'constantRowsCount' => true, 'parameters' => array(), 'metrics' => $conversionReportMetrics, @@ -190,7 +190,7 @@ class Goals extends \Piwik\Plugin // This API call requires a custom parameter $reports[] = array( 'category' => $goalsCategory, - 'name' => Piwik_Translate('Goals_GoalX', $goal['name']), + 'name' => Piwik::translate('Goals_GoalX', $goal['name']), 'module' => 'Goals', 'action' => 'get', 'parameters' => array('idGoal' => $goal['idgoal']), @@ -202,10 +202,10 @@ class Goals extends \Piwik\Plugin // Add visits to conversion report $reports[] = array( 'category' => $goalsCategory, - 'name' => $goal['name'] . ' - ' . Piwik_Translate('Goals_VisitsUntilConv'), + 'name' => $goal['name'] . ' - ' . Piwik::translate('Goals_VisitsUntilConv'), 'module' => 'Goals', 'action' => 'getVisitsUntilConversion', - 'dimension' => Piwik_Translate('Goals_VisitsUntilConv'), + 'dimension' => Piwik::translate('Goals_VisitsUntilConv'), 'constantRowsCount' => true, 'parameters' => array('idGoal' => $goal['idgoal']), 'metrics' => $conversionReportMetrics, @@ -215,10 +215,10 @@ class Goals extends \Piwik\Plugin // Add days to conversion report $reports[] = array( 'category' => $goalsCategory, - 'name' => $goal['name'] . ' - ' . Piwik_Translate('Goals_DaysToConv'), + 'name' => $goal['name'] . ' - ' . Piwik::translate('Goals_DaysToConv'), 'module' => 'Goals', 'action' => 'getDaysToConversion', - 'dimension' => Piwik_Translate('Goals_DaysToConv'), + 'dimension' => Piwik::translate('Goals_DaysToConv'), 'constantRowsCount' => true, 'parameters' => array('idGoal' => $goal['idgoal']), 'metrics' => $conversionReportMetrics, @@ -228,21 +228,21 @@ class Goals extends \Piwik\Plugin $site = new Site($idSite); if ($site->isEcommerceEnabled()) { - $category = Piwik_Translate('Goals_Ecommerce'); + $category = Piwik::translate('Goals_Ecommerce'); $ecommerceMetrics = array_merge($goalMetrics, array( - 'revenue_subtotal' => Piwik_Translate('General_Subtotal'), - 'revenue_tax' => Piwik_Translate('General_Tax'), - 'revenue_shipping' => Piwik_Translate('General_Shipping'), - 'revenue_discount' => Piwik_Translate('General_Discount'), - 'items' => Piwik_Translate('General_PurchasedProducts'), - 'avg_order_revenue' => Piwik_Translate('General_AverageOrderValue') + 'revenue_subtotal' => Piwik::translate('General_Subtotal'), + 'revenue_tax' => Piwik::translate('General_Tax'), + 'revenue_shipping' => Piwik::translate('General_Shipping'), + 'revenue_discount' => Piwik::translate('General_Discount'), + 'items' => Piwik::translate('General_PurchasedProducts'), + 'avg_order_revenue' => Piwik::translate('General_AverageOrderValue') )); - $ecommerceMetrics['nb_conversions'] = Piwik_Translate('General_EcommerceOrders'); + $ecommerceMetrics['nb_conversions'] = Piwik::translate('General_EcommerceOrders'); // General Ecommerce metrics $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_EcommerceOrders'), + 'name' => Piwik::translate('General_EcommerceOrders'), 'module' => 'Goals', 'action' => 'get', 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER), @@ -252,10 +252,10 @@ class Goals extends \Piwik\Plugin ); $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_EcommerceOrders') . ' - ' . Piwik_Translate('Goals_VisitsUntilConv'), + 'name' => Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_VisitsUntilConv'), 'module' => 'Goals', 'action' => 'getVisitsUntilConversion', - 'dimension' => Piwik_Translate('Goals_VisitsUntilConv'), + 'dimension' => Piwik::translate('Goals_VisitsUntilConv'), 'constantRowsCount' => true, 'metrics' => $conversionReportMetrics, 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER), @@ -263,10 +263,10 @@ class Goals extends \Piwik\Plugin ); $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_EcommerceOrders') . ' - ' . Piwik_Translate('Goals_DaysToConv'), + 'name' => Piwik::translate('General_EcommerceOrders') . ' - ' . Piwik::translate('Goals_DaysToConv'), 'module' => 'Goals', 'action' => 'getDaysToConversion', - 'dimension' => Piwik_Translate('Goals_DaysToConv'), + 'dimension' => Piwik::translate('Goals_DaysToConv'), 'constantRowsCount' => true, 'metrics' => $conversionReportMetrics, 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER), @@ -275,15 +275,15 @@ class Goals extends \Piwik\Plugin // Abandoned cart general metrics $abandonedCartMetrics = $goalMetrics; - $abandonedCartMetrics['nb_conversions'] = Piwik_Translate('General_AbandonedCarts'); - $abandonedCartMetrics['revenue'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_ColumnRevenue')); - $abandonedCartMetrics['items'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('Goals_Products')); + $abandonedCartMetrics['nb_conversions'] = Piwik::translate('General_AbandonedCarts'); + $abandonedCartMetrics['revenue'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ColumnRevenue')); + $abandonedCartMetrics['items'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('Goals_Products')); unset($abandonedCartMetrics['nb_visits_converted']); // Abandoned Cart metrics $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_AbandonedCarts'), + 'name' => Piwik::translate('General_AbandonedCarts'), 'module' => 'Goals', 'action' => 'get', 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART), @@ -294,10 +294,10 @@ class Goals extends \Piwik\Plugin $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_AbandonedCarts') . ' - ' . Piwik_Translate('Goals_VisitsUntilConv'), + 'name' => Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_VisitsUntilConv'), 'module' => 'Goals', 'action' => 'getVisitsUntilConversion', - 'dimension' => Piwik_Translate('Goals_VisitsUntilConv'), + 'dimension' => Piwik::translate('Goals_VisitsUntilConv'), 'constantRowsCount' => true, 'metrics' => $conversionReportMetrics, 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART), @@ -305,10 +305,10 @@ class Goals extends \Piwik\Plugin ); $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate('General_AbandonedCarts') . ' - ' . Piwik_Translate('Goals_DaysToConv'), + 'name' => Piwik::translate('General_AbandonedCarts') . ' - ' . Piwik::translate('Goals_DaysToConv'), 'module' => 'Goals', 'action' => 'getDaysToConversion', - 'dimension' => Piwik_Translate('Goals_DaysToConv'), + 'dimension' => Piwik::translate('Goals_DaysToConv'), 'constantRowsCount' => true, 'metrics' => $conversionReportMetrics, 'parameters' => array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART), @@ -320,10 +320,10 @@ class Goals extends \Piwik\Plugin foreach ($this->ecommerceReports as $i => $ecommerceReport) { $reports[] = array( 'category' => $category, - 'name' => Piwik_Translate($ecommerceReport[0]), + 'name' => Piwik::translate($ecommerceReport[0]), 'module' => 'Goals', 'action' => $ecommerceReport[2], - 'dimension' => Piwik_Translate($ecommerceReport[0]), + 'dimension' => Piwik::translate($ecommerceReport[0]), 'metrics' => $productColumns, 'processedMetrics' => false, 'order' => 30 + $i @@ -367,13 +367,13 @@ class Goals extends \Piwik\Plugin static public function getProductReportColumns() { return array( - 'revenue' => Piwik_Translate('General_ProductRevenue'), - 'quantity' => Piwik_Translate('General_Quantity'), - 'orders' => Piwik_Translate('General_UniquePurchases'), - 'avg_price' => Piwik_Translate('General_AveragePrice'), - 'avg_quantity' => Piwik_Translate('General_AverageQuantity'), - 'nb_visits' => Piwik_Translate('General_ColumnNbVisits'), - 'conversion_rate' => Piwik_Translate('General_ProductConversionRate'), + 'revenue' => Piwik::translate('General_ProductRevenue'), + 'quantity' => Piwik::translate('General_Quantity'), + 'orders' => Piwik::translate('General_UniquePurchases'), + 'avg_price' => Piwik::translate('General_AveragePrice'), + 'avg_quantity' => Piwik::translate('General_AverageQuantity'), + 'nb_visits' => Piwik::translate('General_ColumnNbVisits'), + 'conversion_rate' => Piwik::translate('General_ProductConversionRate'), ); } @@ -385,13 +385,13 @@ class Goals extends \Piwik\Plugin public function getActualReportsWithGoalMetrics(&$dimensions) { $reportWithGoalMetrics = array( - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('Goals_VisitsUntilConv'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('Goals_VisitsUntilConv'), 'module' => 'Goals', 'action' => 'getVisitsUntilConversion' ), - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('Goals_DaysToConv'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('Goals_DaysToConv'), 'module' => 'Goals', 'action' => 'getDaysToConversion' ) @@ -403,7 +403,7 @@ class Goals extends \Piwik\Plugin { $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => 'General_VisitConvertedGoalId', 'segment' => 'visitConvertedGoalId', 'sqlSegment' => 'log_conversion.idgoal', @@ -528,17 +528,17 @@ class Goals extends \Piwik\Plugin private function getDisplayPropertiesForGetItemsSku() { - return $this->getDisplayPropertiesForItemsReport(Piwik_Translate('Goals_ProductSKU')); + return $this->getDisplayPropertiesForItemsReport(Piwik::translate('Goals_ProductSKU')); } private function getDisplayPropertiesForGetItemsName() { - return $this->getDisplayPropertiesForItemsReport(Piwik_Translate('Goals_ProductName')); + return $this->getDisplayPropertiesForItemsReport(Piwik::translate('Goals_ProductName')); } private function getDisplayPropertiesForGetItemsCategory() { - return $this->getDisplayPropertiesForItemsReport(Piwik_Translate('Goals_ProductCategory')); + return $this->getDisplayPropertiesForItemsReport(Piwik::translate('Goals_ProductCategory')); } private function getDisplayPropertiesForGetVisitsUntilConversion() @@ -551,8 +551,8 @@ class Goals extends \Piwik\Plugin 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', 'translations' => array( - 'label' => Piwik_Translate('Goals_VisitsUntilConv'), - 'nb_conversions' => Piwik_Translate('Goals_ColumnConversions'), + 'label' => Piwik::translate('Goals_VisitsUntilConv'), + 'nb_conversions' => Piwik::translate('Goals_ColumnConversions'), ), 'filter_limit' => count(Archiver::$visitCountRanges), 'show_offset_information' => false, @@ -571,8 +571,8 @@ class Goals extends \Piwik\Plugin 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', 'translations' => array( - 'label' => Piwik_Translate('Goals_DaysToConv'), - 'nb_conversions' => Piwik_Translate('Goals_ColumnConversions'), + 'label' => Piwik::translate('Goals_DaysToConv'), + 'nb_conversions' => Piwik::translate('Goals_ColumnConversions'), ), 'filter_limit' => count(Archiver::$daysToConvRanges), 'show_all_views_icons' => false, @@ -607,10 +607,10 @@ class Goals extends \Piwik\Plugin $abandonedCart = Common::getRequestVar('viewDataTable', 'ecommerceOrder', 'string') == 'ecommerceAbandonedCart'; if ($abandonedCart) { - $columns['abandoned_carts'] = Piwik_Translate('General_AbandonedCarts'); - $columns['revenue'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_ProductRevenue')); - $columns['quantity'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_Quantity')); - $columns['avg_quantity'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_AverageQuantity')); + $columns['abandoned_carts'] = Piwik::translate('General_AbandonedCarts'); + $columns['revenue'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_ProductRevenue')); + $columns['quantity'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_Quantity')); + $columns['avg_quantity'] = Piwik::translate('Goals_LeftInCart', Piwik::translate('General_AverageQuantity')); unset($columns['orders']); unset($columns['conversion_rate']); @@ -623,14 +623,14 @@ class Goals extends \Piwik\Plugin // set metrics documentation in normal ecommerce report if (!$abandonedCart) { $result['metrics_documentation'] = array( - 'revenue' => Piwik_Translate('Goals_ColumnRevenueDocumentation', - Piwik_Translate('Goals_DocumentationRevenueGeneratedByProductSales')), - 'quantity' => Piwik_Translate('Goals_ColumnQuantityDocumentation', $label), - 'orders' => Piwik_Translate('Goals_ColumnOrdersDocumentation', $label), - 'avg_price' => Piwik_Translate('Goals_ColumnAveragePriceDocumentation', $label), - 'avg_quantity' => Piwik_Translate('Goals_ColumnAverageQuantityDocumentation', $label), - 'nb_visits' => Piwik_Translate('Goals_ColumnVisitsProductDocumentation', $label), - 'conversion_rate' => Piwik_Translate('Goals_ColumnConversionRateProductDocumentation', $label), + 'revenue' => Piwik::translate('Goals_ColumnRevenueDocumentation', + Piwik::translate('Goals_DocumentationRevenueGeneratedByProductSales')), + 'quantity' => Piwik::translate('Goals_ColumnQuantityDocumentation', $label), + 'orders' => Piwik::translate('Goals_ColumnOrdersDocumentation', $label), + 'avg_price' => Piwik::translate('Goals_ColumnAveragePriceDocumentation', $label), + 'avg_quantity' => Piwik::translate('Goals_ColumnAverageQuantityDocumentation', $label), + 'nb_visits' => Piwik::translate('Goals_ColumnVisitsProductDocumentation', $label), + 'conversion_rate' => Piwik::translate('Goals_ColumnConversionRateProductDocumentation', $label), ); } diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index 4ee71fde95..a9b59f240f 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -210,7 +210,7 @@ class API $availableGraphTypes = StaticGraph::getAvailableStaticGraphTypes(); if (!in_array($graphType, $availableGraphTypes)) { throw new Exception( - Piwik_TranslateException( + Piwik::translateException( 'General_ExceptionInvalidStaticGraphType', array($graphType, implode(', ', $availableGraphTypes)) ) @@ -247,7 +247,7 @@ class API foreach ($ordinateColumns as $column) { if (empty($reportColumns[$column])) { throw new Exception( - Piwik_Translate( + Piwik::translate( 'ImageGraph_ColumnOrdinateMissing', array($column, implode(',', array_keys($reportColumns))) ) @@ -320,7 +320,7 @@ class API //@review this test will need to be updated after evaluating the @review comment in API/API.php if (!$processedReport) { - throw new Exception(Piwik_Translate('General_NoDataForGraph')); + throw new Exception(Piwik::translate('General_NoDataForGraph')); } // restoring generic filter parameters @@ -458,7 +458,7 @@ class API } if (!$hasData || !$hasNonZeroValue) { - throw new Exception(Piwik_Translate('General_NoDataForGraph')); + throw new Exception(Piwik::translate('General_NoDataForGraph')); } //Setup the graph diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index bdc59dc629..8ebaab6240 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -16,6 +16,7 @@ use pData; use pImage; use Piwik\Loader; +use Piwik\Piwik; use Piwik\SettingsPiwik; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pDraw.class.php"; @@ -94,7 +95,7 @@ abstract class StaticGraph return new $className; } else { throw new Exception( - Piwik_TranslateException( + Piwik::translateException( 'General_ExceptionInvalidStaticGraphType', array($graphType, implode(', ', self::getAvailableStaticGraphTypes())) ) diff --git a/plugins/ImageGraph/StaticGraph/HorizontalBar.php b/plugins/ImageGraph/StaticGraph/HorizontalBar.php index cc3133dbe5..ca01136f8c 100644 --- a/plugins/ImageGraph/StaticGraph/HorizontalBar.php +++ b/plugins/ImageGraph/StaticGraph/HorizontalBar.php @@ -9,6 +9,7 @@ * @package StaticGraph */ namespace Piwik\Plugins\ImageGraph\StaticGraph; +use Piwik\Piwik; /** @@ -80,7 +81,7 @@ class HorizontalBar extends GridGraph $truncatedOrdinateSeries[$column][] = $sumOfOthers[$column]; } - $truncatedAbscissaSeries[] = Piwik_Translate('General_Others'); + $truncatedAbscissaSeries[] = Piwik::translate('General_Others'); $this->abscissaSeries = $truncatedAbscissaSeries; $this->ordinateSeries = $truncatedOrdinateSeries; $this->abscissaLogos = $truncatedAbscissaLogos; diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 7c2f24178f..df9659b181 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -635,7 +635,7 @@ class Controller extends \Piwik\Controller\Admin } if ($error) { \Piwik\Plugins\Login\Controller::clearSession(); - $message = Piwik_Translate('Installation_ErrorInvalidState', + $message = Piwik::translate('Installation_ErrorInvalidState', array('<br /><strong>', '</strong>', '<a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', @@ -858,7 +858,7 @@ class Controller extends \Piwik\Controller\Admin $infos['integrityErrorMessages'] = array(); if (isset($integrityInfo[1])) { if ($infos['integrity'] == false) { - $infos['integrityErrorMessages'][] = Piwik_Translate('General_FileIntegrityWarningExplanation'); + $infos['integrityErrorMessages'][] = Piwik::translate('General_FileIntegrityWarningExplanation'); } $infos['integrityErrorMessages'] = array_merge($infos['integrityErrorMessages'], array_slice($integrityInfo, 1)); } diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index 920e33bff3..0d625efab8 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -18,6 +18,7 @@ use Piwik\Db\Adapter; use Piwik\Db; use Piwik\DbHelper; use Piwik\Filesystem; +use Piwik\Piwik; use Piwik\QuickForm2; use Zend_Db_Adapter_Exception; @@ -46,35 +47,35 @@ class FormDatabaseSetup extends QuickForm2 } $this->addElement('text', 'host') - ->setLabel(Piwik_Translate('Installation_DatabaseSetupServer')) - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupServer'))); + ->setLabel(Piwik::translate('Installation_DatabaseSetupServer')) + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupServer'))); $user = $this->addElement('text', 'username') - ->setLabel(Piwik_Translate('Installation_DatabaseSetupLogin')); - $user->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupLogin'))); + ->setLabel(Piwik::translate('Installation_DatabaseSetupLogin')); + $user->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupLogin'))); $requiredPrivileges = Rule_checkUserPrivileges::getRequiredPrivilegesPretty(); $user->addRule('checkUserPrivileges', - Piwik_Translate('Installation_InsufficientPrivilegesMain', $requiredPrivileges . '<br/><br/>') . - Piwik_Translate('Installation_InsufficientPrivilegesHelp')); + Piwik::translate('Installation_InsufficientPrivilegesMain', $requiredPrivileges . '<br/><br/>') . + Piwik::translate('Installation_InsufficientPrivilegesHelp')); $this->addElement('password', 'password') - ->setLabel(Piwik_Translate('General_Password')); + ->setLabel(Piwik::translate('General_Password')); $item = $this->addElement('text', 'dbname') - ->setLabel(Piwik_Translate('Installation_DatabaseSetupDatabaseName')); - $item->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupDatabaseName'))); - $item->addRule('checkValidFilename', Piwik_Translate('General_NotValid', Piwik_Translate('Installation_DatabaseSetupDatabaseName'))); + ->setLabel(Piwik::translate('Installation_DatabaseSetupDatabaseName')); + $item->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupDatabaseName'))); + $item->addRule('checkValidFilename', Piwik::translate('General_NotValid', Piwik::translate('Installation_DatabaseSetupDatabaseName'))); $this->addElement('text', 'tables_prefix') - ->setLabel(Piwik_Translate('Installation_DatabaseSetupTablePrefix')) - ->addRule('checkValidFilename', Piwik_Translate('General_NotValid', Piwik_Translate('Installation_DatabaseSetupTablePrefix'))); + ->setLabel(Piwik::translate('Installation_DatabaseSetupTablePrefix')) + ->addRule('checkValidFilename', Piwik::translate('General_NotValid', Piwik::translate('Installation_DatabaseSetupTablePrefix'))); $this->addElement('select', 'adapter') - ->setLabel(Piwik_Translate('Installation_DatabaseSetupAdapter')) + ->setLabel(Piwik::translate('Installation_DatabaseSetupAdapter')) ->loadOptions($adapters) - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupAdapter'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupAdapter'))); - $this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next') . ' »', 'class' => 'submit')); + $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'submit')); // default values $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index e509c3096f..42159bdf43 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -14,6 +14,7 @@ namespace Piwik\Plugins\Installation; use HTML_QuickForm2_DataSource_Array; use HTML_QuickForm2_Factory; use HTML_QuickForm2_Rule; +use Piwik\Piwik; use Piwik\Plugins\SitesManager\API; use Piwik\QuickForm2; @@ -36,32 +37,32 @@ class FormFirstWebsiteSetup extends QuickForm2 $javascriptOnClickUrlExample = "javascript:if(this.value=='$urlExample'){this.value='http://';} this.style.color='black';"; $timezones = API::getInstance()->getTimezonesList(); - $timezones = array_merge(array('No timezone' => Piwik_Translate('SitesManager_SelectACity')), $timezones); + $timezones = array_merge(array('No timezone' => Piwik::translate('SitesManager_SelectACity')), $timezones); $this->addElement('text', 'siteName') - ->setLabel(Piwik_Translate('Installation_SetupWebSiteName')) - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_SetupWebSiteName'))); + ->setLabel(Piwik::translate('Installation_SetupWebSiteName')) + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_SetupWebSiteName'))); $url = $this->addElement('text', 'url') - ->setLabel(Piwik_Translate('Installation_SetupWebSiteURL')); + ->setLabel(Piwik::translate('Installation_SetupWebSiteURL')); $url->setAttribute('style', 'color:rgb(153, 153, 153);'); $url->setAttribute('onfocus', $javascriptOnClickUrlExample); $url->setAttribute('onclick', $javascriptOnClickUrlExample); - $url->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_SetupWebSiteURL'))); + $url->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_SetupWebSiteURL'))); $tz = $this->addElement('select', 'timezone') - ->setLabel(Piwik_Translate('Installation_Timezone')) + ->setLabel(Piwik::translate('Installation_Timezone')) ->loadOptions($timezones); - $tz->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_Timezone'))); - $tz->addRule('checkTimezone', Piwik_Translate('General_NotValid', Piwik_Translate('Installation_Timezone'))); + $tz->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_Timezone'))); + $tz->addRule('checkTimezone', Piwik::translate('General_NotValid', Piwik::translate('Installation_Timezone'))); $tz = $this->addElement('select', 'ecommerce') - ->setLabel(Piwik_Translate('Goals_Ecommerce')) + ->setLabel(Piwik::translate('Goals_Ecommerce')) ->loadOptions(array( - 0 => Piwik_Translate('SitesManager_NotAnEcommerceSite'), - 1 => Piwik_Translate('SitesManager_EnableEcommerce'), + 0 => Piwik::translate('SitesManager_NotAnEcommerceSite'), + 1 => Piwik::translate('SitesManager_EnableEcommerce'), )); - $this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next') . ' »', 'class' => 'submit')); + $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'submit')); // default values $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( diff --git a/plugins/Installation/FormGeneralSetup.php b/plugins/Installation/FormGeneralSetup.php index 4691f2289e..e205be9933 100644 --- a/plugins/Installation/FormGeneralSetup.php +++ b/plugins/Installation/FormGeneralSetup.php @@ -33,33 +33,33 @@ class FormGeneralSetup extends QuickForm2 HTML_QuickForm2_Factory::registerRule('checkEmail', 'Piwik\Plugins\Installation\Rule_isValidEmailString'); $login = $this->addElement('text', 'login') - ->setLabel(Piwik_Translate('Installation_SuperUserLogin')); - $login->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_SuperUserLogin'))); + ->setLabel(Piwik::translate('Installation_SuperUserLogin')); + $login->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_SuperUserLogin'))); $login->addRule('checkLogin'); $password = $this->addElement('password', 'password') - ->setLabel(Piwik_Translate('Installation_Password')); - $password->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_Password'))); + ->setLabel(Piwik::translate('Installation_Password')); + $password->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_Password'))); $passwordBis = $this->addElement('password', 'password_bis') - ->setLabel(Piwik_Translate('Installation_PasswordRepeat')); - $passwordBis->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_PasswordRepeat'))); - $passwordBis->addRule('eq', Piwik_Translate('Installation_PasswordDoNotMatch'), $password); + ->setLabel(Piwik::translate('Installation_PasswordRepeat')); + $passwordBis->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_PasswordRepeat'))); + $passwordBis->addRule('eq', Piwik::translate('Installation_PasswordDoNotMatch'), $password); $email = $this->addElement('text', 'email') - ->setLabel(Piwik_Translate('Installation_Email')); - $email->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_Email'))); - $email->addRule('checkEmail', Piwik_Translate('UsersManager_ExceptionInvalidEmail')); + ->setLabel(Piwik::translate('Installation_Email')); + $email->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_Email'))); + $email->addRule('checkEmail', Piwik::translate('UsersManager_ExceptionInvalidEmail')); $this->addElement('checkbox', 'subscribe_newsletter_security', null, array( - 'content' => ' ' . Piwik_Translate('Installation_SecurityNewsletter'), + 'content' => ' ' . Piwik::translate('Installation_SecurityNewsletter'), )); $this->addElement('checkbox', 'subscribe_newsletter_community', null, array( - 'content' => ' ' . Piwik_Translate('Installation_CommunityNewsletter'), + 'content' => ' ' . Piwik::translate('Installation_CommunityNewsletter'), )); - $this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next') . ' »', 'class' => 'submit')); + $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' »', 'class' => 'submit')); // default values $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index e76484c777..dca5ecb666 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -67,7 +67,7 @@ class Installation extends \Piwik\Plugin ) { $controller->$step($message); } else { - Piwik::exitWithErrorMessage(Piwik_Translate('Installation_NoConfigFound')); + Piwik::exitWithErrorMessage(Piwik::translate('Installation_NoConfigFound')); } exit; diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 3cfc1bba75..04083c86ba 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -479,7 +479,7 @@ class API if ($referrerType === false || $referrerType == 'direct' ) { - $result = Piwik_Translate('Referrers_DirectEntry'); + $result = Piwik::translate('Referrers_DirectEntry'); } else if ($referrerType == 'search') { $result = $visit->getColumn('referrerName'); @@ -490,7 +490,7 @@ class API $result .= ' (' . $keyword . ')'; } } else if ($referrerType == 'campaign') { - $result = Piwik_Translate('Referrers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')'; + $result = Piwik::translate('Referrers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')'; } else { $result = $visit->getColumn('referrerName'); } @@ -535,10 +535,10 @@ class API $visitorDetailsArray['serverTimestamp'] = $visitorDetailsArray['lastActionTimestamp']; $dateTimeVisit = Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone); $visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized('%time%'); - $visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat')); + $visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); $dateTimeVisitFirstAction = Date::factory($visitorDetailsArray['firstActionTimestamp'], $timezone); - $visitorDetailsArray['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat')); + $visitorDetailsArray['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); $visitorDetailsArray['serverTimePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized('%time%'); $visitorDetailsArray['actionDetails'] = array(); @@ -557,8 +557,8 @@ class API private function getCustomVariablePrettyKey($key) { $rename = array( - Action::CVAR_KEY_SEARCH_CATEGORY => Piwik_Translate('Actions_ColumnSearchCategory'), - Action::CVAR_KEY_SEARCH_COUNT => Piwik_Translate('Actions_ColumnSearchResultsCount'), + Action::CVAR_KEY_SEARCH_CATEGORY => Piwik::translate('Actions_ColumnSearchCategory'), + Action::CVAR_KEY_SEARCH_COUNT => Piwik::translate('Actions_ColumnSearchResultsCount'), ); if (isset($rename[$key])) { return $rename[$key]; @@ -1005,7 +1005,7 @@ class API } // Convert datetimes to the site timezone $dateTimeVisit = Date::factory($details['serverTimePretty'], $timezone); - $details['serverTimePretty'] = $dateTimeVisit->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat') . ' %time%'); + $details['serverTimePretty'] = $dateTimeVisit->getLocalized(Piwik::translate('CoreHome_ShortDateFormat') . ' %time%'); } $visitorDetailsArray['goalConversions'] = count($goalDetails); return $visitorDetailsArray; diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index 3c87d8897b..edc80beda1 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -57,14 +57,14 @@ class Controller extends \Piwik\Controller $view->actions = MetricsFormatter::getPrettyNumber($lastNData[0]['actions']); $view->refreshAfterXSecs = Config::getInstance()->General['live_widget_refresh_after_seconds']; $view->translations = array( - 'one_visitor' => Piwik_Translate('Live_NbVisitor'), - 'visitors' => Piwik_Translate('Live_NbVisitors'), - 'one_visit' => Piwik_Translate('General_OneVisit'), - 'visits' => Piwik_Translate('General_NVisits'), - 'one_action' => Piwik_Translate('General_OneAction'), - 'actions' => Piwik_Translate('VisitsSummary_NbActionsDescription'), - 'one_minute' => Piwik_Translate('General_OneMinute'), - 'minutes' => Piwik_Translate('General_NMinutes') + 'one_visitor' => Piwik::translate('Live_NbVisitor'), + 'visitors' => Piwik::translate('Live_NbVisitors'), + 'one_visit' => Piwik::translate('General_OneVisit'), + 'visits' => Piwik::translate('General_NVisits'), + 'one_action' => Piwik::translate('General_OneAction'), + 'actions' => Piwik::translate('VisitsSummary_NbActionsDescription'), + 'one_minute' => Piwik::translate('General_OneMinute'), + 'minutes' => Piwik::translate('General_NMinutes') ); return $this->render($view, $fetch); } diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index 09d6f092c3..e08d556b0a 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\Live; use Piwik\Common; +use Piwik\Piwik; use Piwik\WidgetsList; /** @@ -91,13 +92,13 @@ class Live extends \Piwik\Plugin 'show_all_views_icons' => false, 'show_table_all_columns' => false, 'show_export_as_rss_feed' => false, - 'documentation' => Piwik_Translate('Live_VisitorLogDocumentation', array('<br />', '<br />')), + 'documentation' => Piwik::translate('Live_VisitorLogDocumentation', array('<br />', '<br />')), 'custom_parameters' => array( // set a very high row count so that the next link in the footer of the data table is always shown 'totalRows' => 10000000, 'filterEcommerce' => Common::getRequestVar('filterEcommerce', 0, 'int'), - 'pageUrlNotDefined' => Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageURL')) + 'pageUrlNotDefined' => Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL')) ), 'footer_icons' => array( array( @@ -105,7 +106,7 @@ class Live extends \Piwik\Plugin 'buttons' => array( array( 'id' => 'Piwik\\Plugins\\Live\\VisitorLog', - 'title' => Piwik_Translate('Live_LinkVisitorLog'), + 'title' => Piwik::translate('Live_LinkVisitorLog'), 'icon' => 'plugins/Zeitgeist/images/table.png' ) ) diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 39581e7f83..10aa1bbf80 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\Live; use Piwik\Common; use Piwik\IP; +use Piwik\Piwik; use Piwik\Plugins\API\API as APIMetadata; use Piwik\Plugins\Referrers\API as APIReferrers; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; @@ -540,7 +541,7 @@ class Visitor if (isset($this->details['location_provider'])) { return $this->details['location_provider']; } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index ea9cd8788e..3c7b88c5ec 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -133,12 +133,12 @@ class Controller extends \Piwik\Controller $password = Common::getRequestVar('password', null, 'string'); if (strlen($password) != 32) { - throw new Exception(Piwik_TranslateException('Login_ExceptionPasswordMD5HashExpected')); + throw new Exception(Piwik::translateException('Login_ExceptionPasswordMD5HashExpected')); } $login = Common::getRequestVar('login', null, 'string'); if ($login == Config::getInstance()->superuser['login']) { - throw new Exception(Piwik_TranslateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme"))); + throw new Exception(Piwik::translateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme"))); } $currentUrl = 'index.php'; @@ -190,7 +190,7 @@ class Controller extends \Piwik\Controller protected function getMessageExceptionNoAccess() { - $message = Piwik_Translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); + $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); // Should mention trusted_hosts or link to FAQ return $message; } @@ -215,7 +215,7 @@ class Controller extends \Piwik\Controller if (Nonce::verifyNonce('Login.login', $nonce)) { $formErrors = $this->resetPasswordFirstStep($form); if (empty($formErrors)) { - $infoMessage = Piwik_Translate('Login_ConfirmationLinkSent'); + $infoMessage = Piwik::translate('Login_ConfirmationLinkSent'); } } else { $formErrors = array($this->getMessageExceptionNoAccess()); @@ -253,12 +253,12 @@ class Controller extends \Piwik\Controller // get the user's login if ($loginMail === 'anonymous') { - return array(Piwik_Translate('Login_InvalidUsernameEmail')); + return array(Piwik::translate('Login_InvalidUsernameEmail')); } $user = self::getUserInformation($loginMail); if ($user === null) { - return array(Piwik_Translate('Login_InvalidUsernameEmail')); + return array(Piwik::translate('Login_InvalidUsernameEmail')); } $login = $user['login']; @@ -273,7 +273,7 @@ class Controller extends \Piwik\Controller // remove password reset info Login::removePasswordResetInfo($login); - return array($ex->getMessage() . '<br/>' . Piwik_Translate('Login_ContactAdmin')); + return array($ex->getMessage() . '<br/>' . Piwik::translate('Login_ContactAdmin')); } return null; @@ -300,11 +300,11 @@ class Controller extends \Piwik\Controller // send email with new password $mail = new Mail(); $mail->addTo($email, $login); - $mail->setSubject(Piwik_Translate('Login_MailTopicPasswordChange')); + $mail->setSubject(Piwik::translate('Login_MailTopicPasswordChange')); $bodyText = str_replace( '\n', "\n", - sprintf(Piwik_Translate('Login_MailPasswordChangeBody'), $login, $ip, $url) + sprintf(Piwik::translate('Login_MailPasswordChangeBody'), $login, $ip, $url) ) . "\n"; $mail->setBodyText($bodyText); @@ -329,13 +329,13 @@ class Controller extends \Piwik\Controller // get password reset info & user info $user = self::getUserInformation($login); if ($user === null) { - throw new Exception(Piwik_Translate('Login_InvalidUsernameEmail')); + throw new Exception(Piwik::translate('Login_InvalidUsernameEmail')); } // check that the reset token is valid $resetPassword = Login::getPasswordToResetTo($login); if ($resetPassword === false || !self::isValidToken($resetToken, $user)) { - throw new Exception(Piwik_Translate('Login_InvalidOrExpiredToken')); + throw new Exception(Piwik::translate('Login_InvalidOrExpiredToken')); } // reset password of user @@ -387,7 +387,7 @@ class Controller extends \Piwik\Controller */ public function resetPasswordSuccess() { - $this->login($errorMessage = null, $infoMessage = Piwik_Translate('Login_PasswordChanged')); + $this->login($errorMessage = null, $infoMessage = Piwik::translate('Login_PasswordChanged')); } /** diff --git a/plugins/Login/FormLogin.php b/plugins/Login/FormLogin.php index 862ebe65d7..70e69b9bdb 100644 --- a/plugins/Login/FormLogin.php +++ b/plugins/Login/FormLogin.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Login; use HTML_QuickForm2_DataSource_Array; +use Piwik\Piwik; use Piwik\QuickForm2; /** @@ -27,10 +28,10 @@ class FormLogin extends QuickForm2 function init() { $this->addElement('text', 'form_login') - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('General_Username'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username'))); $this->addElement('password', 'form_password') - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('General_Password'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password'))); $this->addElement('hidden', 'form_nonce'); diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index 9a5783b519..924f52c52d 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\Login; +use Piwik\Piwik; use Piwik\QuickForm2; /** @@ -26,14 +27,14 @@ class FormResetPassword extends QuickForm2 function init() { $this->addElement('text', 'form_login') - ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('General_Username'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username'))); $password = $this->addElement('password', 'form_password'); - $password->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('General_Password'))); + $password->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password'))); $passwordBis = $this->addElement('password', 'form_password_bis'); - $passwordBis->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Login_PasswordRepeat'))); - $passwordBis->addRule('eq', Piwik_Translate('Login_PasswordsDoNotMatch'), $password); + $passwordBis->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_PasswordRepeat'))); + $passwordBis->addRule('eq', Piwik::translate('Login_PasswordsDoNotMatch'), $password); $this->addElement('hidden', 'form_nonce'); diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index fd242c3230..5abd11b98a 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -118,7 +118,7 @@ class Login extends \Piwik\Plugin $cookie = new Cookie($authCookieName, $authCookieExpiry, $authCookiePath); if (!$authResult->wasAuthenticationSuccessful()) { $cookie->delete(); - throw new Exception(Piwik_Translate('Login_LoginPasswordNotCorrect')); + throw new Exception(Piwik::translate('Login_LoginPasswordNotCorrect')); } $cookie->set('login', $login); diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php index 3b345e94c4..3c369785a8 100644 --- a/plugins/MobileMessaging/API.php +++ b/plugins/MobileMessaging/API.php @@ -130,12 +130,12 @@ class API $verificationCode .= mt_rand(0, 9); } - $smsText = Piwik_Translate( + $smsText = Piwik::translate( 'MobileMessaging_VerificationText', array( $verificationCode, - Piwik_Translate('General_Settings'), - Piwik_Translate('MobileMessaging_SettingsMenu') + Piwik::translate('General_Settings'), + Piwik::translate('MobileMessaging_SettingsMenu') ) ); diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php index 135452833a..96d5509977 100644 --- a/plugins/MobileMessaging/Controller.php +++ b/plugins/MobileMessaging/Controller.php @@ -45,7 +45,7 @@ class Controller extends \Piwik\Controller\Admin $view->delegatedManagement = $mobileMessagingAPI->getDelegatedManagement(); $view->credentialSupplied = $mobileMessagingAPI->areSMSAPICredentialProvided(); $view->accountManagedByCurrentUser = $view->isSuperUser || $view->delegatedManagement; - $view->strHelpAddPhone = Piwik_Translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(Piwik_Translate('General_Settings'), Piwik_Translate('MobileMessaging_SettingsMenu'))); + $view->strHelpAddPhone = Piwik::translate('MobileMessaging_Settings_PhoneNumbers_HelpAdd', array(Piwik::translate('General_Settings'), Piwik::translate('MobileMessaging_SettingsMenu'))); if ($view->credentialSupplied && $view->accountManagedByCurrentUser) { $view->provider = $mobileMessagingAPI->getSMSProvider(); $view->creditLeft = $mobileMessagingAPI->getCreditLeft(); diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 34017d1956..846a453ff6 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -171,7 +171,7 @@ class MobileMessaging extends \Piwik\Plugin $reportRenderer = new Sms(); } else { $reportRenderer = new ReportRendererException( - Piwik_Translate('MobileMessaging_MultiSites_Must_Be_Activated') + Piwik::translate('MobileMessaging_MultiSites_Must_Be_Activated') ); } } @@ -203,8 +203,8 @@ class MobileMessaging extends \Piwik\Plugin $phoneNumbers = $parameters[self::PHONE_NUMBERS_PARAMETER]; // 'All Websites' is one character above the limit, use 'Reports' instead - if ($reportSubject == Piwik_Translate('General_MultiSitesSummary')) { - $reportSubject = Piwik_Translate('General_Reports'); + if ($reportSubject == Piwik::translate('General_MultiSitesSummary')) { + $reportSubject = Piwik::translate('General_Reports'); } $mobileMessagingAPI = APIMobileMessaging::getInstance(); diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index e7aa7ced85..67217cc841 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\MobileMessaging; use Exception; use Piwik\Loader; +use Piwik\Piwik; /** * The SMSProvider abstract class is used as a base class for SMS provider implementations. @@ -57,7 +58,7 @@ abstract class SMSProvider return new $className; } catch (Exception $e) { throw new Exception( - Piwik_TranslateException( + Piwik::translateException( 'MobileMessaging_Exception_UnknownProvider', array($providerName, implode(', ', array_keys(self::$availableSMSProviders))) ) @@ -95,7 +96,7 @@ abstract class SMSProvider */ static public function truncate($string, $maximumNumberOfConcatenatedSMS, $appendedString = 'MobileMessaging_SMS_Content_Too_Long') { - $appendedString = Piwik_Translate($appendedString); + $appendedString = Piwik::translate($appendedString); $smsContentContainsUCS2Chars = self::containsUCS2Characters($string); $maxCharsAllowed = self::maxCharsAllowed($maximumNumberOfConcatenatedSMS, $smsContentContainsUCS2Chars); diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index 54071e129b..ef38a890da 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -9,6 +9,7 @@ * @package MultiSites */ namespace Piwik\Plugins\MultiSites; +use Piwik\Piwik; /** @@ -43,17 +44,17 @@ class MultiSites extends \Piwik\Plugin $metadataMetrics = array(); foreach (API::getApiMetrics($enhanced = true) as $metricName => $metricSettings) { $metadataMetrics[$metricName] = - Piwik_Translate($metricSettings[API::METRIC_TRANSLATION_KEY]); + Piwik::translate($metricSettings[API::METRIC_TRANSLATION_KEY]); $metadataMetrics[$metricSettings[API::METRIC_EVOLUTION_COL_NAME_KEY]] = - Piwik_Translate($metricSettings[API::METRIC_TRANSLATION_KEY]) . " " . Piwik_Translate('MultiSites_Evolution'); + Piwik::translate($metricSettings[API::METRIC_TRANSLATION_KEY]) . " " . Piwik::translate('MultiSites_Evolution'); } $reports[] = array( - 'category' => Piwik_Translate('General_MultiSitesSummary'), - 'name' => Piwik_Translate('General_AllWebsitesDashboard'), + 'category' => Piwik::translate('General_MultiSitesSummary'), + 'name' => Piwik::translate('General_AllWebsitesDashboard'), 'module' => 'MultiSites', 'action' => 'getAll', - 'dimension' => Piwik_Translate('General_Website'), // re-using translation + 'dimension' => Piwik::translate('General_Website'), // re-using translation 'metrics' => $metadataMetrics, 'processedMetrics' => false, 'constantRowsCount' => false, @@ -61,11 +62,11 @@ class MultiSites extends \Piwik\Plugin ); $reports[] = array( - 'category' => Piwik_Translate('General_MultiSitesSummary'), - 'name' => Piwik_Translate('General_SingleWebsitesDashboard'), + 'category' => Piwik::translate('General_MultiSitesSummary'), + 'name' => Piwik::translate('General_SingleWebsitesDashboard'), 'module' => 'MultiSites', 'action' => 'getOne', - 'dimension' => Piwik_Translate('General_Website'), // re-using translation + 'dimension' => Piwik::translate('General_Website'), // re-using translation 'metrics' => $metadataMetrics, 'processedMetrics' => false, 'constantRowsCount' => false, @@ -76,7 +77,7 @@ class MultiSites extends \Piwik\Plugin public function addTopMenu() { $urlParams = array('module' => 'MultiSites', 'action' => 'index', 'segment' => false); - $tooltip = Piwik_Translate('MultiSites_TopLinkTooltip'); + $tooltip = Piwik::translate('MultiSites_TopLinkTooltip'); Piwik_AddTopMenu('General_MultiSitesSummary', $urlParams, true, 3, $isHTML = false, $tooltip); } diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php index 37ac6b7e49..59f2342d89 100644 --- a/plugins/Overlay/API.php +++ b/plugins/Overlay/API.php @@ -51,7 +51,7 @@ class API 'link' => 'Overlay_Link' ); - return array_map('Piwik_Translate', $translations); + return array_map('Piwik::translate', $translations); } /** diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index 5abfcd29f8..8ebf533c27 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -201,7 +201,7 @@ class Controller extends \Piwik\Controller $url = Common::getRequestVar('url', ''); $url = Common::unsanitizeInputValue($url); - $message = Piwik_Translate('Overlay_RedirectUrlError', array($url, "\n")); + $message = Piwik::translate('Overlay_RedirectUrlError', array($url, "\n")); $message = nl2br(htmlentities($message)); $view = new View('@Overlay/showErrorWrongDomain'); @@ -211,11 +211,11 @@ class Controller extends \Piwik\Controller // TODO use $idSite to link to the correct row. This is tricky because the #rowX ids don't match // the site ids when sites have been deleted. $url = 'index.php?module=SitesManager&action=index'; - $troubleshoot = htmlentities(Piwik_Translate('Overlay_RedirectUrlErrorAdmin')); + $troubleshoot = htmlentities(Piwik::translate('Overlay_RedirectUrlErrorAdmin')); $troubleshoot = sprintf($troubleshoot, '<a href="' . $url . '" target="_top">', '</a>'); $view->troubleshoot = $troubleshoot; } else { - $view->troubleshoot = htmlentities(Piwik_Translate('Overlay_RedirectUrlErrorUser')); + $view->troubleshoot = htmlentities(Piwik::translate('Overlay_RedirectUrlErrorUser')); } echo $view->render(); diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index a6b67e68fd..d47e774d2d 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -47,12 +47,12 @@ class Provider extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('Provider_ColumnProvider'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('Provider_ColumnProvider'), 'module' => 'Provider', 'action' => 'getProvider', - 'dimension' => Piwik_Translate('Provider_ColumnProvider'), - 'documentation' => Piwik_Translate('Provider_ProviderReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Provider_ColumnProvider'), + 'documentation' => Piwik::translate('Provider_ProviderReportDocumentation', '<br />'), 'order' => 50 ); } @@ -62,7 +62,7 @@ class Provider extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('Provider_ColumnProvider'), + 'name' => Piwik::translate('Provider_ColumnProvider'), 'segment' => 'provider', 'acceptedValues' => 'comcast.net, proxad.net, etc.', 'sqlSegment' => 'log_visit.location_provider' @@ -210,7 +210,7 @@ class Provider extends \Piwik\Plugin static public function footerUserCountry(&$out) { $out = '<div> - <h2>' . Piwik_Translate('Provider_WidgetProviders') . '</h2>'; + <h2>' . Piwik::translate('Provider_WidgetProviders') . '</h2>'; $out .= FrontController::getInstance()->fetchDispatch('Provider', 'getProvider'); $out .= '</div>'; } @@ -242,7 +242,7 @@ class Provider extends \Piwik\Plugin private function getDisplayPropertiesForGetProvider() { return array( - 'translations' => array('label' => Piwik_Translate('Provider_ColumnProvider')), + 'translations' => array('label' => Piwik::translate('Provider_ColumnProvider')), 'filter_limit' => 5 ); } diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php index 480cfbe3e0..a266c93d84 100644 --- a/plugins/Provider/functions.php +++ b/plugins/Provider/functions.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\Provider; use Piwik\Common; use Piwik\DataTable; +use Piwik\Piwik; /** * Return hostname portion of a domain name @@ -22,7 +23,7 @@ use Piwik\DataTable; function getHostnameName($in) { if (empty($in)) { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } if (strtolower($in) === 'ip') { return "IP"; diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index 57983497f5..1599546b4f 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -165,7 +165,7 @@ class API */ static public function getKeywordNotDefinedString() { - return Piwik_Translate('General_NotDefined', Piwik_Translate('General_ColumnKeyword')); + return Piwik::translate('General_NotDefined', Piwik::translate('General_ColumnKeyword')); } /** diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 559c9c6918..62473aebc6 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -112,13 +112,13 @@ class Controller extends \Piwik\Controller $referrersReportsByDimension->addReport( 'Referrers_ViewAllReferrers', 'Referrers_WidgetGetAll', 'Referrers.getAll'); - $byTypeCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('Live_GoalType')); + $byTypeCategory = Piwik::translate('Referrers_ViewReferrersBy', Piwik::translate('Live_GoalType')); $referrersReportsByDimension->addReport( $byTypeCategory, 'Referrers_WidgetKeywords', 'Referrers.getKeywords'); $referrersReportsByDimension->addReport($byTypeCategory, 'SitesManager_Sites', 'Referrers.getWebsites'); $referrersReportsByDimension->addReport($byTypeCategory, 'Referrers_Campaigns', 'Referrers.getCampaigns'); - $bySourceCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('General_Source')); + $bySourceCategory = Piwik::translate('Referrers_ViewReferrersBy', Piwik::translate('General_Source')); $referrersReportsByDimension->addReport($bySourceCategory, 'Referrers_Socials', 'Referrers.getSocials'); $referrersReportsByDimension->addReport( $bySourceCategory, 'Referrers_SearchEngines', 'Referrers.getSearchEngines'); @@ -205,7 +205,7 @@ class Controller extends \Piwik\Controller public function indexCampaigns($fetch = false) { return View::singleReport( - Piwik_Translate('Referrers_Campaigns'), + Piwik::translate('Referrers_Campaigns'), $this->getCampaigns(true), $fetch); } @@ -297,17 +297,17 @@ class Controller extends \Piwik\Controller $typeReferrer = Common::getRequestVar('typeReferrer', false); } $label = self::getTranslatedReferrerTypeLabel($typeReferrer); - $total = Piwik_Translate('General_Total'); + $total = Piwik::translate('General_Total'); $visibleRows = array($label, $total); $view->request_parameters_to_modify['rows'] = $label . ',' . $total; } $view->visualization_properties->row_picker_match_rows_by = 'label'; $view->visualization_properties->rows_to_display = $visibleRows; - $view->documentation = Piwik_Translate('Referrers_EvolutionDocumentation') . '<br />' - . Piwik_Translate('General_BrokenDownReportDocumentation') . '<br />' - . Piwik_Translate('Referrers_EvolutionDocumentationMoreInfo', '"' - . Piwik_Translate('Referrers_DetailsByReferrerType') . '"'); + $view->documentation = Piwik::translate('Referrers_EvolutionDocumentation') . '<br />' + . Piwik::translate('General_BrokenDownReportDocumentation') . '<br />' + . Piwik::translate('Referrers_EvolutionDocumentationMoreInfo', '"' + . Piwik::translate('Referrers_DetailsByReferrerType') . '"'); return $this->renderView($view, $fetch); } @@ -315,7 +315,7 @@ class Controller extends \Piwik\Controller public function getLastDistinctSearchEnginesGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctSearchEngines"); - $view->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik_Translate('Referrers_DistinctSearchEngines')); + $view->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik::translate('Referrers_DistinctSearchEngines')); $view->columns_to_display = array('Referrers_distinctSearchEngines'); return $this->renderView($view, $fetch); } @@ -323,7 +323,7 @@ class Controller extends \Piwik\Controller public function getLastDistinctKeywordsGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctKeywords"); - $view->translations['Referrers_distinctKeywords'] = ucfirst(Piwik_Translate('Referrers_DistinctKeywords')); + $view->translations['Referrers_distinctKeywords'] = ucfirst(Piwik::translate('Referrers_DistinctKeywords')); $view->columns_to_display = array('Referrers_distinctKeywords'); return $this->renderView($view, $fetch); } @@ -331,7 +331,7 @@ class Controller extends \Piwik\Controller public function getLastDistinctWebsitesGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctWebsites"); - $view->translations['Referrers_distinctWebsites'] = ucfirst(Piwik_Translate('Referrers_DistinctWebsites')); + $view->translations['Referrers_distinctWebsites'] = ucfirst(Piwik::translate('Referrers_DistinctWebsites')); $view->columns_to_display = array('Referrers_distinctWebsites'); return $this->renderView($view, $fetch); } @@ -339,7 +339,7 @@ class Controller extends \Piwik\Controller public function getLastDistinctCampaignsGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctCampaigns"); - $view->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik_Translate('Referrers_DistinctCampaigns')); + $view->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik::translate('Referrers_DistinctCampaigns')); $view->columns_to_display = array('Referrers_distinctCampaigns'); return $this->renderView($view, $fetch); } @@ -472,7 +472,7 @@ function DisplayTopKeywords($url = "") public static function getTranslatedReferrerTypeLabel($typeReferrer) { $label = getReferrerTypeLabel($typeReferrer); - return Piwik_Translate($label); + return Piwik::translate($label); } /** @@ -483,7 +483,7 @@ function DisplayTopKeywords($url = "") */ private function getReferrerUrlSparkline($referrerType) { - $totalRow = Piwik_Translate('General_Total'); + $totalRow = Piwik::translate('General_Total'); return $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_visits'), diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php index 30bef2a1dd..96cd26d111 100644 --- a/plugins/Referrers/Referrers.php +++ b/plugins/Referrers/Referrers.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\Referrers; use Piwik\ArchiveProcessor; use Piwik\Common; +use Piwik\Piwik; use Piwik\SettingsPiwik; use Piwik\WidgetsList; @@ -47,124 +48,124 @@ class Referrers extends \Piwik\Plugin { $reports = array_merge($reports, array( array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Type'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Type'), 'module' => 'Referrers', 'action' => 'getReferrerType', - 'dimension' => Piwik_Translate('Referrers_Type'), + 'dimension' => Piwik::translate('Referrers_Type'), 'constantRowsCount' => true, - 'documentation' => Piwik_Translate('Referrers_TypeReportDocumentation') . '<br />' - . '<b>' . Piwik_Translate('Referrers_DirectEntry') . ':</b> ' . Piwik_Translate('Referrers_DirectEntryDocumentation') . '<br />' - . '<b>' . Piwik_Translate('Referrers_SearchEngines') . ':</b> ' . Piwik_Translate('Referrers_SearchEnginesDocumentation', - array('<br />', '"' . Piwik_Translate('Referrers_SubmenuSearchEngines') . '"')) . '<br />' - . '<b>' . Piwik_Translate('Referrers_Websites') . ':</b> ' . Piwik_Translate('Referrers_WebsitesDocumentation', - array('<br />', '"' . Piwik_Translate('Referrers_SubmenuWebsites') . '"')) . '<br />' - . '<b>' . Piwik_Translate('Referrers_Campaigns') . ':</b> ' . Piwik_Translate('Referrers_CampaignsDocumentation', - array('<br />', '"' . Piwik_Translate('Referrers_Campaigns') . '"')), + 'documentation' => Piwik::translate('Referrers_TypeReportDocumentation') . '<br />' + . '<b>' . Piwik::translate('Referrers_DirectEntry') . ':</b> ' . Piwik::translate('Referrers_DirectEntryDocumentation') . '<br />' + . '<b>' . Piwik::translate('Referrers_SearchEngines') . ':</b> ' . Piwik::translate('Referrers_SearchEnginesDocumentation', + array('<br />', '"' . Piwik::translate('Referrers_SubmenuSearchEngines') . '"')) . '<br />' + . '<b>' . Piwik::translate('Referrers_Websites') . ':</b> ' . Piwik::translate('Referrers_WebsitesDocumentation', + array('<br />', '"' . Piwik::translate('Referrers_SubmenuWebsites') . '"')) . '<br />' + . '<b>' . Piwik::translate('Referrers_Campaigns') . ':</b> ' . Piwik::translate('Referrers_CampaignsDocumentation', + array('<br />', '"' . Piwik::translate('Referrers_Campaigns') . '"')), 'order' => 1, ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_WidgetGetAll'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_WidgetGetAll'), 'module' => 'Referrers', 'action' => 'getAll', - 'dimension' => Piwik_Translate('Referrers_Referrer'), - 'documentation' => Piwik_Translate('Referrers_AllReferrersReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_Referrer'), + 'documentation' => Piwik::translate('Referrers_AllReferrersReportDocumentation', '<br />'), 'order' => 2, ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Keywords'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Keywords'), 'module' => 'Referrers', 'action' => 'getKeywords', 'actionToLoadSubTables' => 'getSearchEnginesFromKeywordId', - 'dimension' => Piwik_Translate('General_ColumnKeyword'), - 'documentation' => Piwik_Translate('Referrers_KeywordsReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('General_ColumnKeyword'), + 'documentation' => Piwik::translate('Referrers_KeywordsReportDocumentation', '<br />'), 'order' => 3, ), array( // subtable report - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Keywords'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Keywords'), 'module' => 'Referrers', 'action' => 'getSearchEnginesFromKeywordId', - 'dimension' => Piwik_Translate('Referrers_ColumnSearchEngine'), - 'documentation' => Piwik_Translate('Referrers_KeywordsReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_ColumnSearchEngine'), + 'documentation' => Piwik::translate('Referrers_KeywordsReportDocumentation', '<br />'), 'isSubtableReport' => true, 'order' => 4 ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Websites'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Websites'), 'module' => 'Referrers', 'action' => 'getWebsites', - 'dimension' => Piwik_Translate('Referrers_ColumnWebsite'), - 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_ColumnWebsite'), + 'documentation' => Piwik::translate('Referrers_WebsitesReportDocumentation', '<br />'), 'actionToLoadSubTables' => 'getUrlsFromWebsiteId', 'order' => 5 ), array( // subtable report - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Websites'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Websites'), 'module' => 'Referrers', 'action' => 'getUrlsFromWebsiteId', - 'dimension' => Piwik_Translate('Referrers_ColumnWebsitePage'), - 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_ColumnWebsitePage'), + 'documentation' => Piwik::translate('Referrers_WebsitesReportDocumentation', '<br />'), 'isSubtableReport' => true, 'order' => 6, ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_SearchEngines'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_SearchEngines'), 'module' => 'Referrers', 'action' => 'getSearchEngines', - 'dimension' => Piwik_Translate('Referrers_ColumnSearchEngine'), - 'documentation' => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_ColumnSearchEngine'), + 'documentation' => Piwik::translate('Referrers_SearchEnginesReportDocumentation', '<br />'), 'actionToLoadSubTables' => 'getKeywordsFromSearchEngineId', 'order' => 7, ), array( // subtable report - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_SearchEngines'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_SearchEngines'), 'module' => 'Referrers', 'action' => 'getKeywordsFromSearchEngineId', - 'dimension' => Piwik_Translate('General_ColumnKeyword'), - 'documentation' => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('General_ColumnKeyword'), + 'documentation' => Piwik::translate('Referrers_SearchEnginesReportDocumentation', '<br />'), 'isSubtableReport' => true, 'order' => 8, ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Campaigns'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Campaigns'), 'module' => 'Referrers', 'action' => 'getCampaigns', - 'dimension' => Piwik_Translate('Referrers_ColumnCampaign'), - 'documentation' => Piwik_Translate('Referrers_CampaignsReportDocumentation', + 'dimension' => Piwik::translate('Referrers_ColumnCampaign'), + 'documentation' => Piwik::translate('Referrers_CampaignsReportDocumentation', array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" target="_blank">', '</a>')), 'actionToLoadSubTables' => 'getKeywordsFromCampaignId', 'order' => 9, ), array( // subtable report - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Campaigns'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Campaigns'), 'module' => 'Referrers', 'action' => 'getKeywordsFromCampaignId', - 'dimension' => Piwik_Translate('General_ColumnKeyword'), - 'documentation' => Piwik_Translate('Referrers_CampaignsReportDocumentation', + 'dimension' => Piwik::translate('General_ColumnKeyword'), + 'documentation' => Piwik::translate('Referrers_CampaignsReportDocumentation', array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" target="_blank">', '</a>')), 'isSubtableReport' => true, 'order' => 10, ), array( - 'category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Socials'), + 'category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Socials'), 'module' => 'Referrers', 'action' => 'getSocials', 'actionToLoadSubTables' => 'getUrlsForSocial', - 'dimension' => Piwik_Translate('Referrers_ColumnSocial'), - 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'), + 'dimension' => Piwik::translate('Referrers_ColumnSocial'), + 'documentation' => Piwik::translate('Referrers_WebsitesReportDocumentation', '<br />'), 'order' => 11, ), )); @@ -242,28 +243,28 @@ class Referrers extends \Piwik\Plugin public function getReportsWithGoalMetrics(&$dimensions) { $dimensions = array_merge($dimensions, array( - array('category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Keywords'), + array('category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Keywords'), 'module' => 'Referrers', 'action' => 'getKeywords', ), - array('category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_SearchEngines'), + array('category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_SearchEngines'), 'module' => 'Referrers', 'action' => 'getSearchEngines', ), - array('category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Websites'), + array('category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Websites'), 'module' => 'Referrers', 'action' => 'getWebsites', ), - array('category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Campaigns'), + array('category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Campaigns'), 'module' => 'Referrers', 'action' => 'getCampaigns', ), - array('category' => Piwik_Translate('Referrers_Referrers'), - 'name' => Piwik_Translate('Referrers_Type'), + array('category' => Piwik::translate('Referrers_Referrers'), + 'name' => Piwik::translate('Referrers_Type'), 'module' => 'Referrers', 'action' => 'getReferrerType', ), @@ -312,16 +313,16 @@ class Referrers extends \Piwik\Plugin private function getDisplayPropertiesForGetReferrerType() { $idSubtable = Common::getRequestVar('idSubtable', false); - $labelColumnTitle = Piwik_Translate('Referrers_Type'); + $labelColumnTitle = Piwik::translate('Referrers_Type'); switch ($idSubtable) { case Common::REFERRER_TYPE_SEARCH_ENGINE: - $labelColumnTitle = Piwik_Translate('Referrers_ColumnSearchEngine'); + $labelColumnTitle = Piwik::translate('Referrers_ColumnSearchEngine'); break; case Common::REFERRER_TYPE_WEBSITE: - $labelColumnTitle = Piwik_Translate('Referrers_ColumnWebsite'); + $labelColumnTitle = Piwik::translate('Referrers_ColumnWebsite'); break; case Common::REFERRER_TYPE_CAMPAIGN: - $labelColumnTitle = Piwik_Translate('Referrers_ColumnCampaign'); + $labelColumnTitle = Piwik::translate('Referrers_ColumnCampaign'); break; default: break; @@ -350,7 +351,7 @@ class Referrers extends \Piwik\Plugin $setGetAllHtmlPrefix = array($this, 'setGetAllHtmlPrefix'); return array( 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('Referrers_Referrer')), + 'translations' => array('label' => Piwik::translate('Referrers_Referrer')), 'show_goals' => true, 'filter_limit' => 20, 'visualization_properties' => array( @@ -369,7 +370,7 @@ class Referrers extends \Piwik\Plugin return array( 'subtable_controller_action' => 'getSearchEnginesFromKeywordId', 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('General_ColumnKeyword')), + 'translations' => array('label' => Piwik::translate('General_ColumnKeyword')), 'show_goals' => true, 'filter_limit' => 25, 'visualization_properties' => array( @@ -385,7 +386,7 @@ class Referrers extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSearchEngine')) + 'translations' => array('label' => Piwik::translate('Referrers_ColumnSearchEngine')) ); } @@ -397,7 +398,7 @@ class Referrers extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 25, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSearchEngine')), + 'translations' => array('label' => Piwik::translate('Referrers_ColumnSearchEngine')), 'visualization_properties' => array( 'table' => array( 'disable_subtable_when_show_goals' => true, @@ -411,7 +412,7 @@ class Referrers extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('General_ColumnKeyword')) + 'translations' => array('label' => Piwik::translate('General_ColumnKeyword')) ); } @@ -422,7 +423,7 @@ class Referrers extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 25, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsite')), + 'translations' => array('label' => Piwik::translate('Referrers_ColumnWebsite')), 'visualization_properties' => array( 'table' => array( 'disable_subtable_when_show_goals' => true, @@ -439,7 +440,7 @@ class Referrers extends \Piwik\Plugin 'show_exclude_low_population' => false, 'filter_limit' => 10, 'show_goals' => true, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSocial')), + 'translations' => array('label' => Piwik::translate('Referrers_ColumnSocial')), 'visualization_properties' => array( 'table' => array( 'disable_subtable_when_show_goals' => true, @@ -449,7 +450,7 @@ class Referrers extends \Piwik\Plugin $widget = Common::getRequestVar('widget', false); if (empty($widget)) { - $result['show_footer_message'] = Piwik_Translate('Referrers_SocialFooterMessage'); + $result['show_footer_message'] = Piwik::translate('Referrers_SocialFooterMessage'); } return $result; @@ -461,7 +462,7 @@ class Referrers extends \Piwik\Plugin 'show_exclude_low_population' => false, 'filter_limit' => 10, 'show_goals' => true, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsitePage')) + 'translations' => array('label' => Piwik::translate('Referrers_ColumnWebsitePage')) ); } @@ -472,11 +473,11 @@ class Referrers extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 25, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnCampaign')), + 'translations' => array('label' => Piwik::translate('Referrers_ColumnCampaign')), ); if (Common::getRequestVar('viewDataTable', false) != 'graphEvolution') { - $result['show_footer_message'] = Piwik_Translate('Referrers_CampaignFooterHelp', + $result['show_footer_message'] = Piwik::translate('Referrers_CampaignFooterHelp', array('<a target="_blank" href="http://piwik.org/docs/tracking-campaigns/">', '</a> - <a target="_blank" href="http://piwik.org/docs/tracking-campaigns/url-builder/">', '</a>') @@ -491,7 +492,7 @@ class Referrers extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('General_ColumnKeyword')) + 'translations' => array('label' => Piwik::translate('General_ColumnKeyword')) ); } @@ -500,7 +501,7 @@ class Referrers extends \Piwik\Plugin return array( 'show_search' => false, 'show_exclude_low_population' => false, - 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsitePage')), + 'translations' => array('label' => Piwik::translate('Referrers_ColumnWebsitePage')), 'tooltip_metadata_name' => 'url' ); } @@ -535,7 +536,7 @@ class Referrers extends \Piwik\Plugin break; } - $label = strtolower(Piwik_Translate($indexTranslation)); + $label = strtolower(Piwik::translate($indexTranslation)); // return html that displays it as grey & italic return '<span class="datatable-label-category"><em>(' . $label . ')</em></span>'; diff --git a/plugins/Referrers/functions.php b/plugins/Referrers/functions.php index f162f65668..aad50ec82e 100644 --- a/plugins/Referrers/functions.php +++ b/plugins/Referrers/functions.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Referrers; use Piwik\Common; +use Piwik\Piwik; use Piwik\UrlHelper; /** @@ -54,7 +55,7 @@ function getSocialNetworkFromDomain($url) if (isset($GLOBALS['Piwik_socialUrl'][$domain])) { return $GLOBALS['Piwik_socialUrl'][$domain]; } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } @@ -237,7 +238,7 @@ function getReferrerTypeLabel($label) $indexTranslation = 'General_Others'; break; } - return Piwik_Translate($indexTranslation); + return Piwik::translate($indexTranslation); } /** diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php index fafc3dc977..f23875812a 100644 --- a/plugins/SEO/API.php +++ b/plugins/SEO/API.php @@ -58,38 +58,38 @@ class API 'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'), 'id' => 'pagerank' ), - Piwik_Translate('SEO_Google_IndexedPages') => array( + Piwik::translate('SEO_Google_IndexedPages') => array( 'rank' => $rank->getIndexedPagesGoogle(), 'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://google.com'), 'id' => 'google-index', ), - Piwik_Translate('SEO_Bing_IndexedPages') => array( + Piwik::translate('SEO_Bing_IndexedPages') => array( 'rank' => $rank->getIndexedPagesBing(), 'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://bing.com'), 'id' => 'bing-index', ), - Piwik_Translate('SEO_AlexaRank') => array( + Piwik::translate('SEO_AlexaRank') => array( 'rank' => $rank->getAlexaRank(), 'logo' => \Piwik\Plugins\Referrers\getSearchEngineLogoFromUrl('http://alexa.com'), 'id' => 'alexa', ), - Piwik_Translate('SEO_DomainAge') => array( + Piwik::translate('SEO_DomainAge') => array( 'rank' => $rank->getAge(), 'logo' => 'plugins/SEO/images/whois.png', 'id' => 'domain-age', ), - Piwik_Translate('SEO_ExternalBacklinks') => array( + Piwik::translate('SEO_ExternalBacklinks') => array( 'rank' => $rank->getExternalBacklinkCount(), 'logo' => 'plugins/SEO/images/majesticseo.png', 'logo_link' => $linkToMajestic, - 'logo_tooltip' => Piwik_Translate('SEO_ViewBacklinksOnMajesticSEO'), + 'logo_tooltip' => Piwik::translate('SEO_ViewBacklinksOnMajesticSEO'), 'id' => 'external-backlinks', ), - Piwik_Translate('SEO_ReferrerDomains') => array( + Piwik::translate('SEO_ReferrerDomains') => array( 'rank' => $rank->getReferrerDomainCount(), 'logo' => 'plugins/SEO/images/majesticseo.png', 'logo_link' => $linkToMajestic, - 'logo_tooltip' => Piwik_Translate('SEO_ViewBacklinksOnMajesticSEO'), + 'logo_tooltip' => Piwik::translate('SEO_ViewBacklinksOnMajesticSEO'), 'id' => 'referrer-domains', ), ); @@ -101,7 +101,7 @@ class API 'id' => 'dmoz', ); if ($dmozRank['rank'] > 0) { - $data[Piwik_Translate('SEO_Dmoz')] = $dmozRank; + $data[Piwik::translate('SEO_Dmoz')] = $dmozRank; } return DataTable::makeFromIndexedArray($data); diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index bdac69a7db..14cd94851a 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -566,12 +566,12 @@ class API private static function getReportSubjectAndReportTitle($websiteName, $reports) { // if the only report is "All websites", we don't display the site name - $reportTitle = Piwik_Translate('General_Website') . " " . $websiteName; + $reportTitle = Piwik::translate('General_Website') . " " . $websiteName; $reportSubject = $websiteName; if (count($reports) == 1 && $reports[0] == 'MultiSites_getAll' ) { - $reportSubject = Piwik_Translate('General_MultiSitesSummary'); + $reportSubject = Piwik::translate('General_MultiSitesSummary'); $reportTitle = $reportSubject; } @@ -697,7 +697,7 @@ class API if (!in_array($reportFormat, $reportFormats)) { throw new Exception( - Piwik_TranslateException( + Piwik::translateException( 'General_ExceptionInvalidReportRendererFormat', array($reportFormat, implode(', ', $reportFormats)) ) diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index b63663fc10..b31f2af312 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -123,7 +123,7 @@ class ScheduledReports extends \Piwik\Plugin $availableDisplayFormats = array_keys(self::getDisplayFormats()); if (!in_array($reportFormat, $availableDisplayFormats)) { throw new Exception( - Piwik_TranslateException( + Piwik::translateException( // General_ExceptionInvalidAggregateReportsFormat should be named General_ExceptionInvalidDisplayFormat 'General_ExceptionInvalidAggregateReportsFormat', array($reportFormat, implode(', ', $availableDisplayFormats)) @@ -170,7 +170,7 @@ class ScheduledReports extends \Piwik\Plugin // removing reports from the API category and MultiSites.getOne if ( $reportMetadata['category'] == 'API' || - $reportMetadata['category'] == Piwik_Translate('General_MultiSitesSummary') && $reportMetadata['name'] == Piwik_Translate('General_SingleWebsitesDashboard') + $reportMetadata['category'] == Piwik::translate('General_MultiSitesSummary') && $reportMetadata['name'] == Piwik::translate('General_SingleWebsitesDashboard') ) continue; $filteredReportMetadata[] = $reportMetadata; @@ -272,14 +272,14 @@ class ScheduledReports extends \Piwik\Plugin $additionalFiles = $notificationInfo[API::ADDITIONAL_FILES_KEY]; $periods = self::getPeriodToFrequencyAsAdjective(); - $message = Piwik_Translate('ScheduledReports_EmailHello'); - $subject = Piwik_Translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate; + $message = Piwik::translate('ScheduledReports_EmailHello'); + $subject = Piwik::translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate; $mail = new Mail(); $mail->setSubject($subject); $fromEmailName = Config::getInstance()->branding['use_custom_logo'] - ? Piwik_Translate('CoreHome_WebAnalyticsReports') - : Piwik_Translate('ScheduledReports_PiwikReports'); + ? Piwik::translate('CoreHome_WebAnalyticsReports') + : Piwik::translate('ScheduledReports_PiwikReports'); $fromEmailAddress = Config::getInstance()->General['noreply_email_address']; $attachmentName = $subject; $mail->setFrom($fromEmailAddress, $fromEmailName); @@ -289,7 +289,7 @@ class ScheduledReports extends \Piwik\Plugin $segment = API::getSegment($report['idsegment']); if ($segment != null) { $displaySegmentInfo = true; - $segmentInfo = Piwik_Translate('ScheduledReports_SegmentAppliedToReports', $segment['name']); + $segmentInfo = Piwik::translate('ScheduledReports_SegmentAppliedToReports', $segment['name']); } switch ($report['format']) { @@ -297,7 +297,7 @@ class ScheduledReports extends \Piwik\Plugin // Needed when using images as attachment with cid $mail->setType(Zend_Mime::MULTIPART_RELATED); - $message .= "<br/>" . Piwik_Translate('ScheduledReports_PleaseFindBelow', array($periods[$report['period']], $reportTitle)); + $message .= "<br/>" . Piwik::translate('ScheduledReports_PleaseFindBelow', array($periods[$report['period']], $reportTitle)); if ($displaySegmentInfo) { $message .= " " . $segmentInfo; @@ -308,7 +308,7 @@ class ScheduledReports extends \Piwik\Plugin default: case 'pdf': - $message .= "\n" . Piwik_Translate('ScheduledReports_PleaseFindAttachedFile', array($periods[$report['period']], $reportTitle)); + $message .= "\n" . Piwik::translate('ScheduledReports_PleaseFindAttachedFile', array($periods[$report['period']], $reportTitle)); if ($displaySegmentInfo) { $message .= " " . $segmentInfo; @@ -457,13 +457,13 @@ class ScheduledReports extends \Piwik\Plugin if (count($reportsUsingSegment) > 0) { $reportList = ''; - $reportNameJoinText = ' ' . Piwik_Translate('General_And') . ' '; + $reportNameJoinText = ' ' . Piwik::translate('General_And') . ' '; foreach ($reportsUsingSegment as $report) { $reportList .= '\'' . $report['description'] . '\'' . $reportNameJoinText; } $reportList = rtrim($reportList, $reportNameJoinText); - $errorMessage = Piwik_Translate('ScheduledReports_Segment_Deletion_Error', $reportList); + $errorMessage = Piwik::translate('ScheduledReports_Segment_Deletion_Error', $reportList); throw new Exception($errorMessage); } } @@ -476,7 +476,7 @@ class ScheduledReports extends \Piwik\Plugin true, 13, $isHTML = false, - $tooltip = Piwik_Translate( + $tooltip = Piwik::translate( \Piwik\PluginsManager::getInstance()->isPluginActivated('MobileMessaging') ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip' ) @@ -562,7 +562,7 @@ class ScheduledReports extends \Piwik\Plugin if (empty($email)) { $email = false; } elseif (!Piwik::isValidEmailString($email)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidEmail') . ' (' . $email . ')'); + throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidEmail') . ' (' . $email . ')'); } } $additionalEmails = array_filter($additionalEmails); @@ -573,12 +573,12 @@ class ScheduledReports extends \Piwik\Plugin { $displayFormats = array( // ScheduledReports_AggregateReportsFormat_TablesOnly should be named ScheduledReports_DisplayFormat_GraphsOnlyForKeyMetrics - self::DISPLAY_FORMAT_GRAPHS_ONLY_FOR_KEY_METRICS => Piwik_Translate('ScheduledReports_AggregateReportsFormat_TablesOnly'), + self::DISPLAY_FORMAT_GRAPHS_ONLY_FOR_KEY_METRICS => Piwik::translate('ScheduledReports_AggregateReportsFormat_TablesOnly'), // ScheduledReports_AggregateReportsFormat_GraphsOnly should be named ScheduledReports_DisplayFormat_GraphsOnly - self::DISPLAY_FORMAT_GRAPHS_ONLY => Piwik_Translate('ScheduledReports_AggregateReportsFormat_GraphsOnly'), + self::DISPLAY_FORMAT_GRAPHS_ONLY => Piwik::translate('ScheduledReports_AggregateReportsFormat_GraphsOnly'), // ScheduledReports_AggregateReportsFormat_TablesAndGraphs should be named ScheduledReports_DisplayFormat_TablesAndGraphs - self::DISPLAY_FORMAT_TABLES_AND_GRAPHS => Piwik_Translate('ScheduledReports_AggregateReportsFormat_TablesAndGraphs'), - self::DISPLAY_FORMAT_TABLES_ONLY => Piwik_Translate('ScheduledReports_DisplayFormat_TablesOnly'), + self::DISPLAY_FORMAT_TABLES_AND_GRAPHS => Piwik::translate('ScheduledReports_AggregateReportsFormat_TablesAndGraphs'), + self::DISPLAY_FORMAT_TABLES_ONLY => Piwik::translate('ScheduledReports_DisplayFormat_TablesOnly'), ); return $displayFormats; } @@ -590,10 +590,10 @@ class ScheduledReports extends \Piwik\Plugin static public function getPeriodToFrequency() { return array( - ScheduledTime::PERIOD_NEVER => Piwik_Translate('General_Never'), - ScheduledTime::PERIOD_DAY => Piwik_Translate('General_Daily'), - ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_Weekly'), - ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_Monthly'), + ScheduledTime::PERIOD_NEVER => Piwik::translate('General_Never'), + ScheduledTime::PERIOD_DAY => Piwik::translate('General_Daily'), + ScheduledTime::PERIOD_WEEK => Piwik::translate('General_Weekly'), + ScheduledTime::PERIOD_MONTH => Piwik::translate('General_Monthly'), ); } @@ -604,11 +604,11 @@ class ScheduledReports extends \Piwik\Plugin static public function getPeriodToFrequencyAsAdjective() { return array( - ScheduledTime::PERIOD_DAY => Piwik_Translate('General_DailyReport'), - ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_WeeklyReport'), - ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_MonthlyReport'), - ScheduledTime::PERIOD_YEAR => Piwik_Translate('General_YearlyReport'), - ScheduledTime::PERIOD_RANGE => Piwik_Translate('General_RangeReports'), + ScheduledTime::PERIOD_DAY => Piwik::translate('General_DailyReport'), + ScheduledTime::PERIOD_WEEK => Piwik::translate('General_WeeklyReport'), + ScheduledTime::PERIOD_MONTH => Piwik::translate('General_MonthlyReport'), + ScheduledTime::PERIOD_YEAR => Piwik::translate('General_YearlyReport'), + ScheduledTime::PERIOD_RANGE => Piwik::translate('General_RangeReports'), ); } } diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php index 888f0a9701..a05c0d2382 100644 --- a/plugins/SegmentEditor/Controller.php +++ b/plugins/SegmentEditor/Controller.php @@ -30,10 +30,10 @@ class Controller extends \Piwik\Controller $segmentsByCategory = $customVariablesSegments = array(); foreach ($segments as $segment) { - if ($segment['category'] == Piwik_Translate('General_Visit') + if ($segment['category'] == Piwik::translate('General_Visit') && $segment['type'] == 'metric' ) { - $metricsLabel = Piwik_Translate('General_Metrics'); + $metricsLabel = Piwik::translate('General_Metrics'); $metricsLabel[0] = strtolower($metricsLabel[0]); $segment['category'] .= ' (' . $metricsLabel . ')'; } @@ -58,7 +58,7 @@ class Controller extends \Piwik\Controller public function sortSegmentCategories($a, $b) { // Custom Variables last - if ($a == Piwik_Translate('CustomVariables_CustomVariables')) { + if ($a == Piwik::translate('CustomVariables_CustomVariables')) { return 1; } return 0; @@ -88,7 +88,7 @@ class Controller extends \Piwik\Controller ); $translations = array(); foreach ($translationKeys as $key) { - $translations[$key] = Piwik_Translate($key); + $translations[$key] = Piwik::translate($key); } return $translations; } diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 6c6dab9f54..c78e0a9d2c 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -578,7 +578,7 @@ class API } $nbSites = count($idSites); if ($nbSites == 1) { - throw new Exception(Piwik_TranslateException("SitesManager_ExceptionDeleteSite")); + throw new Exception(Piwik::translateException("SitesManager_ExceptionDeleteSite")); } $db = Db::get(); @@ -614,7 +614,7 @@ class API if (!is_array($urls) || count($urls) == 0 ) { - throw new Exception(Piwik_TranslateException("SitesManager_ExceptionNoUrl")); + throw new Exception(Piwik::translateException("SitesManager_ExceptionNoUrl")); } } @@ -628,13 +628,13 @@ class API } } } - throw new Exception(Piwik_TranslateException('SitesManager_ExceptionInvalidTimezone', array($timezone))); + throw new Exception(Piwik::translateException('SitesManager_ExceptionInvalidTimezone', array($timezone))); } private function checkValidCurrency($currency) { if (!in_array($currency, array_keys($this->getCurrencyList()))) { - throw new Exception(Piwik_TranslateException('SitesManager_ExceptionInvalidCurrency', array($currency, "USD, EUR, etc."))); + throw new Exception(Piwik::translateException('SitesManager_ExceptionInvalidCurrency', array($currency, "USD, EUR, etc."))); } } @@ -656,7 +656,7 @@ class API $ips = array_filter($ips, 'strlen'); foreach ($ips as $ip) { if (!$this->isValidIp($ip)) { - throw new Exception(Piwik_TranslateException('SitesManager_ExceptionInvalidIPFormat', array($ip, "1.2.3.4, 1.2.3.*, or 1.2.3.4/5"))); + throw new Exception(Piwik::translateException('SitesManager_ExceptionInvalidIPFormat', array($ip, "1.2.3.4, 1.2.3.*, or 1.2.3.4/5"))); } } $ips = implode(',', $ips); @@ -1266,7 +1266,7 @@ class API private function checkName($siteName) { if (empty($siteName)) { - throw new Exception(Piwik_TranslateException("SitesManager_ExceptionEmptyName")); + throw new Exception(Piwik::translateException("SitesManager_ExceptionEmptyName")); } } @@ -1302,7 +1302,7 @@ class API { foreach ($urls as $url) { if (!$this->isValidUrl($url)) { - throw new Exception(sprintf(Piwik_TranslateException("SitesManager_ExceptionInvalidUrl"), $url)); + throw new Exception(sprintf(Piwik::translateException("SitesManager_ExceptionInvalidUrl"), $url)); } } } diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index d68e582c6e..b67f1144cf 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -177,7 +177,7 @@ class Controller extends \Piwik\Controller\Admin $sites = API::getInstance()->getPatternMatchSites($pattern); $pattern = str_replace('%', '', $pattern); if (!count($sites)) { - $results[] = array('label' => Piwik_Translate('SitesManager_NotFound') . " <span class='autocompleteMatched'>$pattern</span>.", 'id' => '#'); + $results[] = array('label' => Piwik::translate('SitesManager_NotFound') . " <span class='autocompleteMatched'>$pattern</span>.", 'id' => '#'); } else { if (strpos($pattern, '/') !== false && strpos($pattern, '\\/') === false diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 482719d486..e6fe825617 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -615,7 +615,7 @@ class API case Common::REFERRER_TYPE_CAMPAIGN: return Controller::getTranslation('fromCampaigns'); default: - return Piwik_Translate('General_Others'); + return Piwik::translate('General_Others'); } } diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php index a4465a09d5..a4ee6213c4 100644 --- a/plugins/Transitions/Controller.php +++ b/plugins/Transitions/Controller.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\Transitions; +use Piwik\Piwik; use Piwik\View; /** @@ -68,7 +69,7 @@ class Controller extends \Piwik\Controller public static function getTranslation($key) { - return Piwik_Translate(self::$metricTranslations[$key]); + return Piwik::translate(self::$metricTranslations[$key]); } /** @@ -86,7 +87,7 @@ class Controller extends \Piwik\Controller { $translations = self::$metricTranslations + self::$jsTranslations; foreach ($translations as &$message) { - $message = Piwik_Translate($message); + $message = Piwik::translate($message); } return $translations; } diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 910d8bb796..85ff3973c4 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -127,7 +127,7 @@ class API // split the label and put the elements into the 'city_name', 'region', 'country', // 'lat' & 'long' metadata fields - $strUnknown = Piwik_Translate('General_Unknown'); + $strUnknown = Piwik::translate('General_Unknown'); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'city_name', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 0, $strUnknown))); diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 99605e5ddf..1fda49ee67 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -387,7 +387,7 @@ class Controller extends Admin return array( 'to_download' => $missingDbKey, - 'to_download_label' => Piwik_Translate('UserCountry_DownloadingDb', $link) . '...', + 'to_download_label' => Piwik::translate('UserCountry_DownloadingDb', $link) . '...', ); } return false; diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index 8a8064db57..999a973b1b 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -16,6 +16,7 @@ use Piwik\Date; use Piwik\Http; use Piwik\Log; use Piwik\Option; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php; @@ -156,7 +157,7 @@ class GeoIPAutoUpdater $content = $unzip->listContent(); if (empty($content)) { - throw new Exception(Piwik_Translate('UserCountry_CannotListContent', + throw new Exception(Piwik::translate('UserCountry_CannotListContent', array("'$path'", $unzip->errorInfo()))); } @@ -169,7 +170,7 @@ class GeoIPAutoUpdater } if ($datFile === null) { - throw new Exception(Piwik_Translate('UserCountry_CannotFindGeoIPDatabaseInArchive', + throw new Exception(Piwik::translate('UserCountry_CannotFindGeoIPDatabaseInArchive', array($dbFilename, "'$path'"))); } @@ -177,7 +178,7 @@ class GeoIPAutoUpdater $unzipped = $unzip->extractInString($datFile); if (empty($unzipped)) { - throw new Exception(Piwik_Translate('UserCountry_CannotUnzipDatFile', + throw new Exception(Piwik::translate('UserCountry_CannotUnzipDatFile', array("'$path'", $unzip->errorInfo()))); } @@ -190,12 +191,12 @@ class GeoIPAutoUpdater $success = $unzip->extract($outputPath); if ($success !== true) { - throw new Exception(Piwik_Translate('UserCountry_CannotUnzipDatFile', + throw new Exception(Piwik::translate('UserCountry_CannotUnzipDatFile', array("'$path'", $unzip->errorInfo()))); } } else { $ext = end(explode(basename($path), '.', 2)); - throw new Exception(Piwik_Translate('UserCountry_UnsupportedArchiveType', "'$ext'")); + throw new Exception(Piwik::translate('UserCountry_UnsupportedArchiveType', "'$ext'")); } try { @@ -226,7 +227,7 @@ class GeoIPAutoUpdater " GeoIP database: %s: %s on line %s of %s.", $errno, $errstr, $errline, $errfile); } - throw new Exception(Piwik_Translate('UserCountry_ThisUrlIsNotAValidGeoIPDB')); + throw new Exception(Piwik::translate('UserCountry_ThisUrlIsNotAValidGeoIPDB')); } // delete the existing GeoIP database (if any) and rename the downloaded file @@ -334,7 +335,7 @@ class GeoIPAutoUpdater if ($period != self::SCHEDULE_PERIOD_MONTHLY && $period != self::SCHEDULE_PERIOD_WEEKLY ) { - throw new Exception(Piwik_Translate( + throw new Exception(Piwik::translate( 'UserCountry_InvalidGeoIPUpdatePeriod', array("'$period'", "'" . self::SCHEDULE_PERIOD_MONTHLY . "', '" . self::SCHEDULE_PERIOD_WEEKLY . "'") )); @@ -475,7 +476,7 @@ class GeoIPAutoUpdater if ($ext != 'tar.gz' && $ext != 'gz' ) { - throw new \Exception(Piwik_Translate('UserCountry_UnsupportedArchiveType', "'$ext'")); + throw new \Exception(Piwik::translate('UserCountry_UnsupportedArchiveType', "'$ext'")); } } diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php index 23d3f47a24..ae2cee3919 100755 --- a/plugins/UserCountry/LocationProvider.php +++ b/plugins/UserCountry/LocationProvider.php @@ -14,6 +14,7 @@ use Exception; use Piwik\Common; use Piwik\IP; use Piwik\Option; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider; use Piwik\Tracker\Cache; use ReflectionClass; @@ -341,7 +342,7 @@ abstract class LocationProvider && !empty($location[self::CONTINENT_CODE_KEY]) ) { $continentCode = strtolower($location[self::CONTINENT_CODE_KEY]); - $location[self::CONTINENT_NAME_KEY] = Piwik_Translate('UserCountry_continent_' . $continentCode); + $location[self::CONTINENT_NAME_KEY] = Piwik::translate('UserCountry_continent_' . $continentCode); } // fill in country name if country code is present @@ -349,7 +350,7 @@ abstract class LocationProvider && !empty($location[self::COUNTRY_CODE_KEY]) ) { $countryCode = strtolower($location[self::COUNTRY_CODE_KEY]); - $location[self::COUNTRY_NAME_KEY] = Piwik_Translate('UserCountry_country_' . $countryCode); + $location[self::COUNTRY_NAME_KEY] = Piwik::translate('UserCountry_country_' . $countryCode); } // deal w/ improper latitude/longitude & round proper values @@ -381,7 +382,7 @@ abstract class LocationProvider public static function prettyFormatLocation($locationInfo, $newline = "\n", $includeExtra = false) { if ($locationInfo === false) { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } // add latitude/longitude line @@ -424,7 +425,7 @@ abstract class LocationProvider if ($includeExtra) { $lines[] = ''; - $unknown = Piwik_Translate('General_Unknown'); + $unknown = Piwik::translate('General_Unknown'); $org = !empty($locationInfo[self::ORG_KEY]) ? $locationInfo[self::ORG_KEY] : $unknown; $lines[] = "Org: $org"; diff --git a/plugins/UserCountry/LocationProvider/Default.php b/plugins/UserCountry/LocationProvider/Default.php index 797f207c2e..ab2acb5596 100755 --- a/plugins/UserCountry/LocationProvider/Default.php +++ b/plugins/UserCountry/LocationProvider/Default.php @@ -103,11 +103,11 @@ class DefaultProvider extends LocationProvider */ public function getInfo() { - $desc = Piwik_Translate('UserCountry_DefaultLocationProviderDesc1') . ' ' - . Piwik_Translate('UserCountry_DefaultLocationProviderDesc2', + $desc = Piwik::translate('UserCountry_DefaultLocationProviderDesc1') . ' ' + . Piwik::translate('UserCountry_DefaultLocationProviderDesc2', array('<strong>', '<em>', '</em>', '</strong>')) . '<p><em><a href="http://piwik.org/faq/how-to/#faq_163" target="_blank">' - . Piwik_Translate('UserCountry_HowToInstallGeoIPDatabases') + . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</em></a></p>'; return array('id' => self::ID, 'title' => self::TITLE, 'description' => $desc, 'order' => 1); } diff --git a/plugins/UserCountry/LocationProvider/GeoIp.php b/plugins/UserCountry/LocationProvider/GeoIp.php index 8e26cb86e2..f6189478d0 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp.php +++ b/plugins/UserCountry/LocationProvider/GeoIp.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\UserCountry\LocationProvider; use Exception; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider; /** @@ -119,7 +120,7 @@ abstract class GeoIp extends LocationProvider } if (!$isResultCorrect) { - $unknown = Piwik_Translate('General_Unknown'); + $unknown = Piwik::translate('General_Unknown'); $location = "'" . (empty($location[self::CITY_NAME_KEY]) ? $unknown : $location[self::CITY_NAME_KEY]) @@ -134,7 +135,7 @@ abstract class GeoIp extends LocationProvider . $expectedResult[self::COUNTRY_CODE_KEY] . "'"; $bind = array($testIp, $location, $expectedLocation); - return Piwik_Translate('UserCountry_TestIPLocatorFailed', $bind); + return Piwik::translate('UserCountry_TestIPLocatorFailed', $bind); } return true; @@ -160,7 +161,7 @@ abstract class GeoIp extends LocationProvider if (isset($regionNames[$countryCode][$regionCode])) { return $regionNames[$countryCode][$regionCode]; } else { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } } diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index aaf1d7a1b7..6e49dbdcd8 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; /** @@ -125,16 +126,16 @@ class Pecl extends GeoIp // check if the directory the PECL module is looking for exists if (!is_dir($dbDir)) { - return Piwik_Translate('UserCountry_PeclGeoIPNoDBDir', array($quotedDir, "'geoip.custom_directory'")); + return Piwik::translate('UserCountry_PeclGeoIPNoDBDir', array($quotedDir, "'geoip.custom_directory'")); } // check if the user named the city database GeoLiteCity.dat if (file_exists($dbDir . 'GeoLiteCity.dat')) { - return Piwik_Translate('UserCountry_PeclGeoLiteError', + return Piwik::translate('UserCountry_PeclGeoLiteError', array($quotedDir, "'GeoLiteCity.dat'", "'GeoIPCity.dat'")); } - return Piwik_Translate('UserCountry_CannotFindPeclGeoIPDb', + return Piwik::translate('UserCountry_CannotFindPeclGeoIPDb', array($quotedDir, "'GeoIP.dat'", "'GeoIPCity.dat'")); } @@ -212,11 +213,11 @@ class Pecl extends GeoIp */ public function getInfo() { - $desc = Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>' - . Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_Pecl2'); + $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>' + . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl2'); $installDocs = '<em>' . '<a target="_blank" href="http://piwik.org/faq/how-to/#faq_164">' - . Piwik_Translate('UserCountry_HowToInstallGeoIpPecl') + . Piwik::translate('UserCountry_HowToInstallGeoIpPecl') . '</a>' . '</em>'; @@ -224,32 +225,32 @@ class Pecl extends GeoIp if ($this->isAvailable()) { $peclDir = ini_get('geoip.custom_directory'); if ($peclDir === false) { - $extraMessage = Piwik_Translate('UserCountry_GeoIPPeclCustomDirNotSet', "'geoip.custom_directory'"); + $extraMessage = Piwik::translate('UserCountry_GeoIPPeclCustomDirNotSet', "'geoip.custom_directory'"); } else { $extraMessage = 'The \'geoip.custom_directory\' PHP ini option is set to \'' . $peclDir . '\'.'; } $availableDatabaseTypes = array(); if (self::isCityDatabaseAvailable()) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_City'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_City'); } if (self::isRegionDatabaseAvailable()) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Region'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Region'); } if (self::isCountryDatabaseAvailable()) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Country'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Country'); } if (self::isISPDatabaseAvailable()) { $availableDatabaseTypes[] = 'ISP'; } if (self::isOrgDatabaseAvailable()) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Organization'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Organization'); } - $extraMessage .= '<br/><br/>' . Piwik_Translate('UserCountry_GeoIPImplHasAccessTo') . ': <strong><em>' + $extraMessage .= '<br/><br/>' . Piwik::translate('UserCountry_GeoIPImplHasAccessTo') . ': <strong><em>' . implode(', ', $availableDatabaseTypes) . '</em></strong>.'; - $extraMessage = '<strong><em>' . Piwik_Translate('General_Note') . ': </em></strong>' . $extraMessage; + $extraMessage = '<strong><em>' . Piwik::translate('General_Note') . ': </em></strong>' . $extraMessage; } return array('id' => self::ID, diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index e01ddc3b10..03ed06cded 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Log; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; /** @@ -184,7 +185,7 @@ class Php extends GeoIp public function isWorking() { if (!function_exists('mb_internal_encoding')) { - return Piwik_Translate('UserCountry_GeoIPCannotFindMbstringExtension', + return Piwik::translate('UserCountry_GeoIPCannotFindMbstringExtension', array('mb_internal_encoding', 'mbstring')); } @@ -209,7 +210,7 @@ class Php extends GeoIp list($errno, $errstr, $errfile, $errline) = $geoIpError; Log::warning("Got GeoIP error when testing PHP GeoIP location provider: %s(%s): %s", $errfile, $errline, $errstr); - return Piwik_Translate('UserCountry_GeoIPIncorrectDatabaseFormat'); + return Piwik::translate('UserCountry_GeoIPIncorrectDatabaseFormat'); } return $result; @@ -297,32 +298,32 @@ class Php extends GeoIp */ public function getInfo() { - $desc = Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>' - . Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_Php2', + $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>' + . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php2', array('<strong><em>', '</em></strong>', '<strong><em>', '</em></strong>')); $installDocs = '<em><a target="_blank" href="http://piwik.org/faq/how-to/#faq_163">' - . Piwik_Translate('UserCountry_HowToInstallGeoIPDatabases') + . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</em></a>'; $availableDatabaseTypes = array(); if (self::getPathToGeoIpDatabase(array('GeoIPCity.dat', 'GeoLiteCity.dat')) !== false) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_City'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_City'); } if (self::getPathToGeoIpDatabase(array('GeoIPRegion.dat')) !== false) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Region'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Region'); } if (self::getPathToGeoIpDatabase(array('GeoIPCountry.dat')) !== false) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Country'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Country'); } if (self::getPathToGeoIpDatabase(array('GeoIPISP.dat')) !== false) { $availableDatabaseTypes[] = 'ISP'; } if (self::getPathToGeoIpDatabase(array('GeoIPOrg.dat')) !== false) { - $availableDatabaseTypes[] = Piwik_Translate('UserCountry_Organization'); + $availableDatabaseTypes[] = Piwik::translate('UserCountry_Organization'); } - $extraMessage = '<strong><em>' . Piwik_Translate('General_Note') . '</em></strong>: ' - . Piwik_Translate('UserCountry_GeoIPImplHasAccessTo') . ': <strong><em>' + $extraMessage = '<strong><em>' . Piwik::translate('General_Note') . '</em></strong>: ' + . Piwik::translate('UserCountry_GeoIPImplHasAccessTo') . ': <strong><em>' . implode(', ', $availableDatabaseTypes) . '</em></strong>.'; return array('id' => self::ID, diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index c279fddaa8..5700625a1b 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -13,6 +13,7 @@ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Common; use Piwik\IP; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; @@ -159,11 +160,11 @@ class ServerBased extends GeoIp } else // if not available return message w/ extra info { if (!function_exists('apache_get_modules')) { - return Piwik_Translate('General_Note') . ': ' . Piwik_Translate('UserCountry_AssumingNonApache'); + return Piwik::translate('General_Note') . ': ' . Piwik::translate('UserCountry_AssumingNonApache'); } - $message = "<strong><em>" . Piwik_Translate('General_Note') . ': ' - . Piwik_Translate('UserCountry_FoundApacheModules') + $message = "<strong><em>" . Piwik::translate('General_Note') . ': ' + . Piwik::translate('UserCountry_FoundApacheModules') . "</em></strong>:<br/><br/>\n<ul style=\"list-style:disc;margin-left:24px\">\n"; foreach (apache_get_modules() as $name) { $message .= "<li>$name</li>\n"; @@ -183,7 +184,7 @@ class ServerBased extends GeoIp if (empty($_SERVER[self::TEST_SERVER_VAR]) && empty($_SERVER[self::TEST_SERVER_VAR_ALT]) ) { - return Piwik_Translate("UserCountry_CannotFindGeoIPServerVar", self::TEST_SERVER_VAR . ' $_SERVER'); + return Piwik::translate("UserCountry_CannotFindGeoIPServerVar", self::TEST_SERVER_VAR . ' $_SERVER'); } return true; // can't check for another IP @@ -205,22 +206,22 @@ class ServerBased extends GeoIp if (function_exists('apache_note')) { $serverDesc = 'Apache'; } else { - $serverDesc = Piwik_Translate('UserCountry_HttpServerModule'); + $serverDesc = Piwik::translate('UserCountry_HttpServerModule'); } $title = sprintf(self::TITLE, $serverDesc); - $desc = Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_ServerBased1', array('<strong>', '</strong>')) + $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased1', array('<strong>', '</strong>')) . '<br/><br/>' - . '<em>' . Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_ServerBasedAnonWarn') . '</em>' + . '<em>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBasedAnonWarn') . '</em>' . '<br/><br/>' - . Piwik_Translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', + . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array('<strong><em>', '</em></strong>', '<strong><em>', '</em></strong>')); $installDocs = '<em><a target="_blank" href="http://piwik.org/faq/how-to/#faq_165">' - . Piwik_Translate('UserCountry_HowToInstallApacheModule') + . Piwik::translate('UserCountry_HowToInstallApacheModule') . '</a></em><br/><em>' . '<a target="_blank" href="http://piwik.org/faq/how-to/#faq_166">' - . Piwik_Translate('UserCountry_HowToInstallNginxModule') + . Piwik::translate('UserCountry_HowToInstallNginxModule') . '</a></em>'; $geoipServerVars = array(); @@ -231,9 +232,9 @@ class ServerBased extends GeoIp } if (empty($geoipServerVars)) { - $extraMessage = '<strong><em>' . Piwik_Translate('UserCountry_GeoIPNoServerVars', '$_SERVER') . '</em></strong>'; + $extraMessage = '<strong><em>' . Piwik::translate('UserCountry_GeoIPNoServerVars', '$_SERVER') . '</em></strong>'; } else { - $extraMessage = '<strong><em>' . Piwik_Translate('UserCountry_GeoIPServerVarsFound', '$_SERVER') + $extraMessage = '<strong><em>' . Piwik::translate('UserCountry_GeoIPServerVarsFound', '$_SERVER') . ":</em></strong><br/><br/>\n<ul style=\"list-style:disc;margin-left:24px\">\n"; foreach ($geoipServerVars as $key) { $extraMessage .= '<li>' . $key . "</li>\n"; diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index a58b968e78..7ca5500011 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -169,14 +169,14 @@ class UserCountry extends \Piwik\Plugin public function addWidgets() { - $widgetContinentLabel = Piwik_Translate('UserCountry_WidgetLocation') - . ' (' . Piwik_Translate('UserCountry_Continent') . ')'; - $widgetCountryLabel = Piwik_Translate('UserCountry_WidgetLocation') - . ' (' . Piwik_Translate('UserCountry_Country') . ')'; - $widgetRegionLabel = Piwik_Translate('UserCountry_WidgetLocation') - . ' (' . Piwik_Translate('UserCountry_Region') . ')'; - $widgetCityLabel = Piwik_Translate('UserCountry_WidgetLocation') - . ' (' . Piwik_Translate('UserCountry_City') . ')'; + $widgetContinentLabel = Piwik::translate('UserCountry_WidgetLocation') + . ' (' . Piwik::translate('UserCountry_Continent') . ')'; + $widgetCountryLabel = Piwik::translate('UserCountry_WidgetLocation') + . ' (' . Piwik::translate('UserCountry_Country') . ')'; + $widgetRegionLabel = Piwik::translate('UserCountry_WidgetLocation') + . ' (' . Piwik::translate('UserCountry_Region') . ')'; + $widgetCityLabel = Piwik::translate('UserCountry_WidgetLocation') + . ' (' . Piwik::translate('UserCountry_City') . ')'; WidgetsList::add('General_Visitors', $widgetContinentLabel, 'UserCountry', 'getContinent'); WidgetsList::add('General_Visitors', $widgetCountryLabel, 'UserCountry', 'getCountry'); @@ -205,7 +205,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_Country'), + 'name' => Piwik::translate('UserCountry_Country'), 'segment' => 'countryCode', 'sqlSegment' => 'log_visit.location_country', 'acceptedValues' => 'de, us, fr, in, es, etc.', @@ -213,7 +213,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_Continent'), + 'name' => Piwik::translate('UserCountry_Continent'), 'segment' => 'continentCode', 'sqlSegment' => 'log_visit.location_country', 'acceptedValues' => 'eur, asi, amc, amn, ams, afr, ant, oce', @@ -222,7 +222,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_Region'), + 'name' => Piwik::translate('UserCountry_Region'), 'segment' => 'regionCode', 'sqlSegment' => 'log_visit.location_region', 'acceptedValues' => '01 02, OR, P8, etc.<br/>eg. region=A1;country=fr', @@ -230,7 +230,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_City'), + 'name' => Piwik::translate('UserCountry_City'), 'segment' => 'city', 'sqlSegment' => 'log_visit.location_city', 'acceptedValues' => 'Sydney, Sao Paolo, Rome, etc.', @@ -238,7 +238,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_Latitude'), + 'name' => Piwik::translate('UserCountry_Latitude'), 'segment' => 'latitude', 'sqlSegment' => 'log_visit.location_latitude', 'acceptedValues' => '-33.578, 40.830, etc.<br/>You can select visitors within a lat/long range using &segment=lat>X;lat<Y;long>M;long<N.', @@ -246,7 +246,7 @@ class UserCountry extends \Piwik\Plugin $segments[] = array( 'type' => 'dimension', 'category' => 'Visit Location', - 'name' => Piwik_Translate('UserCountry_Longitude'), + 'name' => Piwik::translate('UserCountry_Longitude'), 'segment' => 'longitude', 'sqlSegment' => 'log_visit.location_longitude', 'acceptedValues' => '-70.664, 14.326, etc.', @@ -256,47 +256,47 @@ class UserCountry extends \Piwik\Plugin public function getReportMetadata(&$reports) { $metrics = array( - 'nb_visits' => Piwik_Translate('General_ColumnNbVisits'), - 'nb_uniq_visitors' => Piwik_Translate('General_ColumnNbUniqVisitors'), - 'nb_actions' => Piwik_Translate('General_ColumnNbActions'), + 'nb_visits' => Piwik::translate('General_ColumnNbVisits'), + 'nb_uniq_visitors' => Piwik::translate('General_ColumnNbUniqVisitors'), + 'nb_actions' => Piwik::translate('General_ColumnNbActions'), ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('UserCountry_Country'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('UserCountry_Country'), 'module' => 'UserCountry', 'action' => 'getCountry', - 'dimension' => Piwik_Translate('UserCountry_Country'), + 'dimension' => Piwik::translate('UserCountry_Country'), 'metrics' => $metrics, 'order' => 5, ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('UserCountry_Continent'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('UserCountry_Continent'), 'module' => 'UserCountry', 'action' => 'getContinent', - 'dimension' => Piwik_Translate('UserCountry_Continent'), + 'dimension' => Piwik::translate('UserCountry_Continent'), 'metrics' => $metrics, 'order' => 6, ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('UserCountry_Region'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('UserCountry_Region'), 'module' => 'UserCountry', 'action' => 'getRegion', - 'dimension' => Piwik_Translate('UserCountry_Region'), + 'dimension' => Piwik::translate('UserCountry_Region'), 'metrics' => $metrics, 'order' => 7, ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('UserCountry_City'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('UserCountry_City'), 'module' => 'UserCountry', 'action' => 'getCity', - 'dimension' => Piwik_Translate('UserCountry_City'), + 'dimension' => Piwik::translate('UserCountry_City'), 'metrics' => $metrics, 'order' => 8, ); @@ -305,22 +305,22 @@ class UserCountry extends \Piwik\Plugin public function getReportsWithGoalMetrics(&$dimensions) { $dimensions = array_merge($dimensions, array( - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('UserCountry_Country'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('UserCountry_Country'), 'module' => 'UserCountry', 'action' => 'getCountry', ), - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('UserCountry_Continent'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('UserCountry_Continent'), 'module' => 'UserCountry', 'action' => 'getContinent', ), - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('UserCountry_Region'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('UserCountry_Region'), 'module' => 'UserCountry', 'action' => 'getRegion'), - array('category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('UserCountry_City'), + array('category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('UserCountry_City'), 'module' => 'UserCountry', 'action' => 'getCity'), )); @@ -375,14 +375,14 @@ class UserCountry extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 5, - 'translations' => array('label' => Piwik_Translate('UserCountry_Country')), - 'documentation' => Piwik_Translate('UserCountry_getCountryDocumentation') + 'translations' => array('label' => Piwik::translate('UserCountry_Country')), + 'documentation' => Piwik::translate('UserCountry_getCountryDocumentation') ); if (LocationProvider::getCurrentProviderId() == DefaultProvider::ID) { // if we're using the default location provider, add a note explaining how it works - $footerMessage = Piwik_Translate("General_Note") . ': ' - . Piwik_Translate('UserCountry_DefaultLocationProviderExplanation', + $footerMessage = Piwik::translate("General_Note") . ': ' + . Piwik::translate('UserCountry_DefaultLocationProviderExplanation', array('<a target="_blank" href="http://piwik.org/docs/geo-locate/">', '</a>')); $result['show_footer_message'] = $footerMessage; @@ -400,8 +400,8 @@ class UserCountry extends \Piwik\Plugin 'show_offset_information' => false, 'show_pagination_control' => false, 'show_limit_control' => false, - 'translations' => array('label' => Piwik_Translate('UserCountry_Continent')), - 'documentation' => Piwik_Translate('UserCountry_getContinentDocumentation') + 'translations' => array('label' => Piwik::translate('UserCountry_Continent')), + 'documentation' => Piwik::translate('UserCountry_getContinentDocumentation') ); } @@ -411,8 +411,8 @@ class UserCountry extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 5, - 'translations' => array('label' => Piwik_Translate('UserCountry_Region')), - 'documentation' => Piwik_Translate('UserCountry_getRegionDocumentation') . '<br/>' + 'translations' => array('label' => Piwik::translate('UserCountry_Region')), + 'documentation' => Piwik::translate('UserCountry_getRegionDocumentation') . '<br/>' . $this->getGeoIPReportDocSuffix() ); $this->checkIfNoDataForGeoIpReport($result); @@ -425,8 +425,8 @@ class UserCountry extends \Piwik\Plugin 'show_exclude_low_population' => false, 'show_goals' => true, 'filter_limit' => 5, - 'translations' => array('label' => Piwik_Translate('UserCountry_City')), - 'documentation' => Piwik_Translate('UserCountry_getCityDocumentation') . '<br/>' + 'translations' => array('label' => Piwik::translate('UserCountry_City')), + 'documentation' => Piwik::translate('UserCountry_getCityDocumentation') . '<br/>' . $this->getGeoIPReportDocSuffix() ); $this->checkIfNoDataForGeoIpReport($result); @@ -435,7 +435,7 @@ class UserCountry extends \Piwik\Plugin private function getGeoIPReportDocSuffix() { - return Piwik_Translate('UserCountry_GeoIPDocumentationSuffix', + return Piwik::translate('UserCountry_GeoIPDocumentationSuffix', array('<a target="_blank" href="http://www.maxmind.com/?rId=piwik">', '</a>', '<a target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">', @@ -453,20 +453,20 @@ class UserCountry extends \Piwik\Plugin $properties['filters'][] = function ($dataTable, $view) use ($self) { // if there's only one row whose label is 'Unknown', display a message saying there's no data if ($dataTable->getRowsCount() == 1 - && $dataTable->getFirstRow()->getColumn('label') == Piwik_Translate('General_Unknown') + && $dataTable->getFirstRow()->getColumn('label') == Piwik::translate('General_Unknown') ) { - $footerMessage = Piwik_Translate('UserCountry_NoDataForGeoIPReport1'); + $footerMessage = Piwik::translate('UserCountry_NoDataForGeoIPReport1'); // if GeoIP is working, don't display this part of the message if (!$self->isGeoIPWorking()) { $params = array('module' => 'UserCountry', 'action' => 'adminIndex'); - $footerMessage .= ' ' . Piwik_Translate('UserCountry_NoDataForGeoIPReport2', + $footerMessage .= ' ' . Piwik::translate('UserCountry_NoDataForGeoIPReport2', array('<a target="_blank" href="' . Url::getCurrentQueryStringWithParametersModified($params) . '">', '</a>', '<a target="_blank" href="http://dev.maxmind.com/geoip/geolite?rId=piwik">', '</a>')); } else { - $footerMessage .= ' ' . Piwik_Translate('UserCountry_ToGeolocateOldVisits', + $footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits', array('<a target="_blank" href="http://piwik.org/faq/how-to/#faq_167">', '</a>')); } diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index dba271091b..4d68b7ebe6 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -12,6 +12,7 @@ namespace Piwik\Plugins\UserCountry; use Piwik\DataTable; +use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Tracker\Visit; @@ -41,9 +42,9 @@ function getFlagFromCode($code) function continentTranslate($label) { if ($label == 'unk' || $label == '') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } - return Piwik_Translate('UserCountry_continent_' . $label); + return Piwik::translate('UserCountry_continent_' . $label); } /** @@ -55,9 +56,9 @@ function continentTranslate($label) function countryTranslate($label) { if ($label == Visit::UNKNOWN_CODE || $label == '') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } - return Piwik_Translate('UserCountry_country_' . $label); + return Piwik::translate('UserCountry_country_' . $label); } /** @@ -95,7 +96,7 @@ function getRegionName($label) } if ($label == '') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } list($regionCode, $countryCode) = explode(Archiver::LOCATION_SEPARATOR, $label); @@ -117,7 +118,7 @@ function getPrettyRegionName($label) } if ($label == '') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } list($regionCode, $countryCode) = explode(Archiver::LOCATION_SEPARATOR, $label); @@ -145,7 +146,7 @@ function getPrettyCityName($label) } if ($label == '') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } // get city name, region code & country code @@ -155,7 +156,7 @@ function getPrettyCityName($label) $countryCode = @$parts[2]; if ($cityName == Visit::UNKNOWN_CODE || $cityName == '') { - $cityName = Piwik_Translate('General_Unknown'); + $cityName = Piwik::translate('General_Unknown'); } $result = $cityName; diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 8c9b5974ea..d700d4ef39 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -68,16 +68,16 @@ class Controller extends \Piwik\Controller // some translations $view->localeJSON = Common::json_encode(array( - 'nb_visits' => Piwik_Translate('General_NVisits'), - 'one_visit' => Piwik_Translate('General_OneVisit'), - 'no_visit' => Piwik_Translate('UserCountryMap_NoVisit'), - 'nb_actions' => Piwik_Translate('VisitsSummary_NbActionsDescription'), - 'nb_actions_per_visit' => Piwik_Translate('VisitsSummary_NbActionsPerVisit'), - 'bounce_rate' => Piwik_Translate('VisitsSummary_NbVisitsBounced'), - 'avg_time_on_site' => Piwik_Translate('VisitsSummary_AverageVisitDuration'), - 'and_n_others' => Piwik_Translate('UserCountryMap_AndNOthers'), - 'no_data' => Piwik_Translate('CoreHome_ThereIsNoDataForThisReport'), - 'nb_uniq_visitors' => Piwik_Translate('VisitsSummary_NbUniqueVisitors') + 'nb_visits' => Piwik::translate('General_NVisits'), + 'one_visit' => Piwik::translate('General_OneVisit'), + 'no_visit' => Piwik::translate('UserCountryMap_NoVisit'), + 'nb_actions' => Piwik::translate('VisitsSummary_NbActionsDescription'), + 'nb_actions_per_visit' => Piwik::translate('VisitsSummary_NbActionsPerVisit'), + 'bounce_rate' => Piwik::translate('VisitsSummary_NbVisitsBounced'), + 'avg_time_on_site' => Piwik::translate('VisitsSummary_AverageVisitDuration'), + 'and_n_others' => Piwik::translate('UserCountryMap_AndNOthers'), + 'no_data' => Piwik::translate('CoreHome_ThereIsNoDataForThisReport'), + 'nb_uniq_visitors' => Piwik::translate('VisitsSummary_NbUniqueVisitors') )); $view->reqParamsJSON = $this->getEnrichedRequest($params = array( @@ -143,19 +143,19 @@ class Controller extends \Piwik\Controller // some translations $locale = array( - 'nb_actions' => Piwik_Translate('VisitsSummary_NbActionsDescription'), - 'local_time' => Piwik_Translate('VisitTime_ColumnLocalTime'), - 'from' => Piwik_Translate('General_FromReferrer'), - 'seconds' => Piwik_Translate('UserCountryMap_Seconds'), - 'seconds_ago' => Piwik_Translate('UserCountryMap_SecondsAgo'), - 'minutes' => Piwik_Translate('UserCountryMap_Minutes'), - 'minutes_ago' => Piwik_Translate('UserCountryMap_MinutesAgo'), - 'hours' => Piwik_Translate('UserCountryMap_Hours'), - 'hours_ago' => Piwik_Translate('UserCountryMap_HoursAgo'), - 'days_ago' => Piwik_Translate('UserCountryMap_DaysAgo'), - 'actions' => Piwik_Translate('VisitsSummary_NbPageviewsDescription'), - 'searches' => Piwik_Translate('UserCountryMap_Searches'), - 'goal_conversions' => Piwik_Translate('UserCountryMap_GoalConversions'), + 'nb_actions' => Piwik::translate('VisitsSummary_NbActionsDescription'), + 'local_time' => Piwik::translate('VisitTime_ColumnLocalTime'), + 'from' => Piwik::translate('General_FromReferrer'), + 'seconds' => Piwik::translate('UserCountryMap_Seconds'), + 'seconds_ago' => Piwik::translate('UserCountryMap_SecondsAgo'), + 'minutes' => Piwik::translate('UserCountryMap_Minutes'), + 'minutes_ago' => Piwik::translate('UserCountryMap_MinutesAgo'), + 'hours' => Piwik::translate('UserCountryMap_Hours'), + 'hours_ago' => Piwik::translate('UserCountryMap_HoursAgo'), + 'days_ago' => Piwik::translate('UserCountryMap_DaysAgo'), + 'actions' => Piwik::translate('VisitsSummary_NbPageviewsDescription'), + 'searches' => Piwik::translate('UserCountryMap_Searches'), + 'goal_conversions' => Piwik::translate('UserCountryMap_GoalConversions'), ); $segment = $segmentOverride ? : Request::getRawSegmentFromRequest() ? : ''; @@ -217,7 +217,7 @@ class Controller extends \Piwik\Controller private function checkUserCountryPluginEnabled() { if (!\Piwik\PluginsManager::getInstance()->isPluginActivated('UserCountry')) { - throw new Exception(Piwik_Translate('General_Required', 'Plugin UserCountry')); + throw new Exception(Piwik::translate('General_Required', 'Plugin UserCountry')); } } diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 8376d9bfa8..c976d784fb 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -37,15 +37,15 @@ class UserCountryMap extends \Piwik\Plugin public function postLoad() { - WidgetsList::add('General_Visitors', Piwik_Translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); - WidgetsList::add('Live!', Piwik_Translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); + WidgetsList::add('General_Visitors', Piwik::translate('UserCountryMap_VisitorMap'), 'UserCountryMap', 'visitorMap'); + WidgetsList::add('Live!', Piwik::translate('UserCountryMap_RealTimeMap'), 'UserCountryMap', 'realtimeMap'); Piwik::addAction('Template.leftColumnUserCountry', array('Piwik\Plugins\UserCountryMap\UserCountryMap', 'insertMapInLocationReport')); } static public function insertMapInLocationReport(&$out) { - $out = '<h2>' . Piwik_Translate('UserCountryMap_VisitorMap') . '</h2>'; + $out = '<h2>' . Piwik::translate('UserCountryMap_VisitorMap') . '</h2>'; $out .= FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap'); } diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 0e15dd5938..7b632122f4 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -83,7 +83,7 @@ class API { $dataTable = $this->getOS($idSite, $period, $date, $segment, $addShortLabel = false); $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getOSFamily')); - $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_Translate')); + $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik::translate')); return $dataTable; } @@ -101,7 +101,7 @@ class API array('logo', __NAMESPACE__ . '\getDeviceTypeImg', null, array('label'))); // translate the labels - $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_Translate')); + $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik::translate')); return $dataTable; } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 309e769fb2..51c93d0122 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\UserSettings; use Piwik\ArchiveProcessor; +use Piwik\Piwik; use Piwik\WidgetsList; /** @@ -192,7 +193,7 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetResolution() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnResolution')) + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnResolution')) )); } @@ -200,15 +201,15 @@ class UserSettings extends \Piwik\Plugin { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( 'filter_limit' => 3, - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnConfiguration')) + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnConfiguration')) )); } private function getDisplayPropertiesForGetOS() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnOperatingSystem')), - 'title' => Piwik_Translate('UserSettings_OperatingSystems'), + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnOperatingSystem')), + 'title' => Piwik::translate('UserSettings_OperatingSystems'), 'related_reports' => $this->getOsRelatedReports() )); } @@ -216,8 +217,8 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetOSFamily() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_OperatingSystemFamily')), - 'title' => Piwik_Translate('UserSettings_OperatingSystemFamily'), + 'translations' => array('label' => Piwik::translate('UserSettings_OperatingSystemFamily')), + 'title' => Piwik::translate('UserSettings_OperatingSystemFamily'), 'related_reports' => $this->getOsRelatedReports() )); } @@ -225,8 +226,8 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetBrowserVersion() { $result = array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnBrowserVersion')), - 'title' => Piwik_Translate('UserSettings_ColumnBrowserVersion'), + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnBrowserVersion')), + 'title' => Piwik::translate('UserSettings_ColumnBrowserVersion'), 'related_reports' => $this->getBrowserRelatedReports() )); $result['visualization_properties']['graph']['max_graph_elements'] = 7; @@ -236,8 +237,8 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetBrowser() { $result = array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnBrowser')), - 'title' => Piwik_Translate('UserSettings_Browsers'), + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnBrowser')), + 'title' => Piwik::translate('UserSettings_Browsers'), 'related_reports' => $this->getBrowserRelatedReports() )); $result['visualization_properties']['graph']['max_graph_elements'] = 7; @@ -247,7 +248,7 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetBrowserType() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnBrowserFamily')), + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnBrowserFamily')), 'show_offset_information' => false, 'show_pagination_control' => false, 'show_limit_control' => false, @@ -258,11 +259,11 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetWideScreen() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_ColumnTypeOfScreen')), + 'translations' => array('label' => Piwik::translate('UserSettings_ColumnTypeOfScreen')), 'show_offset_information' => false, 'show_pagination_control' => false, 'show_limit_control' => false, - 'title' => Piwik_Translate('UserSettings_ColumnTypeOfScreen'), + 'title' => Piwik::translate('UserSettings_ColumnTypeOfScreen'), 'related_reports' => $this->getWideScreenDeviceTypeRelatedReports() )); } @@ -270,8 +271,8 @@ class UserSettings extends \Piwik\Plugin private function getDisplayPropertiesForGetMobileVsDesktop() { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( - 'translations' => array('label' => Piwik_Translate('UserSettings_MobileVsDesktop')), - 'title' => Piwik_Translate('UserSettings_MobileVsDesktop'), + 'translations' => array('label' => Piwik::translate('UserSettings_MobileVsDesktop')), + 'title' => Piwik::translate('UserSettings_MobileVsDesktop'), 'related_reports' => $this->getWideScreenDeviceTypeRelatedReports() )); } @@ -280,9 +281,9 @@ class UserSettings extends \Piwik\Plugin { return array_merge($this->getBasicUserSettingsDisplayProperties(), array( 'translations' => array( - 'label' => Piwik_Translate('General_Plugin'), + 'label' => Piwik::translate('General_Plugin'), 'nb_visits_percentage' => - str_replace(' ', ' ', Piwik_Translate('General_ColumnPercentageVisits')) + str_replace(' ', ' ', Piwik::translate('General_ColumnPercentageVisits')) ), 'show_offset_information' => false, 'show_pagination_control' => false, @@ -293,14 +294,14 @@ class UserSettings extends \Piwik\Plugin 'filter_sort_column' => 'nb_visits_percentage', 'filter_sort_order' => 'desc', 'filter_limit' => 10, - 'show_footer_message' => Piwik_Translate('UserSettings_PluginDetectionDoesNotWorkInIE'), + 'show_footer_message' => Piwik::translate('UserSettings_PluginDetectionDoesNotWorkInIE'), )); } private function getDisplayPropertiesForGetLanguage() { return array( - 'translations' => array('label' => Piwik_Translate('General_Language')), + 'translations' => array('label' => Piwik::translate('General_Language')), 'filter_sort_column' => 'nb_visits', 'filter_sort_order' => 'desc', 'show_search' => false, @@ -312,24 +313,24 @@ class UserSettings extends \Piwik\Plugin private function getWideScreenDeviceTypeRelatedReports() { return array( - 'UserSettings.getMobileVsDesktop' => Piwik_Translate('UserSettings_MobileVsDesktop'), - 'UserSettings.getWideScreen' => Piwik_Translate('UserSettings_ColumnTypeOfScreen') + 'UserSettings.getMobileVsDesktop' => Piwik::translate('UserSettings_MobileVsDesktop'), + 'UserSettings.getWideScreen' => Piwik::translate('UserSettings_ColumnTypeOfScreen') ); } private function getBrowserRelatedReports() { return array( - 'UserSettings.getBrowser' => Piwik_Translate('UserSettings_Browsers'), - 'UserSettings.getBrowserVersion' => Piwik_Translate('UserSettings_ColumnBrowserVersion') + 'UserSettings.getBrowser' => Piwik::translate('UserSettings_Browsers'), + 'UserSettings.getBrowserVersion' => Piwik::translate('UserSettings_ColumnBrowserVersion') ); } private function getOsRelatedReports() { return array( - 'UserSettings.getOSFamily' => Piwik_Translate('UserSettings_OperatingSystemFamily'), - 'UserSettings.getOS' => Piwik_Translate('UserSettings_OperatingSystems') + 'UserSettings.getOSFamily' => Piwik::translate('UserSettings_OperatingSystemFamily'), + 'UserSettings.getOS' => Piwik::translate('UserSettings_OperatingSystems') ); } @@ -360,16 +361,16 @@ class UserSettings extends \Piwik\Plugin if ($category == false) continue; $report = array( - 'category' => Piwik_Translate($category), - 'name' => Piwik_Translate($name), + 'category' => Piwik::translate($category), + 'name' => Piwik::translate($name), 'module' => $apiModule, 'action' => $apiAction, - 'dimension' => Piwik_Translate($columnName), + 'dimension' => Piwik::translate($columnName), 'order' => $i++ ); $translation = $name . 'Documentation'; - $translated = Piwik_Translate($translation, '<br />'); + $translated = Piwik::translate($translation, '<br />'); if ($translated != $translation) { $report['documentation'] = $translated; } @@ -378,7 +379,7 @@ class UserSettings extends \Piwik\Plugin if ($apiAction == 'getPlugin') { $report['metrics'] = array( 'nb_visits', - 'nb_visits_percentage' => Piwik_Translate('General_ColumnPercentageVisits') + 'nb_visits_percentage' => Piwik::translate('General_ColumnPercentageVisits') ); // There is no processedMetrics for this report $report['processedMetrics'] = array(); @@ -399,7 +400,7 @@ class UserSettings extends \Piwik\Plugin if (empty($segment)) continue; $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), + 'category' => Piwik::translate('General_Visit'), 'name' => $columnName, 'segment' => $segment, 'acceptedValues' => $acceptedValues, diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index f2ae5f4f7a..d0114b15df 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -22,7 +22,7 @@ require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php'; function getPluginsLogo($oldLabel) { - if ($oldLabel == Piwik_Translate('General_Others')) { + if ($oldLabel == Piwik::translate('General_Others')) { return false; } return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif'; @@ -35,7 +35,7 @@ function getOSLabel($osId) return $osName; } if ($osId == 'UNK') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $osId; } @@ -47,7 +47,7 @@ function getOSShortLabel($osId) return $osShortName; } if ($osId == 'UNK') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $osId; } @@ -59,9 +59,9 @@ function getOSFamily($osLabel) $osFamily = UserAgentParser::getOperatingSystemFamilyFromId($osId); if ($osFamily == 'unknown') { - $osFamily = Piwik_Translate('General_Unknown'); + $osFamily = Piwik::translate('General_Unknown'); } else if ($osFamily == 'Gaming Console') { - $osFamily = Piwik_Translate('UserSettings_GamingConsole'); + $osFamily = Piwik::translate('UserSettings_GamingConsole'); } return $osFamily; @@ -98,7 +98,7 @@ function getBrowserTypeLabel($oldLabel) return UserSettings::$browserType_display[$oldLabel]; } if ($oldLabel == 'unknown') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $oldLabel; } @@ -115,7 +115,7 @@ function getConfigurationLabel($str) $name = $values[1]; $browser = UserAgentParser::getBrowserNameFromId($name); if ($browser === false) { - $browser = Piwik_Translate('General_Unknown'); + $browser = Piwik::translate('General_Unknown'); } $resolution = $values[2]; return $os . " / " . $browser . " / " . $resolution; @@ -130,7 +130,7 @@ function getBrowserLabel($oldLabel) return $browserName . " " . $version; } if ($browserId == 'UNK') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $oldLabel; } @@ -144,7 +144,7 @@ function getBrowserShortLabel($oldLabel) return $browserName . " " . $version; } if ($browserId == 'UNK') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } return $oldLabel; } @@ -261,16 +261,16 @@ function getBrowserFromBrowserVersion($browserWithVersion) function languageTranslate($label) { if ($label == '' || $label == 'xx') { - return Piwik_Translate('General_Unknown'); + return Piwik::translate('General_Unknown'); } $key = 'UserSettings_Language_' . $label; - $translation = Piwik_Translate($key); + $translation = Piwik::translate($key); // Show language code if unknown code if ($translation == $key) { - $translation = Piwik_Translate('UserSettings_LanguageCode') . ' ' . $label; + $translation = Piwik::translate('UserSettings_LanguageCode') . ' ' . $label; } return $translation; diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 47217e73b1..34bca9c465 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -327,7 +327,7 @@ class API private function checkLogin($userLogin) { if ($this->userExists($userLogin)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionLoginExists', $userLogin)); + throw new Exception(Piwik::translateException('UsersManager_ExceptionLoginExists', $userLogin)); } Piwik::checkValidLoginString($userLogin); @@ -336,11 +336,11 @@ class API private function checkEmail($email) { if ($this->userEmailExists($email)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionEmailExists', $email)); + throw new Exception(Piwik::translateException('UsersManager_ExceptionEmailExists', $email)); } if (!Piwik::isValidEmailString($email)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidEmail')); + throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidEmail')); } } @@ -482,7 +482,7 @@ class API $this->checkUserIsNotAnonymous($userLogin); $this->checkUserIsNotSuperUser($userLogin); if (!$this->userExists($userLogin)) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionDeleteDoesNotExist", $userLogin)); + throw new Exception(Piwik::translateException("UsersManager_ExceptionDeleteDoesNotExist", $userLogin)); } $this->deleteUserOnly($userLogin); @@ -546,7 +546,7 @@ class API if ($userLogin == 'anonymous' && $access == 'admin' ) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionAdminAnonymous")); + throw new Exception(Piwik::translateException("UsersManager_ExceptionAdminAnonymous")); } // in case idSites is all we grant access to all the websites on which the current connected user has an 'admin' access @@ -595,7 +595,7 @@ class API private function checkUserExists($userLogin) { if (!$this->userExists($userLogin)) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionUserDoesNotExist", $userLogin)); + throw new Exception(Piwik::translateException("UsersManager_ExceptionUserDoesNotExist", $userLogin)); } } @@ -608,21 +608,21 @@ class API private function checkUserEmailExists($userEmail) { if (!$this->userEmailExists($userEmail)) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionUserDoesNotExist", $userEmail)); + throw new Exception(Piwik::translateException("UsersManager_ExceptionUserDoesNotExist", $userEmail)); } } private function checkUserIsNotAnonymous($userLogin) { if ($userLogin == 'anonymous') { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionEditAnonymous")); + throw new Exception(Piwik::translateException("UsersManager_ExceptionEditAnonymous")); } } private function checkUserIsNotSuperUser($userLogin) { if ($userLogin == Piwik::getSuperUserLogin()) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionSuperUser")); + throw new Exception(Piwik::translateException("UsersManager_ExceptionSuperUser")); } } @@ -634,7 +634,7 @@ class API unset($accessList[array_search("superuser", $accessList)]); if (!in_array($access, $accessList)) { - throw new Exception(Piwik_TranslateException("UsersManager_ExceptionAccessValues", implode(", ", $accessList))); + throw new Exception(Piwik::translateException("UsersManager_ExceptionAccessValues", implode(", ", $accessList))); } } @@ -696,7 +696,7 @@ class API public function getTokenAuth($userLogin, $md5Password) { if (strlen($md5Password) != 32) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionPasswordMD5HashExpected')); + throw new Exception(Piwik::translateException('UsersManager_ExceptionPasswordMD5HashExpected')); } return md5($userLogin . $md5Password); } diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 49d2f0bcba..7106deb878 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -53,7 +53,7 @@ class Controller extends Admin if ($idSiteSelected === 'all') { $usersAccessByWebsite = array(); - $defaultReportSiteName = Piwik_Translate('UsersManager_ApplyToAllWebsites'); + $defaultReportSiteName = Piwik::translate('UsersManager_ApplyToAllWebsites'); } else { $usersAccessByWebsite = APIUsersManager::getInstance()->getUsersAccessFromSite($idSiteSelected); $defaultReportSiteName = Site::getNameFor($idSiteSelected); @@ -159,15 +159,15 @@ class Controller extends Admin $view->defaultDate = $this->getDefaultDateForUser($userLogin); $view->availableDefaultDates = array( - 'today' => Piwik_Translate('General_Today'), - 'yesterday' => Piwik_Translate('General_Yesterday'), - 'previous7' => Piwik_Translate('General_PreviousDays', 7), - 'previous30' => Piwik_Translate('General_PreviousDays', 30), - 'last7' => Piwik_Translate('General_LastDays', 7), - 'last30' => Piwik_Translate('General_LastDays', 30), - 'week' => Piwik_Translate('General_CurrentWeek'), - 'month' => Piwik_Translate('General_CurrentMonth'), - 'year' => Piwik_Translate('General_CurrentYear'), + 'today' => Piwik::translate('General_Today'), + 'yesterday' => Piwik::translate('General_Yesterday'), + 'previous7' => Piwik::translate('General_PreviousDays', 7), + 'previous30' => Piwik::translate('General_PreviousDays', 30), + 'last7' => Piwik::translate('General_LastDays', 7), + 'last30' => Piwik::translate('General_LastDays', 30), + 'week' => Piwik::translate('General_CurrentWeek'), + 'month' => Piwik::translate('General_CurrentMonth'), + 'year' => Piwik::translate('General_CurrentYear'), ); $view->ignoreCookieSet = IgnoreCookie::isIgnoreCookieFound(); @@ -277,7 +277,7 @@ class Controller extends Admin || !empty($passwordBis) ) { if ($password != $passwordBis) { - throw new Exception(Piwik_Translate('Login_PasswordsDoNotMatch')); + throw new Exception(Piwik::translate('Login_PasswordsDoNotMatch')); } $newPassword = $password; } diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 4f4ff6bfde..f86cb58f39 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -123,7 +123,7 @@ class UsersManager extends \Piwik\Plugin public static function checkPassword($password) { if (!self::isValidPasswordString($password)) { - throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidPassword', array(self::PASSWORD_MIN_LENGTH, + throw new Exception(Piwik::translateException('UsersManager_ExceptionInvalidPassword', array(self::PASSWORD_MIN_LENGTH, self::PASSWORD_MAX_LENGTH))); } } diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index 273c1c9642..1f6d09286e 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -43,9 +43,9 @@ class Controller extends \Piwik\Controller $columns = Piwik::getArrayFromApiParameter($columns); } - $documentation = Piwik_Translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />' - . Piwik_Translate('General_BrokenDownReportDocumentation') . '<br />' - . Piwik_Translate('VisitFrequency_ReturningVisitDocumentation'); + $documentation = Piwik::translate('VisitFrequency_ReturningVisitsDocumentation') . '<br />' + . Piwik::translate('General_BrokenDownReportDocumentation') . '<br />' + . Piwik::translate('VisitFrequency_ReturningVisitDocumentation'); // Note: if you edit this array, maybe edit the code below as well $selectableColumns = array( diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index 4054636767..a3199e9624 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\VisitFrequency; +use Piwik\Piwik; use Piwik\WidgetsList; /** @@ -34,17 +35,17 @@ class VisitFrequency extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('VisitFrequency_ColumnReturningVisits'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('VisitFrequency_ColumnReturningVisits'), 'module' => 'VisitFrequency', 'action' => 'get', 'metrics' => array( - 'nb_visits_returning' => Piwik_Translate('VisitFrequency_ColumnReturningVisits'), - 'nb_actions_returning' => Piwik_Translate('VisitFrequency_ColumnActionsByReturningVisits'), - 'avg_time_on_site_returning' => Piwik_Translate('VisitFrequency_ColumnAverageVisitDurationForReturningVisitors'), - 'bounce_rate_returning' => Piwik_Translate('VisitFrequency_ColumnBounceRateForReturningVisits'), - 'nb_actions_per_visit_returning' => Piwik_Translate('VisitFrequency_ColumnAvgActionsPerReturningVisit'), - 'nb_uniq_visitors_returning' => Piwik_Translate('VisitFrequency_ColumnUniqueReturningVisitors'), + 'nb_visits_returning' => Piwik::translate('VisitFrequency_ColumnReturningVisits'), + 'nb_actions_returning' => Piwik::translate('VisitFrequency_ColumnActionsByReturningVisits'), + 'avg_time_on_site_returning' => Piwik::translate('VisitFrequency_ColumnAverageVisitDurationForReturningVisitors'), + 'bounce_rate_returning' => Piwik::translate('VisitFrequency_ColumnBounceRateForReturningVisits'), + 'nb_actions_per_visit_returning' => Piwik::translate('VisitFrequency_ColumnAvgActionsPerReturningVisit'), + 'nb_uniq_visitors_returning' => Piwik::translate('VisitFrequency_ColumnUniqueReturningVisitors'), // Not displayed // 'nb_visits_converted_returning', // 'sum_visit_length_returning', diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index 5397ddd37a..b6b3c9d3ba 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -15,6 +15,7 @@ use Piwik\ArchiveProcessor; use Piwik\Common; use Piwik\Period; +use Piwik\Piwik; use Piwik\Site; use Piwik\WidgetsList; @@ -45,34 +46,34 @@ class VisitTime extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('VisitsSummary_VisitsSummary'), - 'name' => Piwik_Translate('VisitTime_WidgetLocalTime'), + 'category' => Piwik::translate('VisitsSummary_VisitsSummary'), + 'name' => Piwik::translate('VisitTime_WidgetLocalTime'), 'module' => 'VisitTime', 'action' => 'getVisitInformationPerLocalTime', - 'dimension' => Piwik_Translate('VisitTime_ColumnLocalTime'), - 'documentation' => Piwik_Translate('VisitTime_WidgetLocalTimeDocumentation', array('<strong>', '</strong>')), + 'dimension' => Piwik::translate('VisitTime_ColumnLocalTime'), + 'documentation' => Piwik::translate('VisitTime_WidgetLocalTimeDocumentation', array('<strong>', '</strong>')), 'constantRowsCount' => true, 'order' => 20 ); $reports[] = array( - 'category' => Piwik_Translate('VisitsSummary_VisitsSummary'), - 'name' => Piwik_Translate('VisitTime_WidgetServerTime'), + 'category' => Piwik::translate('VisitsSummary_VisitsSummary'), + 'name' => Piwik::translate('VisitTime_WidgetServerTime'), 'module' => 'VisitTime', 'action' => 'getVisitInformationPerServerTime', - 'dimension' => Piwik_Translate('VisitTime_ColumnServerTime'), - 'documentation' => Piwik_Translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>')), + 'dimension' => Piwik::translate('VisitTime_ColumnServerTime'), + 'documentation' => Piwik::translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>')), 'constantRowsCount' => true, 'order' => 15, ); $reports[] = array( - 'category' => Piwik_Translate('VisitsSummary_VisitsSummary'), - 'name' => Piwik_Translate('VisitTime_VisitsByDayOfWeek'), + 'category' => Piwik::translate('VisitsSummary_VisitsSummary'), + 'name' => Piwik::translate('VisitTime_VisitsByDayOfWeek'), 'module' => 'VisitTime', 'action' => 'getByDayOfWeek', - 'dimension' => Piwik_Translate('VisitTime_DayOfWeek'), - 'documentation' => Piwik_Translate('VisitTime_WidgetByDayOfWeekDocumentation'), + 'dimension' => Piwik::translate('VisitTime_DayOfWeek'), + 'documentation' => Piwik::translate('VisitTime_WidgetByDayOfWeekDocumentation'), 'constantRowsCount' => true, 'order' => 25, ); @@ -92,8 +93,8 @@ class VisitTime extends \Piwik\Plugin public function getReportsWithGoalMetrics(&$dimensions) { - $dimensions[] = array('category' => Piwik_Translate('VisitTime_ColumnServerTime'), - 'name' => Piwik_Translate('VisitTime_ColumnServerTime'), + $dimensions[] = array('category' => Piwik::translate('VisitTime_ColumnServerTime'), + 'name' => Piwik::translate('VisitTime_ColumnServerTime'), 'module' => 'VisitTime', 'action' => 'getVisitInformationPerServerTime', ); @@ -104,16 +105,16 @@ class VisitTime extends \Piwik\Plugin $acceptedValues = "0, 1, 2, 3, ..., 20, 21, 22, 23"; $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('VisitTime_ColumnServerTime'), + 'category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('VisitTime_ColumnServerTime'), 'segment' => 'visitServerHour', 'sqlSegment' => 'HOUR(log_visit.visit_last_action_time)', 'acceptedValues' => $acceptedValues ); $segments[] = array( 'type' => 'dimension', - 'category' => Piwik_Translate('General_Visit'), - 'name' => Piwik_Translate('VisitTime_ColumnLocalTime'), + 'category' => Piwik::translate('General_Visit'), + 'name' => Piwik::translate('VisitTime_ColumnLocalTime'), 'segment' => 'visitLocalHour', 'sqlSegment' => 'HOUR(log_visit.visitor_localtime)', 'acceptedValues' => $acceptedValues @@ -136,7 +137,7 @@ class VisitTime extends \Piwik\Plugin $properties['VisitTime.getVisitInformationPerServerTime'] = array_merge($commonProperties, array( 'filter_limit' => 24, 'show_goals' => true, - 'translations' => array('label' => Piwik_Translate('VisitTime_ColumnServerTime')), + 'translations' => array('label' => Piwik::translate('VisitTime_ColumnServerTime')), 'request_parameters_to_modify' => array('hideFutureHoursWhenToday' => 1), 'visualization_properties' => array( 'graph' => array( @@ -147,8 +148,8 @@ class VisitTime extends \Piwik\Plugin $properties['VisitTime.getVisitInformationPerLocalTime'] = array_merge($commonProperties, array( 'filter_limit' => 24, - 'title' => Piwik_Translate('VisitTime_ColumnLocalTime'), - 'translations' => array('label' => Piwik_Translate('VisitTime_LocalTime')), + 'title' => Piwik::translate('VisitTime_ColumnLocalTime'), + 'translations' => array('label' => Piwik::translate('VisitTime_LocalTime')), 'visualization_properties' => array( 'graph' => array( 'max_graph_elements' => false, @@ -160,8 +161,8 @@ class VisitTime extends \Piwik\Plugin 'filter_limit' => 7, 'enable_sort' => false, 'show_footer_message' => - Piwik_Translate('General_ReportGeneratedFrom', self::getDateRangeForFooterMessage()), - 'translations' => array('label' => Piwik_Translate('VisitTime_DayOfWeek')), + Piwik::translate('General_ReportGeneratedFrom', self::getDateRangeForFooterMessage()), + 'translations' => array('label' => Piwik::translate('VisitTime_DayOfWeek')), 'visualization_properties' => array( 'graph' => array( 'show_all_ticks' => true, @@ -173,7 +174,7 @@ class VisitTime extends \Piwik\Plugin // add the visits by day of week as a related report, if the current period is not 'day' if (Common::getRequestVar('period', 'day') != 'day') { $properties['VisitTime.getVisitInformationPerLocalTime']['related_reports'] = array( - 'VisitTime.getByDayOfWeek' => Piwik_Translate('VisitTime_VisitsByDayOfWeek') + 'VisitTime.getByDayOfWeek' => Piwik::translate('VisitTime_VisitsByDayOfWeek') ); } } diff --git a/plugins/VisitTime/functions.php b/plugins/VisitTime/functions.php index f4ccb20d46..48a0520461 100644 --- a/plugins/VisitTime/functions.php +++ b/plugins/VisitTime/functions.php @@ -11,9 +11,11 @@ namespace Piwik\Plugins\VisitTime; +use Piwik\Piwik; + function getTimeLabel($label) { - return sprintf(Piwik_Translate('VisitTime_NHour'), $label); + return sprintf(Piwik::translate('VisitTime_NHour'), $label); } /** @@ -36,5 +38,5 @@ function dayOfWeekFromDate($dateStr) */ function translateDayOfWeek($dayOfWeek) { - return Piwik_Translate('General_LongDay_' . $dayOfWeek); + return Piwik::translate('General_LongDay_' . $dayOfWeek); } diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php index 5553b543cb..1cb1fc3a1e 100644 --- a/plugins/VisitorInterest/API.php +++ b/plugins/VisitorInterest/API.php @@ -47,9 +47,9 @@ class API $dataTable = $this->getDataTable(Archiver::TIME_SPENT_RECORD_NAME, $idSite, $period, $date, $segment); $dataTable->queueFilter('Sort', array('label', 'asc', true)); $dataTable->queueFilter('BeautifyTimeRangeLabels', array( - Piwik_Translate('VisitorInterest_BetweenXYSeconds'), - Piwik_Translate('VisitorInterest_OneMinute'), - Piwik_Translate('VisitorInterest_PlusXMin'))); + Piwik::translate('VisitorInterest_BetweenXYSeconds'), + Piwik::translate('VisitorInterest_OneMinute'), + Piwik::translate('VisitorInterest_PlusXMin'))); return $dataTable; } @@ -58,8 +58,8 @@ class API $dataTable = $this->getDataTable(Archiver::PAGES_VIEWED_RECORD_NAME, $idSite, $period, $date, $segment); $dataTable->queueFilter('Sort', array('label', 'asc', true)); $dataTable->queueFilter('BeautifyRangeLabels', array( - Piwik_Translate('VisitorInterest_OnePage'), - Piwik_Translate('VisitorInterest_NPages'))); + Piwik::translate('VisitorInterest_OnePage'), + Piwik::translate('VisitorInterest_NPages'))); return $dataTable; } @@ -77,7 +77,7 @@ class API { $dataTable = $this->getDataTable( Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS); - $dataTable->queueFilter('BeautifyRangeLabels', array(Piwik_Translate('General_OneDay'), Piwik_Translate('General_NDays'))); + $dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays'))); return $dataTable; } @@ -97,7 +97,7 @@ class API Archiver::VISITS_COUNT_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS); $dataTable->queueFilter('BeautifyRangeLabels', array( - Piwik_Translate('General_OneVisit'), Piwik_Translate('General_NVisits'))); + Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits'))); // add visit percent column self::addVisitsPercentColumn($dataTable); diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index 4bf80255a9..a6a9b41509 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -42,60 +42,60 @@ class VisitorInterest extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('VisitorInterest_WidgetLengths'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('VisitorInterest_WidgetLengths'), 'module' => 'VisitorInterest', 'action' => 'getNumberOfVisitsPerVisitDuration', - 'dimension' => Piwik_Translate('VisitorInterest_ColumnVisitDuration'), + 'dimension' => Piwik::translate('VisitorInterest_ColumnVisitDuration'), 'metrics' => array('nb_visits'), 'processedMetrics' => false, 'constantRowsCount' => true, - 'documentation' => Piwik_Translate('VisitorInterest_WidgetLengthsDocumentation') - . '<br />' . Piwik_Translate('General_ChangeTagCloudView'), + 'documentation' => Piwik::translate('VisitorInterest_WidgetLengthsDocumentation') + . '<br />' . Piwik::translate('General_ChangeTagCloudView'), 'order' => 15 ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('VisitorInterest_WidgetPages'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('VisitorInterest_WidgetPages'), 'module' => 'VisitorInterest', 'action' => 'getNumberOfVisitsPerPage', - 'dimension' => Piwik_Translate('VisitorInterest_ColumnPagesPerVisit'), + 'dimension' => Piwik::translate('VisitorInterest_ColumnPagesPerVisit'), 'metrics' => array('nb_visits'), 'processedMetrics' => false, 'constantRowsCount' => true, - 'documentation' => Piwik_Translate('VisitorInterest_WidgetPagesDocumentation') - . '<br />' . Piwik_Translate('General_ChangeTagCloudView'), + 'documentation' => Piwik::translate('VisitorInterest_WidgetPagesDocumentation') + . '<br />' . Piwik::translate('General_ChangeTagCloudView'), 'order' => 20 ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('VisitorInterest_visitsByVisitCount'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('VisitorInterest_visitsByVisitCount'), 'module' => 'VisitorInterest', 'action' => 'getNumberOfVisitsByVisitCount', - 'dimension' => Piwik_Translate('VisitorInterest_visitsByVisitCount'), + 'dimension' => Piwik::translate('VisitorInterest_visitsByVisitCount'), 'metrics' => array( 'nb_visits', - 'nb_visits_percentage' => Piwik_Translate('General_ColumnPercentageVisits'), + 'nb_visits_percentage' => Piwik::translate('General_ColumnPercentageVisits'), ), 'processedMetrics' => false, 'constantRowsCount' => true, - 'documentation' => Piwik_Translate('VisitorInterest_WidgetVisitsByNumDocumentation') - . '<br />' . Piwik_Translate('General_ChangeTagCloudView'), + 'documentation' => Piwik::translate('VisitorInterest_WidgetVisitsByNumDocumentation') + . '<br />' . Piwik::translate('General_ChangeTagCloudView'), 'order' => 25 ); $reports[] = array( - 'category' => Piwik_Translate('General_Visitors'), - 'name' => Piwik_Translate('VisitorInterest_VisitsByDaysSinceLast'), + 'category' => Piwik::translate('General_Visitors'), + 'name' => Piwik::translate('VisitorInterest_VisitsByDaysSinceLast'), 'module' => 'VisitorInterest', 'action' => 'getNumberOfVisitsByDaysSinceLast', - 'dimension' => Piwik_Translate('VisitorInterest_VisitsByDaysSinceLast'), + 'dimension' => Piwik::translate('VisitorInterest_VisitsByDaysSinceLast'), 'metrics' => array('nb_visits'), 'processedMetrics' => false, 'constantRowsCount' => true, - 'documentation' => Piwik_Translate('VisitorInterest_WidgetVisitsByDaysSinceLastDocumentation'), + 'documentation' => Piwik::translate('VisitorInterest_WidgetVisitsByDaysSinceLastDocumentation'), 'order' => 30 ); } @@ -168,7 +168,7 @@ class VisitorInterest extends \Piwik\Plugin 'default_view_type' => 'cloud', 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', - 'translations' => array('label' => Piwik_Translate('VisitorInterest_ColumnVisitDuration')), + 'translations' => array('label' => Piwik::translate('VisitorInterest_ColumnVisitDuration')), 'enable_sort' => false, 'show_exclude_low_population' => false, 'show_offset_information' => false, @@ -190,7 +190,7 @@ class VisitorInterest extends \Piwik\Plugin 'default_view_type' => 'cloud', 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', - 'translations' => array('label' => Piwik_Translate('VisitorInterest_ColumnPagesPerVisit')), + 'translations' => array('label' => Piwik::translate('VisitorInterest_ColumnPagesPerVisit')), 'enable_sort' => false, 'show_exclude_low_population' => false, 'show_offset_information' => false, @@ -212,7 +212,7 @@ class VisitorInterest extends \Piwik\Plugin 'columns_to_display' => array('label', 'nb_visits', 'nb_visits_percentage'), 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', - 'translations' => array('label' => Piwik_Translate('VisitorInterest_VisitNum'), + 'translations' => array('label' => Piwik::translate('VisitorInterest_VisitNum'), 'nb_visits_percentage' => Metrics::getPercentVisitColumn()), 'show_exclude_low_population' => false, 'show_offset_information' => false, @@ -231,7 +231,7 @@ class VisitorInterest extends \Piwik\Plugin return array( 'filter_sort_column' => 'label', 'filter_sort_order' => 'asc', - 'translations' => array('label' => Piwik_Translate('General_DaysSinceLastVisit')), + 'translations' => array('label' => Piwik::translate('General_DaysSinceLastVisit')), 'show_exclude_low_population' => false, 'show_offset_information' => false, 'show_pagination_control' => false, diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 8ef3ce40bd..ed0486640b 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -50,20 +50,20 @@ class Controller extends \Piwik\Controller $columns = Piwik::getArrayFromApiParameter($columns); } - $documentation = Piwik_Translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />' - . Piwik_Translate('General_BrokenDownReportDocumentation') . '<br /><br />' + $documentation = Piwik::translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />' + . Piwik::translate('General_BrokenDownReportDocumentation') . '<br /><br />' - . '<b>' . Piwik_Translate('General_ColumnNbVisits') . ':</b> ' - . Piwik_Translate('General_ColumnNbVisitsDocumentation') . '<br />' + . '<b>' . Piwik::translate('General_ColumnNbVisits') . ':</b> ' + . Piwik::translate('General_ColumnNbVisitsDocumentation') . '<br />' - . '<b>' . Piwik_Translate('General_ColumnNbUniqVisitors') . ':</b> ' - . Piwik_Translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />' + . '<b>' . Piwik::translate('General_ColumnNbUniqVisitors') . ':</b> ' + . Piwik::translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />' - . '<b>' . Piwik_Translate('General_ColumnNbActions') . ':</b> ' - . Piwik_Translate('General_ColumnNbActionsDocumentation') . '<br />' + . '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> ' + . Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />' - . '<b>' . Piwik_Translate('General_ColumnActionsPerVisit') . ':</b> ' - . Piwik_Translate('General_ColumnActionsPerVisitDocumentation'); + . '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> ' + . Piwik::translate('General_ColumnActionsPerVisitDocumentation'); $selectableColumns = array( // columns from VisitsSummary.get diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index aa9522bb50..a2022b25cd 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -10,6 +10,7 @@ */ namespace Piwik\Plugins\VisitsSummary; +use Piwik\Piwik; use Piwik\WidgetsList; /** @@ -37,8 +38,8 @@ class VisitsSummary extends \Piwik\Plugin public function getReportMetadata(&$reports) { $reports[] = array( - 'category' => Piwik_Translate('VisitsSummary_VisitsSummary'), - 'name' => Piwik_Translate('VisitsSummary_VisitsSummary'), + 'category' => Piwik::translate('VisitsSummary_VisitsSummary'), + 'name' => Piwik::translate('VisitsSummary_VisitsSummary'), 'module' => 'VisitsSummary', 'action' => 'get', 'metrics' => array( @@ -47,8 +48,8 @@ class VisitsSummary extends \Piwik\Plugin 'nb_actions', 'nb_actions_per_visit', 'bounce_rate', - 'avg_time_on_site' => Piwik_Translate('General_VisitDuration'), - 'max_actions' => Piwik_Translate('General_ColumnMaxActions'), + 'avg_time_on_site' => Piwik::translate('General_VisitDuration'), + 'max_actions' => Piwik::translate('General_ColumnMaxActions'), // Used to process metrics, not displayed/used directly // 'sum_visit_length', // 'nb_visits_converted', diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 06e54d15a8..c9941994da 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -11,6 +11,7 @@ */ namespace Piwik\Plugins\Widgetize; +use Piwik\Piwik; /** * @@ -33,7 +34,7 @@ class Widgetize extends \Piwik\Plugin public function addTopMenu() { - $tooltip = Piwik_Translate('Widgetize_TopLinkTooltip'); + $tooltip = Piwik::translate('Widgetize_TopLinkTooltip'); $urlParams = array('module' => 'Widgetize', 'action' => 'index', 'segment' => false); Piwik_AddTopMenu('General_Widgets', $urlParams, true, 5, $isHTML = false, $tooltip); diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php index f8c79c3bfa..617fc5239f 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php @@ -117,7 +117,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik } // create empty dashboard - $widget = reset($allWidgets[Piwik_Translate('UserSettings_VisitorSettings')]); + $widget = reset($allWidgets[\Piwik\Piwik::translate('UserSettings_VisitorSettings')]); $dashboard = array( array( array( diff --git a/tests/PHPUnit/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Plugins/MobileMessagingTest.php index 91a87f3b9f..e3dd3ef3a7 100644 --- a/tests/PHPUnit/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Plugins/MobileMessagingTest.php @@ -71,7 +71,7 @@ class MobileMessagingTest extends DatabaseTestCase fclose($handle); $this->assertEquals( - Piwik_Translate('MobileMessaging_MultiSites_Must_Be_Activated'), + \Piwik\Piwik::translate('MobileMessaging_MultiSites_Must_Be_Activated'), $contents ); } |