diff options
74 files changed, 187 insertions, 716 deletions
diff --git a/core/Plugin.php b/core/Plugin.php index 811f43eccf..c2e5fafca6 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -26,13 +26,31 @@ abstract class Piwik_Plugin * - 'license' => string // plugin license * - 'license_homepage' => string // license homepage URL * - 'version' => string // plugin version number; examples and 3rd party plugins must not use Piwik_Version::VERSION; 3rd party plugins must increment the version number with each plugin release - * - 'translationAvailable' => bool // is there a translation file in plugins/your-plugin/lang/* ? - * - 'TrackerPlugin' => bool // should we load this plugin during the stats logging process? * - 'theme' => bool // Whether this plugin is a theme (a theme is a plugin, but a plugin is not necessarily a theme) * * @return array */ - abstract public function getInformation(); + public function getInformation() + { + $descriptionKey = $this->getPluginName() . '_PluginDescription'; + $translation = Piwik_Translate($descriptionKey); + $info = array( + 'description' => $translation, + 'homepage' => 'http://piwik.org/', + 'author' => 'Piwik', + 'author_homepage' => 'http://piwik.org/', + 'license' => 'GPL v3 or later', + 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html', + 'version' => Piwik_Version::VERSION, + 'theme' => false, + ); + + $infoFromJson = Piwik_PluginsManager::getInstance()->loadInfoFromJson($this); + if(!empty($infoFromJson)) { + $info = array_merge($info, $infoFromJson); + } + return $info; + } /** * Returns the list of hooks registered with the methods names @@ -130,17 +148,4 @@ abstract class Piwik_Plugin { return Piwik_Common::unprefixClass(get_class($this)); } - - /** - * Returns the plugin's base class name without the "Piwik_" prefix, - * e.g., "UserCountry" when the plugin class is "Piwik_UserCountry" - * - * @deprecated since 1.2 - for backward compatibility - * - * @return string - */ - final public function getClassName() - { - return $this->getPluginName(); - } } diff --git a/core/PluginsManager.php b/core/PluginsManager.php index ab341e5654..bf3cf47bd8 100644 --- a/core/PluginsManager.php +++ b/core/PluginsManager.php @@ -53,7 +53,11 @@ class Piwik_PluginsManager 'LanguagesManager', ); + // If a plugin hooks onto at least an event starting with "Tracker.", we load the plugin during tracker + const TRACKER_EVENT_PREFIX = 'Tracker.'; + static private $instance = null; + const PLUGIN_JSON_FILENAME = 'plugin.piwik.json'; /** * Returns the singleton Piwik_PluginsManager @@ -145,7 +149,7 @@ class Piwik_PluginsManager */ public function readPluginsDirectory() { - $pluginsName = _glob(PIWIK_INCLUDE_PATH . '/plugins/*', GLOB_ONLYDIR); + $pluginsName = _glob($this->getPluginsDirectory() . '*', GLOB_ONLYDIR); $result = array(); if ($pluginsName != false) { foreach ($pluginsName as $path) { @@ -159,6 +163,28 @@ class Piwik_PluginsManager return $result; } + public function loadInfoFromJson(Piwik_Plugin $plugin) + { + $path = $this->getPluginsDirectory() . $plugin->getPluginName() . '/' . self::PLUGIN_JSON_FILENAME; + if(!file_exists($path)) { + return false; + } + $json = file_get_contents($path); + if(!$json) { + return false; + } + $info = Piwik_Common::json_decode($json, $assoc = true); + if(!is_array($info) || empty($info)) { + throw new Exception("Invalid JSON file: $path"); + } + return $info; + } + + protected function getPluginsDirectory() + { + return PIWIK_INCLUDE_PATH . '/plugins/'; + } + /** * Deactivate plugin * @@ -391,7 +417,7 @@ class Piwik_PluginsManager throw new Exception(sprintf("The plugin filename '%s' is not a valid filename", $pluginFileName)); } - $path = PIWIK_INCLUDE_PATH . '/plugins/' . $pluginFileName; + $path = $this->getPluginsDirectory() . $pluginFileName; if (!file_exists($path)) { // ToDo: We should log this - but this will crash in Tracker mode since core/Piwik is not loaded @@ -413,7 +439,7 @@ class Piwik_PluginsManager } $this->addLoadedPlugin($pluginName, $newPlugin); - + Piwik_EventDispatcher::getInstance()->postPendingEventsTo($newPlugin); return $newPlugin; @@ -493,7 +519,7 @@ class Piwik_PluginsManager * @param Piwik_Plugin $plugin * @param string $langCode * @throws Exception - * @return void + * @return bool whether the translation was found and loaded */ private function loadTranslation($plugin, $langCode) { @@ -502,19 +528,9 @@ class Piwik_PluginsManager return; } - $infos = $plugin->getInformation(); - if (!isset($infos['translationAvailable'])) { - $infos['translationAvailable'] = false; - } - $translationAvailable = $infos['translationAvailable']; - - if (!$translationAvailable) { - return; - } - $pluginName = $plugin->getPluginName(); - $path = PIWIK_INCLUDE_PATH . '/plugins/' . $pluginName . '/lang/%s.php'; + $path = $this->getPluginsDirectory() . $pluginName . '/lang/%s.php'; $defaultLangPath = sprintf($path, $langCode); $defaultEnglishLangPath = sprintf($path, 'en'); @@ -526,9 +542,10 @@ class Piwik_PluginsManager } elseif (file_exists($defaultEnglishLangPath)) { require $defaultEnglishLangPath; } else { - throw new Exception("Language file not found for the plugin '$pluginName'."); + return false; } Piwik_Translate::getInstance()->mergeTranslationArray($translations); + return true; } /** @@ -583,12 +600,7 @@ class Piwik_PluginsManager $saveConfig = true; } - $information = $plugin->getInformation(); - - // if the plugin is to be loaded during the statistics logging - if (isset($information['TrackerPlugin']) - && $information['TrackerPlugin'] === true - ) { + if ($this->isTrackerPlugin($plugin)) { $pluginsTracker = Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; if (is_null($pluginsTracker)) { $pluginsTracker = array(); @@ -604,6 +616,18 @@ class Piwik_PluginsManager Piwik_Config::getInstance()->forceSave(); } } + + protected function isTrackerPlugin(Piwik_Plugin $plugin) + { + $hooks = $plugin->getListHooksRegistered(); + $hookNames = array_keys($hooks); + foreach ($hookNames as $name) { + if (strpos($name, self::TRACKER_EVENT_PREFIX) === 0) { + return true; + } + } + return false; + } } /** diff --git a/core/Translate.php b/core/Translate.php index d2b95e700b..177cb64ca7 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -31,7 +31,7 @@ class Piwik_Translate public function loadEnglishTranslation() { - $this->loadTranslation('en'); + $this->loadCoreTranslationFile('en'); } public function unloadEnglishTranslation() @@ -64,10 +64,10 @@ class Piwik_Translate if ($this->loadedLanguage == $language) { return; } - $this->loadTranslation($language); + $this->loadCoreTranslationFile($language); } - private function loadTranslation($language) + private function loadCoreTranslationFile($language) { $translations = array(); $path = PIWIK_INCLUDE_PATH . '/lang/' . $language . '.php'; diff --git a/lang/ar.php b/lang/ar.php index 6b181706ff..a7d2baaf25 100644 --- a/lang/ar.php +++ b/lang/ar.php @@ -1359,7 +1359,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => 'التوقيت', 'VisitTime_NHour' => '%s س', 'Widgetize_PluginDescription' => 'الإضافات تجعل من السهل جداً تصدير أي لوحة إعدادات في Piwik إلى مدونتك، موقعك أو صفحتك الخاصة على iGoogle أو Netvibes.', - 'PDFReports_PluginDescriptionReports' => 'أنشأ وحمل تقاريرك المخصصة، واجعلها تُرسل إليك يومياً، أسبوعياً أو شهرياً.', + 'PDFReports_PluginDescription' => 'أنشأ وحمل تقاريرك المخصصة، واجعلها تُرسل إليك يومياً، أسبوعياً أو شهرياً.', 'PDFReports_ManageEmailReports' => 'إدارة تقارير البريد', 'PDFReports_EmailReports' => 'التقارير البريدية', 'PDFReports_PDF' => 'PDF', diff --git a/lang/be.php b/lang/be.php index 0acb8a16d2..a8f8b3f12a 100644 --- a/lang/be.php +++ b/lang/be.php @@ -1361,7 +1361,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => 'Па часе', 'VisitTime_NHour' => '%s ч.', 'Widgetize_PluginDescription' => 'Плагін дазваляе лёгка экспартаваць любы віджэт Piwik у блог, вэб-сайт або на iGoogle і Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Стварэнне і запампоука карыстацкіх справаздач, і адпраўка іх па электроннай пошце штодзень, штотыдзень або штомесяц.', + 'PDFReports_PluginDescription' => 'Стварэнне і запампоука карыстацкіх справаздач, і адпраўка іх па электроннай пошце штодзень, штотыдзень або штомесяц.', 'PDFReports_ManageEmailReports' => 'Упраўленне справаздачамі па электроннай пошце', 'PDFReports_EmailReports' => 'Справаздачы па Email', 'PDFReports_SendReportNow' => 'Адправіць справаздачу зараз', diff --git a/lang/bg.php b/lang/bg.php index b0985b3ac2..212ddb9530 100644 --- a/lang/bg.php +++ b/lang/bg.php @@ -1679,7 +1679,7 @@ $translations = array( 'VisitTime_DayOfWeek' => 'Ден от седмицата', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Графиката показва посещенията за всеки ден от седмицата.', 'Widgetize_PluginDescription' => 'Този плъгин прави много лесен за износ на всяка Piwik джаджа във вашия блог, уебсайт или по Igoogle и Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Създайте и изтеглете Вашите персонализирани отчети,и ги изпращайте по имейл ежедневно, ежеседмично или ежемесечно.', + 'PDFReports_PluginDescription' => 'Създайте и изтеглете Вашите персонализирани отчети,и ги изпращайте по имейл ежедневно, ежеседмично или ежемесечно.', 'PDFReports_ManageEmailReports' => 'Управление на Email докладите', 'PDFReports_EmailReports' => 'Email доклади', 'PDFReports_PDF' => 'PDF', diff --git a/lang/ca.php b/lang/ca.php index c4f5645d25..90828f7e69 100644 --- a/lang/ca.php +++ b/lang/ca.php @@ -1023,14 +1023,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => 'El formulari de seguretat ha fallat. Sisuplau recarregeu el formaulari i reviseu que teniu les cookies activades. Si feu servir un proxy, heu de %s configurar el Piwik per a que accepti la capcelera del proxy %s que conté la capçalera del host. També reviseu que el la vostra capçalera de referent s\'envia correctament.', 'Login_InvalidOrExpiredToken' => 'El codi és invàlid o ha caducat', 'Login_MailTopicPasswordChange' => 'Confirmeu el canvi de contrasenya', - 'Login_MailPasswordChangeBody' => 'Hola %1$s,
-
-S\'ha rebut una petició per restablir la contrasenya de %2$s. Per confirmar aquest canvi de contrasenya (per a que pogueu entrar amb les noves credencials), visiteu el següent enllaç:
-
-%3$s
-
-Nota: aquest enllaç caduca en 24 hores.
-
+ 'Login_MailPasswordChangeBody' => 'Hola %1$s, + +S\'ha rebut una petició per restablir la contrasenya de %2$s. Per confirmar aquest canvi de contrasenya (per a que pogueu entrar amb les noves credencials), visiteu el següent enllaç: + +%3$s + +Nota: aquest enllaç caduca en 24 hores. + Us donem les gràcies per utiltizar el Piwik!', 'Login_ConfirmationLinkSent' => 'S\'ha enviat un enllaç de confirmació a la vostra bústia d\'entrada. Reviseu el vostre correu electrònic i visiteu l\'enllaç per autoritzar la sol·licitud de canvi de password.', 'Login_PasswordChanged' => 'S\'ha canviat la vostra contrasenya', @@ -1819,7 +1819,7 @@ Us donem les gràcies per utiltizar el Piwik!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Aquest gràfic mostre el nombre de visites que ha rebut el vostre lloc web cada dia de la setmana.', 'Widgetize_PluginDescription' => 'Aquesta extensió permet exportar qualsevol Giny de Piwik al vostre bloc, lloc web, Igoogle i Netvibes!', 'Widgetize_TopLinkTooltip' => 'Exporteu informes i ginys de Piwik i incrusteu el Tauler de Control a la vostra aplicació com un iframe.', - 'PDFReports_PluginDescriptionReports' => 'Creeu i descarregeu els vostres informes personalitats. Envieu-vos els per correu electronic diariament, semanalment o mensualment.', + 'PDFReports_PluginDescription' => 'Creeu i descarregeu els vostres informes personalitats. Envieu-vos els per correu electronic diariament, semanalment o mensualment.', 'PDFReports_ManageEmailReports' => 'Administra els informes per correu electrònic.', 'PDFReports_EmailReports' => 'Informes per correu electrònic', 'PDFReports_PDF' => 'PDF', diff --git a/lang/cs.php b/lang/cs.php index 9be866bd58..df996b3f1b 100644 --- a/lang/cs.php +++ b/lang/cs.php @@ -1478,7 +1478,7 @@ $translations = array( 'VisitTime_VisitsByDayOfWeek' => 'Návštěvy podle dnů v týdnu', 'VisitTime_DayOfWeek' => 'Dny v týdnu', 'Widgetize_PluginDescription' => 'Tento zásuvný modul zjednodušuje export widgetů Piwiku na váš blog, sídlo nebo Igoogle a Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Vytvořit a uložit vlastní hlášení a dostávat denní, týdenní nebo měsíční emailové hlášení.', + 'PDFReports_PluginDescription' => 'Vytvořit a uložit vlastní hlášení a dostávat denní, týdenní nebo měsíční emailové hlášení.', 'PDFReports_ManageEmailReports' => 'Spravovat emailové hlášení', 'PDFReports_EmailReports' => 'Poslat hlášení na e-mail', 'PDFReports_PDF' => 'PDF', diff --git a/lang/da.php b/lang/da.php index c666812bf1..c1891d4059 100644 --- a/lang/da.php +++ b/lang/da.php @@ -1977,7 +1977,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Denne graf viser antallet af besøg hjemmesiden har modtaget på hver dag i ugen.', 'Widgetize_PluginDescription' => 'Programudvidelsen gør det nemt at eksportere Piwik moduler til din blog, hjemmeside eller på iGoogle og Netvibes!', 'Widgetize_TopLinkTooltip' => 'Eksporter Piwik rapporter som moduler og indlejre dit kontrolpanel i din applikation som en iframe.', - 'PDFReports_PluginDescriptionReports' => 'Opret og hent brugerdefinerede rapporter, og få dem sendt dagligt, ugentligt eller månedligt.', + 'PDFReports_PluginDescription' => 'Opret og hent brugerdefinerede rapporter, og få dem sendt dagligt, ugentligt eller månedligt.', 'PDFReports_ManageEmailReports' => 'Administrer e-mail rapporter', 'PDFReports_EmailReports' => 'E-mail rapporter', 'PDFReports_PDF' => 'PDF', diff --git a/lang/de.php b/lang/de.php index f0c22f807a..0fef6dff5a 100644 --- a/lang/de.php +++ b/lang/de.php @@ -1977,7 +1977,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Dieser Graph zeigt die Anzahl der Besuche Ihrer Webseite nach Wochentagen.', 'Widgetize_PluginDescription' => 'Dieses Plugin macht es sehr einfach, Piwik-Widgets für einen Blog, eine Webseite oder IGoogle und Netvibes zu exportieren.', 'Widgetize_TopLinkTooltip' => 'Exportiere Piwik Berichte als Widgets und binde das Dashboard in deiner Applikation als iframe ein.', - 'PDFReports_PluginDescriptionReports' => 'Berichte erstellen, herunterladen und täglich, wöchentlich oder monatlich per E-Mail versenden.', + 'PDFReports_PluginDescription' => 'Berichte erstellen, herunterladen und täglich, wöchentlich oder monatlich per E-Mail versenden.', 'PDFReports_ManageEmailReports' => 'E-Mail-Berichte verwalten', 'PDFReports_EmailReports' => 'E-Mail-Berichte', 'PDFReports_PDF' => 'PDF', diff --git a/lang/el.php b/lang/el.php index 0ce48cdfc9..cea9d7a56d 100644 --- a/lang/el.php +++ b/lang/el.php @@ -1886,7 +1886,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Αυτό το διάγραμμα δείχνει τον αριθμό των επισκέψεων που είχε η ιστοσελίδα σας κάθε ημέρα της εβδομάδας.', 'Widgetize_PluginDescription' => 'Το πρόσθετο κάνει πολύ εύκολη την εξαγωγή οποιασδήποτε Μικροεφαρμογής Piwik στο Ιστολόγιό σας, την Ιστοσελίδα σας ή το Igoogle και το Netvibes!', 'Widgetize_TopLinkTooltip' => 'Εξαγωγή Αναφορών Piwik ως Μικροεφαρμογές και ενσωμάτωσή του Κεντρικού Πίνακα στην εφαρμογή σας ως πλαίσιο.', - 'PDFReports_PluginDescriptionReports' => 'Δημιουργήστε και λάβετε τις προσαρμοσμένες αναφορές σας και ρυθμίστε τες ώστε να τις λαμβάνετε ημερησίως, εβδομαδιαίως ή μηνιαίως.', + 'PDFReports_PluginDescription' => 'Δημιουργήστε και λάβετε τις προσαρμοσμένες αναφορές σας και ρυθμίστε τες ώστε να τις λαμβάνετε ημερησίως, εβδομαδιαίως ή μηνιαίως.', 'PDFReports_ManageEmailReports' => 'Διαχείριση Αναφορών Αλληλογραφίας', 'PDFReports_EmailReports' => 'Αναφορές Αλληλογραφίας', 'PDFReports_PDF' => 'PDF', diff --git a/lang/en.php b/lang/en.php index a551d74bbc..f3aa71df92 100644 --- a/lang/en.php +++ b/lang/en.php @@ -1994,7 +1994,7 @@ And thank you for using Piwik!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'This graph shows the number of visits your website received on each day of the week.', 'Widgetize_PluginDescription' => 'The plugin makes it very easy to export any Piwik Widget in your Blog, Website or on Igoogle and Netvibes!', 'Widgetize_TopLinkTooltip' => 'Export Piwik Reports as Widgets and embed the Dashboard in your app as an iframe.', - 'PDFReports_PluginDescriptionReports' => 'Create and download your custom reports, and have them emailed daily, weekly or monthly.', + 'PDFReports_PluginDescription' => 'Create and download your custom reports, and have them emailed daily, weekly or monthly.', 'PDFReports_ManageEmailReports' => 'Manage Email Reports', 'PDFReports_EmailReports' => 'Email Reports', 'PDFReports_PDF' => 'PDF', diff --git a/lang/es.php b/lang/es.php index 127eaece57..0fb62c73fb 100644 --- a/lang/es.php +++ b/lang/es.php @@ -1018,14 +1018,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => 'La seguridad del formulario ha fallado. Por favor actualice el formulario y compruebe que sus cookies están habilitadas. Si usa un proxy, debe %s configurar Piwik para aceptar la cabecera proxy%s que precede la cabecera Host. Compruebe también que su cabecera Referer se envía correctamente.', 'Login_InvalidOrExpiredToken' => 'El indicio no es válido o ha caducado', 'Login_MailTopicPasswordChange' => 'Confirma el Cambio de Contraseña', - 'Login_MailPasswordChangeBody' => 'Estimado %1$s:
-
-Se ha recibido una solicitud de modificación de contraseña desde %2$s. Para confirmar el cambio y de esta manera permitir tu inicio de sesión con nuevas credenciales, visita esta enlace:
-
-%3$s
-
-Nota: Este código vencerá en 24 hora.
-
+ 'Login_MailPasswordChangeBody' => 'Estimado %1$s: + +Se ha recibido una solicitud de modificación de contraseña desde %2$s. Para confirmar el cambio y de esta manera permitir tu inicio de sesión con nuevas credenciales, visita esta enlace: + +%3$s + +Nota: Este código vencerá en 24 hora. + ¡Y gracias por usar Piwik!', 'Login_ConfirmationLinkSent' => 'Un enlace de confirmación ha sido enviado a tu casilla de correo. Chequea tu e-mail y visita ese enlace para autorizar tu solicitud de cambios de contraseña.', 'Login_PasswordChanged' => 'Tu contraseña ha sido modificada.', @@ -1831,7 +1831,7 @@ Nota: Este código vencerá en 24 hora. 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Este gráfico muestra el número de visitas que su sitio de internet recibió en cada día de la semana.', 'Widgetize_PluginDescription' => 'Este plugin hace muy fácil exportar cualquier Widget de Piwik a tu blog, sitio web o a iGoogle y Netvibes!', 'Widgetize_TopLinkTooltip' => 'Exportar los informes de Piwik como una aplicación (widget) e incrustar el panel en su aplicación como un elemento iframe.', - 'PDFReports_PluginDescriptionReports' => 'Cree y descargue sus reportes personalizados, y envíelos por email diariamente, semanalmente o mensualmente.', + 'PDFReports_PluginDescription' => 'Cree y descargue sus reportes personalizados, y envíelos por email diariamente, semanalmente o mensualmente.', 'PDFReports_ManageEmailReports' => 'Administrar los Reportes por Email', 'PDFReports_EmailReports' => 'Informes por correo electrónico', 'PDFReports_PDF' => 'PDF', diff --git a/lang/fa.php b/lang/fa.php index 7cfd6a980a..4c7b957e5a 100644 --- a/lang/fa.php +++ b/lang/fa.php @@ -1707,7 +1707,7 @@ $translations = array( 'VisitTime_DayOfWeek' => 'روز از هفته', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'این نمودار تعداد بازدیدهای وبسایت شما را در هر روز از هفته نمایش می دهد.', 'Widgetize_PluginDescription' => 'این پلاگین باعث می شود آن را بسیار آسان برای صادرات هر گونه عناصر Piwik در وبلاگ، وب سایت خود و یا در iGoogle و کام!', - 'PDFReports_PluginDescriptionReports' => 'ایجاد و گزارش های سفارشی خود را، و آنها را ایمیل های روزانه، هفتگی و یا ماهانه.', + 'PDFReports_PluginDescription' => 'ایجاد و گزارش های سفارشی خود را، و آنها را ایمیل های روزانه، هفتگی و یا ماهانه.', 'PDFReports_ManageEmailReports' => 'مدیریت گزارش از راه ایمیل', 'PDFReports_EmailReports' => 'گزارش ها را ایمیل کن', 'PDFReports_PDF' => 'پی دی اف', diff --git a/lang/fi.php b/lang/fi.php index 5da7d811f9..2f962b9e1e 100644 --- a/lang/fi.php +++ b/lang/fi.php @@ -1673,7 +1673,7 @@ Kiitos Piwikin käyttämisestä!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Tämä kuvaaja näyttää käyntien määrän sivuilla viikonpäivien mukaan', 'Widgetize_PluginDescription' => 'Tällä lisäosalla voit helposti näyttää minkä tahansa Piwikin raportin blogissa, verkkosivulla, iGooglessa tai Netvibesissä!', 'Widgetize_TopLinkTooltip' => 'Vie Piwikin raportteja vimpaimiksi ja lisää työpöytä ohjelmaan iframena.', - 'PDFReports_PluginDescriptionReports' => 'Luo ja lataa kustomoituja raportejasi. Lisäksi voit ajastaa sähköpostituksen päivittäin, viikottain tai kuukausittain.', + 'PDFReports_PluginDescription' => 'Luo ja lataa kustomoituja raportejasi. Lisäksi voit ajastaa sähköpostituksen päivittäin, viikottain tai kuukausittain.', 'PDFReports_ManageEmailReports' => 'Hallitse sähköpostiraportteja', 'PDFReports_EmailReports' => 'Sähköpostiraportit', 'PDFReports_PDF' => 'PDF', diff --git a/lang/fr.php b/lang/fr.php index e0cdf59c6e..1148929542 100644 --- a/lang/fr.php +++ b/lang/fr.php @@ -1128,14 +1128,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => 'La sécurité du formulaire a échoué. Veuillez recharger le formulaire et vérifier que vos cookies sont activés. Si vous utilisez un serveur proxy, vous devez %s configurer Piwik pour accepter les en-têtes du proxy %s qui relaient les en-têtes de l\'hôte. Vérifiez aussi que l\'en-tête de votre référant est correctement transmis.', 'Login_InvalidOrExpiredToken' => 'La clef est invalide ou a expiré', 'Login_MailTopicPasswordChange' => 'Confirmer le changement de mot de passe', - 'Login_MailPasswordChangeBody' => 'Bonjour %s,
-
-Une demande de réinitialisation de mot de passe a été reçue depuis %2$s. Pour confirmer le changement de mot de passe afin de pouvoir vous authentifier avec vos nouveaux identifiants, cliquez sur le lien suivant :
-
-%3$s
-
-Note : ce jeton expirera dans 24 heures.
-
+ 'Login_MailPasswordChangeBody' => 'Bonjour %s, + +Une demande de réinitialisation de mot de passe a été reçue depuis %2$s. Pour confirmer le changement de mot de passe afin de pouvoir vous authentifier avec vos nouveaux identifiants, cliquez sur le lien suivant : + +%3$s + +Note : ce jeton expirera dans 24 heures. + Merci d\'utiliser Piwik!', 'Login_ConfirmationLinkSent' => 'Un lien de confirmation a été envoyé à votre courriel. Vérifiez votre courriel et cliquez sur le lien pour autoriser votre demande de changement de mot de passe.', 'Login_PasswordChanged' => 'Votre mot de passe a été modifié', @@ -1984,7 +1984,7 @@ Merci d\'utiliser Piwik!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Ce graphique affiche le nombre de visites que votre site web a reçu durant chaque jour de la semaine.', 'Widgetize_PluginDescription' => 'Le plugin rend simple l\'export de n\'importe quel Widget Piwik dans votre blog, site web ou sur Igoogle et Netvibes!', 'Widgetize_TopLinkTooltip' => 'Exporter les rapports Piwik en tant que gadget et incorporer le tableau de bord dans votre application en tant qu\'iframe.', - 'PDFReports_PluginDescriptionReports' => 'Créez et téléchargez vos rapports personnalisés, et recevez les par e-mail quotidiennement, chaque semaine ou mensuellement.', + 'PDFReports_PluginDescription' => 'Créez et téléchargez vos rapports personnalisés, et recevez les par e-mail quotidiennement, chaque semaine ou mensuellement.', 'PDFReports_ManageEmailReports' => 'Gérer les rapports par e-mail', 'PDFReports_EmailReports' => 'Rapports e-mail', 'PDFReports_PDF' => 'PDF', diff --git a/lang/hi.php b/lang/hi.php index 6f50a89d51..30a59b4d87 100644 --- a/lang/hi.php +++ b/lang/hi.php @@ -1249,7 +1249,7 @@ $translations = array( 'UserCountry_country_za' => 'दक्षिण अफ्रीका', 'UserCountry_country_zm' => 'जाम्बिया', 'UserCountry_country_zw' => 'जिम्बाब्वे', - 'PDFReports_PluginDescriptionReports' => 'बनाएँ और डाउनलोड करें अपने विशिष्ट प्रतिवेदन, और उन्हें दैनिक, साप्ताहिक या मासिक ईमेल किया.', + 'PDFReports_PluginDescription' => 'बनाएँ और डाउनलोड करें अपने विशिष्ट प्रतिवेदन, और उन्हें दैनिक, साप्ताहिक या मासिक ईमेल किया.', 'PDFReports_ManageEmailReports' => 'ईमेल प्रतिवेदन प्रबंधन', 'PDFReports_EmailReports' => 'ईमेल प्रतिवेदन', 'PDFReports_PDF' => 'पीडीएफ', diff --git a/lang/id.php b/lang/id.php index 9bfc7391eb..598874f446 100644 --- a/lang/id.php +++ b/lang/id.php @@ -1129,13 +1129,13 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => 'Borang keamanan gagal. Silkan muat ulang borang dan periksa apakah kuki Anda telah aktif. Bila Anda menggunakan peladen wali, Anda harus %s mengkonfigurasi Piwik untuk menerima `header` wali%s yang meneruskan `header` Inang. Serta, periksa apakah `header` Pengarah telah terkirim dengan benar.', 'Login_InvalidOrExpiredToken' => 'Kepingan tak sahih atau telah kedaluwarsa.', 'Login_MailTopicPasswordChange' => 'Konfirmasi Pengubahan Sandi', - 'Login_MailPasswordChangeBody' => 'Hai %1$s,
-
-Sebuah permintaan atur ulang sandi telah diterima dari %2$s. Untuk mengkonfirmasi pengubahan sandi, Anda dapat masuk-log dengan mandat baru Anda, kunjungi tautan berikut:
-
-%3$s
-
-Catatan: kepingan ini akan kedaluwarsa dalam 24 jam.
+ 'Login_MailPasswordChangeBody' => 'Hai %1$s, + +Sebuah permintaan atur ulang sandi telah diterima dari %2$s. Untuk mengkonfirmasi pengubahan sandi, Anda dapat masuk-log dengan mandat baru Anda, kunjungi tautan berikut: + +%3$s + +Catatan: kepingan ini akan kedaluwarsa dalam 24 jam. Dan terima kasih menggunakan Piwik!', 'Login_ConfirmationLinkSent' => 'Tautan konfirmasi telah dikirim ke kotak masuk Anda. Periksa surel Anda dan kunjungi tautan ini untuk memberi izin permintaan perubahan sandi Anda.', 'Login_PasswordChanged' => 'Sandi Anda telah berubah.', @@ -1984,7 +1984,7 @@ Dan terima kasih menggunakan Piwik!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Grafik ini menampilkan jumlah kunjungan yang diperoleh situs Anda dalam setiap hari dalam sepekan.', 'Widgetize_PluginDescription' => 'Pengaya ini mempermudah mengekspor Gawit Piwik dalam Blog, Situs, atau dalam Igoogle dan Netvibes Anda!', 'Widgetize_TopLinkTooltip' => 'Ekspor Laporan Piwik sebagai gawit dan sematkan dalam Penel Kendali di aplikasi Anda sebagai binkai pendam.', - 'PDFReports_PluginDescriptionReports' => 'Buat dan unduh laporan tersesuai, dan mengatur surel laporan harian, mingguan atau bulanan.', + 'PDFReports_PluginDescription' => 'Buat dan unduh laporan tersesuai, dan mengatur surel laporan harian, mingguan atau bulanan.', 'PDFReports_ManageEmailReports' => 'Pengatur Laporan Surel', 'PDFReports_EmailReports' => 'Laporan Surel', 'PDFReports_PDF' => 'PDF', diff --git a/lang/ja.php b/lang/ja.php index 7b89098cbe..ce7125be14 100644 --- a/lang/ja.php +++ b/lang/ja.php @@ -1506,7 +1506,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => '時間', 'VisitTime_NHour' => '%s時', 'Widgetize_PluginDescription' => 'あなたのブログ、ウェブサイト、Igoogle、Netvibes 等に、任意の Piwik ウィジェットをとても簡単にエクスポートできるようにします。', - 'PDFReports_PluginDescriptionReports' => 'カスタムリポートを作成してダウンロードします。それらを、毎日、毎週または毎月メールで送信します。', + 'PDFReports_PluginDescription' => 'カスタムリポートを作成してダウンロードします。それらを、毎日、毎週または毎月メールで送信します。', 'PDFReports_ManageEmailReports' => 'メールリポートの管理', 'PDFReports_EmailReports' => 'メールリポート', 'PDFReports_PDF' => 'PDF', diff --git a/lang/ko.php b/lang/ko.php index be90a67338..80451db24c 100644 --- a/lang/ko.php +++ b/lang/ko.php @@ -1047,14 +1047,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => '양식 보안 실패, 양식을 새로고침하여 쿠키가 활성화되어 있는지 확인하세요. 프록시 서버를 사용하는 경우라면, 호스트 헤더에 %sPiwik configure에서 프록시 헤더를 수락%s하고 전달해야합니다. 또한 리퍼러 헤더가 올바르게 전송되는지 확인합니다.', 'Login_InvalidOrExpiredToken' => '토큰이 잘못되었거나 만료되었습니다.', 'Login_MailTopicPasswordChange' => '비밀번호 변경 확인', - 'Login_MailPasswordChangeBody' => '안녕하세요, %1$s 님,
-
-%2$s님으로부터 비밀번호 재설정 요청을 받았습니다. 새로운 자격 증명을 이용하여 로그인할 수 있도록 다음 링크를 클릭하고 비밀번호를 변경해주세요:
-
-%3$s
-
-참고: 이 토큰은 24시간 내에 만료됩니다.
-
+ 'Login_MailPasswordChangeBody' => '안녕하세요, %1$s 님, + +%2$s님으로부터 비밀번호 재설정 요청을 받았습니다. 새로운 자격 증명을 이용하여 로그인할 수 있도록 다음 링크를 클릭하고 비밀번호를 변경해주세요: + +%3$s + +참고: 이 토큰은 24시간 내에 만료됩니다. + 그리고 Piwik을 사용하여 주셔서 감사합니다!', 'Login_ConfirmationLinkSent' => '확인 링크가 당신의 받은 편지함으로 전송되었습니다. 이메일을 확인하고 비밀번호 변경요청을 승인하려면 이 링크를 방문하세요.', 'Login_PasswordChanged' => '비밀번호가 변경되었습니다.', @@ -1893,7 +1893,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => '이 그래프는 각 요일별로 웹사이트에 방문한 수를 보여줍니다.', 'Widgetize_PluginDescription' => '당신의 블로그, 웹사이트, Igoogle, Netvibes 등 모든 Piwik 위젯을 매우 쉽게 내보낼 수 있습니다.', 'Widgetize_TopLinkTooltip' => 'Piwik 보고서를 위젯으로 내보내고 당신의 애플리케이션 대시보드에 IFRAME으로 삽입할 수 있습니다.', - 'PDFReports_PluginDescriptionReports' => '사용자정의 보고서를 작성하고 다운로드합니다. 매일, 매주 또는 매월 이메일로 전송합니다.', + 'PDFReports_PluginDescription' => '사용자정의 보고서를 작성하고 다운로드합니다. 매일, 매주 또는 매월 이메일로 전송합니다.', 'PDFReports_ManageEmailReports' => '이메일 보고서 관리', 'PDFReports_EmailReports' => '이메일 보고서', 'PDFReports_PDF' => 'PDF', diff --git a/lang/lt.php b/lang/lt.php index f99b1279bd..316b2751b3 100644 --- a/lang/lt.php +++ b/lang/lt.php @@ -1157,7 +1157,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => 'Laikai', 'VisitTime_NHour' => '%sh', 'Widgetize_PluginDescription' => 'Šis papildinys leidžia itin paprastai eksportuoti bet kurį Piwik valdiklį į Jūsų interneto dienoraštį, svetainę ar į Igoogle bei Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Sukurkite ir atsisiųskite savo ataskaitas arba nustatytike jų kadieninį, kas savaitinį ar mėnesinį atsisiuntimą.', + 'PDFReports_PluginDescription' => 'Sukurkite ir atsisiųskite savo ataskaitas arba nustatytike jų kadieninį, kas savaitinį ar mėnesinį atsisiuntimą.', 'PDFReports_ManageEmailReports' => 'Administruoti ataskaitas', 'PDFReports_EmailReports' => 'Ataskaitos el. paštu', 'PDFReports_PDF' => 'PDF', diff --git a/lang/nl.php b/lang/nl.php index 99f11f8fcb..603cb0ce9e 100644 --- a/lang/nl.php +++ b/lang/nl.php @@ -1726,7 +1726,7 @@ $translations = array( 'VisitTime_DayOfWeek' => 'Dag van de week', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Deze grafiek toont het aantal bezoeken op elke dag van de week.', 'Widgetize_PluginDescription' => 'Deze plugin maakt het zeer gemakkelijk om Piwik widgets te exporteren naar uw blog, website of op iGoogle en Netvibes.', - 'PDFReports_PluginDescriptionReports' => 'Maak en download uw aangepaste rapporten en laat deze dagelijks, wekelijks of maandelijks per e-mail versturen.', + 'PDFReports_PluginDescription' => 'Maak en download uw aangepaste rapporten en laat deze dagelijks, wekelijks of maandelijks per e-mail versturen.', 'PDFReports_ManageEmailReports' => 'Beheer de e-mail rapporten', 'PDFReports_EmailReports' => 'E-mail rapporten', 'PDFReports_PDF' => 'PDF', diff --git a/lang/pt-br.php b/lang/pt-br.php index 0a123e8765..a2a3552d10 100644 --- a/lang/pt-br.php +++ b/lang/pt-br.php @@ -1977,7 +1977,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Este gráfico mostra o número de visitas que seu site recebeu, em cada dia da semana.', 'Widgetize_PluginDescription' => 'O plugin faz ficar muito fácil exportar qualquer widget Piwik para seu blog, website ou em Igoogle e Netvibes!', 'Widgetize_TopLinkTooltip' => 'Exportar relatórios Piwik como widgets do Dashboard e incorporar em seu aplicativo como um iframe.', - 'PDFReports_PluginDescriptionReports' => 'Criar e baixar seus relatórios personalizados, e tê-los enviado por email diária, semanal ou mensalmente.', + 'PDFReports_PluginDescription' => 'Criar e baixar seus relatórios personalizados, e tê-los enviado por email diária, semanal ou mensalmente.', 'PDFReports_ManageEmailReports' => 'Gerenciar relatórios de e-mail', 'PDFReports_EmailReports' => 'Relatórios de e-mail', 'PDFReports_PDF' => 'PDF', diff --git a/lang/pt.php b/lang/pt.php index 55b87dd2b3..e7a7ede344 100644 --- a/lang/pt.php +++ b/lang/pt.php @@ -1392,7 +1392,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => 'Horas', 'VisitTime_NHour' => '%sh', 'Widgetize_PluginDescription' => 'Este plugin torna muito fácil exportar qualquer Widget Piwik para o seu Blog, Website ou no Igoogle e Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Criar e fazer download dos seus relatórios personalizados, e enviar por e-mail diariamente, semanalmente ou mensalmente.', + 'PDFReports_PluginDescription' => 'Criar e fazer download dos seus relatórios personalizados, e enviar por e-mail diariamente, semanalmente ou mensalmente.', 'PDFReports_ManageEmailReports' => 'Gerir relatórios de email', 'PDFReports_EmailReports' => 'Relatórios Email', 'PDFReports_PDF' => 'PDF', diff --git a/lang/ru.php b/lang/ru.php index 1b66c40f81..49392cd93d 100644 --- a/lang/ru.php +++ b/lang/ru.php @@ -1919,7 +1919,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Этот график показывает число посещений по каждому дню в неделе.', 'Widgetize_PluginDescription' => 'Этот плагин позволяет легко экспортировать любой виджет Веб-аналитики на ваш блог, сайт, iGoogle и Netvibes!', 'Widgetize_TopLinkTooltip' => 'Экспортируйте аналитику Piwik в виде виджетов и установите их на своем сайте или веб-сервисе как iframe.', - 'PDFReports_PluginDescriptionReports' => 'Создавайте и скачивайте ваши пользовательские отчеты и получайте их по почте каждый день, неделю, месяц.', + 'PDFReports_PluginDescription' => 'Создавайте и скачивайте ваши пользовательские отчеты и получайте их по почте каждый день, неделю, месяц.', 'PDFReports_ManageEmailReports' => 'Управление Email-отчетами', 'PDFReports_EmailReports' => 'Отправка по e-mail', 'PDFReports_PDF' => 'PDF', diff --git a/lang/sq.php b/lang/sq.php index ec34553867..ed323f5d7a 100644 --- a/lang/sq.php +++ b/lang/sq.php @@ -1448,7 +1448,7 @@ $translations = array( 'VisitTime_SubmenuTimes' => 'Kohë', 'VisitTime_NHour' => '%sh', 'Widgetize_PluginDescription' => 'Shtojca e bën shumë të lehtë të eksportohet çfarëdo Widget-i Piwik-u te Blogu juaj, site-i juaj web ose te Igoogle apo Netvibes!', - 'PDFReports_PluginDescriptionReports' => 'Krijoni dhe shkarkoni raporte të personalizuar, dhe merrini ata përditë, përjavë ose përmuaj, me email.', + 'PDFReports_PluginDescription' => 'Krijoni dhe shkarkoni raporte të personalizuar, dhe merrini ata përditë, përjavë ose përmuaj, me email.', 'PDFReports_ManageEmailReports' => 'Administroni Raporte Email', 'PDFReports_EmailReports' => 'Dërgo Raportet Me Email', 'PDFReports_PDF' => 'PDF', diff --git a/lang/sr.php b/lang/sr.php index 53bc385294..758c604c94 100644 --- a/lang/sr.php +++ b/lang/sr.php @@ -1919,7 +1919,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Ovaj grafikon prikazuje broj poseta po danu u nedelji', 'Widgetize_PluginDescription' => 'Ovaj dodatak vam omogućuje da na veoma jednostavan način prikažete bilo koji od Piwik vidžeta na svom blogu, sajtu, Igoogle ili Netvibes!', 'Widgetize_TopLinkTooltip' => 'Prikaži Piwik izveštaje kao vidžete i ugradi konzolu u svoju aplikaciju kao iframe.', - 'PDFReports_PluginDescriptionReports' => 'Napravite i preuzmite izveštaje putem elektronske pošte dnevno, nedeljno ili mesečno.', + 'PDFReports_PluginDescription' => 'Napravite i preuzmite izveštaje putem elektronske pošte dnevno, nedeljno ili mesečno.', 'PDFReports_ManageEmailReports' => 'Upravljanje izveštajima', 'PDFReports_EmailReports' => 'Slanje elektronskom poštom', 'PDFReports_PDF' => 'PDF', diff --git a/lang/sv.php b/lang/sv.php index b036012a3a..a7974eecd3 100644 --- a/lang/sv.php +++ b/lang/sv.php @@ -1041,14 +1041,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => 'Formulärets säkerhet misslyckades. Vänligen ladda formuläret och kontrollera att cookies är aktiverade. Om du använder en proxyserver måste du %s konfigurera Piwik att acceptera proxy huvuden %s som överför Host-huvuden. Kontrollera också att din Referer header skickas korrekt.', 'Login_InvalidOrExpiredToken' => 'Lösenordsbevis är felaktigt eller har utgått.', 'Login_MailTopicPasswordChange' => 'Bekräfta byte av lösenord', - 'Login_MailPasswordChangeBody' => 'Hej %1$s,
-
-En begäran om att återställa ditt lösenord togs emot från %2$s. Besök följande länk för att bekräfta lösenordsbytet och göra det möjligt att logga in med dina nya uppgifter:
-
-%3$s
-
-Notera: den här förfrågan kommer att upphöra om 24 timmar.
-
+ 'Login_MailPasswordChangeBody' => 'Hej %1$s, + +En begäran om att återställa ditt lösenord togs emot från %2$s. Besök följande länk för att bekräfta lösenordsbytet och göra det möjligt att logga in med dina nya uppgifter: + +%3$s + +Notera: den här förfrågan kommer att upphöra om 24 timmar. + Tack för att du använder Piwik!', 'Login_ConfirmationLinkSent' => 'En länk för bekräftelse har skickats till dig. Kontrollera din e-post och besök länken för att fullfölja begäran att ändra ditt lösenord.', 'Login_PasswordChanged' => 'Ditt lösenord har ändrats.', @@ -1855,7 +1855,7 @@ Tack för att du använder Piwik!', 'VisitTime_WidgetByDayOfWeekDocumentation' => 'Den här grafen visar antalet besök din webbplats fått per veckodag.', 'Widgetize_PluginDescription' => 'Pluginen gör det väldigt enkelt att exportera Piwik widget i din blogg, hemsida eller på iGoogle och Netvibes!', 'Widgetize_TopLinkTooltip' => 'Exportera rapporter från Piwik som Widgets och bädda in instrumentpanelen i din app som en iframe.', - 'PDFReports_PluginDescriptionReports' => 'Skapa och ladda ner dina anpassade rapporter, och få dem e-postade dagligen, veckovis eller månadsvis.', + 'PDFReports_PluginDescription' => 'Skapa och ladda ner dina anpassade rapporter, och få dem e-postade dagligen, veckovis eller månadsvis.', 'PDFReports_ManageEmailReports' => 'Hantera e-postrapporter', 'PDFReports_EmailReports' => 'E-postrapporter', 'PDFReports_PDF' => 'PDF', diff --git a/lang/zh-cn.php b/lang/zh-cn.php index 979ab1ec19..ddc4e5563b 100644 --- a/lang/zh-cn.php +++ b/lang/zh-cn.php @@ -1110,14 +1110,14 @@ $translations = array( 'Login_InvalidNonceOrHeadersOrReferer' => '表单安全检查失败，请重新打开表单，检查是否启用cookie。如果配置了代理服务器，需要 %s 设置Piwik接收代理头信息 %s ，同时检查Referer头是否正确', 'Login_InvalidOrExpiredToken' => '凭证无效或已经过期。', 'Login_MailTopicPasswordChange' => '密码修改确认', - 'Login_MailPasswordChangeBody' => '您好 %1$s，
-
-重置密码的请求来自 %2$s。要确认密码修改，请访问下面的链接:
-
-%3$s
-
-提示: 本链接24小时后失效。
-
+ 'Login_MailPasswordChangeBody' => '您好 %1$s， + +重置密码的请求来自 %2$s。要确认密码修改，请访问下面的链接: + +%3$s + +提示: 本链接24小时后失效。 + 感谢您使用 Piwik！', 'Login_ConfirmationLinkSent' => '确认链接已发到您的邮箱，请接收邮件并点击链接确认密码修改。', 'Login_PasswordChanged' => '您的密码已修改。', @@ -1966,7 +1966,7 @@ $translations = array( 'VisitTime_WidgetByDayOfWeekDocumentation' => '本图形显示一周内网站每天的访问次数。', 'Widgetize_PluginDescription' => '这个插件让您轻松导出任何 Piwik 模块到博客、网站或 iGoogle 及 Netvibes!', 'Widgetize_TopLinkTooltip' => '小工具形式导出 Piwik 报表，将面板以 iframe 形式嵌入您的应用程序中。', - 'PDFReports_PluginDescriptionReports' => '生成和下载您的自定义报表，可以选择日发送，周发送或者月发送。', + 'PDFReports_PluginDescription' => '生成和下载您的自定义报表，可以选择日发送，周发送或者月发送。', 'PDFReports_ManageEmailReports' => '管理报表邮件', 'PDFReports_EmailReports' => '报表邮件', 'PDFReports_PDF' => 'PDF', diff --git a/plugins/API/API.php b/plugins/API/API.php index 69b33db39d..cbaa9b0ec0 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -15,19 +15,6 @@ class Piwik_API extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('API_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 5578862b41..c60f4e457f 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -35,20 +35,6 @@ class Piwik_Actions extends Piwik_Plugin } /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('Actions_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php index 52f4b33171..1ef39eeee6 100755 --- a/plugins/Annotations/Annotations.php +++ b/plugins/Annotations/Annotations.php @@ -18,19 +18,6 @@ class Piwik_Annotations extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Annotations_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php index 53f0cae54b..382faa329a 100644 --- a/plugins/AnonymizeIP/AnonymizeIP.php +++ b/plugins/AnonymizeIP/AnonymizeIP.php @@ -26,7 +26,6 @@ class Piwik_AnonymizeIP extends Piwik_Plugin 'author' => 'Piwik', 'author_homepage' => 'http://piwik.org/', 'version' => Piwik_Version::VERSION, - 'TrackerPlugin' => true, ); } diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index 764da020c1..e238e255ba 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -16,19 +16,6 @@ class Piwik_CoreAdminHome extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('CoreAdminHome_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 684520ea62..07820ffe01 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -18,19 +18,6 @@ class Piwik_CoreHome extends Piwik_Plugin /** * @see Piwik_Plugin::getListHooksRegistered */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('CoreHome_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** - * @see Piwik_Plugin::getListHooksRegistered - */ public function getListHooksRegistered() { return array( diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php index e34a37977d..88fa697684 100644 --- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php +++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php @@ -16,19 +16,6 @@ class Piwik_CorePluginsAdmin extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('CorePluginsAdmin_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index a5e4d6ae2a..56ca7dd396 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -16,19 +16,6 @@ class Piwik_CoreUpdater extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('CoreUpdater_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index 028b83f19e..9a402c192f 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -14,19 +14,10 @@ */ class Piwik_CustomVariables extends Piwik_Plugin { - /** - * @see Piwik_Plugin::getInformation - */ public function getInformation() { - $info = array( - 'description' => Piwik_Translate('CustomVariables_PluginDescription') - . ' <br/>Required to use <a href="http://piwik.org/docs/ecommerce-analytics/">Ecommerce Analytics</a> feature!', - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - + $info = parent::getInformation(); + $info['description'] .= ' <br/>Required to use <a href="http://piwik.org/docs/ecommerce-analytics/">Ecommerce Analytics</a> feature!'; return $info; } diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index bbe7d03f48..69a24f4021 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -18,19 +18,6 @@ class Piwik_DBStats extends Piwik_Plugin const TIME_OF_LAST_TASK_RUN_OPTION = 'dbstats_time_of_last_cache_task_run'; /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('DBStats_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 8680703ec2..d8909fbf01 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -15,19 +15,6 @@ class Piwik_Dashboard extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Dashboard_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 7556409ec0..e86c5d9a98 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -24,8 +24,23 @@ class Piwik_DevicesDetection extends Piwik_Plugin 'author' => 'Piwik and Clearcode.cc', 'author_homepage' => 'http://clearcode.cc', 'version' => '1.12-b6', - 'TrackerPlugin' => true, - 'translationAvailable' => true, + ); + } + + + /** + * @see Piwik_Plugin::getListHooksRegistered + */ + public function getListHooksRegistered() + { + return array( + 'ArchiveProcessing_Day.compute' => "archiveDay", + 'ArchiveProcessing_Period.compute' => 'archivePeriod', + 'Menu.add' => 'addMenu', + 'Tracker.newVisitorInformation' => 'parseMobileVisitData', + 'WidgetsList.add' => 'addWidgets', + 'API.getReportMetadata' => 'getReportMetadata', + 'API.getSegmentsMetadata' => 'getSegmentsMetadata', ); } @@ -104,22 +119,6 @@ class Piwik_DevicesDetection extends Piwik_Plugin return $report; } - /** - * @see Piwik_Plugin::getListHooksRegistered - */ - public function getListHooksRegistered() - { - return array( - 'ArchiveProcessing_Day.compute' => "archiveDay", - 'ArchiveProcessing_Period.compute' => 'archivePeriod', - 'Menu.add' => 'addMenu', - 'Tracker.newVisitorInformation' => 'parseMobileVisitData', - 'WidgetsList.add' => 'addWidgets', - 'API.getReportMetadata' => 'getReportMetadata', - 'API.getSegmentsMetadata' => 'getSegmentsMetadata', - ); - } - public function addWidgets() { foreach ($this->getRawMetadataReports() as $report) { diff --git a/plugins/DoNotTrack/DoNotTrack.php b/plugins/DoNotTrack/DoNotTrack.php index c662dde0bb..59c2ee95db 100644 --- a/plugins/DoNotTrack/DoNotTrack.php +++ b/plugins/DoNotTrack/DoNotTrack.php @@ -19,21 +19,6 @@ class Piwik_DoNotTrack extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('DoNotTrack_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - 'translationAvailable' => false, - 'TrackerPlugin' => true, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/ExampleAPI/ExampleAPI.php b/plugins/ExampleAPI/ExampleAPI.php index f26630e7ee..7c96f96c19 100644 --- a/plugins/ExampleAPI/ExampleAPI.php +++ b/plugins/ExampleAPI/ExampleAPI.php @@ -16,20 +16,4 @@ */ class Piwik_ExampleAPI extends Piwik_Plugin { - /** - * Return information about this plugin. - * - * @see Piwik_Plugin - * - * @return array - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('ExampleAPI_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => '0.1', - ); - } } diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php index 17dfadd2e0..a3143b34bb 100644 --- a/plugins/ExamplePlugin/ExamplePlugin.php +++ b/plugins/ExamplePlugin/ExamplePlugin.php @@ -16,23 +16,6 @@ class Piwik_ExamplePlugin extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('ExamplePlugin_PluginDescription'), - 'homepage' => 'http://piwik.org/', - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'license' => 'GPL v3 or later', - 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html', - 'version' => '0.1', - 'translationAvailable' => true, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php index 51ab12c677..eeb4d78157 100644 --- a/plugins/ExampleRssWidget/ExampleRssWidget.php +++ b/plugins/ExampleRssWidget/ExampleRssWidget.php @@ -16,19 +16,6 @@ class Piwik_ExampleRssWidget extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('ExampleRssWidget_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => '0.1', - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/ExampleUI/ExampleUI.php b/plugins/ExampleUI/ExampleUI.php index d695cfcd06..6808be9109 100644 --- a/plugins/ExampleUI/ExampleUI.php +++ b/plugins/ExampleUI/ExampleUI.php @@ -26,19 +26,6 @@ class Piwik_ExampleUI extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('ExampleUI_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => '0.1', - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php index 35350edc17..5217def3d4 100644 --- a/plugins/Feedback/Feedback.php +++ b/plugins/Feedback/Feedback.php @@ -15,18 +15,6 @@ */ class Piwik_Feedback extends Piwik_Plugin { - /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Feedback_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } /** * @see Piwik_Plugin::getListHooksRegistered diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 100c776153..88f42bc8d7 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -61,18 +61,12 @@ class Piwik_Goals extends Piwik_Plugin return $columns; } - /** - * @see Piwik_Plugin::getInformation - */ public function getInformation() { - $info = array( - 'description' => Piwik_Translate('Goals_PluginDescription') . ' ' . Piwik_Translate('SitesManager_PiwikOffersEcommerceAnalytics', array('<a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">', '</a>')), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - 'TrackerPlugin' => true, // this plugin must be loaded during the stats logging - ); + $suffix = Piwik_Translate('SitesManager_PiwikOffersEcommerceAnalytics', + array('<a href="http://piwik.org/docs/ecommerce-analytics/" target="_blank">', '</a>')); + $info = parent::getInformation(); + $info['description'] .= ' ' . $suffix; return $info; } diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index 06f60e7d33..4dd048827d 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -20,20 +20,13 @@ class Piwik_ImageGraph extends Piwik_Plugin 'Referers_getAll', ); - /** - * @see Piwik_Plugin::getInformation - */ public function getInformation() { - return array( - 'description' => Piwik_Translate('ImageGraph_PluginDescription') - . ' Debug: <a href="' . Piwik_Url::getCurrentQueryStringWithParametersModified( - array('module' => 'ImageGraph', 'action' => 'index')) - . '">All images</a>', - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION - ); + $suffix = ' Debug: <a href="' . Piwik_Url::getCurrentQueryStringWithParametersModified( + array('module' => 'ImageGraph', 'action' => 'index')) . '">All images</a>'; + $info = parent::getInformation(); + $info['description'] .= ' ' . $suffix; + return $info; } /** diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index 95e8686656..5849dc94c2 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -18,21 +18,6 @@ class Piwik_Installation extends Piwik_Plugin protected $installationControllerName = 'Piwik_Installation_Controller'; /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('Installation_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index b2391ddbc9..2afe21d209 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -17,19 +17,6 @@ class Piwik_LanguagesManager extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('LanguagesManager_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index e7e93f6b1c..d4bd504204 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -16,19 +16,6 @@ class Piwik_Live extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Live_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index 00c98620ae..62336764f1 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -16,20 +16,6 @@ class Piwik_Login extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('Login_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 887c3c6883..4d755f39de 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -53,23 +53,6 @@ class Piwik_MobileMessaging extends Piwik_Plugin ); /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'name' => 'Mobile Messaging Plugin', - 'description' => Piwik_Translate('MobileMessaging_PluginDescription'), - 'homepage' => 'http://piwik.org/', - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'license' => 'GPL v3 or later', - 'license_homepage' => 'http://www.gnu.org/licenses/gpl.html', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index 7cd4321445..a8ccc1ffcf 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -15,17 +15,12 @@ */ class Piwik_MultiSites extends Piwik_Plugin { - /** - * @see Piwik_Plugin::getInformation - */ public function getInformation() { - return array( - 'description' => Piwik_Translate('MultiSites_PluginDescription'), - 'author' => 'ClearCode.cc', - 'author_homepage' => "http://clearcode.cc/", - 'version' => Piwik_Version::VERSION, - ); + $info = parent::getInformation(); + $info['author'] = 'Piwik PRO'; + $info['author_homepage'] = 'http://piwik.pro'; + return $info; } /** diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php index 5270d03e3d..5c6d072be5 100644 --- a/plugins/Overlay/Overlay.php +++ b/plugins/Overlay/Overlay.php @@ -11,17 +11,12 @@ class Piwik_Overlay extends Piwik_Plugin { - /** - * @see Piwik_Plugin::getInformation - */ public function getInformation() { - return array( - 'description' => Piwik_Translate('Overlay_PluginDescription') . ' Note: Requires the Transitions plugin enabled.', - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); + $suffix = ' Note: Requires the Transitions plugin enabled.'; + $info = parent::getInformation(); + $info['description'] .= ' ' . $suffix; + return $info; } /** diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 08a886dbd6..eb07f07f0b 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -54,20 +54,6 @@ class Piwik_PDFReports extends Piwik_Plugin ); /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'name' => 'Email Reports Plugin', - 'description' => Piwik_Translate('PDFReports_PluginDescriptionReports'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/PleineLune/PleineLune.php b/plugins/PleineLune/PleineLune.php index 9d035197f0..133cbbfea2 100644 --- a/plugins/PleineLune/PleineLune.php +++ b/plugins/PleineLune/PleineLune.php @@ -15,18 +15,6 @@ */ class Piwik_PleineLune extends Piwik_Plugin { - public function getInformation() - { - return array( - 'description' => Piwik_Translate('PleineLune_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - 'translationAvailable' => true, - 'theme' => true, - ); - } - public function getListHooksRegistered() { return array( diff --git a/plugins/PleineLune/lang/en.php b/plugins/PleineLune/lang/en.php deleted file mode 100644 index 389c5466a3..0000000000 --- a/plugins/PleineLune/lang/en.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * Piwik - Open source web analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - * @category Piwik_Plugins - * @package Piwik_ExamplePlugin - */ - -$translations = array( - 'PleineLune_PluginDescription' => 'A dark theme for your Piwik instance.', -); diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index b21628bbaa..c3ec627713 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -48,19 +48,6 @@ class Piwik_PrivacyManager extends Piwik_Plugin ); /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('PrivacyManager_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index aafb9ecb27..6a22f1ba4f 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -16,22 +16,6 @@ class Piwik_Provider extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('Provider_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - 'TrackerPlugin' => true, // this plugin must be loaded during the stats logging - ); - - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php index 89b0a436e0..0c5fbdb989 100644 --- a/plugins/Referers/Referers.php +++ b/plugins/Referers/Referers.php @@ -20,19 +20,6 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Referers/functions.php'; class Piwik_Referers extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Referers_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/SecurityInfo/SecurityInfo.php b/plugins/SecurityInfo/SecurityInfo.php index 18e1f972ec..92aa1b1ad4 100644 --- a/plugins/SecurityInfo/SecurityInfo.php +++ b/plugins/SecurityInfo/SecurityInfo.php @@ -16,20 +16,6 @@ class Piwik_SecurityInfo extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('SecurityInfo_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 2f9b01edfc..c5744c4e0c 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -20,20 +20,6 @@ class Piwik_SitesManager extends Piwik_Plugin const KEEP_URL_FRAGMENT_NO = 2; /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('SitesManager_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php index 1b5e389b00..90d1ff2839 100644 --- a/plugins/Transitions/Transitions.php +++ b/plugins/Transitions/Transitions.php @@ -15,19 +15,6 @@ class Piwik_Transitions extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Transitions_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index 97914c27e4..62cab9ec4f 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -21,21 +21,6 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/GeoIPAutoUpdater.php'; class Piwik_UserCountry extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('UserCountry_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - 'TrackerPlugin' => true, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index f98294fc40..ad0e5d9316 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -16,19 +16,6 @@ class Piwik_UserSettings extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('UserSettings_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * Mapping between the browser family shortcode and the displayed name * * @type array diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 98ef355bb2..ee33afd98e 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -20,21 +20,6 @@ class Piwik_UsersManager extends Piwik_Plugin const PASSWORD_MAX_LENGTH = 26; /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('UsersManager_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index e6330a2889..ee0def21d1 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -16,20 +16,6 @@ class Piwik_VisitFrequency extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('VisitFrequency_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index c654dcfa7f..18e6fde02f 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -16,20 +16,6 @@ class Piwik_VisitTime extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('VisitTime_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/VisitorGenerator/VisitorGenerator.php b/plugins/VisitorGenerator/VisitorGenerator.php index be6eed43e0..0b733c2cee 100644 --- a/plugins/VisitorGenerator/VisitorGenerator.php +++ b/plugins/VisitorGenerator/VisitorGenerator.php @@ -16,19 +16,6 @@ class Piwik_VisitorGenerator extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('VisitorGenerator_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index b9c95d2a5e..10231517e1 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -16,20 +16,6 @@ class Piwik_VisitorInterest extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('VisitorInterest_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index 9963396e34..daf509753c 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -20,20 +20,6 @@ class Piwik_VisitsSummary extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - $info = array( - 'description' => Piwik_Translate('VisitsSummary_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - return $info; - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 28ea9ce99d..62fae7ab4a 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -17,19 +17,6 @@ class Piwik_Widgetize extends Piwik_Plugin { /** - * @see Piwik_Plugin::getInformation - */ - public function getInformation() - { - return array( - 'description' => Piwik_Translate('Widgetize_PluginDescription'), - 'author' => 'Piwik', - 'author_homepage' => 'http://piwik.org/', - 'version' => Piwik_Version::VERSION, - ); - } - - /** * @see Piwik_Plugin::getListHooksRegistered */ public function getListHooksRegistered() |