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,8 +1,8 @@
YourLS
For server admins only.
Defines a YourLS url shortener for the Statusnet & Twitter plugins.
Defines a YourLS url shortener for the Statusnet & Twitter addons.
This plugin will not do anything else unless the Statusnet and/or Twitter plugins are installed.
This addon will not do anything else unless the Statusnet and/or Twitter addons are installed.
The message is entered in the admin account at Settings -> Plugin settings.
The message is entered in the admin account at Settings -> Addon settings.

View file

@ -10,7 +10,7 @@ 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:30+0000\n"
"PO-Revision-Date: 2017-09-20 06:09+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,48 @@
# ADDON yourls
# Copyright (C)
# This file is distributed under the same license as the Friendica yourls addon package.
#
#
# Translators:
# Karel Vandecandelaere <karel@dasrakel.eu>, 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: 2018-03-20 13:29+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"
#: yourls.php:55
msgid "YourLS Settings"
msgstr "YourLS-instellingen"
#: yourls.php:57
msgid "URL: http://"
msgstr "URL: http://"
#: yourls.php:62
msgid "Username:"
msgstr "Gebruikersnaam:"
#: yourls.php:67
msgid "Password:"
msgstr "Wachtwoord:"
#: yourls.php:72
msgid "Use SSL "
msgstr "Gebruik SSL"
#: yourls.php:76
msgid "Submit"
msgstr "Toepassen"
#: yourls.php:92
msgid "yourls Settings saved."
msgstr "YourLS-instellingen bijgewerkt."

View file

@ -0,0 +1,14 @@
<?php
if(! function_exists("string_plural_select_nl")) {
function string_plural_select_nl($n){
return ($n != 1);;
}}
;
$a->strings["YourLS Settings"] = "YourLS-instellingen";
$a->strings["URL: http://"] = "URL: http://";
$a->strings["Username:"] = "Gebruikersnaam:";
$a->strings["Password:"] = "Wachtwoord:";
$a->strings["Use SSL "] = "Gebruik SSL";
$a->strings["Submit"] = "Toepassen";
$a->strings["yourls Settings saved."] = "YourLS-instellingen bijgewerkt.";

View file

@ -1,28 +1,29 @@
<?php
/**
* Name: Yourls
* Description: Defines a YourLS url shortener for the Statusnet & Twitter plugins
* Description: Defines a YourLS url shortener for the Statusnet & Twitter addons
* Version: 1.0
* Author: Keith Fernie <http://friendika.me4.it/profile/keith>
*
* Status: Unsupported
*/
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
function yourls_install() {
register_hook('plugin_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings');
register_hook('plugin_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post');
Addon::registerHook('addon_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings');
Addon::registerHook('addon_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post');
}
function yourls_uninstall() {
unregister_hook('plugin_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings');
unregister_hook('plugin_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post');
set_config('yourls','url1',trim($_POST['']));
set_config('yourls','username1',trim($_POST['']));
set_config('yourls','password1',trim($_POST['']));
set_config('yourls','ssl1',trim($_POST['']));
Addon::unregisterHook('addon_settings', 'addon/yourls/yourls.php', 'yourls_addon_settings');
Addon::unregisterHook('addon_settings_post', 'addon/yourls/yourls.php', 'yourls_addon_settings_post');
Config::set('yourls','url1',trim($_POST['']));
Config::set('yourls','username1',trim($_POST['']));
Config::set('yourls','password1',trim($_POST['']));
Config::set('yourls','ssl1',trim($_POST['']));
}
@ -52,34 +53,34 @@ function yourls_addon_settings(&$a,&$s) {
$yourls_ssl = get_config('yourls', 'ssl1');
$s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
$s .= '<h3>' . t('YourLS') . '</h3>';
$s .= '<h3>' . L10n::t('YourLS') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
$s .= '<h3>' . t('YourLS') . '</h3>';
$s .= '<h3>' . L10n::t('YourLS') . '</h3>';
$s .= '</span>';
$s .= '<div id="yourls-url-wrapper">';
$s .= '<label id="yourls-url-label" for="yourls-url">' . t('URL: http://') . '</label>';
$s .= '<label id="yourls-url-label" for="yourls-url">' . L10n::t('URL: http://') . '</label>';
$s .= '<input id="yourls-url" type="text" name="yourls_url" value="' . $yourls_url .'" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-username-wrapper">';
$s .= '<label id="yourls-username-label" for="yourls-username">' . t('Username:') . '</label>';
$s .= '<label id="yourls-username-label" for="yourls-username">' . L10n::t('Username:') . '</label>';
$s .= '<input id="yourls-username" type="text" name="yourls_username" value="' . $yourls_username .'" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-password-wrapper">';
$s .= '<label id="yourls-password-label" for="yourls-password">' . t('Password:') . '</label>';
$s .= '<label id="yourls-password-label" for="yourls-password">' . L10n::t('Password:') . '</label>';
$s .= '<input id="yourls-password" type="password" name="yourls_password" value="' . $yourls_password .'" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="yourls-ssl-wrapper">';
$s .= '<label id="yourls-ssl-label" for="yourls-ssl">' . t('Use SSL ') . '</label>';
$s .= '<label id="yourls-ssl-label" for="yourls-ssl">' . L10n::t('Use SSL ') . '</label>';
$s .= '<input id="yourls-ssl" type="checkbox" name="yourls_ssl" value="1" ' . $ssl_checked . ' />';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
return;
@ -91,10 +92,10 @@ function yourls_addon_settings_post(&$a,&$b) {
return;
if($_POST['yourls-submit']) {
set_config('yourls','url1',trim($_POST['yourls_url']));
set_config('yourls','username1',trim($_POST['yourls_username']));
set_config('yourls','password1',trim($_POST['yourls_password']));
set_config('yourls','ssl1',intval($_POST['yourls_ssl']));
info( t('yourls Settings saved.') . EOL);
Config::set('yourls','url1',trim($_POST['yourls_url']));
Config::set('yourls','username1',trim($_POST['yourls_username']));
Config::set('yourls','password1',trim($_POST['yourls_password']));
Config::set('yourls','ssl1',intval($_POST['yourls_ssl']));
info(L10n::t('yourls Settings saved.') . EOL);
}
}