Skip to content

Commit 2365a9a

Browse files
tobiasdtobiasd
committed
Merge branch '2020.09-rc' into stable
2 parents 0a43efa + 10d1156 commit 2365a9a

File tree

132 files changed

+1377
-1258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1377
-1258
lines changed

‎advancedcontentfilter/advancedcontentfilter.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@ function advancedcontentfilter_install(App $a)
6565
Logger::log("installed advancedcontentfilter");
6666
}
6767

68-
function advancedcontentfilter_uninstall()
69-
{
70-
Hook::unregister('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition');
71-
Hook::unregister('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
72-
Hook::unregister('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings');
73-
}
74-
7568
/*
7669
* Hooks
7770
*/

‎blackout/blackout.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ function blackout_install() {
5454
Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
5555
}
5656

57-
function blackout_uninstall() {
58-
Hook::unregister('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
59-
}
6057
function blackout_redirect ($a, $b) {
6158
// if we have a logged in user, don't throw her out
6259
if (local_user()) {

‎blackout/lang/it/messages.po‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,63 @@
55
#
66
# Translators:
77
# fabrixxm <[email protected]>, 2014,2018
8+
# Sylke Vicious <[email protected]>, 2020
89
msgid ""
910
msgstr ""
1011
"Project-Id-Version: friendica\n"
1112
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2014-06-22 13:18+0200\n"
13-
"PO-Revision-Date: 2018-03-19 19:50+0000\n"
14-
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
13+
"POT-Creation-Date: 2019-03-12 09:26+0100\n"
14+
"PO-Revision-Date: 2020-08-31 15:28+0000\n"
15+
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
1516
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
1617
"MIME-Version: 1.0\n"
1718
"Content-Type: text/plain; charset=UTF-8\n"
1819
"Content-Transfer-Encoding: 8bit\n"
1920
"Language: it\n"
2021
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2122

22-
#: blackout.php:99
23+
#: blackout.php:101
24+
msgid ""
25+
"The end-date is prior to the start-date of the blackout, you should fix this"
26+
msgstr "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle"
27+
28+
#: blackout.php:103
29+
#, php-format
30+
msgid ""
31+
"Please double check that the current settings for the blackout. Begin will "
32+
"be <strong>%s</strong> and it will end <strong>%s</strong>."
33+
msgstr "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>."
34+
35+
#: blackout.php:106
2336
msgid "Save Settings"
2437
msgstr "Salva Impostazioni"
2538

26-
#: blackout.php:100
39+
#: blackout.php:107
2740
msgid "Redirect URL"
2841
msgstr "URL di reindirizzamento"
2942

30-
#: blackout.php:100
43+
#: blackout.php:107
3144
msgid "all your visitors from the web will be redirected to this URL"
3245
msgstr "tutti i visitatori dal web verranno reindirizzati a questo URL"
3346

34-
#: blackout.php:101
47+
#: blackout.php:108
3548
msgid "Begin of the Blackout"
3649
msgstr "Inzio del blackout"
3750

38-
#: blackout.php:101
51+
#: blackout.php:108
3952
msgid ""
40-
"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
41-
"<em>hh</em> hour and <em>mm</em> minute"
42-
msgstr "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto"
53+
"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
54+
"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
55+
msgstr "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto."
4356

44-
#: blackout.php:102
57+
#: blackout.php:109
4558
msgid "End of the Blackout"
4659
msgstr "Fine del blackout"
4760

48-
#: blackout.php:108
61+
#: blackout.php:111
4962
msgid ""
50-
"The end-date is prior to the start-date of the blackout, you should fix "
51-
"this."
52-
msgstr "La data di fine è precedente alla data di inizio. Dovresti sistemarla."
63+
"<strong>Note</strong>: The redirect will be active from the moment you press"
64+
" the submit button. Users currently logged in will <strong>not</strong> be "
65+
"thrown out but can't login again after logging out should the blackout is "
66+
"still in place."
67+
msgstr "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo."

‎blackout/lang/it/strings.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22

33
if(! function_exists("string_plural_select_it")) {
44
function string_plural_select_it($n){
5+
$n = intval($n);
56
return ($n != 1);;
67
}}
78
;
9+
$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle";
10+
$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>.";
811
$a->strings["Save Settings"] = "Salva Impostazioni";
912
$a->strings["Redirect URL"] = "URL di reindirizzamento";
1013
$a->strings["all your visitors from the web will be redirected to this URL"] = "tutti i visitatori dal web verranno reindirizzati a questo URL";
1114
$a->strings["Begin of the Blackout"] = "Inzio del blackout";
12-
$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto";
15+
$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto.";
1316
$a->strings["End of the Blackout"] = "Fine del blackout";
14-
$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La data di fine è precedente alla data di inizio. Dovresti sistemarla.";
17+
$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo.";

‎blockbot/blockbot.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ function blockbot_install() {
2222
Hook::register('init_1', __FILE__, 'blockbot_init_1');
2323
}
2424

25-
26-
function blockbot_uninstall() {
27-
Hook::unregister('init_1', __FILE__, 'blockbot_init_1');
28-
}
29-
3025
function blockbot_addon_admin(&$a, &$o) {
3126
$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
3227

@@ -42,7 +37,6 @@ function blockbot_addon_admin_post(&$a) {
4237
DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
4338
DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
4439
DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
45-
info(DI::l10n()->t('Settings updated.'). EOL);
4640
}
4741

4842
function blockbot_init_1(App $a) {
@@ -54,7 +48,8 @@ function blockbot_init_1(App $a) {
5448

5549
// List of "good" crawlers
5650
$good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
57-
'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/'];
51+
'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
52+
'PTST/'];
5853

5954
// List of known crawlers.
6055
$agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',

‎blockbot/lang/it/messages.po‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# ADDON blockbot
2+
# Copyright (C)
3+
# This file is distributed under the same license as the Friendica blockbot addon package.
4+
#
5+
#
6+
# Translators:
7+
# Sylke Vicious <[email protected]>, 2020
8+
#
9+
#, fuzzy
10+
msgid ""
11+
msgstr ""
12+
"Project-Id-Version: \n"
13+
"Report-Msgid-Bugs-To: \n"
14+
"POT-Creation-Date: 2019-08-07 09:03+0200\n"
15+
"PO-Revision-Date: 2019-08-07 07:43+0000\n"
16+
"Last-Translator: Sylke Vicious <[email protected]>, 2020\n"
17+
"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
18+
"MIME-Version: 1.0\n"
19+
"Content-Type: text/plain; charset=UTF-8\n"
20+
"Content-Transfer-Encoding: 8bit\n"
21+
"Language: it\n"
22+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
23+
24+
#: blockbot.php:35
25+
msgid "Save Settings"
26+
msgstr "Salva Impostazioni"
27+
28+
#: blockbot.php:36
29+
msgid "Allow \"good\" crawlers"
30+
msgstr "Permetti crawler \"buoni\""
31+
32+
#: blockbot.php:37
33+
msgid "Block GabSocial"
34+
msgstr "Blocca GabSocial"
35+
36+
#: blockbot.php:38
37+
msgid "Training mode"
38+
msgstr "Modalità addestramento"
39+
40+
#: blockbot.php:46
41+
msgid "Settings updated."
42+
msgstr "Impostazioni aggiornate."

‎blockbot/lang/it/strings.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
if(! function_exists("string_plural_select_it")) {
4+
function string_plural_select_it($n){
5+
$n = intval($n);
6+
return ($n != 1);;
7+
}}
8+
;
9+
$a->strings["Save Settings"] = "Salva Impostazioni";
10+
$a->strings["Allow \"good\" crawlers"] = "Permetti crawler \"buoni\"";
11+
$a->strings["Block GabSocial"] = "Blocca GabSocial";
12+
$a->strings["Training mode"] = "Modalità addestramento";
13+
$a->strings["Settings updated."] = "Impostazioni aggiornate.";

‎blockem/blockem.php‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ function blockem_install()
2323
Hook::register('enotify_store' , 'addon/blockem/blockem.php', 'blockem_enotify_store');
2424
}
2525

26-
function blockem_uninstall()
27-
{
28-
Hook::unregister('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
29-
Hook::unregister('prepare_body' , 'addon/blockem/blockem.php', 'blockem_prepare_body');
30-
Hook::unregister('display_item' , 'addon/blockem/blockem.php', 'blockem_display_item');
31-
Hook::unregister('addon_settings' , 'addon/blockem/blockem.php', 'blockem_addon_settings');
32-
Hook::unregister('addon_settings_post' , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
33-
Hook::unregister('conversation_start' , 'addon/blockem/blockem.php', 'blockem_conversation_start');
34-
Hook::unregister('item_photo_menu' , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
35-
Hook::unregister('enotify_store' , 'addon/blockem/blockem.php', 'blockem_enotify_store');
36-
}
37-
3826
function blockem_addon_settings (App $a, &$s)
3927
{
4028
if (!local_user()) {
@@ -78,7 +66,6 @@ function blockem_addon_settings_post(App $a, array &$b)
7866

7967
if (!empty($_POST['blockem-submit'])) {
8068
DI::pConfig()->set(local_user(), 'blockem', 'words', trim($_POST['blockem-words']));
81-
info(DI::l10n()->t('BLOCKEM Settings saved.') . EOL);
8269
}
8370
}
8471

@@ -242,6 +229,5 @@ function blockem_init(App $a)
242229
}
243230

244231
DI::pConfig()->set(local_user(), 'blockem', 'words', $words);
245-
info(DI::l10n()->t('blockem settings updated') . EOL);
246232
exit();
247233
}

‎blogger/blogger.php‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Friendica\Core\Hook;
1212
use Friendica\Core\Logger;
1313
use Friendica\DI;
14-
use Friendica\Util\Network;
1514
use Friendica\Util\XML;
1615

1716
function blogger_install()
@@ -24,22 +23,6 @@ function blogger_install()
2423
Hook::register('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
2524
}
2625

27-
function blogger_uninstall()
28-
{
29-
Hook::unregister('hook_fork', 'addon/blogger/blogger.php', 'blogger_hook_fork');
30-
Hook::unregister('post_local', 'addon/blogger/blogger.php', 'blogger_post_local');
31-
Hook::unregister('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send');
32-
Hook::unregister('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets');
33-
Hook::unregister('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings');
34-
Hook::unregister('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
35-
36-
// obsolete - remove
37-
Hook::unregister('post_local_end', 'addon/blogger/blogger.php', 'blogger_send');
38-
Hook::unregister('addon_settings', 'addon/blogger/blogger.php', 'blogger_settings');
39-
Hook::unregister('addon_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
40-
}
41-
42-
4326
function blogger_jot_nets(App $a, array &$jotnets_fields)
4427
{
4528
if (!local_user()) {
@@ -225,7 +208,7 @@ function blogger_send(App $a, array &$b)
225208
Logger::log('blogger: data: ' . $xml, Logger::DATA);
226209

227210
if ($bl_blog !== 'test') {
228-
$x = Network::post($bl_blog, $xml)->getBody();
211+
$x = DI::httpRequest()->post($bl_blog, $xml)->getBody();
229212
}
230213

231214
Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);

‎buffer/buffer.php‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ function buffer_install()
2929
Hook::register('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
3030
}
3131

32-
function buffer_uninstall()
33-
{
34-
Hook::unregister('hook_fork', 'addon/buffer/buffer.php', 'buffer_hook_fork');
35-
Hook::unregister('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
36-
Hook::unregister('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send');
37-
Hook::unregister('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets');
38-
Hook::unregister('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings');
39-
Hook::unregister('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
40-
}
41-
4232
function buffer_module()
4333
{
4434
}
@@ -89,8 +79,6 @@ function buffer_addon_admin_post(App $a)
8979

9080
DI::config()->set('buffer', 'client_id' , $client_id);
9181
DI::config()->set('buffer', 'client_secret', $client_secret);
92-
93-
info(DI::l10n()->t('Settings updated.'). EOL);
9482
}
9583

9684
function buffer_connect(App $a)

0 commit comments

Comments
 (0)