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

@ -7,23 +7,29 @@
* Author: Michael Vogel <heluecht@pirati.ca>
*/
require_once("addon/diaspora/Diaspora_Connection.php");
require_once 'addon/diaspora/Diaspora_Connection.php';
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\Queue;
function diaspora_install() {
register_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
register_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
register_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
register_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
register_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
register_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
Addon::registerHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
Addon::registerHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
Addon::registerHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
Addon::registerHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
Addon::registerHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
Addon::registerHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
}
function diaspora_uninstall() {
unregister_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
unregister_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
unregister_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
unregister_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
unregister_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
unregister_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
Addon::unregisterHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
Addon::unregisterHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
Addon::unregisterHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
Addon::unregisterHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
Addon::unregisterHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
Addon::unregisterHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
}
@ -36,7 +42,7 @@ function diaspora_jot_nets(&$a,&$b) {
$diaspora_defpost = get_pconfig(local_user(),'diaspora','post_by_default');
$selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
. t('Post to Diaspora') . '</div>';
. L10n::t('Post to Diaspora') . '</div>';
}
}
@ -49,8 +55,6 @@ function diaspora_queue_hook(&$a,&$b) {
if(! count($qi))
return;
require_once('include/queue_fn.php');
foreach($qi as $x) {
if($x['network'] !== NETWORK_DIASPORA2)
continue;
@ -90,20 +94,21 @@ function diaspora_queue_hook(&$a,&$b) {
$conn->provider = $hostname;
$conn->postStatusMessage($post, $aspect);
logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
$success = true;
$success = true;
remove_queue_item($x['id']);
Queue::removeItem($x['id']);
} catch (Exception $e) {
logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG);
}
} else
} else {
logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
}
if (!$success) {
logger('diaspora_queue: delayed');
update_queue_time($x['id']);
Queue::updateTime($x['id']);
}
}
}
@ -134,10 +139,10 @@ function diaspora_settings(&$a,&$s) {
$status = "";
$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
if (dbm::is_result($r)) {
$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
if (DBM::is_result($r)) {
$status = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
$status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
$status .= L10n::t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
}
$aspects = false;
@ -147,18 +152,18 @@ function diaspora_settings(&$a,&$s) {
$conn->logIn();
$aspects = $conn->getAspects();
if (!$aspects) {
$status = t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
$status = L10n::t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
}
}
/* Add some HTML to the existing form */
$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
$s .= '</span>';
if ($status) {
@ -168,32 +173,32 @@ function diaspora_settings(&$a,&$s) {
}
$s .= '<div id="diaspora-enable-wrapper">';
$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . t('Enable Diaspora Post Plugin') . '</label>';
$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . L10n::t('Enable Diaspora Post Addon') . '</label>';
$s .= '<input id="diaspora-checkbox" type="checkbox" name="diaspora" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="diaspora-username-wrapper">';
$s .= '<label id="diaspora-username-label" for="diaspora-username">' . t('Diaspora handle') . '</label>';
$s .= '<label id="diaspora-username-label" for="diaspora-username">' . L10n::t('Diaspora handle') . '</label>';
$s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="diaspora-password-wrapper">';
$s .= '<label id="diaspora-password-label" for="diaspora-password">' . t('Diaspora password') . '</label>';
$s .= '<label id="diaspora-password-label" for="diaspora-password">' . L10n::t('Diaspora password') . '</label>';
$s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
$s .= '</div><div class="clear"></div>';
if ($aspects) {
$single_aspect = new stdClass();
$single_aspect->id = 'all_aspects';
$single_aspect->name = t('All aspects');
$single_aspect->name = L10n::t('All aspects');
$aspects[] = $single_aspect;
$single_aspect = new stdClass();
$single_aspect->id = 'public';
$single_aspect->name = t('Public');
$single_aspect->name = L10n::t('Public');
$aspects[] = $single_aspect;
$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . t('Post to aspect:') . '</label>';
$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
$s .= '<select name="aspect" id="diaspora-aspect">';
foreach($aspects as $single_aspect) {
if ($single_aspect->id == $aspect)
@ -207,13 +212,13 @@ function diaspora_settings(&$a,&$s) {
}
$s .= '<div id="diaspora-bydefault-wrapper">';
$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . t('Post to Diaspora by default') . '</label>';
$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . L10n::t('Post to Diaspora by default') . '</label>';
$s .= '<input id="diaspora-bydefault" type="checkbox" name="diaspora_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
@ -323,7 +328,7 @@ function diaspora_send(&$a,&$b) {
} while ($oldbody != $body);
// convert to markdown
$body = bb2diaspora($body, false, true);
$body = bb2diaspora($body);
// Adding the title
if(strlen($title))
@ -351,10 +356,10 @@ function diaspora_send(&$a,&$b) {
if (count($r))
$a->contact = $r[0]["id"];
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body));
require_once('include/queue_fn.php');
add_to_queue($a->contact,NETWORK_DIASPORA2,$s);
notice(t('Diaspora post failed. Queued for retry.').EOL);
$s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $body]);
Queue::add($a->contact, NETWORK_DIASPORA2, $s);
notice(L10n::t('Diaspora post failed. Queued for retry.').EOL);
}
}
}

