Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-22 15:18+0200\n"
"PO-Revision-Date: 2015-12-14 10:47+0000\n"
"PO-Revision-Date: 2017-09-22 12:16+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"

View file

@ -0,0 +1,70 @@
# ADDON langfilter
# Copyright (C)
# This file is distributed under the same license as the Friendica langfilter addon package.
#
#
# Translators:
# Karel Vandecandelaere <karel@dasrakel.eu>, 2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-22 15:18+0200\n"
"PO-Revision-Date: 2018-03-20 13:46+0000\n"
"Last-Translator: Karel Vandecandelaere <karel@dasrakel.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: langfilter.php:44
msgid "Language Filter"
msgstr "Taalfilter"
#: langfilter.php:45
msgid ""
"This addon tries to identify the language of a postings. If it does not "
"match any language spoken by you (see below) the posting will be collapsed. "
"Remember detecting the language is not perfect, especially with short "
"postings."
msgstr "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten."
#: langfilter.php:46
msgid "Use the language filter"
msgstr "Gebruik de taalfilter"
#: langfilter.php:47
msgid "I speak"
msgstr "Ik spreek"
#: langfilter.php:47
msgid ""
"List of abbreviations (iso2 codes) for languages you speak, comma separated."
" For example \"de,it\"."
msgstr "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\"."
#: langfilter.php:48
msgid "Minimum confidence in language detection"
msgstr ""
#: langfilter.php:48
msgid ""
"Minimum confidence in language detection being correct, from 0 to 100. Posts"
" will not be filtered when the confidence of language detection is below "
"this percent value."
msgstr ""
#: langfilter.php:49
msgid "Save Settings"
msgstr "Instellingen opslaan"
#: langfilter.php:73
msgid "Language Filter Settings saved."
msgstr "Taalfilter-instellingen bijgewerkt."
#: langfilter.php:123
#, php-format
msgid "unspoken language %s - Click to open/close"
msgstr "niet gesproken taal %s - Klik om open/dicht te klappen"

View file

@ -0,0 +1,17 @@
<?php
if(! function_exists("string_plural_select_nl")) {
function string_plural_select_nl($n){
return ($n != 1);;
}}
;
$a->strings["Language Filter"] = "Taalfilter";
$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten.";
$a->strings["Use the language filter"] = "Gebruik de taalfilter";
$a->strings["I speak"] = "Ik spreek";
$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\".";
$a->strings["Minimum confidence in language detection"] = "";
$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "";
$a->strings["Save Settings"] = "Instellingen opslaan";
$a->strings["Language Filter Settings saved."] = "Taalfilter-instellingen bijgewerkt.";
$a->strings["unspoken language %s - Click to open/close"] = "niet gesproken taal %s - Klik om open/dicht te klappen";

View file

@ -0,0 +1,70 @@
# ADDON langfilter
# Copyright (C)
# This file is distributed under the same license as the Friendica langfilter addon package.
#
#
# Translators:
# 朱陈锬 <tangenters@outlook.com>, 2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-22 15:18+0200\n"
"PO-Revision-Date: 2018-02-28 11:28+0000\n"
"Last-Translator: 朱陈锬 <tangenters@outlook.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: langfilter.php:44
msgid "Language Filter"
msgstr ""
#: langfilter.php:45
msgid ""
"This addon tries to identify the language of a postings. If it does not "
"match any language spoken by you (see below) the posting will be collapsed. "
"Remember detecting the language is not perfect, especially with short "
"postings."
msgstr ""
#: langfilter.php:46
msgid "Use the language filter"
msgstr ""
#: langfilter.php:47
msgid "I speak"
msgstr ""
#: langfilter.php:47
msgid ""
"List of abbreviations (iso2 codes) for languages you speak, comma separated."
" For example \"de,it\"."
msgstr ""
#: langfilter.php:48
msgid "Minimum confidence in language detection"
msgstr ""
#: langfilter.php:48
msgid ""
"Minimum confidence in language detection being correct, from 0 to 100. Posts"
" will not be filtered when the confidence of language detection is below "
"this percent value."
msgstr ""
#: langfilter.php:49
msgid "Save Settings"
msgstr "保存设置"
#: langfilter.php:73
msgid "Language Filter Settings saved."
msgstr ""
#: langfilter.php:123
#, php-format
msgid "unspoken language %s - Click to open/close"
msgstr ""

View file

@ -0,0 +1,17 @@
<?php
if(! function_exists("string_plural_select_zh_cn")) {
function string_plural_select_zh_cn($n){
return 0;;
}}
;
$a->strings["Language Filter"] = "";
$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "";
$a->strings["Use the language filter"] = "";
$a->strings["I speak"] = "";
$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "";
$a->strings["Minimum confidence in language detection"] = "";
$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "";
$a->strings["Save Settings"] = "保存设置";
$a->strings["Language Filter Settings saved."] = "";
$a->strings["unspoken language %s - Click to open/close"] = "";

View file

