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

@ -2,7 +2,7 @@ Page Header
For server admins only.
Displays a text message for system announcements'
The message is entered in the admin account at settings, Plugin settings.
The message is entered in the admin account at settings, Addon settings.
If you want to use HTML in the pageheader, create a file called pageheader.html
in the document root of your friendica instance and add the html there.

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n"
"POT-Creation-Date: 2018-03-11 18:52+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,14 +17,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: pageheader.php:50
#: pageheader.php:53
msgid "\"pageheader\" Settings"
msgstr ""
#: pageheader.php:55
msgid "Submit"
#: pageheader.php:54
msgid "Message"
msgstr ""
#: pageheader.php:68
#: pageheader.php:54
msgid ""
"Message to display on every page on this server (or put a pageheader.html "
"file in your docroot)"
msgstr ""
#: pageheader.php:55
msgid "Save Settings"
msgstr ""
#: pageheader.php:69
msgid "pageheader Settings saved."
msgstr ""

View file

@ -4,30 +4,41 @@
#
#
# Translators:
# Abrax <webmaster@a-zwenkau.de>, 2014
# bavatar <tobias.diekershoff@gmx.net>, 2014
# Andreas H., 2014
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 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-15 12:32+0000\n"
"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
"POT-Creation-Date: 2018-03-11 18:52+0100\n"
"PO-Revision-Date: 2018-03-16 07:42+0000\n"
"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: pageheader.php:50
#: pageheader.php:53
msgid "\"pageheader\" Settings"
msgstr "\"pageheader\"-Einstellungen"
#: pageheader.php:55
msgid "Submit"
msgstr "Senden"
#: pageheader.php:54
msgid "Message"
msgstr "Mitteilung"
#: pageheader.php:68
#: pageheader.php:54
msgid ""
"Message to display on every page on this server (or put a pageheader.html "
"file in your docroot)"
msgstr "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden)."
#: pageheader.php:55
msgid "Save Settings"
msgstr "Einstellungen speichern"
#: pageheader.php:69
msgid "pageheader Settings saved."
msgstr "pageheader-Einstellungen gespeichert."

View file

@ -6,5 +6,7 @@ function string_plural_select_de($n){
}}
;
$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
$a->strings["Submit"] = "Senden";
$a->strings["Message"] = "Mitteilung";
$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden).";
$a->strings["Save Settings"] = "Einstellungen speichern";
$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,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: 2015-08-31 10:21+0000\n"
"POT-Creation-Date: 2018-03-11 18:52+0100\n"
"PO-Revision-Date: 2018-03-19 13:19+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,14 +19,24 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: pageheader.php:50
#: pageheader.php:53
msgid "\"pageheader\" Settings"
msgstr "Impostazioni \"Intestazione pagina\""
#: pageheader.php:55
msgid "Submit"
msgstr "Invia"
#: pageheader.php:54
msgid "Message"
msgstr "Messaggio"
#: pageheader.php:68
#: pageheader.php:54
msgid ""
"Message to display on every page on this server (or put a pageheader.html "
"file in your docroot)"
msgstr "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)"
#: pageheader.php:55
msgid "Save Settings"
msgstr "Salva Impostazioni"
#: pageheader.php:69
msgid "pageheader Settings saved."
msgstr "Impostazioni \"Intestazione pagina\" salvate."

View file

@ -6,5 +6,7 @@ function string_plural_select_it($n){
}}
;
$a->strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\"";
$a->strings["Submit"] = "Invia";
$a->strings["Message"] = "Messaggio";
$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["pageheader Settings saved."] = "Impostazioni \"Intestazione pagina\" salvate.";

View file

@ -1,6 +1,4 @@
<?php
/**
* Name: Page Header
* Description: Inserts a page header
@ -9,22 +7,25 @@
* Hauke Altmann <https://snarl.de/profile/tugelblend>
*
*/
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
function pageheader_install() {
register_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
register_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
Addon::registerHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
Addon::registerHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
Addon::registerHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
}
function pageheader_uninstall() {
unregister_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
unregister_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
Addon::unregisterHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
Addon::unregisterHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
Addon::unregisterHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
// hook moved, uninstall the old one if still there.
unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
Addon::unregisterHook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
}
@ -47,14 +48,12 @@ function pageheader_addon_settings(&$a,&$s) {
if(! $words)
$words = '';
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
$s .= '<div id="pageheader-wrapper">';
$s .= '<label id="pageheader-label" for="pageheader-words">' . t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
$s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$t = get_markup_template("settings.tpl", "addon/pageheader/");
$s .= replace_macros($t, [
'$title' => L10n::t('"pageheader" Settings'),
'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
'$submit' => L10n::t('Save Settings')
]);
return;
@ -66,8 +65,8 @@ function pageheader_addon_settings_post(&$a,&$b) {
return;
if($_POST['pageheader-submit']) {
set_config('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
info( t('pageheader Settings saved.') . EOL);
Config::set('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
info(L10n::t('pageheader Settings saved.') . EOL);
}
}

View file

@ -0,0 +1,14 @@
<span id="settings_pageheader_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
<h3>{{$title}}</h3>
</span>
<div id="settings_pageheader_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
<h3>{{$title}}</h3>
</span>
{{include file="field_textarea.tpl" field=$phwords}}
<div class="settings-submit-wrapper" >
<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>
<div class="clear"></div>