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

@ -1,16 +1,16 @@
# ADDON blockem
# ADDON superblock
# Copyright (C)
# This file is distributed under the same license as the Friendica blockem addon package.
# This file is distributed under the same license as the Friendica superblock addon package.
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2017
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2015-08-31 10:28+0000\n"
"POT-Creation-Date: 2017-04-21 08:45+0200\n"
"PO-Revision-Date: 2017-09-20 06:08+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"
@ -19,35 +19,26 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: blockem.php:51
msgid "\"Blockem\" Settings"
msgstr "Impostazioni \"Blockem\""
#: superblock.php:53 superblock.php:57
msgid "\"Superblock\""
msgstr "\"Superblocco\""
#: blockem.php:53
#: superblock.php:60
msgid "Comma separated profile URLS to block"
msgstr "Lista, separata da virgola, di indirizzi di profili da bloccare"
#: blockem.php:57
msgid "Submit"
msgstr "Invia"
#: superblock.php:64
msgid "Save Settings"
msgstr "Salva Impostazioni"
#: blockem.php:70
msgid "BLOCKEM Settings saved."
msgstr "Impostazioni \"Blockem\" salvate."
#: superblock.php:76
msgid "SUPERBLOCK Settings saved."
msgstr "Impostazioni \"Superblocco\" salvate."
#: blockem.php:105
#, php-format
msgid "Blocked %s - Click to open/close"
msgstr "%s bloccato - Clicca per aprire/chiudere"
#: superblock.php:148
msgid "Block Completely"
msgstr "Blocca Completamente"
#: blockem.php:160
msgid "Unblock Author"
msgstr "Sblocca autore"
#: blockem.php:162
msgid "Block Author"
msgstr "Blocca autore"
#: blockem.php:194
msgid "blockem settings updated"
msgstr "Impostazioni 'blockem' aggiornate."
#: superblock.php:168
msgid "superblock settings updated"
msgstr "impostazioni \"superblocco\" aggiornate."

View file

@ -5,11 +5,9 @@ function string_plural_select_it($n){
return ($n != 1);;
}}
;
$a->strings["\"Blockem\" Settings"] = "Impostazioni \"Blockem\"";
$a->strings["\"Superblock\""] = "\"Superblocco\"";
$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi di profili da bloccare";
$a->strings["Submit"] = "Invia";
$a->strings["BLOCKEM Settings saved."] = "Impostazioni \"Blockem\" salvate.";
$a->strings["Blocked %s - Click to open/close"] = "%s bloccato - Clicca per aprire/chiudere";
$a->strings["Unblock Author"] = "Sblocca autore";
$a->strings["Block Author"] = "Blocca autore";
$a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate.";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["SUPERBLOCK Settings saved."] = "Impostazioni \"Superblocco\" salvate.";
$a->strings["Block Completely"] = "Blocca Completamente";
$a->strings["superblock settings updated"] = "impostazioni \"superblocco\" aggiornate.";

View file

@ -8,25 +8,28 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*
*/
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function superblock_install() {
register_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
register_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
register_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
register_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
register_hook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
Addon::registerHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
Addon::registerHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
Addon::registerHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
Addon::registerHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
Addon::registerHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
}
function superblock_uninstall() {
unregister_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
unregister_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
unregister_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
unregister_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
unregister_hook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
Addon::unregisterHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
Addon::unregisterHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
Addon::unregisterHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
Addon::unregisterHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
Addon::unregisterHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
}
@ -50,18 +53,18 @@ function superblock_addon_settings(&$a,&$s) {
}
$s .= '<span id="settings_superblock_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
$s .= '<h3>' . t('"Superblock"') . '</h3>';
$s .= '<h3>' . L10n::t('"Superblock"') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_superblock_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
$s .= '<h3>' . t('"Superblock"') . '</h3>';
$s .= '<h3>' . L10n::t('"Superblock"') . '</h3>';
$s .= '</span>';
$s .= '<div id="superblock-wrapper">';
$s .= '<label id="superblock-label" for="superblock-words">' . t('Comma separated profile URLS to block') . ' </label>';
$s .= '<label id="superblock-label" for="superblock-words">' . L10n::t('Comma separated profile URLS to block') . ' </label>';
$s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
return;
}
@ -72,8 +75,8 @@ function superblock_addon_settings_post(&$a,&$b) {
return;
if($_POST['superblock-submit']) {
set_pconfig(local_user(),'system','blocked',trim($_POST['superblock-words']));
info( t('SUPERBLOCK Settings saved.') . EOL);
PConfig::set(local_user(),'system','blocked',trim($_POST['superblock-words']));
info(L10n::t('SUPERBLOCK Settings saved.') . EOL);
}
}
@ -145,7 +148,7 @@ function superblock_item_photo_menu(&$a,&$b) {
}
}
$b['menu'][ t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
$b['menu'][L10n::t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
}
function superblock_module() {}
@ -164,7 +167,7 @@ function superblock_init(&$a) {
$words .= trim($_GET['block']);
}
set_pconfig(local_user(),'system','blocked',$words);
info( t('superblock settings updated') . EOL );
PConfig::set(local_user(),'system','blocked',$words);
info(L10n::t('superblock settings updated') . EOL );
killme();
}