@ -7,21 +7,28 @@
* License: MIT
*/
require_once('library/langdet/Text/LanguageDetect.php');
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
/* Define the hooks we want to use
* that is, we have settings, we need to save the settings and we want
* to modify the content of a posting when friendica prepares it.
*/
function langfilter_install() {
register_hook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10);
register_hook('plugin_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
register_hook('plugin_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
function langfilter_install()
{
Addon::registerHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10);
Addon::registerHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
Addon::registerHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
}
function langfilter_uninstall() {
unregister_hook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body');
unregister_hook('plugin_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
unregister_hook('plugin_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
function langfilter_uninstall()
{
Addon::unregisterHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body');
Addon::unregisterHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
Addon::unregisterHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
}
/* The settings
@ -40,16 +47,16 @@ function langfilter_addon_settings(&$a,&$s) {
if(! $languages)
$languages = 'en,de,fr,it,es';
$t = get_markup_template("settings.tpl", "addon/langfilter/" );
$s .= replace_macros ($t, array(
'$title' => t("Language Filter"),
'$intro' => t ('This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings.'),
'$enabled' => array('langfilter_enable', t('Use the language filter'), $enable_checked, ''),
'$languages' => array('langfilter_languages', t('I speak'), $languages, t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".') ),
'$minconfidence' => array('langfilter_minconfidence', t('Minimum confidence in language detection'), $minconfidence, t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.') ),
'$minlength' => array('langfilter_minlength', t('Minimum length of message body'), $minlength, t('Minimum length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.') ),
'$submit' => t('Save Settings'),
));
$t = get_markup_template("settings.tpl", "addon/langfilter/");
$s .= replace_macros($t, [
'$title' => L10n::t("Language Filter"),
'$intro' => L10n::t('This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings.'),
'$enabled' => ['langfilter_enable', L10n::t('Use the language filter'), $enable_checked, ''],
'$languages' => ['langfilter_languages', L10n::t('I speak'), $languages, L10n::t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
'$minconfidence' => ['langfilter_minconfidence', L10n::t('Minimum confidence in language detection'), $minconfidence, L10n::t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')],
'$minlength' => ['langfilter_minlength', L10n::t('Minimum length of message body'), $minlength, L10n::t('Minimum length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.')],
'$submit' => L10n::t('Save Settings'),
]);
return;
}
@ -62,23 +69,30 @@ function langfilter_addon_settings_post(&$a,&$b) {
if(! local_user())
return;
if($_POST['langfilter-settings-submit']) {
set_pconfig(local_user(),'langfilter','languages',trim($_POST['langfilter_languages']));
$enable = ((x($_POST,'langfilter_enable')) ? intval($_POST['langfilter_enable']) : 0);
$disable = 1-$enable;
set_pconfig(local_user(),'langfilter','disable', $disable);
$minconfidence = 0+$_POST['langfilter_minconfidence'];
if ( ! $minconfidence ) $minconfidence = 0;
else if ( $minconfidence < 0 ) $minconfidence = 0;
else if ( $minconfidence > 100 ) $minconfidence = 100;
set_pconfig(local_user(),'langfilter','minconfidence', $minconfidence/100.0);
if ($_POST['langfilter-settings-submit']) {
PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
$enable = ((x($_POST, 'langfilter_enable')) ? intval($_POST['langfilter_enable']) : 0);
$disable = 1 - $enable;
PConfig::set(local_user(), 'langfilter', 'disable', $disable);
$minconfidence = 0 + $_POST['langfilter_minconfidence'];
if (!$minconfidence) {
$minconfidence = 0;
} elseif ($minconfidence < 0) {
$minconfidence = 0;
} elseif ($minconfidence > 100) {
$minconfidence = 100;
}
PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
$minlength = 0+$_POST['langfilter_minlength'];
if ( ! $minlength ) $minlength = 32;
else if ( $minlength < 0 ) $minlength = 32;
set_pconfig(local_user(),'langfilter','minlength', $minlength);
$minlength = 0 + $_POST['langfilter_minlength'];
if (!$minlength) {
$minlength = 32;
} elseif ($minlengt8h < 0) {
$minlength = 32;
}
PConfig::set(local_user(), 'langfilter', 'minlength', $minlength);
info( t('Language Filter Settings saved.') . EOL);
info(L10n::t('Language Filter Settings saved.') . EOL);
}
}
/* Actually filter postings by their language
@ -131,9 +145,9 @@ function langfilter_prepare_body(&$a,&$b) {
if ( ! $iso2 ) return;
$spoken = in_array($iso2, $spoken_languages);
if( ! $spoken ) {
$rnd = random_string(8);
$b['html'] = '<div id="langfilter-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'langfilter-' . $rnd . '\'); >' . sprintf( t('unspoken language %s - Click to open/close'),$lang ) . '</div><div id="langfilter-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
}
if (!$spoken) {
$rnd = random_string(8);
$b['html'] = '<div id="langfilter-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'langfilter-' . $rnd . '\'); >' . L10n::t('unspoken language %s - Click to open/close', $lang) . '</div><div id="langfilter-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
}
}
?>