From bd4c9f4bb673737f6139268172a0c17be30b089a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Feb 2019 10:38:29 +0100 Subject: [PATCH 1/3] reveal the multi apps feature of the fromapp addon and regenerate the addons translation base --- fromapp/fromapp.php | 2 +- fromapp/lang/C/messages.po | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index bbef3d9a..34f2143f 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -69,7 +69,7 @@ function fromapp_settings(&$a, &$s) $s .= '

' . L10n::t('FromApp Settings') . '

'; $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po index f4f0cc22..2dbf7ecd 100644 --- a/fromapp/lang/C/messages.po +++ b/fromapp/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"POT-Creation-Date: 2019-02-19 10:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,23 +17,25 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: fromapp.php:38 +#: fromapp.php:40 msgid "Fromapp settings updated." msgstr "" -#: fromapp.php:64 +#: fromapp.php:65 fromapp.php:69 msgid "FromApp Settings" msgstr "" -#: fromapp.php:66 +#: fromapp.php:72 msgid "" -"The application name you would like to show your posts originating from." +"The application name you would like to show your posts originating from. " +"Setarate different app names with a comma. A random one will then be " +"selected for every posting." msgstr "" -#: fromapp.php:70 +#: fromapp.php:76 msgid "Use this application name even if another application was used." msgstr "" -#: fromapp.php:77 -msgid "Submit" +#: fromapp.php:83 +msgid "Save Settings" msgstr "" -- 2.43.5 From 56c218a33784c53d30183a8df517aff5f9a7e187 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Feb 2019 10:43:22 +0100 Subject: [PATCH 2/3] more Matomo / Piwik, and regen piwik translation base --- piwik/lang/C/messages.po | 54 ++++++++++++++++++++-------------------- piwik/piwik.php | 6 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/piwik/lang/C/messages.po b/piwik/lang/C/messages.po index be379fb5..cadacb40 100644 --- a/piwik/lang/C/messages.po +++ b/piwik/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-26 12:49+0200\n" +"POT-Creation-Date: 2019-02-19 10:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,46 +17,46 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: piwik.php:79 +#: piwik.php:94 msgid "" -"This website is tracked using the Piwik " +"This website is tracked using the Matomo " "analytics tool." msgstr "" -#: piwik.php:82 +#: piwik.php:97 #, php-format msgid "" "If you do not want that your visits are logged in this way you can set a cookie to prevent Piwik from tracking further visits of " -"the site (opt-out)." +"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further " +"visits of the site (opt-out)." msgstr "" -#: piwik.php:89 +#: piwik.php:104 msgid "Save Settings" msgstr "" -#: piwik.php:90 -msgid "Piwik Base URL" -msgstr "" - -#: piwik.php:90 -msgid "" -"Absolute path to your Piwik installation. (without protocol (http/s), with " -"trailing slash)" -msgstr "" - -#: piwik.php:91 -msgid "Site ID" -msgstr "" - -#: piwik.php:92 -msgid "Show opt-out cookie link?" -msgstr "" - -#: piwik.php:93 -msgid "Asynchronous tracking" +#: piwik.php:105 +msgid "Matomo (Piwik) Base URL" msgstr "" #: piwik.php:105 +msgid "" +"Absolute path to your Matomo (Piwik) installation. (without protocol (http/" +"s), with trailing slash)" +msgstr "" + +#: piwik.php:106 +msgid "Site ID" +msgstr "" + +#: piwik.php:107 +msgid "Show opt-out cookie link?" +msgstr "" + +#: piwik.php:108 +msgid "Asynchronous tracking" +msgstr "" + +#: piwik.php:120 msgid "Settings updated." msgstr "" diff --git a/piwik/piwik.php b/piwik/piwik.php index 2960eae5..17ecf68b 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -91,10 +91,10 @@ function piwik_analytics($a,&$b) { */ if ($optout) { $b .= ""; } } @@ -102,7 +102,7 @@ function piwik_addon_admin (&$a, &$o) { $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/piwik/" ); $o = Renderer::replaceMacros( $t, [ '$submit' => L10n::t('Save Settings'), - '$piwikbaseurl' => ['baseurl', L10n::t('Piwik Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')], + '$piwikbaseurl' => ['baseurl', L10n::t('Matomo (Piwik) Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')], '$siteid' => ['siteid', L10n::t('Site ID'), Config::get('piwik','siteid' ), ''], '$optout' => ['optout', L10n::t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''], '$async' => ['async', L10n::t('Asynchronous tracking'), Config::get('piwik','async' ), ''], -- 2.43.5 From bd120aa97b75e34962000332c1fbec337d724aa4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Feb 2019 16:42:22 +0100 Subject: [PATCH 3/3] typo --- fromapp/fromapp.php | 2 +- fromapp/lang/C/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 34f2143f..5c9b4454 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -69,7 +69,7 @@ function fromapp_settings(&$a, &$s) $s .= '

' . L10n::t('FromApp Settings') . '

'; $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po index 2dbf7ecd..18f24e02 100644 --- a/fromapp/lang/C/messages.po +++ b/fromapp/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-19 10:36+0100\n" +"POT-Creation-Date: 2019-02-19 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" #: fromapp.php:72 msgid "" "The application name you would like to show your posts originating from. " -"Setarate different app names with a comma. A random one will then be " +"Separate different app names with a comma. A random one will then be " "selected for every posting." msgstr "" -- 2.43.5