19 files changed, 82 insertions, 54 deletions
diff --git a/app/DoctrineMigrations/Version20200428072628.php b/app/DoctrineMigrations/Version20200428072628.php
new file mode 100644
index 00000000..57fbebc2
--- /dev/null
+++ b/app/DoctrineMigrations/Version20200428072628.php
@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+namespace Application\Migrations;
+use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+/**
+ * Renamed Piwik to Matomo in configuration.
+ */
+final class Version20200428072628 extends WallabagMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_enabled' where name = 'piwik_enabled';");
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_host' where name = 'piwik_host';");
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_site_id' where name = 'piwik_site_id';");
+    }
+    public function down(Schema $schema): void
+    {
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_enabled' where name = 'matomo_enabled';");
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_host' where name = 'matomo_host';");
+        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_site_id' where name = 'matomo_site_id';");
+    }
+}
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 6d6a60d6..86d41b23 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -27,9 +27,9 @@ export: "eksport"
 import: "import"
 misc: "misc"
 modify_settings: "Gem ændring"
-piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
+matomo_host: Hosting af din side hos Matomo (uden http:// eller https://)
-piwik_site_id: ID for din side hos Piwik
+matomo_site_id: ID for din side hos Matomo
-piwik_enabled: Aktiver Piwik
+matomo_enabled: Aktiver Matomo
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
 demo_mode_username: "Demobruger"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index a4fa592b..ebfd020d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -27,9 +27,9 @@ export: 'Export'
 import: 'Import'
 misc: 'Verschiedenes'
 modify_settings: 'Übernehmen'
-piwik_host: 'Host deiner Webseite in Piwik (ohne http:// oder https://)'
+matomo_host: 'Host deiner Webseite in Matomo (ohne http:// oder https://)'
-piwik_site_id: 'ID deiner Webseite in Piwik'
+matomo_site_id: 'ID deiner Webseite in Matomo'
-piwik_enabled: 'Piwik aktivieren'
+matomo_enabled: 'Matomo aktivieren'
 demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
 demo_mode_username: 'Test-Benutzer'
 share_public: 'Erlaube eine öffentliche URL für Einträge'
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 239c69eb..d7eb08df 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -27,9 +27,9 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
-piwik_host: Host of your website in Piwik (without http:// or https://)
+matomo_host: Host of your website in Matomo (without http:// or https://)
-piwik_site_id: ID of your website in Piwik
+matomo_site_id: ID of your website in Matomo
-piwik_enabled: Enable Piwik
+matomo_enabled: Enable Matomo
 demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
 demo_mode_username: "Demo user"
 share_public: Allow public URL for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index f9bd27f2..1cb2a585 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -27,9 +27,9 @@ export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "guardar"
-piwik_host: Host de tu website en Piwik (sin http:// o https://)
+matomo_host: Host de tu website en Matomo (sin http:// o https://)
-piwik_site_id: ID de tu website en Piwik
+matomo_site_id: ID de tu website en Matomo
-piwik_enabled: Activar Piwik
+matomo_enabled: Activar Matomo
 demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
 demo_mode_username: "Nombre de usuario demo"
 share_public: Permitir URL pública para los artículos
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index 15e4d6fd..50e5cc51 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -27,9 +27,9 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
-# piwik_host: Host of your website in Piwik (without http:// or https://)
+# matomo_host: Host of your website in Matomo (without http:// or https://)
-# piwik_site_id: ID of your website in Piwik
+# matomo_site_id: ID of your website in Matomo
-# piwik_enabled: Enable Piwik
+# matomo_enabled: Enable Matomo
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index fe91044a..b66d5f02 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -27,9 +27,9 @@ export: "export"
 import: "import"
 misc: "divers"
 modify_settings: "appliquer"
-piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
+matomo_host: URL de votre site dans Matomo (sans http:// ou https://)
-piwik_site_id: ID de votre site dans Piwik
+matomo_site_id: ID de votre site dans Matomo
-piwik_enabled: Activer Piwik
+matomo_enabled: Activer Matomo
 demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
 demo_mode_username: "Utilisateur de la démo"
 share_public: Autoriser une URL publique pour les articles
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 3d5681fb..1b87b604 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -27,9 +27,9 @@ export: "esporta"
 import: "importa"
 misc: "misc"
 modify_settings: "applica"
-piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
+matomo_host: Host del tuo sito in Matomo (senza http:// o https://)
-piwik_site_id: ID del tuo sito in Piwik
+matomo_site_id: ID del tuo sito in Matomo
-piwik_enabled: Abilita Piwik
+matomo_enabled: Abilita Matomo
 demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
 demo_mode_username: "Utente Demo"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml
index d6559265..5010901d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml
@@ -27,9 +27,9 @@ export: "エクスポート"
 import: "インポート"
 misc: "misc"
 modify_settings: "適用"
-piwik_host: Piwik でのウェブサイトのホスト (http:// または https:// は不要)
+matomo_host: Matomo でのウェブサイトのホスト (http:// または https:// は不要)
-piwik_site_id: Piwik でのあなたのウェブサイトの ID
+matomo_site_id: Matomo でのあなたのウェブサイトの ID
-piwik_enabled: Piwik を有効にする
+matomo_enabled: Matomo を有効にする
 demo_mode_enabled: "デモモードを有効にしますか？ (パブリック Wallabag のデモにのみ使用)"
 demo_mode_username: "デモユーザー"
 share_public: 記事の公開 URL を許可する
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 13771799..13ee347a 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -27,9 +27,9 @@ export: "expòrt"
 import: "impòrt"
 misc: "divèrs"
 modify_settings: "aplicar"
-piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
+matomo_host: URL de vòstre site dins Matomo (sense http:// o https://)
-piwik_site_id: ID de vòstre site dins Piwik
+matomo_site_id: ID de vòstre site dins Matomo
-piwik_enabled: Activar Piwik
+matomo_enabled: Activar Matomo
 demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
 demo_mode_username: "Utilizaire de la demostracion"
 share_public: Autorizar una URL publica pels articles
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 7c125fcf..e44fa58d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -26,9 +26,9 @@ export: "eksport"
 import: "import"
 misc: "różne"
 modify_settings: "zatwierdź"
-piwik_host: Host twojej strony Piwik (bez http:// lub https://)
+matomo_host: Host twojej strony Matomo (bez http:// lub https://)
-piwik_site_id: ID twojej strony Piwik
+matomo_site_id: ID twojej strony Matomo
-piwik_enabled: Włacz Piwik
+matomo_enabled: Włacz Matomo
 demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
 demo_mode_username: "Użytkownik Demonstracyjny"
 share_public: Zezwalaj na publiczny adres url dla wpisow
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index 6f5fb02e..d4a22ac5 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -28,9 +28,9 @@ export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "aplicar"
-piwik_host: Host de seu website Piwik
+matomo_host: Host de seu website Matomo
-piwik_site_id: ID de seu website Piwik
+matomo_site_id: ID de seu website Matomo
-piwik_enabled: Habilitar Piwik
+matomo_enabled: Habilitar Matomo
 demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
 demo_mode_username: "Usuário demo"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 9d927cc0..d3f398f7 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -27,9 +27,9 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
-# piwik_host: Host of your website in Piwik (without http:// or https://)
+# matomo_host: Host of your website in Matomo (without http:// or https://)
-# piwik_site_id: ID of your website in Piwik
+# matomo_site_id: ID of your website in Matomo
-# piwik_enabled: Enable Piwik
+# matomo_enabled: Enable Matomo
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
index 2eb7b237..3bc87165 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
@@ -27,9 +27,9 @@ export: "экспорт"
 import: "импорт"
 misc: "разное"
 modify_settings: "применить"
-piwik_host: "Ссылка на Ваш сайт на Piwik (с http:// или https://)"
+matomo_host: "Ссылка на Ваш сайт на Matomo (с http:// или https://)"
-piwik_site_id: "ID Вашего сайта на Piwik"
+matomo_site_id: "ID Вашего сайта на Matomo"
-piwik_enabled: "Включить Piwik"
+matomo_enabled: "Включить Matomo"
 demo_mode_enabled: "Включить демо режим ? (только для публичной демонстрации wallabag)"
 demo_mode_username: "Демо пользователь"
 share_public: "Разрешить публичные ссылки на записи"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml
index 93c0d6b4..2937af01 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml
@@ -25,9 +25,9 @@ export: "นำข้อมูลออก"
 import: "นำเข้าข้อมูล"
 misc: "เบ็ดเตล็ด"
 modify_settings: "ปรับใช้"
-piwik_host: โฮสบนเว็บไซต์ของคุณใน Piwik (ยกเว้น http:// หรือ https://)
+matomo_host: โฮสบนเว็บไซต์ของคุณใน Matomo (ยกเว้น http:// หรือ https://)
-piwik_site_id: ไอดีบนเว็บไซต์ของคุณใน Piwik
+matomo_site_id: ไอดีบนเว็บไซต์ของคุณใน Matomo
-piwik_enabled: เปิดการใช้ Piwik
+matomo_enabled: เปิดการใช้ Matomo
 demo_mode_enabled: "เปิดการใช้งานโหมดเดโม ? (เฉพาะการใช้สำหรับเดโมสาธารณะของ wallabag)"
 demo_mode_username: "ผู้ใช้ส่วนเดโม"
 share_public: ยอมรับ URL สาธารณะจากการเข้าถึงข้อมูล
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index 6de880ec..0af824ff 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -28,9 +28,9 @@
 # import: "import"
 # misc: "misc"
 # modify_settings: "apply"
-# piwik_host: Host of your website in Piwik (without http:// or https://)
+# matomo_host: Host of your website in Matomo (without http:// or https://)
-# piwik_site_id: ID of your website in Piwik
+# matomo_site_id: ID of your website in Matomo
-# piwik_enabled: Enable Piwik
+# matomo_enabled: Enable Matomo
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml
index 59dd7f1b..28fe2d14 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml
@@ -27,9 +27,9 @@ export: "导出"
 import: "导入"
 misc: "杂项"
 modify_settings: "申请"
-piwik_host: 你的网站在 Piwik 的主机名（不包括 http:// or https://）
+matomo_host: 你的网站在 Matomo 的主机名（不包括 http:// or https://）
-piwik_site_id: 你的网站在 Piwik 的 ID
+matomo_site_id: 你的网站在 Matomo 的 ID
-piwik_enabled: 启用 Piwik
+matomo_enabled: 启用 Matomo
 demo_mode_enabled: "启用演示模式？(仅用于 wallabag 公开演示)"
 demo_mode_username: "Demo user"
 share_public: 允许为项目启用公开链接
diff --git a/app/config/services.yml b/app/config/services.yml
index c2c867cf..aab2a056 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -20,8 +20,8 @@ services:
        tags:
            - { name: twig.extension }
-    wallabag.twig_piwik_extension:
+    wallabag.twig_matomo_extension:
-        class: PiwikTwigExtension\PiwikTwigExtension
+        class: MatomoTwigExtension\MatomoTwigExtension
        public: false
        tags:
            - { name: twig.extension }
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 4dad9200..f3da314c 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -125,15 +125,15 @@ wallabag_core:
            value: 0
            section: import
        -
-            name: piwik_enabled
+            name: matomo_enabled
            value: 0
            section: analytics
        -
-            name: piwik_host
+            name: matomo_host
-            value: v2.wallabag.org
+            value: matomo.wallabag.org
            section: analytics
        -
-            name: piwik_site_id
+            name: matomo_site_id
            value: 1
            section: analytics
        -