View file

@ -32,7 +32,7 @@ msgid "Diaspora Export"
msgstr ""
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr ""
#: diaspora.php:168

View file

@ -34,8 +34,8 @@ msgid "Diaspora Export"
msgstr "Diaspora export"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgstr "Povolit Diaspora Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Povolit Diaspora Addon"
#: diaspora.php:168
msgid "Diaspora username"

View file

@ -8,7 +8,7 @@ function string_plural_select_cs($n){
$a->strings["Post to Diaspora"] = "Příspěvek na Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nelze se přihlásit na váš Diaspora účet. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)";
$a->strings["Diaspora Export"] = "Diaspora export";
$a->strings["Enable Diaspora Post Plugin"] = "Povolit Diaspora Plugin";
$a->strings["Enable Diaspora Post Addon"] = "Povolit Diaspora Addon";
$a->strings["Diaspora username"] = "Diaspora uživatelské jméno";
$a->strings["Diaspora password"] = "Diaspora heslo";
$a->strings["Diaspora site URL"] = "Adresa webu Diaspora";

View file

@ -34,7 +34,7 @@ msgid "Diaspora Export"
msgstr "Diaspora Export"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Veröffentlichungen bei Diaspora erlauben"
#: diaspora.php:168

View file

@ -8,7 +8,7 @@ function string_plural_select_de($n){
$a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde.";
$a->strings["Diaspora Export"] = "Diaspora Export";
$a->strings["Enable Diaspora Post Plugin"] = "Veröffentlichungen bei Diaspora erlauben";
$a->strings["Enable Diaspora Post Addon"] = "Veröffentlichungen bei Diaspora erlauben";
$a->strings["Diaspora username"] = "Diaspora Nutzername";
$a->strings["Diaspora password"] = "Diaspora Passwort";
$a->strings["Diaspora site URL"] = "URL der Diaspora Seite";

View file

@ -34,8 +34,8 @@ msgid "Diaspora Export"
msgstr "Exportar a Diaspora*"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgstr "Habilitar publicar a traves de Diaspora* plugin."
msgid "Enable Diaspora Post Addon"
msgstr "Habilitar publicar a traves de Diaspora* addon."
#: diaspora.php:168
msgid "Diaspora username"

View file

@ -8,7 +8,7 @@ function string_plural_select_es($n){
$a->strings["Post to Diaspora"] = "Publicar hacia Diaspora*";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. .";
$a->strings["Diaspora Export"] = "Exportar a Diaspora*";
$a->strings["Enable Diaspora Post Plugin"] = "Habilitar publicar a traves de Diaspora* plugin.";
$a->strings["Enable Diaspora Post Addon"] = "Habilitar publicar a traves de Diaspora* addon.";
$a->strings["Diaspora username"] = "Nombre de usuario de Diaspora*.";
$a->strings["Diaspora password"] = "Contraseña Diaspora*";
$a->strings["Diaspora site URL"] = "URL sitio Diaspora*";

View file

@ -35,7 +35,7 @@ msgid "Diaspora Export"
msgstr "Export Diaspora"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Activer lextension «Publier sur Diaspora»"
#: diaspora.php:168

View file

@ -8,7 +8,7 @@ function string_plural_select_fr($n){
$a->strings["Post to Diaspora"] = "Publier sur Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Impossible de se connecter à votre compte Diaspora. Veuillez vérifier votre identifiant et votre mot de passe, et assurez-vous davoir indiqué ladresse complète (y compris le «http:// » initial).";
$a->strings["Diaspora Export"] = "Export Diaspora";
$a->strings["Enable Diaspora Post Plugin"] = "Activer lextension «Publier sur Diaspora»";
$a->strings["Enable Diaspora Post Addon"] = "Activer lextension «Publier sur Diaspora»";
$a->strings["Diaspora username"] = "Identifiant Diaspora";
$a->strings["Diaspora password"] = "Mot de passe Diaspora";
$a->strings["Diaspora site URL"] = "Adresse du site Diaspora";

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014
# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-22 13:18+0200\n"
"PO-Revision-Date: 2014-09-10 11:57+0000\n"
"PO-Revision-Date: 2018-03-19 13:21+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"
@ -34,8 +34,8 @@ msgid "Diaspora Export"
msgstr "Esporta Diaspora"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgstr "Abilita il plugin di invio a Diaspora"
msgid "Enable Diaspora Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a Diaspora"
#: diaspora.php:168
msgid "Diaspora username"

View file

@ -8,7 +8,7 @@ function string_plural_select_it($n){
$a->strings["Post to Diaspora"] = "Invia a Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")";
$a->strings["Diaspora Export"] = "Esporta Diaspora";
$a->strings["Enable Diaspora Post Plugin"] = "Abilita il plugin di invio a Diaspora";
$a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora";
$a->strings["Diaspora username"] = "Nome utente Diaspora";
$a->strings["Diaspora password"] = "Password Diaspora";
$a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora";

View file

@ -34,7 +34,7 @@ msgid "Diaspora Export"
msgstr ""
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Habilitar plug-in para publicar na Diaspora"
#: diaspora.php:168

View file

@ -33,7 +33,7 @@ msgid "Diaspora Export"
msgstr "Exportare pe Diaspora "
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Activare Modul Postare pe Diaspora"
#: diaspora.php:168

View file

@ -8,7 +8,7 @@ function string_plural_select_ro($n){
$a->strings["Post to Diaspora"] = "Postați pe Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă (inclusiv http ... )";
$a->strings["Diaspora Export"] = "Exportare pe Diaspora ";
$a->strings["Enable Diaspora Post Plugin"] = "Activare Modul Postare pe Diaspora";
$a->strings["Enable Diaspora Post Addon"] = "Activare Modul Postare pe Diaspora";
$a->strings["Diaspora username"] = "Utilizator Diaspora";
$a->strings["Diaspora password"] = "Parola Diaspora";
$a->strings["Diaspora site URL"] = "URL site Diaspora";

View file

@ -34,7 +34,7 @@ msgid "Diaspora Export"
msgstr "Экспорт в Diaspora"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "Включить плагин отправки сообщений в Diaspora"
#: diaspora.php:168

View file

@ -8,7 +8,7 @@ function string_plural_select_ru($n){
$a->strings["Post to Diaspora"] = "Отправить в Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Невозможно войти в вашу учетную запись Diaspora. Пожалуйста, проверьте имя пользователя, пароль и убедитесь, что вы ввели полный адрес пода (включая http/https)";
$a->strings["Diaspora Export"] = "Экспорт в Diaspora";
$a->strings["Enable Diaspora Post Plugin"] = "Включить плагин отправки сообщений в Diaspora";
$a->strings["Enable Diaspora Post Addon"] = "Включить плагин отправки сообщений в Diaspora";
$a->strings["Diaspora username"] = "Имя пользователя Diaspora";
$a->strings["Diaspora password"] = "Пароль Diaspora";
$a->strings["Diaspora site URL"] = "URL пода Diaspora";

View file

@ -34,7 +34,7 @@ msgid "Diaspora Export"
msgstr "Diaspora 导出"
#: diaspora.php:163
msgid "Enable Diaspora Post Plugin"
msgid "Enable Diaspora Post Addon"
msgstr "启用 Diaspora 发文插件"
#: diaspora.php:168

View file

@ -8,7 +8,7 @@ function string_plural_select_zh_cn($n){
$a->strings["Post to Diaspora"] = "发到 Diaspora";
$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址包括http...";
$a->strings["Diaspora Export"] = "Diaspora 导出";
$a->strings["Enable Diaspora Post Plugin"] = "启用 Diaspora 发文插件";
$a->strings["Enable Diaspora Post Addon"] = "启用 Diaspora 发文插件";
$a->strings["Diaspora username"] = "Diaspora 用户名";
$a->strings["Diaspora password"] = "Diaspora 密码";
$a->strings["Diaspora site URL"] = "Diaspora 站点 URL";