Merge pull request #812 from tobiasd/20190219-addonhstrings

strings in piwik and fromapp addons
This commit is contained in:
Hypolite Petovan 2019-02-19 10:45:10 -05:00 committed by GitHub
commit 96d1b8100e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 39 deletions

View file

@ -69,7 +69,7 @@ function fromapp_settings(&$a, &$s)
$s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
$s .= '</span>';
$s .= '<div id="fromapp-wrapper">';
$s .= '<label id="fromapp-label" for="fromapp-input">' . L10n::t('The application name you would like to show your posts originating from.') . '</label>';
$s .= '<label id="fromapp-label" for="fromapp-input">' . L10n::t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.') . '</label>';
$s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
$s .= '<div class="clear"></div>';

View file

@ -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 16:42+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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. "
"Separate 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 ""

View file

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 <a href='http://www.piwik.org'>Piwik</a> "
"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> "
"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 <a "
"href='%s'>can set a cookie to prevent Piwik from tracking further visits of "
"the site</a> (opt-out)."
"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
"visits of the site</a> (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 ""

View file

@ -91,10 +91,10 @@ function piwik_analytics($a,&$b) {
*/
if ($optout) {
$b .= "<div id='piwik-optout-link'>";
$b .= L10n::t("This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool.");
$b .= L10n::t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
$b .= " ";
$the_url = "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
$b .= "</div>";
}
}
@ -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' ), ''],