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,5 +1,4 @@
<?php
/**
* Name: Dreamwidth Post Connector
* Description: Post to dreamwidth
@ -9,20 +8,27 @@
* Author: Cat Gray <https://free-haven.org/profile/catness>
*/
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
function dwpost_install() {
register_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
register_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
register_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
register_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
register_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
Addon::registerHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
Addon::registerHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
Addon::registerHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
}
function dwpost_uninstall() {
unregister_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
unregister_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
unregister_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
unregister_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
unregister_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
Addon::unregisterHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local');
Addon::unregisterHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send');
Addon::unregisterHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
Addon::unregisterHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings');
Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
}
@ -36,7 +42,7 @@ function dwpost_jot_nets(&$a,&$b) {
$dw_defpost = get_pconfig(local_user(),'dwpost','post_by_default');
$selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
. t('Post to Dreamwidth') . '</div>';
. L10n::t('Post to Dreamwidth') . '</div>';
}
}
@ -67,36 +73,36 @@ function dwpost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. t("Dreamwidth Export").'</h3>';
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
$s .= '</span>';
$s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. t("Dreamwidth Export").'</h3>';
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
$s .= '</span>';
$s .= '<div id="dwpost-enable-wrapper">';
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . t('Enable dreamwidth Post Plugin') . '</label>';
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-username-wrapper">';
$s .= '<label id="dwpost-username-label" for="dwpost-username">' . t('dreamwidth username') . '</label>';
$s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
$s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-password-wrapper">';
$s .= '<label id="dwpost-password-label" for="dwpost-password">' . t('dreamwidth password') . '</label>';
$s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
$s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-bydefault-wrapper">';
$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . t('Post to dreamwidth by default') . '</label>';
$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
$s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_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="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
@ -173,16 +179,12 @@ function dwpost_send(&$a,&$b) {
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
if($dw_username && $dw_password && $dw_blog) {
require_once('include/bbcode.php');
require_once('include/datetime.php');
$title = $b['title'];
$post = bbcode($b['body']);
$post = BBCode::convert($b['body']);
$post = xmlify($post);
$tags = dwpost_get_tags($b['tag']);
$date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2));
@ -218,10 +220,10 @@ EOT;
logger('dwpost: data: ' . $xml, LOGGER_DATA);
if($dw_blog !== 'test')
$x = post_url($dw_blog,$xml,array("Content-Type: text/xml"));
if($dw_blog !== 'test') {
$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
}
logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
}
}

View file

@ -26,7 +26,7 @@ msgid "Dreamwidth Post Settings"
msgstr ""
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr ""
#: dwpost.php:77

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "Missatge a Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Habilitat el addon d'enviaments a Dreamwidth";
$a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth";
$a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth";

View file

@ -28,8 +28,8 @@ msgid "Dreamwidth Post Settings"
msgstr "Dreamwidth nastavení příspěvků"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgstr "Povolit dreamwidth Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr "Povolit dreamwidth Addon"
#: dwpost.php:77
msgid "dreamwidth username"

View file

