Merge pull request #1332 from AndyHee/2022.12-rc

[nitter] Update wording
This commit is contained in:
Hypolite Petovan 2022-12-13 12:51:03 -05:00 committed by GitHub
commit 12bd211516
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-01 16:10+0200\n"
"POT-Creation-Date: 2022-12-13 17:26+0000\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,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: nitter.php:52
#: nitter.php:51
#, php-format
msgid ""
"Which nitter server shall be used for the replacements in the post bodies? "
@ -25,17 +25,15 @@ msgid ""
"public Nitter servers."
msgstr ""
#: nitter.php:53
#: nitter.php:52
msgid "Nitter server"
msgstr ""
#: nitter.php:54
#: nitter.php:53
msgid "Save Settings"
msgstr ""
#: nitter.php:99
#: nitter.php:74
#, php-format
msgid ""
"In an attempt to protect your privacy, links to Twitter in this posting were "
"replaced by links to the Nitter instance at %s"
msgid "(Nitter addon enabled: Twitter links via %s)"
msgstr ""

View file

@ -49,7 +49,7 @@ function nitter_addon_admin(App $a, string &$o)
$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/nitter/');
$o = Renderer::replaceMacros($t, [
'$settingdescription' => DI::l10n()->t('Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol. See %s for a list of available public Nitter servers.', 'https://github.com/zedeus/nitter/wiki/Instances'),
'$nitterserver' => ['nitterserver', DI::l10n()->t('Nitter server'), $nitterserver, 'http://example.com'],
'$nitterserver' => ['nitterserver', DI::l10n()->t('Nitter server'), $nitterserver, 'https://example.com'],
'$submit' => DI::l10n()->t('Save Settings'),
]);
}
@ -71,6 +71,6 @@ function nitter_render(App $a, array &$b)
$replaced = true;
}
if ($replaced) {
$b['html'] .= '<hr><p>' . DI::l10n()->t('In an attempt to protect your privacy, links to Twitter in this posting were replaced by links to the Nitter instance at %s', $nitter) . '</p>';
$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(Nitter addon enabled: Twitter links via %s)', $nitter) . '</small></p>';
}
}