@ -7,7 +7,7 @@ function string_plural_select_cs($n){
;
$a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Dreamwidth nastavení příspěvků";
$a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin";
$a->strings["Enable dreamwidth Post Addon"] = "Povolit dreamwidth Addon";
$a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
$a->strings["dreamwidth password"] = "dreamwidth heslo";
$a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth";

View file

@ -29,8 +29,8 @@ msgid "Dreamwidth Post Settings"
msgstr "Dreamwidth Veröffentlichungs-Einstellungen"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgstr "Dreamwidth Post Plugin aktivieren"
msgid "Enable dreamwidth Post Addon"
msgstr "Dreamwidth Post Addon aktivieren"
#: dwpost.php:77
msgid "dreamwidth username"

View file

@ -7,7 +7,7 @@ function string_plural_select_de($n){
;
$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
$a->strings["Enable dreamwidth Post Addon"] = "Dreamwidth Post Addon aktivieren";
$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Ŝalti la Dreamwidth Kromprogramon";
$a->strings["Enable dreamwidth Post Addon"] = "Ŝalti la Dreamwidth Kromprogramon";
$a->strings["dreamwidth username"] = "Dreamwidth salutnomo";
$a->strings["dreamwidth password"] = "Dreamwidth pasvorto";
$a->strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth";

View file

@ -28,8 +28,8 @@ msgid "Dreamwidth Post Settings"
msgstr "Ajustes de publicación de Dreamwidth"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgstr "Activar el plugin de publicación dreamwidth"
msgid "Enable dreamwidth Post Addon"
msgstr "Activar el addon de publicación dreamwidth"
#: dwpost.php:77
msgid "dreamwidth username"

View file

@ -7,7 +7,7 @@ function string_plural_select_es($n){
;
$a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Ajustes de publicación de Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Activar el plugin de publicación dreamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Activar el addon de publicación dreamwidth";
$a->strings["dreamwidth username"] = "Nombre de usuario de dreamwidth";
$a->strings["dreamwidth password"] = "Contraseña de dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Publicar en dreamwidth por defecto";

View file

@ -29,7 +29,7 @@ msgid "Dreamwidth Post Settings"
msgstr "Paramètres pour Dreamwidth"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr ""
#: dwpost.php:77

View file

@ -7,7 +7,7 @@ function string_plural_select_fr($n){
;
$a->strings["Post to Dreamwidth"] = "Publier sur Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Paramètres pour Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "";
$a->strings["Enable dreamwidth Post Addon"] = "";
$a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
$a->strings["dreamwidth password"] = "Mot de passe dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Poster sur Dreamwidth par défaut";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "";
$a->strings["Dreamwidth Post Settings"] = "";
$a->strings["Enable dreamwidth Post Plugin"] = "";
$a->strings["Enable dreamwidth Post Addon"] = "";
$a->strings["dreamwidth username"] = "";
$a->strings["dreamwidth password"] = "";
$a->strings["Post to dreamwidth by default"] = "";

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: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2014-10-22 07:54+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"
@ -21,15 +21,15 @@ msgstr ""
#: dwpost.php:39
msgid "Post to Dreamwidth"
msgstr "Posta su Dreamwidth"
msgstr "Invia a Dreamwidth"
#: dwpost.php:70
msgid "Dreamwidth Post Settings"
msgstr "Impostazioni di invio a Dreamwidth"
msgstr "Impostazioni Invio a Dreeamwidth"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgstr "Abilita il plugin di invio a Dreamwidth"
msgid "Enable dreamwidth Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
#: dwpost.php:77
msgid "dreamwidth username"
@ -45,4 +45,4 @@ msgstr "Invia sempre a Dreamwidth"
#: dwpost.php:93
msgid "Submit"
msgstr "Invia"
msgstr "Salva"

View file

@ -5,10 +5,10 @@ function string_plural_select_it($n){
return ($n != 1);;
}}
;
$a->strings["Post to Dreamwidth"] = "Posta su Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Impostazioni di invio a Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin di invio a Dreamwidth";
$a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreeamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Abilita il componente aggiuntivo di invio a Dreamwidth";
$a->strings["dreamwidth username"] = "Nome utente Dreamwidth";
$a->strings["dreamwidth password"] = "password Dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Invia sempre a Dreamwidth";
$a->strings["Submit"] = "Invia";
$a->strings["Submit"] = "Salva";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "";
$a->strings["Dreamwidth Post Settings"] = "";
$a->strings["Enable dreamwidth Post Plugin"] = "";
$a->strings["Enable dreamwidth Post Addon"] = "";
$a->strings["dreamwidth username"] = "";
$a->strings["dreamwidth password"] = "";
$a->strings["Post to dreamwidth by default"] = "";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "";
$a->strings["Enable dreamwidth Post Plugin"] = "";
$a->strings["Enable dreamwidth Post Addon"] = "";
$a->strings["dreamwidth username"] = "";
$a->strings["dreamwidth password"] = "";
$a->strings["Post to dreamwidth by default"] = "";

View file

@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings"
msgstr "Configurações de publicação no Dreamwidth"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr "Habilitar plug-in para publicar no Dreamwidth"
#: dwpost.php:77

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "Publicar no Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Habilitar o plugin de publicação no Dreamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Habilitar o addon de publicação no Dreamwidth";
$a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth";
$a->strings["dreamwidth password"] = "Senha do Dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão";

View file

@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings"
msgstr "Configurări Postări Dreamwidth "
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr "Activare Modul Postare pe Dreamwidth"
#: dwpost.php:77

View file

@ -7,7 +7,7 @@ function string_plural_select_ro($n){
;
$a->strings["Post to Dreamwidth"] = "Postați pe Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Configurări Postări Dreamwidth ";
$a->strings["Enable dreamwidth Post Plugin"] = "Activare Modul Postare pe Dreamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Activare Modul Postare pe Dreamwidth";
$a->strings["dreamwidth username"] = "Utilizator Dreamwidth";
$a->strings["dreamwidth password"] = "Parola Dreamwidth ";
$a->strings["Post to dreamwidth by default"] = "Postați implicit pe Dreamwidth";

View file

@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings"
msgstr "Настройки сообщений Dreamwidth"
#: dwpost.php:72
msgid "Enable dreamwidth Post Plugin"
msgid "Enable dreamwidth Post Addon"
msgstr "Включить плагин отправки сообщений в Dreamwidth"
#: dwpost.php:77

View file

@ -7,7 +7,7 @@ function string_plural_select_ru($n){
;
$a->strings["Post to Dreamwidth"] = "Отправить в Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Настройки сообщений Dreamwidth";
$a->strings["Enable dreamwidth Post Plugin"] = "Включить плагин отправки сообщений в Dreamwidth";
$a->strings["Enable dreamwidth Post Addon"] = "Включить плагин отправки сообщений в Dreamwidth";
$a->strings["dreamwidth username"] = "Имя пользователя Dreamwidth";
$a->strings["dreamwidth password"] = "Пароль Dreamwidth";
$a->strings["Post to dreamwidth by default"] = "Отправлять сообщения в Dreamwidth по умолчанию";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Dreamwidth"] = "转播到Dreamwidth";
$a->strings["Dreamwidth Post Settings"] = "Dreamwidth转播设置";
$a->strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用";
$a->strings["Enable dreamwidth Post Addon"] = "使Dreamwidth转播插件可用";
$a->strings["dreamwidth username"] = "Dreamwidth用户名";
$a->strings["dreamwidth password"] = "Dreamwidth密码";
$a->strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth";