From f0522a998b1ab1be173bb6353e43f738a40f4205 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 20 Nov 2021 04:29:09 -0500 Subject: [PATCH 1/4] [various] Use __DIR__ constant in all Page registerStylesheet and registerFooterScript calls --- cookienotice/cookienotice.php | 7 ++----- diaspora/diaspora.php | 2 +- geonames/geonames.php | 4 +--- js_upload/js_upload.php | 4 ++-- nsfw/nsfw.php | 3 +-- pageheader/pageheader.php | 7 ++----- qcomment/qcomment.php | 2 +- showmore/showmore.php | 4 +--- smileybutton/smileybutton.php | 4 ++-- superblock/superblock.php | 3 +-- 10 files changed, 14 insertions(+), 26 deletions(-) diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php index bec981844..f35299733 100644 --- a/cookienotice/cookienotice.php +++ b/cookienotice/cookienotice.php @@ -85,11 +85,8 @@ function cookienotice_addon_admin_post(App $a) */ function cookienotice_page_content_top(App $a, &$b) { - $stylesheetPath = __DIR__ . '/cookienotice.css'; - $footerscriptPath = __DIR__ . '/cookienotice.js'; - - DI::page()->registerStylesheet($stylesheetPath); - DI::page()->registerFooterScript($footerscriptPath); + DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css'); + DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js'); } /** diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index e47f03b16..7b747bef6 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -93,7 +93,7 @@ function diaspora_settings(App $a, &$s) } } - DI::page()->registerStylesheet('addon/diaspora/diaspora.css'); + DI::page()->registerStylesheet(__DIR__ . '/diaspora.css'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/'); $s .= Renderer::replaceMacros($t, [ diff --git a/geonames/geonames.php b/geonames/geonames.php index eb12728f0..5fdf65ef5 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -129,9 +129,7 @@ function geonames_addon_settings(App $a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - $stylesheetPath = __DIR__ . '/geonames.css'; - DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet(__DIR__ . '/geonames.css'); /* Get the current state of our config variable */ $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable')); diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index e67d2ff05..72653d557 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -29,8 +29,8 @@ function js_upload_form(App $a, array &$b) { $b['default_upload'] = false; - DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css'); - DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js'); + DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css'); + DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js'); $tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload'); $b['addon_text'] .= Renderer::replaceMacros($tpl, [ diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 9f81b29d8..1cbcf7c8e 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -54,9 +54,8 @@ function nsfw_addon_settings(&$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ + DI::page()->registerStylesheet(__DIR__ . '/nsfw.css', 'all'); - DI::page()['htmlhead'] .= '' . "\r\n"; $enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); $words = DI::pConfig()->get(local_user(), 'nsfw', 'words'); diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index ce3b26844..9dfe3c02f 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -23,9 +23,7 @@ function pageheader_addon_admin(App &$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - $stylesheetPath = __DIR__ . '/pageheader.css'; - DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet(__DIR__ . '/pageheader.css'); $words = DI::config()->get('pageheader','text'); if(! $words) @@ -62,8 +60,7 @@ function pageheader_fetch(App $a, &$b) $s = DI::config()->get('pageheader', 'text'); } - $stylesheetPath = __DIR__ .'/pageheader.css'; - DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet(__DIR__ .'/pageheader.css'); if ($s) { $b .= '
' . $s . '
'; diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index ed110f667..f662aeccc 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -30,7 +30,7 @@ function qcomment_install() function qcomment_footer(\Friendica\App $a, &$b) { - DI::page()->registerFooterScript(__DIR__ . '/qcomment.js'); + DI::page()->registerFooterScript('addon/qcomment/qcomment.js'); } function qcomment_addon_settings(&$a, &$s) diff --git a/showmore/showmore.php b/showmore/showmore.php index dd6d4773a..574be70fa 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -24,9 +24,7 @@ function showmore_addon_settings(&$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= ''."\r\n"; + DI::page()->registerStylesheet(__DIR__ . '/showmore.css', 'all'); $enable_checked = (intval(DI::pConfig()->get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"'); $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100); diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index f01a62015..1a1f1d638 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -97,9 +97,9 @@ function smileybutton_jot_tool(Friendica\App $a, &$b) $s .= ''; //Add css to header - $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css'; + $css_file = __DIR__ . '/view/' . $a->getCurrentTheme() . '.css'; if (!file_exists($css_file)) { - $css_file = 'addon/smileybutton/view/default.css'; + $css_file = __DIR__ . '/view/default.css'; } DI::page()->registerStylesheet($css_file); diff --git a/superblock/superblock.php b/superblock/superblock.php index 7bf2bc4ce..d31860874 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -25,9 +25,8 @@ function superblock_addon_settings(&$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ + DI::page()->registerStylesheet(__DIR__ . '/superblock.css', 'all'); - DI::page()['htmlhead'] .= '' . "\r\n"; $words = DI::pConfig()->get(local_user(), 'system', 'blocked'); if (!$words) { From 779b38ec0988a2b92e1fe5db3a8f59e76a64f58d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 20 Nov 2021 04:56:55 -0500 Subject: [PATCH 2/4] [various] Convert addon_settings hook functions to the new data array format - Add separate template files to several addons - Remove superfluous addon settings CSS files --- .../advancedcontentfilter.php | 14 +++--- birdavatar/birdavatar.php | 29 ++++++----- birdavatar/templates/settings.tpl | 26 +--------- blockem/blockem.css | 18 ------- blockem/blockem.php | 39 +++++---------- blockem/templates/settings.tpl | 1 + catavatar/catavatar.php | 33 +++++++------ catavatar/templates/settings.tpl | 26 +--------- curweather/curweather.php | 36 +++++++------- curweather/templates/settings.tpl | 21 +++----- fromapp/fromapp.css | 14 ------ fromapp/fromapp.php | 48 ++++++------------- fromapp/templates/settings.tpl | 2 + geonames/geonames.css | 14 ------ geonames/geonames.php | 24 +++++----- geonames/templates/settings.tpl | 16 +------ gnot/gnot.css | 16 ------- gnot/gnot.php | 37 +++++++------- gnot/templates/settings.tpl | 22 +-------- group_text/group_text.css | 14 ------ group_text/group_text.php | 38 +++++++-------- group_text/templates/settings.tpl | 1 + irc/irc.php | 36 +++++++------- irc/templates/settings.tpl | 18 ++----- krynn/krynn.css | 14 ------ krynn/krynn.php | 47 +++++++----------- krynn/templates/settings.tpl | 1 + langfilter/langfilter.php | 24 +++++----- langfilter/templates/settings.tpl | 24 ++-------- mailstream/mailstream.php | 48 +++++++++++-------- mailstream/templates/settings.tpl | 17 ++----- markdown/markdown.php | 16 ++++--- markdown/templates/settings.tpl | 16 +------ mathjax/mathjax.php | 12 +++-- mathjax/templates/settings.tpl | 18 +------ notimeline/templates/settings.tpl | 1 + nsfw/nsfw.css | 19 -------- nsfw/nsfw.php | 47 +++++++----------- nsfw/templates/settings.tpl | 3 ++ numfriends/numfriends.css | 14 ------ numfriends/numfriends.php | 31 +++++------- numfriends/templates/settings.tpl | 1 + opmlexport/opmlexport.php | 12 ++--- opmlexport/templates/settings.tpl | 12 ----- planets/planets.css | 14 ------ planets/planets.php | 47 +++++++----------- planets/templates/settings.tpl | 1 + qcomment/qcomment.php | 26 ++++++---- qcomment/templates/settings.tpl | 23 +-------- randplace/randplace.css | 14 ------ randplace/randplace.php | 39 +++++++-------- randplace/templates/settings.tpl | 1 + securemail/securemail.php | 29 ++++++----- securemail/templates/admin.tpl | 16 ------- securemail/templates/settings.tpl | 2 + showmore/showmore.php | 42 +++++++--------- showmore/templates/settings.tpl | 3 ++ showmore_dyn/showmore_dyn.php | 11 +++-- showmore_dyn/templates/settings.tpl | 14 +----- startpage/startpage.css | 16 ------- startpage/startpage.php | 39 ++++++--------- startpage/templates/settings.tpl | 1 + superblock/superblock.css | 18 ------- superblock/superblock.php | 36 ++++++-------- superblock/templates/settings.tpl | 1 + windowsphonepush/templates/settings.tpl | 3 ++ windowsphonepush/windowsphonepush.css | 36 -------------- windowsphonepush/windowsphonepush.php | 45 +++++------------ 68 files changed, 444 insertions(+), 953 deletions(-) delete mode 100644 blockem/blockem.css create mode 100644 blockem/templates/settings.tpl delete mode 100644 fromapp/fromapp.css create mode 100644 fromapp/templates/settings.tpl delete mode 100644 geonames/geonames.css delete mode 100644 gnot/gnot.css delete mode 100644 group_text/group_text.css create mode 100644 group_text/templates/settings.tpl delete mode 100644 krynn/krynn.css create mode 100644 krynn/templates/settings.tpl create mode 100644 notimeline/templates/settings.tpl delete mode 100644 nsfw/nsfw.css create mode 100644 nsfw/templates/settings.tpl delete mode 100644 numfriends/numfriends.css create mode 100644 numfriends/templates/settings.tpl delete mode 100644 opmlexport/templates/settings.tpl delete mode 100644 planets/planets.css create mode 100644 planets/templates/settings.tpl delete mode 100644 randplace/randplace.css create mode 100644 randplace/templates/settings.tpl delete mode 100644 securemail/templates/admin.tpl create mode 100644 securemail/templates/settings.tpl create mode 100644 showmore/templates/settings.tpl delete mode 100644 startpage/startpage.css create mode 100644 startpage/templates/settings.tpl delete mode 100644 superblock/superblock.css create mode 100644 superblock/templates/settings.tpl create mode 100644 windowsphonepush/templates/settings.tpl delete mode 100644 windowsphonepush/windowsphonepush.css diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index 41ddffdb9..3fe6884ea 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -159,19 +159,17 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data) } -function advancedcontentfilter_addon_settings(App $a, &$s) +function advancedcontentfilter_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - $advancedcontentfilter = DI::l10n()->t('Advanced Content Filter'); - - $s .= <<

$advancedcontentfilter

-HTML; - - return; + $data = [ + 'addon' => 'advancedcontentfilter', + 'title' => DI::l10n()->t('Advanced Content Filter'), + 'href' => 'advancedcontentfilter', + ]; } /* diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php index af573bbd3..0981b35dd 100644 --- a/birdavatar/birdavatar.php +++ b/birdavatar/birdavatar.php @@ -24,9 +24,9 @@ define("BIRDAVATAR_SIZE", 256); */ function birdavatar_install() { - Hook::register('avatar_lookup', 'addon/birdavatar/birdavatar.php', 'birdavatar_lookup'); - Hook::register('addon_settings', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings'); - Hook::register('addon_settings_post', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings_post'); + Hook::register('avatar_lookup', __FILE__, 'birdavatar_lookup'); + Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings'); + Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post'); Logger::log('registered birdavatar'); } @@ -34,24 +34,29 @@ function birdavatar_install() /** * Bird avatar user settings page */ -function birdavatar_addon_settings(App $a, &$s) +function birdavatar_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/'); - $s .= Renderer::replaceMacros($t, [ - '$postpost' => !empty($_POST['birdavatar-morebird']) || !empty($_POST['birdavatar-emailbird']), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/'); + $html = Renderer::replaceMacros($t, [ '$uncache' => time(), '$uid' => local_user(), - '$usebird' => DI::l10n()->t('Use Bird as Avatar'), - '$morebird' => DI::l10n()->t('More Random Bird!'), - '$emailbird' => DI::l10n()->t('Reset to email Bird'), - '$seed' => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false), - '$header' => DI::l10n()->t('Bird Avatar Settings'), '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the bird.'), ]); + + $data = [ + 'addon' => 'birdavar', + 'title' => DI::l10n()->t('Bird Avatar Settings'), + 'html' => $html, + 'submit' => [ + 'birdavatar-usebird' => DI::l10n()->t('Use Bird as Avatar'), + 'birdavatar-morebird' => DI::l10n()->t('More Random Bird!'), + 'birdavatar-emailbird' => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false) ? DI::l10n()->t('Reset to email Bird') : null, + ], + ]; } /** diff --git a/birdavatar/templates/settings.tpl b/birdavatar/templates/settings.tpl index a31acfdb0..13230bd10 100644 --- a/birdavatar/templates/settings.tpl +++ b/birdavatar/templates/settings.tpl @@ -1,24 +1,2 @@ - -

{{$header}}

- -
- -

{{$header}}

- - -

{{$setrandomize}}

-
- - -
- - -
-
-
+

{{$setrandomize}}

+

diff --git a/blockem/blockem.css b/blockem/blockem.css deleted file mode 100644 index 265b6ba86..000000000 --- a/blockem/blockem.css +++ /dev/null @@ -1,18 +0,0 @@ - -#blockem-label { - float: left; - width: 300px; - margin-top: 10px; -} - -#blockem-words { - float: left; - margin-top: 10px; - width: 400px; - height: 150px; -} - -#blockem-submit { - margin-top: 15px; -} - diff --git a/blockem/blockem.php b/blockem/blockem.php index 3183915c5..79e04c8b5 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -9,6 +9,7 @@ use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\Strings; @@ -25,39 +26,25 @@ function blockem_install() Hook::register('enotify_store' , 'addon/blockem/blockem.php', 'blockem_enotify_store'); } -function blockem_addon_settings (App $a, &$s) +function blockem_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - DI::page()['htmlhead'] .= '' . "\r\n"; + $words = DI::pConfig()->get(local_user(), 'blockem', 'words', ''); - $words = DI::pConfig()->get(local_user(), 'blockem', 'words'); - - if (!$words) { - $words = ''; - } - - $s .= ''; - $s .= '

' . DI::l10n()->t('Blockem') . '

'; - $s .= ''; - $s .= ''; - - return; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/blockem/'); + $html = Renderer::replaceMacros($t, [ + '$info' => DI::l10n()->t("Hides user's content by collapsing posts. Also replaces their avatar with generic image."), + '$words' => ['blockem-words', DI::l10n()->t('Comma separated profile URLS:'), $words], + ]); + $data = [ + 'addon' => 'blockem', + 'title' => DI::l10n()->t('Blockem'), + 'html' => $html, + ]; } function blockem_addon_settings_post(App $a, array &$b) diff --git a/blockem/templates/settings.tpl b/blockem/templates/settings.tpl new file mode 100644 index 000000000..673984009 --- /dev/null +++ b/blockem/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_textarea.tpl" field=$words}} diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index 181ac0163..1304b24dd 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -25,9 +25,9 @@ define("CATAVATAR_SIZE", 256); */ function catavatar_install() { - Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup'); - Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings'); - Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post'); + Hook::register('avatar_lookup', __FILE__, 'catavatar_lookup'); + Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings'); + Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post'); Logger::notice('registered catavatar'); } @@ -35,24 +35,29 @@ function catavatar_install() /** * Cat avatar user settings page */ -function catavatar_addon_settings(App $a, &$s) +function catavatar_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/'); - $s .= Renderer::replaceMacros($t, [ - '$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']), - '$uncache' => time(), - '$uid' => local_user(), - '$usecat' => DI::l10n()->t('Use Cat as Avatar'), - '$morecat' => DI::l10n()->t('More Random Cat!'), - '$emailcat' => DI::l10n()->t('Reset to email Cat'), - '$seed' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false), - '$header' => DI::l10n()->t('Cat Avatar Settings'), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/'); + $html = Renderer::replaceMacros($t, [ + '$uncache' => time(), + '$uid' => local_user(), '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'), ]); + + $data = [ + 'addon' => 'catavar', + 'title' => DI::l10n()->t('Cat Avatar Settings'), + 'html' => $html, + 'submit' => [ + 'catavatar-usecat' => DI::l10n()->t('Use Cat as Avatar'), + 'catavatar-morecat' => DI::l10n()->t('Another random Cat!'), + 'catavatar-emailcat' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null, + ], + ]; } /** diff --git a/catavatar/templates/settings.tpl b/catavatar/templates/settings.tpl index 33563ffe6..7659a9c86 100644 --- a/catavatar/templates/settings.tpl +++ b/catavatar/templates/settings.tpl @@ -1,24 +1,2 @@ - -

{{$header}}

- -
- -

{{$header}}

- - -

{{$setrandomize}}

-
- - -
- - -
-
-
+

{{$setrandomize}}

+

diff --git a/curweather/curweather.php b/curweather/curweather.php index 118c4a9a5..c4b172cad 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -164,40 +164,38 @@ function curweather_addon_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); } -function curweather_addon_settings(App $a, &$s) +function curweather_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - /* Get the current state of our config variable */ - $curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc'); + $curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc'); $curweather_units = DI::pConfig()->get(local_user(), 'curweather', 'curweather_units'); - $appid = DI::config()->get('curweather', 'appid'); + $appid = DI::config()->get('curweather', 'appid'); - if ($appid == "") { + if ($appid == '') { $noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.'); } else { $noappidtext = ''; } - $enable = intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable')); - $enable_checked = (($enable) ? ' checked="checked" ' : ''); - - // load template and replace the macros - $t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" ); + $enabled = intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable')); - $s = Renderer::replaceMacros($t, [ - '$submit' => DI::l10n()->t('Save Settings'), - '$header' => DI::l10n()->t('Current Weather').' '.DI::l10n()->t('Settings'), - '$noappidtext' => $noappidtext, - '$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'), - '$curweather_loc' => [ 'curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE.') ], - '$curweather_units' => [ 'curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in °C or °F'), ['metric'=>'°C', 'imperial'=>'°F']], - '$enabled' => [ 'curweather_enable', DI::l10n()->t('Show weather data'), $enable, ''] + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/curweather/'); + $html = Renderer::replaceMacros($t, [ + '$noappidtext' => $noappidtext, + '$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'), + '$curweather_loc' => ['curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE.')], + '$curweather_units' => ['curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in °C or °F'), ['metric' => '°C', 'imperial' => '°F']], + '$enabled' => ['curweather_enable', DI::l10n()->t('Show weather data'), $enabled, ''], ]); - return; + $data = [ + 'addon' => 'curweather', + 'title' => DI::l10n()->t('Current Weather Settings'), + 'html' => $html, + ]; } // Config stuff for the admin panel to let the admin of the node set a APPID diff --git a/curweather/templates/settings.tpl b/curweather/templates/settings.tpl index 09f6f506d..d250b9bba 100644 --- a/curweather/templates/settings.tpl +++ b/curweather/templates/settings.tpl @@ -1,15 +1,6 @@ - -

{{$header}}

- - +{{if $noappidtext}} +

{{$noappidtext}}

+{{/if}} +{{include file="field_input.tpl" field=$curweather_loc}} +{{include file="field_select.tpl" field=$curweather_units}} +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/fromapp/fromapp.css b/fromapp/fromapp.css deleted file mode 100644 index 422624a1d..000000000 --- a/fromapp/fromapp.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#fromapp-label, #fromapp-force-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#fromapp-input, #fromapp-force { - float: left; -} - - diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index ab1e1518d..c00ad3de5 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -6,8 +6,11 @@ * Author: Commander Zot * */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function fromapp_install() @@ -28,47 +31,26 @@ function fromapp_settings_post($a, $post) DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force'])); } -function fromapp_settings(&$a, &$s) +function fromapp_settings(App &$a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ - $fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', ''); + $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); - $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/fromapp/'); + $html = Renderer::replaceMacros($t, [ + '$fromapp' => ['fromapp-input', DI::l10n()->t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'), $fromapp], + '$force' => ['fromapp-force', DI::l10n()->t('Use this application name even if another application was used.'), $force], + ]); - $force_enabled = (($force) ? ' checked="checked" ' : ''); - - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

' . DI::l10n()->t('FromApp Settings') . '

'; - $s .= ''; - $s .= ''; + $data = [ + 'addon' => 'fromapp', + 'title' => DI::l10n()->t('FromApp Settings'), + 'html' => $html, + ]; } function fromapp_post_hook(&$a, &$item) diff --git a/fromapp/templates/settings.tpl b/fromapp/templates/settings.tpl new file mode 100644 index 000000000..c74e5783e --- /dev/null +++ b/fromapp/templates/settings.tpl @@ -0,0 +1,2 @@ +{{include file="field_input.tpl" field=$fromapp}} +{{include file="field_checkbox.tpl" field=$force}} \ No newline at end of file diff --git a/geonames/geonames.css b/geonames/geonames.css deleted file mode 100644 index 0c67e7fca..000000000 --- a/geonames/geonames.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#geonames-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#geonames-checkbox { - float: left; -} - - diff --git a/geonames/geonames.php b/geonames/geonames.php index 5fdf65ef5..a595a0f0b 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -113,32 +113,32 @@ function geonames_addon_settings_post(App $a, array $post) * Called from the Addon Setting form. * Add our own settings info to the page. * - * @param App $a - * @param string $s + * @param App $a + * @param array $data * @throws Exception */ -function geonames_addon_settings(App $a, &$s) +function geonames_addon_settings(App $a, array &$data) { if (!local_user()) { return; } $geo_account = DI::config()->get('geonames', 'username'); - if (!$geo_account) { return; } - DI::page()->registerStylesheet(__DIR__ . '/geonames.css'); - - /* Get the current state of our config variable */ $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable')); - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Geonames Settings'), - '$description' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/'); + $html = Renderer::replaceMacros($t, [ + '$info' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'), '$enable' => ['geonames-enable', DI::l10n()->t('Enable Geonames Addon'), $enabled], - '$submit' => DI::l10n()->t('Save Settings') ]); + + $data = [ + 'addon' => 'geonames', + 'title' => DI::l10n()->t('Geonames Settings'), + 'html' => $html, + ]; } diff --git a/geonames/templates/settings.tpl b/geonames/templates/settings.tpl index 05897b6ac..796a544c7 100644 --- a/geonames/templates/settings.tpl +++ b/geonames/templates/settings.tpl @@ -1,14 +1,2 @@ - -

{{$title}}

- - -
\ No newline at end of file +

{{$info}}

+{{include file="field_checkbox.tpl" field=$enable}} diff --git a/gnot/gnot.css b/gnot/gnot.css deleted file mode 100644 index ccafdafb3..000000000 --- a/gnot/gnot.css +++ /dev/null @@ -1,16 +0,0 @@ - -#gnot-desc { - margin-bottom: 10px; -} - -#gnot-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#gnot { - float: left; -} - - diff --git a/gnot/gnot.php b/gnot/gnot.php index 8b37fb1cc..7acf8465f 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -8,6 +8,7 @@ * */ +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; @@ -49,31 +50,25 @@ function gnot_settings_post($a,$post) { -function gnot_settings(&$a,&$s) { - - if(! local_user()) +function gnot_settings(App &$a, array &$data) +{ + if (!local_user()) { return; + } - /* Add our stylesheet to the page so we can make our settings look nice */ + $gnot = intval(DI::pConfig()->get(local_user(), 'gnot', 'enable')); - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ - - $gnot = intval(DI::pConfig()->get(local_user(),'gnot','enable')); - - $gnot_checked = (($gnot) ? ' checked="checked" ' : '' ); - - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/'); - /* Add some HTML to the existing form */ - - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Gnot Settings') , - '$submit' => DI::l10n()->t('Save Settings'), - '$enable' => DI::l10n()->t('Enable this addon?'), - '$enabled' => $gnot_checked, - '$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/'); + $html = Renderer::replaceMacros($t, [ + '$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line."), + '$enabled' => ['gnot', DI::l10n()->t('Enable this addon?'), $gnot], ]); + + $data = [ + 'addon' => 'gnot', + 'title' => DI::l10n()->t('Gnot Settings'), + 'html' => $html, + ]; } diff --git a/gnot/templates/settings.tpl b/gnot/templates/settings.tpl index 1323eb4df..b153c6238 100644 --- a/gnot/templates/settings.tpl +++ b/gnot/templates/settings.tpl @@ -1,20 +1,2 @@ - -

{{$title}}

- - +

{{$text}}

+{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/group_text/group_text.css b/group_text/group_text.css deleted file mode 100644 index 4122b67ea..000000000 --- a/group_text/group_text.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#group_text-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#group_text-checkbox { - float: left; -} - - diff --git a/group_text/group_text.php b/group_text/group_text.php index aa6445888..cb2c5eee4 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -5,8 +5,11 @@ * Version: 1.0 * Author: Thomas Willingham */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function group_text_install() { @@ -42,31 +45,22 @@ function group_text_settings_post($a,$post) { -function group_text_settings(&$a,&$s) { - - if(! local_user()) +function group_text_settings(App &$a, array &$data) +{ + if (!local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ + } $enabled = DI::pConfig()->get(local_user(),'system','groupedit_image_limit'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - /* Add some HTML to the existing form */ - - $s .= '
'; - $s .= '

' . DI::l10n()->t('Group Text') . '

'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/group_text/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['group_text', DI::l10n()->t('Use a text only (non-image) group selector in the "group edit" menu'), $enabled], + ]); + $data = [ + 'addon' => 'group_text', + 'title' => DI::l10n()->t('Group Text'), + 'html' => $html, + ]; } diff --git a/group_text/templates/settings.tpl b/group_text/templates/settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/group_text/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/irc/irc.php b/irc/irc.php index b441cebf3..75dc89c0a 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -7,6 +7,7 @@ * Author: Tobias Diekershoff */ +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\DI; @@ -17,30 +18,27 @@ function irc_install() { Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post'); } -function irc_addon_settings(&$a,&$s) { - if(! local_user()) +function irc_addon_settings(App &$a, array &$data) +{ + if (!local_user()) { return; + } - /* Add our stylesheet to the page so we can make our settings look nice */ + $sitechats = DI::pConfig()->get(local_user(), 'irc', 'sitechats'); /* popular channels */ + $autochans = DI::pConfig()->get(local_user(), 'irc', 'autochans'); /* auto connect chans */ -// DI::page()['htmlhead'] .= '' . "\r\n"; - - /* setting popular channels, auto connect channels */ - $sitechats = DI::pConfig()->get( local_user(), 'irc','sitechats'); /* popular channels */ - $autochans = DI::pConfig()->get( local_user(), 'irc','autochans'); /* auto connect chans */ - - $t = Renderer::getMarkupTemplate( "settings.tpl", "addon/irc/" ); - $s .= Renderer::replaceMacros($t, [ - '$header' => DI::l10n()->t('IRC Settings'), - '$info' => DI::l10n()->t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'), - '$submit' => DI::l10n()->t('Save Settings'), - '$autochans' => [ 'autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')], - '$sitechats' => [ 'sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ] + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/irc/'); + $html = Renderer::replaceMacros($t, [ + '$info' => DI::l10n()->t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'), + '$autochans' => ['autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')], + '$sitechats' => ['sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.')], ]); - - return; - + $data = [ + 'addon' => 'irc', + 'title' => DI::l10n()->t('IRC Settings'), + 'html' => $html, + ]; } function irc_addon_settings_post(&$a, &$b) { diff --git a/irc/templates/settings.tpl b/irc/templates/settings.tpl index e463a59c4..215b8f3f2 100644 --- a/irc/templates/settings.tpl +++ b/irc/templates/settings.tpl @@ -1,15 +1,3 @@ - -

{{$header}}

- - +

{{$info}}

+{{include file="field_input.tpl" field=$autochans}} +{{include file="field_input.tpl" field=$sitechats}} diff --git a/krynn/krynn.css b/krynn/krynn.css deleted file mode 100644 index 466a3ecd1..000000000 --- a/krynn/krynn.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#krynn-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#krynn-checkbox { - float: left; -} - - diff --git a/krynn/krynn.php b/krynn/krynn.php index 66cdf5735..3cb7206d6 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -9,8 +9,11 @@ * *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function krynn_install() { @@ -111,42 +114,24 @@ function krynn_settings_post($a,$post) { -function krynn_settings(&$a,&$s) { - - if(! local_user()) +function krynn_settings(App &$a, array &$data) +{ + if(! local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ + } $enabled = DI::pConfig()->get(local_user(),'krynn','enable'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

' . DI::l10n()->t('Krynn') . '

'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/krynn/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['krynn', DI::l10n()->t('Enable Krynn Addon'), $enabled], + ]); + $data = [ + 'addon' => 'krynn', + 'title' => DI::l10n()->t('Krynn Settings'), + 'html' => $html, + ]; } diff --git a/krynn/templates/settings.tpl b/krynn/templates/settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/krynn/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index aeb53eebd..c75a07b50 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -31,7 +31,7 @@ function langfilter_install() * 3rd parse a SMARTY3 template, replacing some translateable strings for the form */ -function langfilter_addon_settings(App $a, &$s) +function langfilter_addon_settings(App $a, array &$data) { if (!local_user()) { return; @@ -40,23 +40,25 @@ function langfilter_addon_settings(App $a, &$s) $enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable', !DI::pConfig()->get(local_user(), 'langfilter', 'disable')); - $enable_checked = $enabled ? ' checked="checked"' : ''; - $languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); - $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100; - $minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength' , 32); + $languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); + $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100; + $minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32); - $t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/"); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t("Language Filter"), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/langfilter/'); + $html = Renderer::replaceMacros($t, [ '$intro' => DI::l10n()->t('This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'), - '$enabled' => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enable_checked, ''], + '$enabled' => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enabled], '$languages' => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')], '$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')], '$minlength' => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')], - '$submit' => DI::l10n()->t('Save Settings'), ]); - return; + $data = [ + 'addon' => 'langfilter', + 'title' => DI::l10n()->t('Language Filter'), + 'html' => $html, + 'submit' => ['langfilter-settings-submit' => DI::l10n()->t('Save Settings')], + ]; } /* Save the settings diff --git a/langfilter/templates/settings.tpl b/langfilter/templates/settings.tpl index d2de7fce2..1197e9f2b 100644 --- a/langfilter/templates/settings.tpl +++ b/langfilter/templates/settings.tpl @@ -1,19 +1,5 @@ - -

{{$title}}

- - +

{{$intro}}

+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$languages}} +{{include file="field/range_percent.tpl" field=$minconfidence}} +{{include file="field_input.tpl" field=$minlength}} diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 7e3f87f8c..33959e1e5 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -6,6 +6,7 @@ * Author: Matthew Exon */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; @@ -462,51 +463,58 @@ function mailstream_convert_table_entries() /** * Form for configuring mailstream features for a user * - * @param Friendica\App $a App object - * @param string $o HTML form data + * @param App $a App object + * @param array $data Hook data array + * @throws \Friendica\Network\HTTPException\ServiceUnavailableException */ -function mailstream_addon_settings(&$a, &$s) +function mailstream_addon_settings(App &$a, array &$data) { - $enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled'); - $address = DI::pConfig()->get(local_user(), 'mailstream', 'address'); - $nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes'); - $attachimg= DI::pConfig()->get(local_user(), 'mailstream', 'attachimg'); - $template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/'); - $s .= Renderer::replaceMacros($template, [ - '$enabled' => [ + $enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled'); + $address = DI::pConfig()->get(local_user(), 'mailstream', 'address'); + $nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes'); + $attachimg = DI::pConfig()->get(local_user(), 'mailstream', 'attachimg'); + + $template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/'); + $html = Renderer::replaceMacros($template, [ + '$enabled' => [ 'mailstream_enabled', DI::l10n()->t('Enabled'), $enabled ], - '$address' => [ + '$address' => [ 'mailstream_address', DI::l10n()->t('Email Address'), $address, - DI::l10n()->t("Leave blank to use your account email address") + DI::l10n()->t('Leave blank to use your account email address') ], - '$nolikes' => [ + '$nolikes' => [ 'mailstream_nolikes', DI::l10n()->t('Exclude Likes'), $nolikes, - DI::l10n()->t("Check this to omit mailing \"Like\" notifications") + DI::l10n()->t('Check this to omit mailing "Like" notifications') ], '$attachimg' => [ 'mailstream_attachimg', DI::l10n()->t('Attach Images'), $attachimg, - DI::l10n()->t("Download images in posts and attach them to the email. " . - "Useful for reading email while offline.") + DI::l10n()->t('Download images in posts and attach them to the email. ' . + 'Useful for reading email while offline.') ], - '$title' => DI::l10n()->t('Mail Stream Settings'), - '$submit' => DI::l10n()->t('Save Settings')]); + ]); + + $data = [ + 'addon' => 'mailstream', + 'title' => DI::l10n()->t('Mail Stream Settings'), + 'html' => $html, + ]; } /** * Process data submitted to user's mailstream features form - * @param \Friendica\App $a + * @param App $a * @param array $post POST data */ -function mailstream_addon_settings_post(\Friendica\App $a, array $post) +function mailstream_addon_settings_post(App $a, array $post) { if (!local_user() || empty($post['mailstream-submit'])) { return; diff --git a/mailstream/templates/settings.tpl b/mailstream/templates/settings.tpl index aa02b2744..6e5d17297 100644 --- a/mailstream/templates/settings.tpl +++ b/mailstream/templates/settings.tpl @@ -1,13 +1,4 @@ - -

{{$title}}

- - +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$address}} +{{include file="field_checkbox.tpl" field=$nolikes}} +{{include file="field_checkbox.tpl" field=$attachimg}} diff --git a/markdown/markdown.php b/markdown/markdown.php index fe533147a..283d8ee20 100644 --- a/markdown/markdown.php +++ b/markdown/markdown.php @@ -17,7 +17,7 @@ function markdown_install() { Hook::register('addon_settings_post', __FILE__, 'markdown_addon_settings_post'); } -function markdown_addon_settings(App $a, &$s) +function markdown_addon_settings(App $a, array &$data) { if (!local_user()) { return; @@ -25,12 +25,16 @@ function markdown_addon_settings(App $a, &$s) $enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled')); - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Markdown'), - '$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, self created items will additionally be parsed via Markdown.')], - '$submit' => DI::l10n()->t('Save Settings'), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')], ]); + + $data = [ + 'addon' => 'markdown', + 'title' => DI::l10n()->t('Markdown Settings'), + 'html' => $html, + ]; } function markdown_addon_settings_post(App $a, &$b) diff --git a/markdown/templates/settings.tpl b/markdown/templates/settings.tpl index 3d0135150..2f3f4ce7d 100644 --- a/markdown/templates/settings.tpl +++ b/markdown/templates/settings.tpl @@ -1,15 +1 @@ - -

{{$title}}

- - +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 9734457d6..43b9d8612 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -29,7 +29,7 @@ function mathjax_settings_post($a) DI::pConfig()->set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use'])); } -function mathjax_settings(App $a, &$s) +function mathjax_settings(App $a, array &$data) { if (!local_user()) { return; @@ -38,12 +38,16 @@ function mathjax_settings(App $a, &$s) $use = DI::pConfig()->get(local_user(), 'mathjax', 'use', false); $tpl = Renderer::getMarkupTemplate('settings.tpl', 'addon/mathjax'); - $s .= Renderer::replaceMacros($tpl, [ - '$title' => 'MathJax', + $html = Renderer::replaceMacros($tpl, [ '$description' => DI::l10n()->t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'), '$mathjax_use' => ['mathjax_use', DI::l10n()->t('Use the MathJax renderer'), $use, ''], - '$savesettings' => DI::l10n()->t('Save Settings'), ]); + + $data = [ + 'addon' => 'mathjax', + 'title' => 'MathJax', + 'html' => $html, + ]; } function mathjax_footer(App $a, &$b) diff --git a/mathjax/templates/settings.tpl b/mathjax/templates/settings.tpl index e26e5a2b9..0966595f6 100644 --- a/mathjax/templates/settings.tpl +++ b/mathjax/templates/settings.tpl @@ -1,16 +1,2 @@ - - -

{{$title}}

- - \ No newline at end of file +

{{$description}}

+{{include file="field_checkbox.tpl" field=$mathjax_use}} diff --git a/notimeline/templates/settings.tpl b/notimeline/templates/settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/notimeline/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/nsfw/nsfw.css b/nsfw/nsfw.css deleted file mode 100644 index a8c1bfe8a..000000000 --- a/nsfw/nsfw.css +++ /dev/null @@ -1,19 +0,0 @@ - -#nsfw-label, #nsfw-enable-label { - float: left; - width: 300px; - margin-top: 10px; -} - -#nsfw-words, #nsfw-enable { - float: left; - margin-top: 10px; -} - -#nsfw-submit { - margin-top: 15px; -} - -.nsfw-desc { - margin-top: 10px; -} \ No newline at end of file diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 1cbcf7c8e..67b4c188b 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -7,7 +7,10 @@ * Author: Mike Macgirvin * */ + +use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; function nsfw_install() @@ -48,41 +51,27 @@ function nsfw_extract_photos($body) return $new_body; } -function nsfw_addon_settings(&$a, &$s) +function nsfw_addon_settings(App &$a, array &$data) { if (!local_user()) { return; } - DI::page()->registerStylesheet(__DIR__ . '/nsfw.css', 'all'); + $enabled = !DI::pConfig()->get(local_user(), 'nsfw', 'disable'); + $words = DI::pConfig()->get(local_user(), 'nsfw', 'words', 'nsfw,'); + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/nsfw/'); + $html = Renderer::replaceMacros($t, [ + '$info' => DI::l10n()->t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'), + '$enabled' => ['nsfw-enable', DI::l10n()->t('Enable Content filter'), $enabled], + '$words' => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions')], + ]); - $enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); - $words = DI::pConfig()->get(local_user(), 'nsfw', 'words'); - if (!$words) { - $words = 'nsfw,'; - } - - $s .= ''; - $s .= '

' . DI::l10n()->t('Content Filter (NSFW and more)') . '

'; - $s .= ''; - $s .= ''; - return; + $data = [ + 'addon' => 'nsfw', + 'title' => DI::l10n()->t('Content Filter (NSFW and more)'), + 'html' => $html, + ]; } function nsfw_addon_settings_post(&$a, &$b) @@ -99,7 +88,7 @@ function nsfw_addon_settings_post(&$a, &$b) } } -function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) +function nsfw_prepare_body_content_filter(App $a, &$hook_data) { $words = null; if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) { diff --git a/nsfw/templates/settings.tpl b/nsfw/templates/settings.tpl new file mode 100644 index 000000000..1e3a2cbeb --- /dev/null +++ b/nsfw/templates/settings.tpl @@ -0,0 +1,3 @@ +

{{$info}}

+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_textarea.tpl" field=$words}} diff --git a/numfriends/numfriends.css b/numfriends/numfriends.css deleted file mode 100644 index c92ef8dce..000000000 --- a/numfriends/numfriends.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#numfriends-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#numfriends { - float: left; -} - - diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 7644c62d9..5bea844cf 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -5,8 +5,11 @@ * Version: 1.0 * Author: Mike Macgirvin */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function numfriends_install() { @@ -39,30 +42,22 @@ function numfriends_settings_post($a,$post) { * Add our own settings info to the page. * */ -function numfriends_settings(&$a, &$s) +function numfriends_settings(App &$a, array &$data) { if (! local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ - $numfriends = DI::pConfig()->get(local_user(), 'system', 'display_friend_count', 24); - /* Add some HTML to the existing form */ + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/'); + $html = Renderer::replaceMacros($t, [ + '$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends], + ]); - $s .= '
'; - $s .= '

' . DI::l10n()->t('Numfriends Settings') . '

'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; + $data = [ + 'addon' => 'numfriends', + 'title' => DI::l10n()->t('Numfriends Settings'), + 'html' => $html, + ]; } diff --git a/numfriends/templates/settings.tpl b/numfriends/templates/settings.tpl new file mode 100644 index 000000000..c8221bb4c --- /dev/null +++ b/numfriends/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_input.tpl" field=$numfriends}} diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php index 238185ed3..c92b59600 100644 --- a/opmlexport/opmlexport.php +++ b/opmlexport/opmlexport.php @@ -68,17 +68,17 @@ function opmlexport(App $a) } -function opmlexport_addon_settings(App $a, &$s) +function opmlexport_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/opmlexport/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('OPML Export'), - '$submit' => DI::l10n()->t('Export RSS/Atom contacts'), - ]); + $data = [ + 'addon' => 'opmlexport', + 'title' => DI::l10n()->t('OPML Export'), + 'submit' => DI::l10n()->t('Export RSS/Atom contacts'), + ]; } diff --git a/opmlexport/templates/settings.tpl b/opmlexport/templates/settings.tpl deleted file mode 100644 index 9f26c512e..000000000 --- a/opmlexport/templates/settings.tpl +++ /dev/null @@ -1,12 +0,0 @@ - -

{{$title}}

- - diff --git a/planets/planets.css b/planets/planets.css deleted file mode 100644 index 668b65bcf..000000000 --- a/planets/planets.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#planets-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#planets-checkbox { - float: left; -} - - diff --git a/planets/planets.php b/planets/planets.php index 14ae0b3c3..ef88db13a 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -6,8 +6,11 @@ * Author: Mike Macgirvin * Author: Tony Baldwin */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function planets_install() { @@ -110,40 +113,22 @@ function planets_settings_post($a,$post) { -function planets_settings(&$a,&$s) { - - if(! local_user()) +function planets_settings(App &$a, array &$data) +{ + if(! local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ + } $enabled = DI::pConfig()->get(local_user(),'planets','enable'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

' . DI::l10n()->t('Planets') . '

'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/planets/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['planets', DI::l10n()->t('Enable Planets Addon'), $enabled], + ]); + $data = [ + 'addon' => 'planets', + 'title' => DI::l10n()->t('Planets Settings'), + 'html' => $html, + ]; } diff --git a/planets/templates/settings.tpl b/planets/templates/settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/planets/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index f662aeccc..aec4e9bfd 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -17,7 +17,10 @@ * them to open the comment window fully and insert the qcomment. Then "Submit" will submit it. * */ + +use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\XML; @@ -28,27 +31,30 @@ function qcomment_install() Hook::register('footer' , __FILE__, 'qcomment_footer'); } -function qcomment_footer(\Friendica\App $a, &$b) +function qcomment_footer(App $a, &$b) { DI::page()->registerFooterScript('addon/qcomment/qcomment.js'); } -function qcomment_addon_settings(&$a, &$s) +function qcomment_addon_settings(App &$a, array &$data) { - if (! local_user()) { + if (!local_user()) { return; } - $words = DI::pConfig()->get(local_user(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol')); + $words = DI::pConfig()->get(local_user(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol')); - $t = \Friendica\Core\Renderer::getMarkupTemplate('settings.tpl', 'addon/qcomment/'); - $s .= \Friendica\Core\Renderer::replaceMacros($t, [ - '$postpost' => isset($_POST['qcomment-words']), - '$header' => DI::l10n()->t('Quick Comment Settings'), - '$description' => DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."), - '$save' => DI::l10n()->t('Save Settings'), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/qcomment/'); + $html = Renderer::replaceMacros($t, [ + '$description' => DI::l10n()->t('Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'), '$words' => ['qcomment-words', DI::l10n()->t('Enter quick comments, one per line'), $words, null, ' rows="10"'], ]); + + $data = [ + 'addon' => 'qcomment', + 'title' => DI::l10n()->t('Quick Comment Settings'), + 'html' => $html, + ]; } function qcomment_addon_settings_post(&$a, &$b) diff --git a/qcomment/templates/settings.tpl b/qcomment/templates/settings.tpl index 31ccea86d..a9bf0d2e4 100644 --- a/qcomment/templates/settings.tpl +++ b/qcomment/templates/settings.tpl @@ -1,21 +1,2 @@ - -

{{$header}}

- -
- -

{{$header}}

- - -
-

{{$description}}

- - {{include file="field_textarea.tpl" field=$words}} - -
- -
-
-
+

{{$description}}

+{{include file="field_textarea.tpl" field=$words}} diff --git a/randplace/randplace.css b/randplace/randplace.css deleted file mode 100644 index bd7af6d74..000000000 --- a/randplace/randplace.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#randplace-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#randplace-checkbox { - float: left; -} - - diff --git a/randplace/randplace.php b/randplace/randplace.php index d831bfe3b..69ad4d52d 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -18,8 +18,11 @@ * system will call the name_uninstall() function. * */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function randplace_install() { @@ -145,32 +148,22 @@ function randplace_settings_post($a,$post) { -function randplace_settings(&$a,&$s) { - - if(! local_user()) +function randplace_settings(App &$a, array &$data) +{ + if(! local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ + } $enabled = DI::pConfig()->get(local_user(),'randplace','enable'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= '
'; - $s .= '

' . DI::l10n()->t('Randplace Settings') . '

'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/randplace/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['randplace', DI::l10n()->t('Enable Randplace Addon'), $enabled], + ]); + $data = [ + 'addon' => 'randplace', + 'title' => DI::l10n()->t('Randplace Settings'), + 'html' => $html, + ]; } diff --git a/randplace/templates/settings.tpl b/randplace/templates/settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/randplace/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/securemail/securemail.php b/securemail/securemail.php index 9ab596ab1..62673eb19 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -36,24 +36,30 @@ function securemail_install() * * @see App */ -function securemail_settings(App &$a, &$s) +function securemail_settings(App &$a, array &$data) { if (!local_user()) { return; } - $enable = intval(DI::pConfig()->get(local_user(), 'securemail', 'enable')); + $enabled = intval(DI::pConfig()->get(local_user(), 'securemail', 'enable')); $publickey = DI::pConfig()->get(local_user(), 'securemail', 'pkey'); - $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/'); - - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('"Secure Mail" Settings'), - '$submit' => DI::l10n()->t('Save Settings'), - '$test' => DI::l10n()->t('Save and send test'), //NOTE: update also in 'post' - '$enable' => ['securemail-enable', DI::l10n()->t('Enable Secure Mail'), $enable, ''], + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/securemail/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['securemail-enable', DI::l10n()->t('Enable Secure Mail'), $enabled], '$publickey' => ['securemail-pkey', DI::l10n()->t('Public key'), $publickey, DI::l10n()->t('Your public PGP key, ascii armored format')] ]); + + $data = [ + 'addon' => 'securemail', + 'title' => DI::l10n()->t('"Secure Mail" Settings'), + 'html' => $html, + 'submit' => [ + 'securemail-submit' => DI::l10n()->t('Save Settings'), + 'securemail-test' => DI::l10n()->t('Save and send test'), + ], + ]; } /** @@ -72,13 +78,12 @@ function securemail_settings_post(App &$a, array &$b) return; } - if ($_POST['securemail-submit']) { + if (!empty($_POST['securemail-submit']) || !empty($_POST['securemail-test'])) { DI::pConfig()->set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); $enable = (!empty($_POST['securemail-enable']) ? 1 : 0); DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); - if ($_POST['securemail-submit'] == 'test') { - + if (!empty($_POST['securemail-test'])) { $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl())); // revert to saved value diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl deleted file mode 100644 index ec35e3328..000000000 --- a/securemail/templates/admin.tpl +++ /dev/null @@ -1,16 +0,0 @@ - -

{{$title}}

- - diff --git a/securemail/templates/settings.tpl b/securemail/templates/settings.tpl new file mode 100644 index 000000000..110a3a7db --- /dev/null +++ b/securemail/templates/settings.tpl @@ -0,0 +1,2 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_textarea.tpl" field=$publickey}} diff --git a/showmore/showmore.php b/showmore/showmore.php index 574be70fa..945277aeb 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -7,7 +7,10 @@ * based upon NSFW from Mike Macgirvin * */ + +use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\Strings; @@ -18,7 +21,7 @@ function showmore_install() Hook::register('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); } -function showmore_addon_settings(&$a, &$s) +function showmore_addon_settings(App &$a, array &$data) { if (!local_user()) { return; @@ -26,31 +29,20 @@ function showmore_addon_settings(&$a, &$s) DI::page()->registerStylesheet(__DIR__ . '/showmore.css', 'all'); - $enable_checked = (intval(DI::pConfig()->get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"'); - $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100); + $enabled = !DI::pConfig()->get(local_user(), 'showmore', 'disable'); + $chars = DI::pConfig()->get(local_user(), 'showmore', 'chars', 1100); - $s .= ''; - $s .= '

' . DI::l10n()->t('"Show more" Settings').'

'; - $s .= ''; - $s .= ''; - - return; + $data = [ + 'addon' => 'showmore', + 'title' => DI::l10n()->t('"Show more" Settings'), + 'html' => $html, + ]; } function showmore_addon_settings_post(&$a, &$b) @@ -101,7 +93,7 @@ function get_body_length($body) return strlen($string); } -function showmore_prepare_body(\Friendica\App $a, &$hook_data) +function showmore_prepare_body(App $a, &$hook_data) { // No combination with content filters if (!empty($hook_data['filter_reasons'])) { diff --git a/showmore/templates/settings.tpl b/showmore/templates/settings.tpl new file mode 100644 index 000000000..b1887d629 --- /dev/null +++ b/showmore/templates/settings.tpl @@ -0,0 +1,3 @@ +

{{$info}}

+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$chars}} diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php index bf8f5608d..39dfa489b 100644 --- a/showmore_dyn/showmore_dyn.php +++ b/showmore_dyn/showmore_dyn.php @@ -45,7 +45,7 @@ function showmore_dyn_settings_post() } } -function showmore_dyn_settings(App &$a, &$o) +function showmore_dyn_settings(App &$a, array &$data) { if(!local_user()) { return; @@ -55,12 +55,15 @@ function showmore_dyn_settings(App &$a, &$o) DI::pConfig()->set(local_user(), 'showmore_dyn', 'limitHeight', $limitHeight); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/showmore_dyn/'); - $o .= Renderer::replaceMacros($t, [ - '$submit' => DI::l10n()->t('Save Settings'), - '$header' => DI::l10n()->t('Show More Dynamic'), + $html = Renderer::replaceMacros($t, [ '$limitHeight' => ['limitHeight', DI::l10n()->t('Limit Height'), $limitHeight, DI::l10n()->t('The maximal pixel height of posts before the Show More link is added, 0 to disable'), '', '', 'number'], ]); + $data = [ + 'addon' => 'showmore_dyn', + 'title' => DI::l10n()->t('Show More Dynamic'), + 'html' => $html, + ]; } function showmore_dyn_script() diff --git a/showmore_dyn/templates/settings.tpl b/showmore_dyn/templates/settings.tpl index ac37e937d..a6a283ad9 100644 --- a/showmore_dyn/templates/settings.tpl +++ b/showmore_dyn/templates/settings.tpl @@ -1,13 +1 @@ - -

{{$header}}

- - +{{include file="field_input.tpl" field=$limitHeight}} diff --git a/startpage/startpage.css b/startpage/startpage.css deleted file mode 100644 index e78be7ec5..000000000 --- a/startpage/startpage.css +++ /dev/null @@ -1,16 +0,0 @@ - - - -#startpage-page-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#startpage-page { - float: left; -} - -#startpage-desc { - margin-bottom: 10px; -} diff --git a/startpage/startpage.php b/startpage/startpage.php index 8cdf444f1..d72effde2 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -6,7 +6,10 @@ * Author: Mike Macgirvin * */ + +use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; function startpage_install() { @@ -54,36 +57,22 @@ function startpage_settings_post($a, $post) * Add our own settings info to the page. * */ -function startpage_settings(&$a, &$s) +function startpage_settings(App &$a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ + $startpage = DI::pConfig()->get(local_user(), 'startpage', 'startpage'); - DI::page()['htmlhead'] .= '' . "\r\n"; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/startpage/'); + $html = Renderer::replaceMacros($t, [ + '$startpage' => ['startpage', DI::l10n()->t('Home page to load after login - leave blank for profile wall'), $startpage, DI::l10n()->t('Examples: "network" or "notifications/system"')], + ]); - /* Get the current state of our config variable */ - - $page = DI::pConfig()->get(local_user(), 'startpage', 'startpage'); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

' . DI::l10n()->t('Startpage') . '

'; - $s .= ''; - $s .= ''; + $data = [ + 'addon' => 'startpage', + 'title' => DI::l10n()->t('Startpage'), + 'html' => $html, + ]; } diff --git a/startpage/templates/settings.tpl b/startpage/templates/settings.tpl new file mode 100644 index 000000000..7078a83a5 --- /dev/null +++ b/startpage/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_input.tpl" field=$startpage}} diff --git a/superblock/superblock.css b/superblock/superblock.css deleted file mode 100644 index 368355bdf..000000000 --- a/superblock/superblock.css +++ /dev/null @@ -1,18 +0,0 @@ - -#superblock-label { - float: left; - width: 300px; - margin-top: 10px; -} - -#superblock-words { - float: left; - margin-top: 10px; - width: 400px; - height: 150px; -} - -#superblock-submit { - margin-top: 15px; -} - diff --git a/superblock/superblock.php b/superblock/superblock.php index d31860874..5c5cfcc3c 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -6,7 +6,10 @@ * Author: Mike Macgirvin * */ + +use Friendica\App; use Friendica\Core\Hook; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\Strings; @@ -19,35 +22,24 @@ function superblock_install() Hook::register('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); } -function superblock_addon_settings(&$a, &$s) +function superblock_addon_settings(App &$a, array &$data) { if (!local_user()) { return; } - DI::page()->registerStylesheet(__DIR__ . '/superblock.css', 'all'); + $blocked = DI::pConfig()->get(local_user(), 'system', 'blocked', ''); + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/superblock/'); + $html = Renderer::replaceMacros($t, [ + '$urls' => ['superblock-words', DI::l10n()->t('Comma separated profile URLs to block'), $blocked], + ]); - $words = DI::pConfig()->get(local_user(), 'system', 'blocked'); - if (!$words) { - $words = ''; - } - - $s .= ''; - $s .= '

' . DI::l10n()->t('Superblock') . '

'; - $s .= ''; - $s .= ''; - - return; + $data = [ + 'addon' => 'superblock', + 'title' => DI::l10n()->t('Superblock'), + 'html' => $html, + ]; } function superblock_addon_settings_post(&$a, &$b) diff --git a/superblock/templates/settings.tpl b/superblock/templates/settings.tpl new file mode 100644 index 000000000..113588e35 --- /dev/null +++ b/superblock/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_textarea.tpl" field=$urls}} diff --git a/windowsphonepush/templates/settings.tpl b/windowsphonepush/templates/settings.tpl new file mode 100644 index 000000000..9198225c2 --- /dev/null +++ b/windowsphonepush/templates/settings.tpl @@ -0,0 +1,3 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_checkbox.tpl" field=$senditemtext}} +{{include file="field_input.tpl" field=$device_url}} diff --git a/windowsphonepush/windowsphonepush.css b/windowsphonepush/windowsphonepush.css deleted file mode 100644 index 95ba6d2c5..000000000 --- a/windowsphonepush/windowsphonepush.css +++ /dev/null @@ -1,36 +0,0 @@ -#windowsphonepush-device_url-wrapper { - margin-top: 25px; -} - - -#windowsphonepush-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#windowsphonepush-enable-chk { - float: left; -} - -#windowsphonepush-device_url-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#windowsphonepush-device_url-text { - float: left; - background-color: #C0C0C0; - width: 500px; -} - -#windowsphonepush-senditemtext-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#windowsphonepush-senditemtext-chk { - float: left; -} diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index d2529eea8..8f289d124 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -31,6 +31,7 @@ use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; @@ -86,48 +87,28 @@ function windowsphonepush_settings_post($a, $post) /* Called from the Addon Setting form. * Add our own settings info to the page. */ -function windowsphonepush_settings(&$a, &$s) +function windowsphonepush_settings(App &$a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ $enabled = DI::pConfig()->get(local_user(), 'windowsphonepush', 'enable'); - $checked_enabled = (($enabled) ? ' checked="checked" ' : ''); - $senditemtext = DI::pConfig()->get(local_user(), 'windowsphonepush', 'senditemtext'); - $checked_senditemtext = (($senditemtext) ? ' checked="checked" ' : ''); - $device_url = DI::pConfig()->get(local_user(), 'windowsphonepush', 'device_url'); - /* Add some HTML to the existing form */ - $s .= '
'; - $s .= '

' . DI::l10n()->t('WindowsPhonePush Settings') . '

'; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/windowsphonepush/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['windowsphonepush', DI::l10n()->t('Enable WindowsPhonePush Addon'), $enabled], + '$senditemtext' => ['windowsphonepush-senditemtext', DI::l10n()->t('Push text of new item'), $senditemtext], + '$device_url' => ['', DI::l10n()->t('Device URL'), $device_url, '', false, ' readonly'], + ]); - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button - enable und senditemtext can be changed by the user */ - $s .= '
'; - - /* provide further read-only information concerning the addon (useful for */ - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - return; + $data = [ + 'addon' => 'windowsphonepush', + 'title' => DI::l10n()->t('WindowsPhonePush Settings'), + 'html' => $html, + ]; } /* Cron function used to regularly check all users on the server with active windowsphonepushaddon and send From 9acfdb409020ee678cfa07dc81a4f731ce5f17e0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Nov 2021 17:10:13 -0500 Subject: [PATCH 3/4] [various] Convert connector_settings hook functions to the new data array format - Add separate template files to several addons - Remove superfluous addon settings CSS files --- diaspora/diaspora.css | 16 -- diaspora/diaspora.php | 59 ++--- diaspora/templates/connector_settings.tpl | 32 +++ diaspora/templates/settings.tpl | 47 ---- discourse/discourse.php | 16 +- discourse/templates/connector_settings.tpl | 1 + discourse/templates/settings.tpl | 15 -- dwpost/dwpost.css | 15 -- dwpost/dwpost.php | 63 ++---- dwpost/templates/connector_settings.tpl | 4 + ifttt/ifttt.php | 59 +++-- ifttt/templates/connector_settings.tpl | 15 ++ ijpost/ijpost.css | 15 -- ijpost/ijpost.php | 67 ++---- ijpost/templates/connector_settings.tpl | 4 + libertree/libertree.css | 16 -- libertree/libertree.php | 78 ++----- libertree/templates/connector_settings.tpl | 4 + ljpost/livejournal.png | Bin 0 -> 3594 bytes ljpost/ljpost.php | 74 +++---- ljpost/templates/connector_settings.tpl | 4 + pumpio/pumpio.css | 16 -- pumpio/pumpio.php | 200 +++++++---------- pumpio/templates/connector_settings.tpl | 13 ++ statusnet/statusnet.css | 59 ----- statusnet/statusnet.php | 241 ++++++++------------- statusnet/templates/connector_settings.tpl | 50 +++++ tumblr/templates/connector_settings.tpl | 10 + tumblr/tumblr.css | 16 -- tumblr/tumblr.php | 103 +++------ twitter/templates/connector_settings.tpl | 23 ++ twitter/twitter.css | 31 --- twitter/twitter.php | 118 +++++----- wppost/templates/connector_settings.tpl | 5 + wppost/wppost.css | 20 -- wppost/wppost.php | 115 +++------- 36 files changed, 612 insertions(+), 1012 deletions(-) delete mode 100644 diaspora/diaspora.css create mode 100644 diaspora/templates/connector_settings.tpl delete mode 100644 diaspora/templates/settings.tpl create mode 100644 discourse/templates/connector_settings.tpl delete mode 100644 discourse/templates/settings.tpl delete mode 100644 dwpost/dwpost.css create mode 100644 dwpost/templates/connector_settings.tpl create mode 100644 ifttt/templates/connector_settings.tpl delete mode 100644 ijpost/ijpost.css create mode 100644 ijpost/templates/connector_settings.tpl delete mode 100644 libertree/libertree.css create mode 100644 libertree/templates/connector_settings.tpl create mode 100644 ljpost/livejournal.png create mode 100644 ljpost/templates/connector_settings.tpl delete mode 100644 pumpio/pumpio.css create mode 100644 pumpio/templates/connector_settings.tpl create mode 100644 statusnet/templates/connector_settings.tpl create mode 100644 tumblr/templates/connector_settings.tpl delete mode 100644 tumblr/tumblr.css create mode 100644 twitter/templates/connector_settings.tpl create mode 100644 wppost/templates/connector_settings.tpl delete mode 100644 wppost/wppost.css diff --git a/diaspora/diaspora.css b/diaspora/diaspora.css deleted file mode 100644 index 21ef9bc51..000000000 --- a/diaspora/diaspora.css +++ /dev/null @@ -1,16 +0,0 @@ - -#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-bydefault-label, #diaspora-aspect-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-bydefault, #diaspora-aspect { - float: left; - margin-top: 10px; -} - -#diaspora-submit { - margin-top: 15px; -} - diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 7b747bef6..82042fc9b 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -48,22 +48,20 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields) } } -function diaspora_settings(App $a, &$s) +function diaspora_settings(App $a, array &$data) { - if (! local_user()) { + if (!local_user()) { return; } - /* Get the current state of our config variables */ + $enabled = DI::pConfig()->get(local_user(), 'diaspora', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default'); - $enabled = DI::pConfig()->get(local_user(),'diaspora','post'); - $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default'); - - $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); + $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); $password = DI::pConfig()->get(local_user(), 'diaspora', 'password'); - $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect'); + $aspect = DI::pConfig()->get(local_user(), 'diaspora', 'aspect'); - $info = ''; + $info = ''; $error = ''; if (Session::get('my_address')) { $info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle %s. ', Session::get('my_address')); @@ -79,37 +77,44 @@ function diaspora_settings(App $a, &$s) if ($rawAspects) { $availableAspects = [ 'all_aspects' => DI::l10n()->t('All aspects'), - 'public' => DI::l10n()->t('Public'), + 'public' => DI::l10n()->t('Public'), ]; foreach ($rawAspects as $rawAspect) { $availableAspects[$rawAspect->id] = $rawAspect->name; } $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects]; - $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle); + $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle); } else { - $info = ''; + $info = ''; $error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."); } } - DI::page()->registerStylesheet(__DIR__ . '/diaspora.css'); + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/diaspora/'); + $html = Renderer::replaceMacros($t, [ + '$l10n' => [ + 'info_header' => DI::l10n()->t('Information'), + 'error_header' => DI::l10n()->t('Error'), + ], - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/'); - $s .= Renderer::replaceMacros($t, [ - '$header' => DI::l10n()->t('Diaspora Export'), - '$info_header' => DI::l10n()->t('Information'), - '$error_header' => DI::l10n()->t('Error'), - '$submit' => DI::l10n()->t('Save Settings'), - '$info' => $info, - '$error' => $error, - '$enabled' => $enabled, - '$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], - '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], - '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')], - '$aspect_select' => $aspect_select, - '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], + '$info' => $info, + '$error' => $error, + + '$enabled' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], + '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], + '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')], + '$aspect_select' => $aspect_select, + '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], ]); + + $data = [ + 'connector' => 'diaspora', + 'title' => DI::l10n()->t('Diaspora Export'), + 'image' => 'images/diaspora-logo.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/diaspora/templates/connector_settings.tpl b/diaspora/templates/connector_settings.tpl new file mode 100644 index 000000000..9f8e270ea --- /dev/null +++ b/diaspora/templates/connector_settings.tpl @@ -0,0 +1,32 @@ +{{if $info}} +
+
+

{{$l10n.info_header}}

+
+

+ {{$info nofilter}} +

+
+{{/if}} +{{if $error}} +
+
+

{{$l10n.error_header}}

+
+

+ {{$error nofilter}} +

+
+{{/if}} + + {{include file="field_checkbox.tpl" field=$enabled}} + +{{if $aspect_select}} + {{include file="field_select.tpl" field=$aspect_select}} + + {{include file="field_checkbox.tpl" field=$post_by_default}} +{{else}} + {{include file="field_input.tpl" field=$handle}} + + {{include file="field_password.tpl" field=$password}} +{{/if}} diff --git a/diaspora/templates/settings.tpl b/diaspora/templates/settings.tpl deleted file mode 100644 index dadebe442..000000000 --- a/diaspora/templates/settings.tpl +++ /dev/null @@ -1,47 +0,0 @@ - - -

{{$header}}

- - \ No newline at end of file diff --git a/discourse/discourse.php b/discourse/discourse.php index 35ec9be52..3d085d92b 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -36,7 +36,7 @@ function discourse_install() Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post'); } -function discourse_settings(App $a, &$s) +function discourse_settings(App $a, array &$data) { if (!local_user()) { return; @@ -44,12 +44,18 @@ function discourse_settings(App $a, &$s) $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled')); - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Discourse'), + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/discourse/'); + $html = Renderer::replaceMacros($t, [ '$enabled' => ['enabled', DI::l10n()->t('Enable processing of Discourse mailing list mails'), $enabled, DI::l10n()->t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')], - '$submit' => DI::l10n()->t('Save Settings'), ]); + + $data = [ + 'connector' => 'discourse', + 'title' => DI::l10n()->t('Discourse'), + 'image' => 'images/discourse.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } function discourse_settings_post(App $a) diff --git a/discourse/templates/connector_settings.tpl b/discourse/templates/connector_settings.tpl new file mode 100644 index 000000000..2f3f4ce7d --- /dev/null +++ b/discourse/templates/connector_settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/discourse/templates/settings.tpl b/discourse/templates/settings.tpl deleted file mode 100644 index d4b0bf8c0..000000000 --- a/discourse/templates/settings.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -

{{$title}}

- - diff --git a/dwpost/dwpost.css b/dwpost/dwpost.css deleted file mode 100644 index 3b0ee32ab..000000000 --- a/dwpost/dwpost.css +++ /dev/null @@ -1,15 +0,0 @@ - -#dwpost-enable-label, #dwpost-username-label, #dwpost-password-label, #dwpost-bydefault-label { -float: left; -width: 200px; -margin-top: 10px; -} - -#dwpost-checkbox, #dwpost-username, #dwpost-password, #dwpost-bydefault { -float: left; -margin-top: 10px; -} - -#dwpost-submit { -margin-top: 15px; -} diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 397dc88f8..286d80127 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -12,7 +12,7 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; -use Friendica\Database\DBA; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Model\Post; use Friendica\Model\Tag; @@ -48,58 +48,31 @@ function dwpost_jot_nets(App $a, array &$jotnets_fields) } -function dwpost_settings(App $a, &$s) +function dwpost_settings(App $a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - + $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post', false); + $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username'); $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/dwpost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['dwpost', DI::l10n()->t('Enable Dreamwidth Post Addon'), $enabled], + '$username' => ['dw_username', DI::l10n()->t('Dreamwidth username'), $dw_username], + '$password' => ['dw_password', DI::l10n()->t('Dreamwidth password')], + '$bydefault' => ['dw_bydefault', DI::l10n()->t('Post to Dreamwidth by default'), $def_enabled], + ]); - $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username'); - $dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password'); - - /* Add some HTML to the existing form */ - $s .= ''; - $s .= '

'. DI::l10n()->t("Dreamwidth Export").'

'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'dwpost', + 'title' => DI::l10n()->t('Dreamwidth Export'), + 'image' => 'images/dreamwidth.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/dwpost/templates/connector_settings.tpl b/dwpost/templates/connector_settings.tpl new file mode 100644 index 000000000..0abcd24eb --- /dev/null +++ b/dwpost/templates/connector_settings.tpl @@ -0,0 +1,4 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_password.tpl" field=$password}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 813ebad55..5962e2ae9 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -11,6 +11,7 @@ use Friendica\Content\PageInfo; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; @@ -33,55 +34,47 @@ function ifttt_content() } -function ifttt_settings(App $a, &$s) +function ifttt_settings(App $a, array &$data) { if (!local_user()) { return; } $key = DI::pConfig()->get(local_user(), 'ifttt', 'key'); - if (!$key) { $key = Strings::getRandomHex(20); DI::pConfig()->set(local_user(), 'ifttt', 'key', $key); } - $s .= ''; - $s .= '

' . DI::l10n()->t('IFTTT Mirror') . '

'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'ifttt', + 'title' => DI::l10n()->t('IFTTT Mirror'), + 'image' => 'addon/ifttt/ifttt.png', + 'html' => $html, + 'submit' => DI::l10n()->t('Generate new key'), + ]; } function ifttt_settings_post() { - if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) { + if (!empty($_POST['ifttt-submit'])) { DI::pConfig()->delete(local_user(), 'ifttt', 'key'); } } diff --git a/ifttt/templates/connector_settings.tpl b/ifttt/templates/connector_settings.tpl new file mode 100644 index 000000000..dfa824c06 --- /dev/null +++ b/ifttt/templates/connector_settings.tpl @@ -0,0 +1,15 @@ +

{{$l10n.intro nofilter}}

+
+
{{$l10n.url}}
+
{{$url}}
+
{{$l10n.method}}
+
POST
+
{{$l10n.content_type}}
+
application/x-www-form-urlencoded
+
{{$l10n.new_status_message_body}}
+
{{$new_status_message_body}}
+
{{$l10n.new_photo_upload_body}}
+
{{$new_photo_upload_body}}
+
{{$l10n.new_link_post_body}}
+
{{$new_link_post_body}}
+
diff --git a/ijpost/ijpost.css b/ijpost/ijpost.css deleted file mode 100644 index 8b4249173..000000000 --- a/ijpost/ijpost.css +++ /dev/null @@ -1,15 +0,0 @@ - -#ijpost-enable-label, #ijpost-username-label, #ijpost-password-label, #ijpost-bydefault-label { -float: left; -width: 200px; -margin-top: 10px; -} - -#ijpost-checkbox, #ijpost-username, #ijpost-password, #ijpost-bydefault { -float: left; -margin-top: 10px; -} - -#ijpost-submit { -margin-top: 15px; -} diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 7ead0fb86..79cd75c89 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -8,9 +8,11 @@ * Author: Cat Gray */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Model\Tag; use Friendica\Model\User; @@ -26,7 +28,7 @@ function ijpost_install() Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } -function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) +function ijpost_jot_nets(App &$a, array &$jotnets_fields) { if (!local_user()) { return; @@ -44,60 +46,31 @@ function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) } } -function ijpost_settings(&$a, &$s) +function ijpost_settings(App &$a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - + $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post', false); + $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username'); $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ijpost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['ijpost', DI::l10n()->t('Enable InsaneJournal Post Addon'), $enabled], + '$username' => ['ij_username', DI::l10n()->t('InsaneJournal username'), $ij_username], + '$password' => ['ij_password', DI::l10n()->t('InsaneJournal password')], + '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to InsaneJournal by default'), $def_enabled], + ]); - $ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username'); - $ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password'); - - /* Add some HTML to the existing form */ - $s .= ''; - $s .= '

'. DI::l10n()->t("InsaneJournal Export").'

'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'ijpost', + 'title' => DI::l10n()->t('InsaneJournal Export'), + 'image' => 'images/insanejournal.gif', + 'enabled' => $enabled, + 'html' => $html, + ]; } function ijpost_settings_post(&$a, &$b) diff --git a/ijpost/templates/connector_settings.tpl b/ijpost/templates/connector_settings.tpl new file mode 100644 index 000000000..0abcd24eb --- /dev/null +++ b/ijpost/templates/connector_settings.tpl @@ -0,0 +1,4 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_password.tpl" field=$password}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/libertree/libertree.css b/libertree/libertree.css deleted file mode 100644 index 1554048ba..000000000 --- a/libertree/libertree.css +++ /dev/null @@ -1,16 +0,0 @@ - -#libertree-enable-label, #libertree-api_token-label, #libertree-url-label, #libertree-bydefault-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#libertree-checkbox, #libertree-api_token, #libertree-url, #libertree-bydefault { - float: left; - margin-top: 10px; -} - -#libertree-submit { - margin-top: 15px; -} - diff --git a/libertree/libertree.php b/libertree/libertree.php index 90910a398..df53aa188 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -10,6 +10,7 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Post; @@ -43,63 +44,32 @@ function libertree_jot_nets(App &$a, array &$jotnets_fields) } -function libertree_settings(&$a,&$s) { +function libertree_settings(App $a, array &$data) +{ + if (!local_user()) { + return; + } - if(! local_user()) - return; + $enabled = DI::pConfig()->get(local_user(), 'libertree', 'post', false); + $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token'); + $ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url'); + $def_enabled = DI::pConfig()->get(local_user(), 'libertree', 'post_by_default'); - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = DI::pConfig()->get(local_user(),'libertree','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $css = (($enabled) ? '' : '-disabled'); - - $def_enabled = DI::pConfig()->get(local_user(),'libertree','post_by_default'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - - $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token'); - $ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url'); - - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

'. DI::l10n()->t('libertree Export').'

'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['libertree', DI::l10n()->t('Enable Libertree Post Addon'), $enabled], + '$ltree_url' => ['libertree_url', DI::l10n()->t('Libertree site URL'), $ltree_url], + '$ltree_api_token' => ['libertree_api_token', DI::l10n()->t('Libertree API token'), $ltree_api_token], + '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to Libertree by default'), $def_enabled], + ]); + $data = [ + 'connector' => 'libertree', + 'title' => DI::l10n()->t('Libertree Export'), + 'image' => 'images/libertree.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/libertree/templates/connector_settings.tpl b/libertree/templates/connector_settings.tpl new file mode 100644 index 000000000..63aa52fc3 --- /dev/null +++ b/libertree/templates/connector_settings.tpl @@ -0,0 +1,4 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$ltree_url}} +{{include file="field_input.tpl" field=$ltree_api_token}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/ljpost/livejournal.png b/ljpost/livejournal.png new file mode 100644 index 0000000000000000000000000000000000000000..ecf004fac8fd10cc67e62995cfbaf878edf34405 GIT binary patch literal 3594 zcmV+l4)yVgP)s$1eD&EWq0TOLskMRuo~Y>GT(Q;IWzapIp?1_XYQG~l>EaB{i_Z5zW{jh z{fy+45ccPdOeweu><^m&H(M2MUhMBX8Onk{fvyB>q7mIh|Qbuo9$y zFE0`iHg>K|Dp}E(GWXG|L?USuZ?HZfSCB2pNc*@1lnS~CN=Vr}CF7L=sMYGNAAY`d z?7<_+#K%gXt?p@0k3TFXtCO=yUWJOeI@?k+Lpi&2GmREwWfq16Rs{ug=>ZU@pOw{q z48lYr?+dW+QcC-wt7)|l(rVR8kO)ly)plr~@zqQKy9hvjc_{!Iji&eR1E-J7Te^d` zGn0|8{adiGGnq8uw<6N6jU8F=@dyV0r>UvgENW{4-HjCz3WaRX=Ghr-TU&ccCE_Ps zj^~68O{qXQ6~;_M(*nkv0e=E~vZ}KDwzA~OqpI?vN`an4AThKs)sq`J<9Ro{Hv)A# zZX0+t_!SzJa{i_0nHrq{R905ScN_efe_mcOi4AB?B7VsxNf{-iqpJfM;@^P;2KFEV z0j+kQsF=fKTWli9%q<}HHs<8}=+L+=36}%+oVf7;M1_Fvf})sOweM2&jC@`F+H2BR zeNaV!T(n)=HC2^kF2{WET%6Sb5FZ~eGPZCmdS`ODth2R2^$Kjh`j~a|YE3zSYCmr8 z$a0Fx==v>jEIlia%H&calSx>9UJ>o&>q2rRMgJ(_{#joE#SD%q>htAhSB>|~! z?pv&Q&h>&Lq(X^25-Sj_b*)gi)5^vGNQv08WJ+kH(9K*t zwYITj-Fy1bR!;UrS*c{3*6pH2g(YNsa9>qGf8Xxzt*p*GmFqV0ORA@D z>;W14JJJQlv;%L+{hxa++IeUvgWso7t9D)5GQEP2a}5lm(x#T%z>dZ{72LHjDGwTS zp+`9di9Lrc>{?z?NyK_0GI2;(B9-WoGPL&`xkw6%%ZN`WchY}gccP8E>XMP3O`;>e zCnBMM?1`G4u5Z}HYuvH}s&b`zA|7)RfRaGhK$i+mCL@k^XKO--rhtm6_enBotQ*VM0Y1#Adid6iJPAf%f9n~ zjvYUk$>q}8I|n_Tm_iQ6B{2tE3)*{dk1K~R+!x|Q7>h6V&Xmnl?>6N3?SsSR*kWfu z)Ix|7qw8JFb}WD9Jvp*J`VXPM7y)gGfUc|;fEL7nQ*p*gL;D$nM-qrS04t$(Qp-ed^|DwT!$(K>&Az zs06TL$aBMtr)v9eqMxrqcK}Ol5CAWQMWr!A$FB^&pPEgC0s*mbupyqkyVg9vcj;H+ zXlX>==;BdlTt&HpARb6@Q7J*Hp&Bu$^P4iM_zZc80%Lis90ElFz+`RTVpQ`$AE9qe zqX6>r3-q&ciZ2YGxT>w9vWm9v(V1AccBnnuEamV?I_T}Lga>r(57EQ4M>J;hJ|Yqc z*xt<{51k#Gdm~@Udl?XLn|O%wRaF#QT-_e30)T!{5r;?NSb>m60cc&xZSTReXFvOL zr@mBQPPz{3NAx7(8UV@)1-*X!3>i0JFq6sZ#zWGHWO6j&G;3jJL1VYfImk51!RBUW zI_FCO@D4=nfq)n_9MG@Cyfqx%bToP5FCQ06y_eq7Q9x(W1n<4Xz z^v&%H@aQYFr|ArUm*_*u2iC3KGYB6m()JBc(!#xMo#*#bu9H?)#>BUC`#SyQWfj%& zP=c-Zi%)`7!{6@I9U#u?qSJYBs7T+UCC`=o;Pa>21k5#%n>!Su{UzG-bq3Jk{YYzj z3!@qHM)(AboD$JSsZz5y2KJ^+EzJJ#dwhygj+~@}2X-UPtu5-rL)vedG-k_wA{GhR z-l&j=PA#nv50XaXq0Nv_C2}+S3J7nV5;g69yLXpbOAJhThB_H5uvsSn?xR*vk<4(3 zm9cD5Y}mVP_Z~cR=JRE{WHJMN+I46@CYDNS46Q^w+(0~xoe+R{kkpBX6F;9P$Bv#u zJXrGc!w<$yn*=llz+>E+mI9F^MOm6}dVSYCHG0kzs~|FofVH#Jr*C;0lii8A zY~{WT`mfM;$mrqSI|u}Viwyz5E)>aAZ~)k*1@IMAw1z#sYQIMt5HM3!S+?=YwvW}? zb}(LcTQv5~FKi6O$$^u?TUDtww9}y8#K_#V=1Y9;yZ!89gnJzq;(Wrzd^T;Io4FeRV8#n)f6Qtzj-bbw zMl&EKYHE>I|1yYjf=xr8eg8QCUK2Ok5Gru|WA-=O zNTQ#L;qSnv#Kr+k`YN!hym0Te9dnts{V6H|1}}N`-QwaBqx)%(lLIG*J1Uhb;^SmU z)=z0g%nU^@bd52qZbt%`H@`Id9J)r;>YKoaqR;O|GV1`qF^|g4 zY=;2-KHhd2zJN-No8Jc83j)$#Bmnu6_wECyPlZM7m8w)~BGIEP;0-f6p-(g7*i2ey z1s3j1quYerUzIewj7AQFEA*O>&@DbTtTztOk>c06oKY7_u`%?*0W zVC(}edVW$`i?%Omps3X9pq$4=%Xh>k+U-7YiscuUR-4_!y(yd2ry2EeG9W*k&tuDD z(`im&6^UFmg?00BvXaZ?In{;+hYPUlYy!ImhTf<(`yW6M|8ND?r@IaS40s#H9;($2 zLnT7rJkm&c@Zf>a!NFk&f_vtVN0Pg3`|ddT_4e;@t zgL5#R3MKl>(Y+sf&eqb+&&=mRT^qXOssq4t{CacjyEXTmSdkN0k#!JI@1Fglf@7p7 zs+qrBz84g;`qp-|2| z5PzY|Pp7UED;KAf%XhPS#jOY~s{Jlprvs{JWTAe@LJR*4fY#WN?x-rut*>nRDC^Gv zs9n@*wYOTsW+Lk_k%&cuo-y7YRXjW`5VL<>7kLc*_j5QzR@-9gRC?|)kO9~Yi-aQ8S@S(J0}*F6h0uOk0{4&d)p{_z0*3j^hGi=kmZ Q */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Model\Post; use Friendica\Model\Tag; @@ -27,7 +29,7 @@ function ljpost_install() { } -function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) +function ljpost_jot_nets(App &$a, array &$jotnets_fields) { if(! local_user()) { return; @@ -46,57 +48,31 @@ function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) } -function ljpost_settings(&$a,&$s) { +function ljpost_settings(App &$a, array &$data) +{ + if (!local_user()) { + return; + } - if(! local_user()) - return; + $enabled = DI::pConfig()->get(local_user(), 'ljpost', 'post', false); + $ij_username = DI::pConfig()->get(local_user(), 'ljpost', 'ij_username'); + $def_enabled = DI::pConfig()->get(local_user(), 'ljpost', 'post_by_default'); - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = DI::pConfig()->get(local_user(),'ljpost','post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - - $def_enabled = DI::pConfig()->get(local_user(),'ljpost','post_by_default'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - - $lj_username = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username'); - $lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password'); - - - /* Add some HTML to the existing form */ - - $s .= '
'; - $s .= '

' . DI::l10n()->t('LiveJournal Post Settings') . '

'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled], + '$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username], + '$password' => ['ij_password', DI::l10n()->t('LiveJournal password')], + '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled], + ]); + $data = [ + 'connector' => 'ljpost', + 'title' => DI::l10n()->t('LiveJournal Export'), + 'image' => 'addon/ljpost/livejournal.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/ljpost/templates/connector_settings.tpl b/ljpost/templates/connector_settings.tpl new file mode 100644 index 000000000..0abcd24eb --- /dev/null +++ b/ljpost/templates/connector_settings.tpl @@ -0,0 +1,4 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_password.tpl" field=$password}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/pumpio/pumpio.css b/pumpio/pumpio.css deleted file mode 100644 index 86dc5a0df..000000000 --- a/pumpio/pumpio.css +++ /dev/null @@ -1,16 +0,0 @@ - -#pumpio-import-label,#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#pumpio-import,#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete { - float: left; - margin-top: 10px; -} - -#pumpio-submit { - margin-top: 15px; -} - diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index e90845349..62ad77120 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -13,6 +13,7 @@ use Friendica\Core\Addon; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -216,150 +217,99 @@ function pumpio_jot_nets(App $a, array &$jotnets_fields) } } -function pumpio_settings(App $a, &$s) +function pumpio_settings(App $a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ + $pumpio_host = DI::pConfig()->get(local_user(), 'pumpio', 'host'); + $pumpio_user = DI::pConfig()->get(local_user(), 'pumpio', 'user'); + $oauth_token = DI::pConfig()->get(local_user(), 'pumpio', 'oauth_token'); + $oauth_token_secret = DI::pConfig()->get(local_user(), 'pumpio', 'oauth_token_secret'); - DI::page()['htmlhead'] .= '' . "\r\n"; + $import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import', false); + $enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default', false); + $public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public', false); + $mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror', false); - /* Get the current state of our config variables */ - - $import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import'); - $import_checked = (($import_enabled) ? ' checked="checked" ' : ''); - - $enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $css = (($enabled) ? '' : '-disabled'); - - $def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - - $public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public'); - $public_checked = (($public_enabled) ? ' checked="checked" ' : ''); - - $mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror'); - $mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : ''); - - $servername = DI::pConfig()->get(local_user(), "pumpio", "host"); - $username = DI::pConfig()->get(local_user(), "pumpio", "user"); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

'. DI::l10n()->t('Pump.io Import/Export/Mirror').'

'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'pumpio', + 'title' => DI::l10n()->t('Pump.io Import/Export/Mirror'), + 'image' => 'images/pumpio.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, + ]; } function pumpio_settings_post(App $a, array &$b) { - if (!empty($_POST['pumpio-submit'])) { - if (!empty($_POST['pumpio_delete'])) { - DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', ''); - DI::pConfig()->set(local_user(), 'pumpio', 'post' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'import' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'host' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'user' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'public' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'lastdate' , 0); - DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); - } else { - // filtering the username if it is filled wrong - $user = $_POST['pumpio_user']; - if (strstr($user, "@")) { - $pos = strpos($user, "@"); + if (!empty($_POST['pumpio_delete'])) { + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', ''); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'lastdate' , 0); + DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); + } elseif (!empty($_POST['pumpio-submit'])) { + // filtering the username if it is filled wrong + $user = $_POST['pumpio_user']; + if (strstr($user, "@")) { + $pos = strpos($user, "@"); - if ($pos > 0) { - $user = substr($user, 0, $pos); - } + if ($pos > 0) { + $user = substr($user, 0, $pos); } + } - // Filtering the hostname if someone is entering it with "http" - $host = $_POST['pumpio_host']; - $host = trim($host); - $host = str_replace(["https://", "http://"], ["", ""], $host); + // Filtering the hostname if someone is entering it with "http" + $host = $_POST['pumpio_host']; + $host = trim($host); + $host = str_replace(["https://", "http://"], ["", ""], $host); - DI::pConfig()->set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'host' , $host); - DI::pConfig()->set(local_user(), 'pumpio', 'user' , $user); - DI::pConfig()->set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , $host); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , $user); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); - if (!empty($_POST['pumpio_mirror'])) { - DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); - } + if (!empty($_POST['pumpio_mirror'])) { + DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); } } } diff --git a/pumpio/templates/connector_settings.tpl b/pumpio/templates/connector_settings.tpl new file mode 100644 index 000000000..6c688ad42 --- /dev/null +++ b/pumpio/templates/connector_settings.tpl @@ -0,0 +1,13 @@ +{{include file="field_input.tpl" field=$servername}} +{{include file="field_input.tpl" field=$username}} + +{{if $oauth_token && $oauth_token_secret}} + {{include file="field_checkbox.tpl" field=$enabled}} + {{include file="field_checkbox.tpl" field=$bydefault}} + {{include file="field_checkbox.tpl" field=$public}} + {{include file="field_checkbox.tpl" field=$mirror}} +{{elseif $pumpio_host && $pumpio_user}} + +{{/if}} diff --git a/statusnet/statusnet.css b/statusnet/statusnet.css index f50d9c05a..21f4733f0 100644 --- a/statusnet/statusnet.css +++ b/statusnet/statusnet.css @@ -10,62 +10,3 @@ height: 52px; vertical-align: middle; } -#statusnet-disconnect-label { - float: left; - width: 250px; - margin-bottom: 25px; -} -#statusnet-disconnect { - float: left; -} - -#statusnet-default-label, -#statusnet-applicationname-label, -#statusnet-sendtaglinks-label, -#statusnet-shortening-label, -#statusnet-mirror-label, -#statusnet-import-label, -#statusnet-create_user-label, -#statusnet-pin-label, -#statusnet-enable-label { - float: left; - width: 250px; - margin-bottom: 5px; -} - -#statusnet-checkbox { - float: left; -} - -#statusnet-pin { - float: left; -} - - -#statusnet-consumerkey-label { - float: left; - width: 250px; - margin-bottom: 8px; -} -#statusnet-consumerkey { - float: left; - margin-bottom: 8px; -} -#statusnet-consumersecret-label { - float: left; - width: 250px; - margin-bottom: 8px; -} -#statusnet-consumersecret { - float: left; - margin-bottom: 8px; -} -#statusnet-baseapi-label { - float: left; - width: 250px; - margin-bottom: 25px; -} -#statusnet-baseapi { - float: left; - margin-bottom: 8px; -} diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 75e441515..b2582b86e 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -107,13 +107,13 @@ function statusnet_settings_post(App $a, $post) return; } // don't check GNU Social settings if GNU Social submit button is not clicked - if (empty($_POST['statusnet-submit'])) { + if (empty($_POST['statusnet-submit']) && empty($_POST['statusnet-disconnect'])) { return; } - if (isset($_POST['statusnet-disconnect'])) { + if (!empty($_POST['statusnet-disconnect'])) { /* * * - * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration + * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration */ DI::pConfig()->delete(local_user(), 'statusnet', 'consumerkey'); DI::pConfig()->delete(local_user(), 'statusnet', 'consumersecret'); @@ -149,7 +149,6 @@ function statusnet_settings_post(App $a, $post) } } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-consumersecret'])) { // check if we can reach the API of the GNU Social server @@ -177,7 +176,6 @@ function statusnet_settings_post(App $a, $post) notice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL); } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen @@ -195,7 +193,6 @@ function statusnet_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'statusnet', 'post', 1); DI::pConfig()->set(local_user(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - DI::baseUrl()->redirect('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a dent for every new __public__ posting to the wall @@ -213,171 +210,125 @@ function statusnet_settings_post(App $a, $post) } } -function statusnet_settings(App $a, &$s) +function statusnet_settings(App $a, array &$data) { if (!local_user()) { return; } - $user = User::getById(local_user()); + DI::page()->registerStylesheet(__DIR__ . '/statusnet.css', 'all'); - DI::page()['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some * allow the user to cancel the connection process at this step * 3) Checkbox for "Send public notices (respect size limitation) */ - $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); - $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); - $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); - $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); - $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); - $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $defenabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'); - $defchecked = (($defenabled) ? ' checked="checked" ' : ''); - $mirrorenabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts'); - $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : ''); - $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); - $importselected = ["", "", ""]; - $importselected[$import] = ' selected="selected"'; - //$importenabled = DI::pConfig()->get(local_user(),'statusnet','import'); - //$importchecked = (($importenabled) ? ' checked="checked" ' : ''); - $create_userenabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user'); - $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); + $baseapi = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); + $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); + $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default', false); + $mirror_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts', false); + $createuser_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user', false); + $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); - $css = (($enabled) ? '' : '-disabled'); + // Radio button list to select existing application credentials + $sites = array_map(function ($site) { + return ['statusnet-preconf-apiurl', $site['sitename'], $site['apiurl']]; + }, DI::config()->get('statusnet', 'sites', [])); - $s .= ''; - $s .= '

' . DI::l10n()->t('GNU Social Import/Export/Mirror') . '

'; - $s .= ''; - $s .= '
'; + + + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/statusnet/'); + $html = Renderer::replaceMacros($t, [ + '$l10n' => [ + 'global_title' => DI::l10n()->t('Globally Available GNU Social OAuthKeys'), + 'global_info' => DI::l10n()->t(DI::l10n()->t('There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).')), + 'credentials_title' => DI::l10n()->t('Provide your own OAuth Credentials'), + 'credentials_info' => DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'), + 'oauth_info' => DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social.'), + 'oauth_alt' => DI::l10n()->t('Log in with GNU Social'), + 'oauth_cancel' => DI::l10n()->t('Cancel Connection Process'), + 'oauth_api' => DI::l10n()->t('Current GNU Social API is: %s', $baseapi), + 'connected_account' => $connected_account ?? '', + 'privacy_warning' => $privacy_warning ?? '', + ], + + '$ckey' => $ckey, + '$csecret' => $csecret, + '$otoken' => $otoken, + '$osecret' => $osecret, + '$sites' => $sites, + + '$authorize_url' => $authorize_url ?? '', + '$request_token' => $request_token ?? null, + '$account' => $account ?? null, + + '$authenticate_url' => DI::baseUrl()->get() . '/statusnet/connect', + + '$consumerkey' => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'], + '$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'], + + '$baseapi' => ['statusnet-baseapi', DI::l10n()->t('Base API Path (remember the trailing /)'), '', '', false, ' size="35'], + '$pin' => ['statusnet-pin', DI::l10n()->t('Copy the security code from GNU Social here')], + + '$enable' => ['statusnet-enabled', DI::l10n()->t('Allow posting to GNU Social'), $enabled, DI::l10n()->t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')], + '$default' => ['statusnet-default', DI::l10n()->t('Post to GNU Social by default'), $def_enabled], + '$mirror' => ['statusnet-mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled], + '$create_user' => ['statusnet-create_user', DI::l10n()->t('Automatically create contacts'), $createuser_enabled], + '$import' => ['statusnet-import', DI::l10n()->t('Import the remote timeline'), $import, '', [ + 0 => DI::l10n()->t('Disabled'), + 1 => DI::l10n()->t('Full Timeline'), + 2 => DI::l10n()->t('Only Mentions'), + ]], + ]); + + $data = [ + 'connector' => 'statusnet', + 'title' => DI::l10n()->t('GNU Social Import/Export/Mirror'), + 'image' => 'images/gnusocial.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, + ]; } function statusnet_hook_fork(App $a, array &$b) diff --git a/statusnet/templates/connector_settings.tpl b/statusnet/templates/connector_settings.tpl new file mode 100644 index 000000000..b5a497a8f --- /dev/null +++ b/statusnet/templates/connector_settings.tpl @@ -0,0 +1,50 @@ +{{if $ckey && $csecret}} + {{if $otoken && $osecret}} + {{if $account}} +
+ +

+ {{$l10n.connected_account nofilter}}
+ {{$account->description}} +

+
+ {{/if}} + {{include file="field_checkbox.tpl" field=$enable}} +

{{$l10n.connected_public nofilter}}

+ {{if $l10n.privacy_warning}} +

{{$l10n.privacy_warning nofilter}}

+ {{/if}} + + {{include file="field_checkbox.tpl" field=$default}} + {{include file="field_checkbox.tpl" field=$mirror}} + {{include file="field_checkbox.tpl" field=$import}} + {{*include file="field_checkbox.tpl" field=$create_user*}} + {{else}} +

{{$l10n.oauth_info}}

+ {{$l10n.oauth_alt}} +
+ + + {{include file="field_input.tpl" field=$pin}} +
+ +

{{$l10n.oauth_api}}

+ {{/if}} +{{else}} + {{if $sites}} +

{{$l10n.global_title}}

+

{{$l10n.global_info}}

+
+ {{foreach $sites as $site}} + {{include file="field_radio.tpl" field=$site}} + {{/foreach}} +
+ {{/if}} +

{{$l10n.credentials_title}}

+

{{$l10n.credentials_info nofilter}}

+
+ {{include file="field_input.tpl" field=$consumerkey}} + {{include file="field_input.tpl" field=$consumersecret}} + {{include file="field_input.tpl" field=$baseapi}} +
+{{/if}} \ No newline at end of file diff --git a/tumblr/templates/connector_settings.tpl b/tumblr/templates/connector_settings.tpl new file mode 100644 index 000000000..d28fab9d0 --- /dev/null +++ b/tumblr/templates/connector_settings.tpl @@ -0,0 +1,10 @@ +

{{$l10n.connect}}

+ +{{include file="field_checkbox.tpl" field=$enable}} +{{include file="field_checkbox.tpl" field=$bydefault}} + +{{if $page_select}} + {{include file="field_select.tpl" field=$page_select}} +{{else}} + {{$l10n.noconnect}} +{{/if}} diff --git a/tumblr/tumblr.css b/tumblr/tumblr.css deleted file mode 100644 index c76fb61eb..000000000 --- a/tumblr/tumblr.css +++ /dev/null @@ -1,16 +0,0 @@ - -#tumblr-enable-label, #tumblr-username-label, #tumblr-page-label, #tumblr-bydefault-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#tumblr-checkbox, #tumblr-username, #tumblr-page, #tumblr-bydefault { - float: left; - margin-top: 10px; -} - -#tumblr-submit { - margin-top: 15px; -} - diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index e664ed7b8..5ae0dd1b6 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -198,89 +198,54 @@ function tumblr_jot_nets(App $a, array &$jotnets_fields) } } -function tumblr_settings(App $a, &$s) +function tumblr_settings(App $a, array &$data) { - if (! local_user()) { + if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ + $enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default', false); - DI::page()['htmlhead'] .= '' . "\r\n"; + $oauth_token = DI::pConfig()->get(local_user(), 'tumblr', 'oauth_token'); + $oauth_token_secret = DI::pConfig()->get(local_user(), 'tumblr', 'oauth_token_secret'); - /* Get the current state of our config variables */ - - $enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $css = (($enabled) ? '' : '-disabled'); - - $def_enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

'. DI::l10n()->t('Tumblr Export').'

'; - $s .= ''; - $s .= ''; + '$authenticate_url' => DI::baseUrl()->get() . '/tumblr/connect', + + '$enable' => ['tumblr', DI::l10n()->t('Enable Tumblr Post Addon'), $enabled], + '$bydefault' => ['tumblr_bydefault', DI::l10n()->t('Post to Tumblr by default'), $def_enabled], + '$page_select' => $page_select ?? '', + ]); + + $data = [ + 'connector' => 'tumblr', + 'title' => DI::l10n()->t('Tumblr Export'), + 'image' => 'images/tumblr.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } function tumblr_settings_post(App $a, array &$b) diff --git a/twitter/templates/connector_settings.tpl b/twitter/templates/connector_settings.tpl new file mode 100644 index 000000000..1c6b7131d --- /dev/null +++ b/twitter/templates/connector_settings.tpl @@ -0,0 +1,23 @@ +
+{{if $l10n.connected}} +

{{$l10n.connected nofilter}}

+

+ + {{$account->description}} +

+{{else}} +

{{$l10n.invalid}}

+ +{{/if}} +
+ +
+ +{{include file="field_checkbox.tpl" field=$enable}} +{{if $l10n.privacy_warning}} +

{{$l10n.privacy_warning nofilter}}

+{{/if}} +{{include file="field_checkbox.tpl" field=$default}} +{{include file="field_checkbox.tpl" field=$mirror}} +{{include file="field_checkbox.tpl" field=$import}} +{{include file="field_checkbox.tpl" field=$create_user}} diff --git a/twitter/twitter.css b/twitter/twitter.css index 99ee0bef3..480ce28d0 100644 --- a/twitter/twitter.css +++ b/twitter/twitter.css @@ -10,34 +10,3 @@ height: 52px; vertical-align: middle; } -#twitter-disconnect-label { - float: left; - width: 250px; - margin-bottom: 25px; -} - -#twitter-disconnect { - float: left; -} -#twitter-default-label, -#twitter-sendtaglinks-label, -#twitter-enable-label, -#twitter-shortening-label, -#twitter-mirror-label, -#twitter-import-label, -#twitter-create_user-label, -#twitter-pin-label { - float: left; - width: 250px; - margin-bottom: 10px; -} - -#twitter-checkbox { - float: left; -} - -#twitter-pin { - float: left; -} - - diff --git a/twitter/twitter.php b/twitter/twitter.php index e3e664f36..33af5663f 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -269,8 +269,6 @@ function twitter_settings_post(App $a) } catch(TwitterOAuthException $e) { notice($e->getMessage()); } - // reload the Addon Settings page, if we don't do it see Bug #42 - DI::baseUrl()->redirect('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a tweet for every new __public__ posting to the wall @@ -287,7 +285,7 @@ function twitter_settings_post(App $a) } } -function twitter_settings(App $a, &$s) +function twitter_settings(App $a, array &$data) { if (!local_user()) { return; @@ -295,7 +293,8 @@ function twitter_settings(App $a, &$s) $user = User::getById(local_user()); - DI::page()['htmlhead'] .= '' . "\r\n"; + DI::page()->registerStylesheet(__DIR__ . '/twitter.css', 'all'); + /* * * * 1) Check that we have global consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -312,21 +311,14 @@ function twitter_settings(App $a, &$s) $importenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'import')); $create_userenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'create_user')); - $css = (($enabled) ? '' : '-disabled'); - - $s .= ''; - $s .= '

' . DI::l10n()->t('Twitter Import/Export/Mirror') . '

'; - $s .= ''; - $s .= '
'; + + $data = [ + 'connector' => 'twitter', + 'title' => DI::l10n()->t('Twitter Import/Export/Mirror'), + 'enabled' => $enabled, + 'image' => 'images/twitter.png', + 'html' => $html, + 'submit' => $submit ?? null, + ]; } function twitter_hook_fork(App $a, array &$b) diff --git a/wppost/templates/connector_settings.tpl b/wppost/templates/connector_settings.tpl new file mode 100644 index 000000000..0afd676c4 --- /dev/null +++ b/wppost/templates/connector_settings.tpl @@ -0,0 +1,5 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$username}} +{{include file="field_password.tpl" field=$password}} +{{include file="field_input.tpl" field=$blog}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/wppost/wppost.css b/wppost/wppost.css deleted file mode 100644 index d5a39fde8..000000000 --- a/wppost/wppost.css +++ /dev/null @@ -1,20 +0,0 @@ - -#wppost-enable-label, #wppost-username-label, #wppost-password-label, -#wppost-blog-label, #wppost-bydefault-label, -#wppost-backlink-label, #wppost-shortcheck-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#wppost-checkbox, #wppost-username, #wppost-password, -#wppost-blog, #wppost-bydefault, -#wppost-shortcheck, #wppost-backlink { - float: left; - margin-top: 10px; -} - -#wppost-submit { - margin-top: 15px; -} - diff --git a/wppost/wppost.php b/wppost/wppost.php index c78157c89..f57772d3f 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -6,10 +6,12 @@ * Author: Mike Macgirvin */ +use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Post; @@ -25,7 +27,7 @@ function wppost_install() Hook::register('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); } -function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) +function wppost_jot_nets(App &$a, array &$jotnets_fields) { if (!local_user()) { return; @@ -44,92 +46,39 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) } -function wppost_settings(&$a, &$s) { - - if(! local_user()) +function wppost_settings(App &$a, array &$data) +{ + if (!local_user()) { return; + } - /* Add our stylesheet to the page so we can make our settings look nice */ + $enabled = DI::pConfig()->get(local_user(), 'wppost', 'post', false); + $wp_username = DI::pConfig()->get(local_user(), 'wppost', 'wp_username'); + $wp_blog = DI::pConfig()->get(local_user(), 'wppost', 'wp_blog'); + $def_enabled = DI::pConfig()->get(local_user(), 'wppost', 'post_by_default', false); + $back_enabled = DI::pConfig()->get(local_user(), 'wppost', 'backlink', false); + $wp_backlink_text = DI::pConfig()->get(local_user(), 'wppost', 'wp_backlink_text'); + $shortcheck_enabled = DI::pConfig()->get(local_user(), 'wppost', 'shortcheck', false); - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - - $enabled = DI::pConfig()->get(local_user(),'wppost','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - - $css = (($enabled) ? '' : '-disabled'); - - $def_enabled = DI::pConfig()->get(local_user(),'wppost','post_by_default'); - $back_enabled = DI::pConfig()->get(local_user(),'wppost','backlink'); - $shortcheck_enabled = DI::pConfig()->get(local_user(),'wppost','shortcheck'); - - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $back_checked = (($back_enabled) ? ' checked="checked" ' : ''); - $shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : ''); - - $wp_username = DI::pConfig()->get(local_user(), 'wppost', 'wp_username'); - $wp_password = DI::pConfig()->get(local_user(), 'wppost', 'wp_password'); - $wp_blog = DI::pConfig()->get(local_user(), 'wppost', 'wp_blog'); - $wp_backlink_text = DI::pConfig()->get(local_user(), 'wppost', 'wp_backlink_text'); - - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

'. DI::l10n()->t('Wordpress Export').'

'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/wppost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['wppost', DI::l10n()->t('Enable Wordpress Post Addon'), $enabled], + '$username' => ['wp_username', DI::l10n()->t('Wordpress username'), $wp_username], + '$password' => ['wp_password', DI::l10n()->t('Wordpress password')], + '$blog' => ['wp_blog', DI::l10n()->t('WordPress API URL'), $wp_blog], + '$bydefault' => ['wp_bydefault', DI::l10n()->t('Post to Wordpress by default'), $def_enabled], + '$backlink' => ['wp_backlink', DI::l10n()->t('Provide a backlink to the Friendica post'), $back_enabled], + '$backlink_text' => ['wp_backlink_text', DI::l10n()->t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.'), $wp_backlink_text], + '$shortcheck' => ['wp_shortcheck', DI::l10n()->t('Don\'t post messages that are too short'), $shortcheck_enabled], + ]); + $data = [ + 'connector' => 'wppost', + 'title' => DI::l10n()->t('Wordpress Export'), + 'image' => 'images/wordpress.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } From 3104d176e74566c4f22e4eaa15cd167947aef3c2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Nov 2021 19:19:32 -0500 Subject: [PATCH 4/4] [various] Updated translation files after editing several strings --- advancedcontentfilter/lang/C/messages.po | 70 +++---- birdavatar/lang/C/messages.po | 44 ++--- blockem/lang/C/messages.po | 20 +- catavatar/lang/C/messages.po | 34 ++-- curweather/lang/C/messages.po | 46 ++--- diaspora/lang/C/messages.po | 46 ++--- discourse/lang/C/messages.po | 34 ++++ dwpost/lang/C/messages.po | 42 ++-- fromapp/lang/C/messages.po | 14 +- geonames/lang/C/messages.po | 14 +- gnot/lang/C/messages.po | 26 ++- group_text/lang/C/messages.po | 12 +- ifttt/lang/C/messages.po | 34 ++-- ijpost/lang/C/messages.po | 20 +- irc/lang/C/messages.po | 32 +-- krynn/lang/C/messages.po | 16 +- langfilter/lang/C/messages.po | 30 +-- libertree/lang/C/messages.po | 26 ++- ljpost/lang/C/messages.po | 20 +- mailstream/lang/C/messages.po | 40 ++-- markdown/lang/C/messages.po | 15 +- mathjax/lang/C/messages.po | 10 +- nsfw/lang/C/messages.po | 26 ++- numfriends/lang/C/messages.po | 12 +- opmlexport/lang/C/messages.po | 26 +++ planets/lang/C/messages.po | 16 +- pumpio/lang/C/messages.po | 98 +++++----- qcomment/lang/C/messages.po | 22 +-- randplace/lang/C/messages.po | 12 +- securemail/lang/C/messages.po | 36 ++-- showmore/lang/C/messages.po | 18 +- showmore_dyn/lang/C/messages.po | 18 +- startpage/lang/C/messages.po | 16 +- statusnet/lang/C/messages.po | 238 ++++++++++++----------- superblock/lang/C/messages.po | 18 +- tumblr/lang/C/messages.po | 36 ++-- twitter/lang/C/messages.po | 89 +++++---- windowsphonepush/lang/C/messages.po | 18 +- wppost/lang/C/messages.po | 40 ++-- 39 files changed, 681 insertions(+), 703 deletions(-) create mode 100644 discourse/lang/C/messages.po create mode 100644 opmlexport/lang/C/messages.po diff --git a/advancedcontentfilter/lang/C/messages.po b/advancedcontentfilter/lang/C/messages.po index d285d071d..742647b96 100644 --- a/advancedcontentfilter/lang/C/messages.po +++ b/advancedcontentfilter/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:15+0000\n" +"POT-Creation-Date: 2021-11-21 19:13-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,28 +17,28 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: advancedcontentfilter.php:153 +#: advancedcontentfilter.php:154 #, php-format msgid "Filtered by rule: %s" msgstr "" -#: advancedcontentfilter.php:167 advancedcontentfilter.php:224 +#: advancedcontentfilter.php:170 advancedcontentfilter.php:225 msgid "Advanced Content Filter" msgstr "" -#: advancedcontentfilter.php:223 +#: advancedcontentfilter.php:224 msgid "Back to Addon Settings" msgstr "" -#: advancedcontentfilter.php:225 +#: advancedcontentfilter.php:226 msgid "Add a Rule" msgstr "" -#: advancedcontentfilter.php:226 +#: advancedcontentfilter.php:227 msgid "Help" msgstr "" -#: advancedcontentfilter.php:227 +#: advancedcontentfilter.php:228 msgid "" "Add and manage your personal content filter rules in this screen. Rules have " "a name and an arbitrary expression that will be matched against post data. " @@ -46,108 +46,108 @@ msgid "" "the help page." msgstr "" -#: advancedcontentfilter.php:228 +#: advancedcontentfilter.php:229 msgid "Your rules" msgstr "" -#: advancedcontentfilter.php:229 +#: advancedcontentfilter.php:230 msgid "" "You have no rules yet! Start adding one by clicking on the button above next " "to the title." msgstr "" -#: advancedcontentfilter.php:230 +#: advancedcontentfilter.php:231 msgid "Disabled" msgstr "" -#: advancedcontentfilter.php:231 +#: advancedcontentfilter.php:232 msgid "Enabled" msgstr "" -#: advancedcontentfilter.php:232 +#: advancedcontentfilter.php:233 msgid "Disable this rule" msgstr "" -#: advancedcontentfilter.php:233 +#: advancedcontentfilter.php:234 msgid "Enable this rule" msgstr "" -#: advancedcontentfilter.php:234 +#: advancedcontentfilter.php:235 msgid "Edit this rule" msgstr "" -#: advancedcontentfilter.php:235 +#: advancedcontentfilter.php:236 msgid "Edit the rule" msgstr "" -#: advancedcontentfilter.php:236 +#: advancedcontentfilter.php:237 msgid "Save this rule" msgstr "" -#: advancedcontentfilter.php:237 +#: advancedcontentfilter.php:238 msgid "Delete this rule" msgstr "" -#: advancedcontentfilter.php:238 +#: advancedcontentfilter.php:239 msgid "Rule" msgstr "" -#: advancedcontentfilter.php:239 +#: advancedcontentfilter.php:240 msgid "Close" msgstr "" -#: advancedcontentfilter.php:240 +#: advancedcontentfilter.php:241 msgid "Add new rule" msgstr "" -#: advancedcontentfilter.php:241 +#: advancedcontentfilter.php:242 msgid "Rule Name" msgstr "" -#: advancedcontentfilter.php:242 +#: advancedcontentfilter.php:243 msgid "Rule Expression" msgstr "" -#: advancedcontentfilter.php:243 +#: advancedcontentfilter.php:244 msgid "Cancel" msgstr "" -#: advancedcontentfilter.php:310 advancedcontentfilter.php:321 -#: advancedcontentfilter.php:332 advancedcontentfilter.php:366 -#: advancedcontentfilter.php:395 advancedcontentfilter.php:416 +#: advancedcontentfilter.php:312 advancedcontentfilter.php:323 +#: advancedcontentfilter.php:334 advancedcontentfilter.php:370 +#: advancedcontentfilter.php:401 advancedcontentfilter.php:424 msgid "You must be logged in to use this method" msgstr "" -#: advancedcontentfilter.php:336 advancedcontentfilter.php:370 -#: advancedcontentfilter.php:399 +#: advancedcontentfilter.php:338 advancedcontentfilter.php:374 +#: advancedcontentfilter.php:405 msgid "Invalid form security token, please refresh the page." msgstr "" -#: advancedcontentfilter.php:348 +#: advancedcontentfilter.php:350 msgid "The rule name and expression are required." msgstr "" -#: advancedcontentfilter.php:360 +#: advancedcontentfilter.php:364 msgid "Rule successfully added" msgstr "" -#: advancedcontentfilter.php:374 advancedcontentfilter.php:403 +#: advancedcontentfilter.php:378 advancedcontentfilter.php:409 msgid "Rule doesn't exist or doesn't belong to you." msgstr "" -#: advancedcontentfilter.php:389 +#: advancedcontentfilter.php:395 msgid "Rule successfully updated" msgstr "" -#: advancedcontentfilter.php:410 +#: advancedcontentfilter.php:418 msgid "Rule successfully deleted" msgstr "" -#: advancedcontentfilter.php:420 +#: advancedcontentfilter.php:428 msgid "Missing argument: guid." msgstr "" -#: advancedcontentfilter.php:428 +#: advancedcontentfilter.php:436 #, php-format msgid "Unknown post with guid: %s" msgstr "" diff --git a/birdavatar/lang/C/messages.po b/birdavatar/lang/C/messages.po index 35db25282..0d90e08ad 100644 --- a/birdavatar/lang/C/messages.po +++ b/birdavatar/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-24 12:04+0100\n" +"POT-Creation-Date: 2021-11-24 08:50-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,38 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: birdavatar.php:49 -msgid "Use Bird as Avatar" -msgstr "" - -#: birdavatar.php:50 -msgid "More Random Bird!" -msgstr "" - -#: birdavatar.php:51 -msgid "Reset to email Bird" -msgstr "" - -#: birdavatar.php:53 -msgid "Bird Avatar Settings" -msgstr "" - -#: birdavatar.php:54 +#: birdavatar.php:47 msgid "Set default profile avatar or randomize the bird." msgstr "" -#: birdavatar.php:72 +#: birdavatar.php:52 +msgid "Bird Avatar Settings" +msgstr "" + +#: birdavatar.php:55 +msgid "Use Bird as Avatar" +msgstr "" + +#: birdavatar.php:56 +msgid "More Random Bird!" +msgstr "" + +#: birdavatar.php:57 +msgid "Reset to email Bird" +msgstr "" + +#: birdavatar.php:76 msgid "The bird has not found itself." msgstr "" -#: birdavatar.php:81 +#: birdavatar.php:85 msgid "There was an error, the bird flew away." msgstr "" -#: birdavatar.php:87 +#: birdavatar.php:91 msgid "Profile Photos" msgstr "" -#: birdavatar.php:97 +#: birdavatar.php:101 msgid "Meow!" msgstr "" diff --git a/blockem/lang/C/messages.po b/blockem/lang/C/messages.po index 1d9ed121a..64bb3fc4d 100644 --- a/blockem/lang/C/messages.po +++ b/blockem/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:13-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,33 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: blockem.php:42 blockem.php:46 -msgid "Blockem" -msgstr "" - -#: blockem.php:50 +#: blockem.php:39 msgid "" "Hides user's content by collapsing posts. Also replaces their avatar with " "generic image." msgstr "" -#: blockem.php:51 +#: blockem.php:40 msgid "Comma separated profile URLS:" msgstr "" -#: blockem.php:55 -msgid "Save Settings" +#: blockem.php:45 +msgid "Blockem" msgstr "" -#: blockem.php:131 +#: blockem.php:120 #, php-format msgid "Filtered user: %s" msgstr "" -#: blockem.php:190 +#: blockem.php:183 msgid "Unblock Author" msgstr "" -#: blockem.php:192 +#: blockem.php:185 msgid "Block Author" msgstr "" diff --git a/catavatar/lang/C/messages.po b/catavatar/lang/C/messages.po index e6efdf771..24735ca1d 100644 --- a/catavatar/lang/C/messages.po +++ b/catavatar/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:16+0000\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,38 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: catavatar.php:49 -msgid "Use Cat as Avatar" -msgstr "" - -#: catavatar.php:50 -msgid "More Random Cat!" -msgstr "" - -#: catavatar.php:51 -msgid "Reset to email Cat" +#: catavatar.php:48 +msgid "Set default profile avatar or randomize the cat." msgstr "" #: catavatar.php:53 msgid "Cat Avatar Settings" msgstr "" -#: catavatar.php:54 -msgid "Set default profile avatar or randomize the cat." +#: catavatar.php:56 +msgid "Use Cat as Avatar" msgstr "" -#: catavatar.php:72 +#: catavatar.php:57 +msgid "Another random Cat!" +msgstr "" + +#: catavatar.php:58 +msgid "Reset to email Cat" +msgstr "" + +#: catavatar.php:77 msgid "The cat hadn't found itself." msgstr "" -#: catavatar.php:81 +#: catavatar.php:86 msgid "There was an error, the cat ran away." msgstr "" -#: catavatar.php:87 +#: catavatar.php:92 msgid "Profile Photos" msgstr "" -#: catavatar.php:97 +#: catavatar.php:102 msgid "Meow!" msgstr "" diff --git a/curweather/lang/C/messages.po b/curweather/lang/C/messages.po index 30a6f0fcd..ec442c9cd 100644 --- a/curweather/lang/C/messages.po +++ b/curweather/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" msgid "Error fetching weather data. Error was: " msgstr "" -#: curweather.php:130 curweather.php:192 +#: curweather.php:130 msgid "Current Weather" msgstr "" @@ -57,66 +57,66 @@ msgstr "" msgid "at OpenWeatherMap" msgstr "" -#: curweather.php:179 +#: curweather.php:178 msgid "No APPID found, please contact your admin to obtain one." msgstr "" -#: curweather.php:191 curweather.php:229 -msgid "Save Settings" -msgstr "" - -#: curweather.php:192 -msgid "Settings" -msgstr "" - -#: curweather.php:194 +#: curweather.php:188 msgid "Enter either the name of your location or the zip code." msgstr "" -#: curweather.php:195 +#: curweather.php:189 msgid "Your Location" msgstr "" -#: curweather.php:195 +#: curweather.php:189 msgid "" "Identifier of your location (name or zip code), e.g. Berlin,DE or " "14476,DE." msgstr "" -#: curweather.php:196 +#: curweather.php:190 msgid "Units" msgstr "" -#: curweather.php:196 +#: curweather.php:190 msgid "select if the temperature should be displayed in °C or °F" msgstr "" -#: curweather.php:197 +#: curweather.php:191 msgid "Show weather data" msgstr "" -#: curweather.php:232 +#: curweather.php:196 +msgid "Current Weather Settings" +msgstr "" + +#: curweather.php:227 +msgid "Save Settings" +msgstr "" + +#: curweather.php:230 msgid "Caching Interval" msgstr "" -#: curweather.php:234 +#: curweather.php:232 msgid "" "For how long should the weather data be cached? Choose according your " "OpenWeatherMap account type." msgstr "" -#: curweather.php:235 +#: curweather.php:233 msgid "no cache" msgstr "" -#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239 +#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237 msgid "minutes" msgstr "" -#: curweather.php:242 +#: curweather.php:240 msgid "Your APPID" msgstr "" -#: curweather.php:242 +#: curweather.php:240 msgid "Your API key provided by OpenWeatherMap" msgstr "" diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 749d3f25f..262e4cd89 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,88 +17,84 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: diaspora.php:43 +#: diaspora.php:44 msgid "Post to Diaspora" msgstr "" -#: diaspora.php:68 +#: diaspora.php:67 #, php-format msgid "" "Please remember: You can always be reached from Diaspora with your Friendica " "handle %s. " msgstr "" -#: diaspora.php:69 +#: diaspora.php:68 msgid "" "This connector is only meant if you still want to use your old Diaspora " "account for some time. " msgstr "" -#: diaspora.php:70 +#: diaspora.php:69 #, php-format msgid "" "However, it is preferred that you tell your Diaspora contacts the new handle " "%s instead." msgstr "" -#: diaspora.php:80 +#: diaspora.php:79 msgid "All aspects" msgstr "" -#: diaspora.php:81 +#: diaspora.php:80 msgid "Public" msgstr "" -#: diaspora.php:87 +#: diaspora.php:86 msgid "Post to aspect:" msgstr "" -#: diaspora.php:88 +#: diaspora.php:87 #, php-format msgid "Connected with your Diaspora account %s" msgstr "" -#: diaspora.php:91 +#: diaspora.php:90 msgid "" "Can't login to your Diaspora account. Please check handle (in the format " "user@domain.tld) and password." msgstr "" -#: diaspora.php:99 -msgid "Diaspora Export" -msgstr "" - -#: diaspora.php:100 +#: diaspora.php:97 msgid "Information" msgstr "" -#: diaspora.php:101 +#: diaspora.php:98 msgid "Error" msgstr "" -#: diaspora.php:102 -msgid "Save Settings" -msgstr "" - -#: diaspora.php:106 +#: diaspora.php:104 msgid "Enable Diaspora Post Addon" msgstr "" -#: diaspora.php:107 +#: diaspora.php:105 msgid "Diaspora handle" msgstr "" -#: diaspora.php:108 +#: diaspora.php:106 msgid "Diaspora password" msgstr "" -#: diaspora.php:108 +#: diaspora.php:106 msgid "" "Privacy notice: Your Diaspora password will be stored unencrypted to " "authenticate you with your Diaspora pod. This means your Friendica node " "administrator can have access to it." msgstr "" -#: diaspora.php:110 +#: diaspora.php:108 msgid "Post to Diaspora by default" msgstr "" + +#: diaspora.php:113 +msgid "Diaspora Export" +msgstr "" diff --git a/discourse/lang/C/messages.po b/discourse/lang/C/messages.po new file mode 100644 index 000000000..ba0809ee6 --- /dev/null +++ b/discourse/lang/C/messages.po @@ -0,0 +1,34 @@ +# ADDON discourse +# Copyright (C) +# This file is distributed under the same license as the Friendica discourse addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: discourse.php:49 +msgid "Enable processing of Discourse mailing list mails" +msgstr "" + +#: discourse.php:49 +msgid "" +"If enabled, incoming mails from Discourse will be improved so they look much " +"better. To make it work, you have to configure the e-mail settings in " +"Friendica. You also have to enable the mailing list mode in Discourse. Then " +"you have to add the Discourse mail account as contact." +msgstr "" + +#: discourse.php:54 +msgid "Discourse" +msgstr "" diff --git a/dwpost/lang/C/messages.po b/dwpost/lang/C/messages.po index 3787f75b6..0b27a70c6 100644 --- a/dwpost/lang/C/messages.po +++ b/dwpost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,30 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: dwpost.php:41 +#: dwpost.php:43 msgid "Post to Dreamwidth" msgstr "" -#: dwpost.php:72 dwpost.php:76 +#: dwpost.php:63 +msgid "Enable Dreamwidth Post Addon" +msgstr "" + +#: dwpost.php:64 +msgid "Dreamwidth username" +msgstr "" + +#: dwpost.php:65 +msgid "Dreamwidth password" +msgstr "" + +#: dwpost.php:66 +msgid "Post to Dreamwidth by default" +msgstr "" + +#: dwpost.php:71 msgid "Dreamwidth Export" msgstr "" - -#: dwpost.php:80 -msgid "Enable dreamwidth Post Addon" -msgstr "" - -#: dwpost.php:85 -msgid "dreamwidth username" -msgstr "" - -#: dwpost.php:90 -msgid "dreamwidth password" -msgstr "" - -#: dwpost.php:95 -msgid "Post to dreamwidth by default" -msgstr "" - -#: dwpost.php:100 -msgid "Save Settings" -msgstr "" diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po index 195d61781..ce4a7827c 100644 --- a/fromapp/lang/C/messages.po +++ b/fromapp/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,21 +17,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: fromapp.php:53 fromapp.php:57 -msgid "FromApp Settings" -msgstr "" - -#: fromapp.php:60 +#: fromapp.php:45 msgid "" "The application name you would like to show your posts originating from. " "Separate different app names with a comma. A random one will then be " "selected for every posting." msgstr "" -#: fromapp.php:64 +#: fromapp.php:46 msgid "Use this application name even if another application was used." msgstr "" -#: fromapp.php:71 -msgid "Save Settings" +#: fromapp.php:51 +msgid "FromApp Settings" msgstr "" diff --git a/geonames/lang/C/messages.po b/geonames/lang/C/messages.po index af1a126a8..c7f730468 100644 --- a/geonames/lang/C/messages.po +++ b/geonames/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,20 +17,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: geonames.php:141 -msgid "Geonames Settings" -msgstr "" - -#: geonames.php:142 +#: geonames.php:135 msgid "" "Replace numerical coordinates by the nearest populated location name in your " "posts." msgstr "" -#: geonames.php:143 +#: geonames.php:136 msgid "Enable Geonames Addon" msgstr "" -#: geonames.php:144 -msgid "Save Settings" +#: geonames.php:141 +msgid "Geonames Settings" msgstr "" diff --git a/gnot/lang/C/messages.po b/gnot/lang/C/messages.po index 11b67cfb6..8ca06d339 100644 --- a/gnot/lang/C/messages.po +++ b/gnot/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,25 +17,21 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gnot.php:71 -msgid "Gnot Settings" -msgstr "" - -#: gnot.php:72 -msgid "Save Settings" -msgstr "" - -#: gnot.php:73 -msgid "Enable this addon?" -msgstr "" - -#: gnot.php:75 +#: gnot.php:63 msgid "" "Allows threading of email comment notifications on Gmail and anonymising the " "subject line." msgstr "" -#: gnot.php:84 +#: gnot.php:64 +msgid "Enable this addon?" +msgstr "" + +#: gnot.php:69 +msgid "Gnot Settings" +msgstr "" + +#: gnot.php:79 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d" msgstr "" diff --git a/group_text/lang/C/messages.po b/group_text/lang/C/messages.po index 87b94b862..0b7ce62ef 100644 --- a/group_text/lang/C/messages.po +++ b/group_text/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: group_text.php:62 -msgid "Group Text" -msgstr "" - -#: group_text.php:64 +#: group_text.php:58 msgid "Use a text only (non-image) group selector in the \"group edit\" menu" msgstr "" -#: group_text.php:70 -msgid "Save Settings" +#: group_text.php:63 +msgid "Group Text" msgstr "" diff --git a/ifttt/lang/C/messages.po b/ifttt/lang/C/messages.po index f8f88f708..077328b00 100644 --- a/ifttt/lang/C/messages.po +++ b/ifttt/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:17+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ifttt.php:50 ifttt.php:54 -msgid "IFTTT Mirror" -msgstr "" - -#: ifttt.php:58 +#: ifttt.php:52 msgid "" "Create an account at IFTTT. Create " "three Facebook recipes that are connected with \n" "Language-Team: LANGUAGE \n" @@ -17,30 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ijpost.php:39 +#: ijpost.php:42 msgid "Post to Insanejournal" msgstr "" -#: ijpost.php:71 ijpost.php:75 -msgid "InsaneJournal Export" -msgstr "" - -#: ijpost.php:79 +#: ijpost.php:61 msgid "Enable InsaneJournal Post Addon" msgstr "" -#: ijpost.php:84 +#: ijpost.php:62 msgid "InsaneJournal username" msgstr "" -#: ijpost.php:89 +#: ijpost.php:63 msgid "InsaneJournal password" msgstr "" -#: ijpost.php:94 +#: ijpost.php:64 msgid "Post to InsaneJournal by default" msgstr "" -#: ijpost.php:99 -msgid "Save Settings" +#: ijpost.php:69 +msgid "InsaneJournal Export" msgstr "" diff --git a/irc/lang/C/messages.po b/irc/lang/C/messages.po index bf560eac1..859cdf169 100644 --- a/irc/lang/C/messages.po +++ b/irc/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,45 +17,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: irc.php:34 -msgid "IRC Settings" -msgstr "" - -#: irc.php:35 +#: irc.php:32 msgid "" "Here you can change the system wide settings for the channels to " "automatically join and access via the side bar. Note the changes you do " "here, only effect the channel selection if you are logged in." msgstr "" -#: irc.php:36 irc.php:134 -msgid "Save Settings" -msgstr "" - -#: irc.php:37 irc.php:135 +#: irc.php:33 irc.php:133 msgid "Channel(s) to auto connect (comma separated)" msgstr "" -#: irc.php:37 irc.php:135 +#: irc.php:33 irc.php:133 msgid "" "List of channels that shall automatically connected to when the app is " "launched." msgstr "" -#: irc.php:38 irc.php:136 +#: irc.php:34 irc.php:134 msgid "Popular Channels (comma separated)" msgstr "" -#: irc.php:38 irc.php:136 +#: irc.php:34 irc.php:134 msgid "" "List of popular channels, will be displayed at the side and hotlinked for " "easy joining." msgstr "" -#: irc.php:62 +#: irc.php:39 +msgid "IRC Settings" +msgstr "" + +#: irc.php:60 msgid "IRC Chatroom" msgstr "" -#: irc.php:90 +#: irc.php:88 msgid "Popular Channels" msgstr "" + +#: irc.php:132 +msgid "Save Settings" +msgstr "" diff --git a/krynn/lang/C/messages.po b/krynn/lang/C/messages.po index 429271bd0..266044b15 100644 --- a/krynn/lang/C/messages.po +++ b/krynn/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: krynn.php:132 krynn.php:136 -msgid "Krynn" -msgstr "" - -#: krynn.php:141 -msgid "Krynn Settings" -msgstr "" - -#: krynn.php:143 +#: krynn.php:127 msgid "Enable Krynn Addon" msgstr "" -#: krynn.php:148 -msgid "Save Settings" +#: krynn.php:132 +msgid "Krynn Settings" msgstr "" diff --git a/langfilter/lang/C/messages.po b/langfilter/lang/C/messages.po index 92fa129c1..e211d38b5 100644 --- a/langfilter/lang/C/messages.po +++ b/langfilter/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,58 +17,58 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: langfilter.php:50 -msgid "Language Filter" -msgstr "" - -#: langfilter.php:51 +#: langfilter.php:49 msgid "" "This addon tries to identify the language posts are written in. If it does " "not match any language specified below, posts will be hidden by collapsing " "them." msgstr "" -#: langfilter.php:52 +#: langfilter.php:50 msgid "Use the language filter" msgstr "" -#: langfilter.php:53 +#: langfilter.php:51 msgid "Able to read" msgstr "" -#: langfilter.php:53 +#: langfilter.php:51 msgid "" "List of abbreviations (ISO 639-1 codes) for languages you speak, comma " "separated. For example \"de,it\"." msgstr "" -#: langfilter.php:54 +#: langfilter.php:52 msgid "Minimum confidence in language detection" msgstr "" -#: langfilter.php:54 +#: langfilter.php:52 msgid "" "Minimum confidence in language detection being correct, from 0 to 100. Posts " "will not be filtered when the confidence of language detection is below this " "percent value." msgstr "" -#: langfilter.php:55 +#: langfilter.php:53 msgid "Minimum length of message body" msgstr "" -#: langfilter.php:55 +#: langfilter.php:53 msgid "" "Minimum number of characters in message body for filter to be used. Posts " "shorter than this will not be filtered. Note: Language detection is " "unreliable for short content (<200 characters)." msgstr "" -#: langfilter.php:56 +#: langfilter.php:58 +msgid "Language Filter" +msgstr "" + +#: langfilter.php:60 msgid "Save Settings" msgstr "" -#: langfilter.php:187 +#: langfilter.php:193 #, php-format msgid "Filtered language: %s" msgstr "" diff --git a/libertree/lang/C/messages.po b/libertree/lang/C/messages.po index 47054070f..6feeef8d5 100644 --- a/libertree/lang/C/messages.po +++ b/libertree/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,30 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libertree.php:37 +#: libertree.php:39 msgid "Post to libertree" msgstr "" -#: libertree.php:71 libertree.php:75 -msgid "libertree Export" -msgstr "" - -#: libertree.php:79 +#: libertree.php:60 msgid "Enable Libertree Post Addon" msgstr "" -#: libertree.php:84 -msgid "Libertree API token" -msgstr "" - -#: libertree.php:89 +#: libertree.php:61 msgid "Libertree site URL" msgstr "" -#: libertree.php:94 +#: libertree.php:62 +msgid "Libertree API token" +msgstr "" + +#: libertree.php:63 msgid "Post to Libertree by default" msgstr "" -#: libertree.php:100 -msgid "Save Settings" +#: libertree.php:68 +msgid "Libertree Export" msgstr "" diff --git a/ljpost/lang/C/messages.po b/ljpost/lang/C/messages.po index 6ee7e27c2..7f5417b7e 100644 --- a/ljpost/lang/C/messages.po +++ b/ljpost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,30 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ljpost.php:39 +#: ljpost.php:43 msgid "Post to LiveJournal" msgstr "" -#: ljpost.php:73 -msgid "LiveJournal Post Settings" -msgstr "" - -#: ljpost.php:75 +#: ljpost.php:63 msgid "Enable LiveJournal Post Addon" msgstr "" -#: ljpost.php:80 +#: ljpost.php:64 msgid "LiveJournal username" msgstr "" -#: ljpost.php:85 +#: ljpost.php:65 msgid "LiveJournal password" msgstr "" -#: ljpost.php:90 +#: ljpost.php:66 msgid "Post to LiveJournal by default" msgstr "" -#: ljpost.php:96 -msgid "Save Settings" +#: ljpost.php:71 +msgid "LiveJournal Export" msgstr "" diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po index 1a5e293c1..5115d8cb4 100644 --- a/mailstream/lang/C/messages.po +++ b/mailstream/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,80 +17,80 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: mailstream.php:66 +#: mailstream.php:77 msgid "From Address" msgstr "" -#: mailstream.php:68 +#: mailstream.php:79 msgid "Email address that stream items will appear to be from." msgstr "" -#: mailstream.php:71 mailstream.php:382 +#: mailstream.php:82 msgid "Save Settings" msgstr "" -#: mailstream.php:225 +#: mailstream.php:301 msgid "Re:" msgstr "" -#: mailstream.php:233 +#: mailstream.php:314 mailstream.php:317 msgid "Friendica post" msgstr "" -#: mailstream.php:236 +#: mailstream.php:320 msgid "Diaspora post" msgstr "" -#: mailstream.php:246 +#: mailstream.php:330 msgid "Feed item" msgstr "" -#: mailstream.php:249 +#: mailstream.php:333 msgid "Email" msgstr "" -#: mailstream.php:251 +#: mailstream.php:335 msgid "Friendica Item" msgstr "" -#: mailstream.php:296 +#: mailstream.php:404 msgid "Upstream" msgstr "" -#: mailstream.php:297 +#: mailstream.php:405 msgid "Local" msgstr "" -#: mailstream.php:364 +#: mailstream.php:481 msgid "Enabled" msgstr "" -#: mailstream.php:368 +#: mailstream.php:486 msgid "Email Address" msgstr "" -#: mailstream.php:370 +#: mailstream.php:488 msgid "Leave blank to use your account email address" msgstr "" -#: mailstream.php:373 +#: mailstream.php:492 msgid "Exclude Likes" msgstr "" -#: mailstream.php:375 +#: mailstream.php:494 msgid "Check this to omit mailing \"Like\" notifications" msgstr "" -#: mailstream.php:378 +#: mailstream.php:498 msgid "Attach Images" msgstr "" -#: mailstream.php:380 +#: mailstream.php:500 msgid "" "Download images in posts and attach them to the email. Useful for reading " "email while offline." msgstr "" -#: mailstream.php:381 +#: mailstream.php:507 msgid "Mail Stream Settings" msgstr "" diff --git a/markdown/lang/C/messages.po b/markdown/lang/C/messages.po index c8b8219cc..33175204b 100644 --- a/markdown/lang/C/messages.po +++ b/markdown/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,18 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: markdown.php:30 -msgid "Markdown" -msgstr "" - -#: markdown.php:31 msgid "Enable Markdown parsing" msgstr "" -#: markdown.php:31 -msgid "" -"If enabled, self created items will additionally be parsed via Markdown." +#: markdown.php:30 +msgid "If enabled, adds Markdown support to the Compose Post form." msgstr "" -#: markdown.php:32 -msgid "Save Settings" +#: markdown.php:35 +msgid "Markdown Settings" msgstr "" diff --git a/mathjax/lang/C/messages.po b/mathjax/lang/C/messages.po index 96d5e2c37..7063a1928 100644 --- a/mathjax/lang/C/messages.po +++ b/mathjax/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,17 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: mathjax.php:43 +#: mathjax.php:42 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " "syntax surrounded by the usual $$ or an eqnarray block in the postings of " "your wall,network tab and private mail." msgstr "" -#: mathjax.php:44 +#: mathjax.php:43 msgid "Use the MathJax renderer" msgstr "" - -#: mathjax.php:45 -msgid "Save Settings" -msgstr "" diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po index 77297a3a4..a44f3e950 100644 --- a/nsfw/lang/C/messages.po +++ b/nsfw/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: nsfw.php:68 nsfw.php:72 -msgid "Content Filter (NSFW and more)" -msgstr "" - -#: nsfw.php:76 +#: nsfw.php:65 msgid "" "This addon searches for specified words/text in posts and collapses them. It " "can be used to filter content tagged with for instance #NSFW that may be " @@ -29,28 +25,28 @@ msgid "" "is also useful for hiding irrelevant or annoying content from direct view." msgstr "" -#: nsfw.php:77 +#: nsfw.php:66 msgid "Enable Content filter" msgstr "" -#: nsfw.php:80 +#: nsfw.php:67 msgid "Comma separated list of keywords to hide" msgstr "" -#: nsfw.php:84 -msgid "Save Settings" -msgstr "" - -#: nsfw.php:85 +#: nsfw.php:67 msgid "Use /expression/ to provide regular expressions" msgstr "" -#: nsfw.php:152 +#: nsfw.php:72 +msgid "Content Filter (NSFW and more)" +msgstr "" + +#: nsfw.php:140 #, php-format msgid "Filtered tag: %s" msgstr "" -#: nsfw.php:154 +#: nsfw.php:142 #, php-format msgid "Filtered word: %s" msgstr "" diff --git a/numfriends/lang/C/messages.po b/numfriends/lang/C/messages.po index 7036f840c..40b8146e5 100644 --- a/numfriends/lang/C/messages.po +++ b/numfriends/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: numfriends.php:59 -msgid "Numfriends Settings" -msgstr "" - -#: numfriends.php:61 +#: numfriends.php:55 msgid "How many contacts to display on profile sidebar" msgstr "" -#: numfriends.php:67 -msgid "Save Settings" +#: numfriends.php:60 +msgid "Numfriends Settings" msgstr "" diff --git a/opmlexport/lang/C/messages.po b/opmlexport/lang/C/messages.po new file mode 100644 index 000000000..fe4855408 --- /dev/null +++ b/opmlexport/lang/C/messages.po @@ -0,0 +1,26 @@ +# ADDON opmlexport +# Copyright (C) +# This file is distributed under the same license as the Friendica opmlexport addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: opmlexport.php:79 +msgid "OPML Export" +msgstr "" + +#: opmlexport.php:80 +msgid "Export RSS/Atom contacts" +msgstr "" diff --git a/planets/lang/C/messages.po b/planets/lang/C/messages.po index f69141dbb..e09be45a1 100644 --- a/planets/lang/C/messages.po +++ b/planets/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: planets.php:131 planets.php:135 -msgid "Planets" -msgstr "" - -#: planets.php:139 -msgid "Planets Settings" -msgstr "" - -#: planets.php:141 +#: planets.php:126 msgid "Enable Planets Addon" msgstr "" -#: planets.php:147 -msgid "Save Settings" +#: planets.php:131 +msgid "Planets Settings" msgstr "" diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po index a0d0a55d2..baac56e65 100644 --- a/pumpio/lang/C/messages.po +++ b/pumpio/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:16+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,76 +17,76 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: pumpio.php:54 +#: pumpio.php:57 msgid "Permission denied." msgstr "" -#: pumpio.php:149 +#: pumpio.php:152 #, php-format msgid "Unable to register the client at the pump.io server '%s'." msgstr "" -#: pumpio.php:189 +#: pumpio.php:192 msgid "You are now authenticated to pumpio." msgstr "" -#: pumpio.php:190 +#: pumpio.php:193 msgid "return to the connector page" msgstr "" -#: pumpio.php:210 +#: pumpio.php:213 msgid "Post to pumpio" msgstr "" -#: pumpio.php:251 pumpio.php:255 -msgid "Pump.io Import/Export/Mirror" -msgstr "" - -#: pumpio.php:259 -msgid "pump.io username (without the servername)" -msgstr "" - -#: pumpio.php:264 -msgid "pump.io servername (without \"http://\" or \"https://\" )" -msgstr "" - -#: pumpio.php:275 -msgid "Authenticate your pump.io connection" -msgstr "" - -#: pumpio.php:279 -msgid "Import the remote timeline" -msgstr "" - -#: pumpio.php:284 -msgid "Enable pump.io Post Addon" -msgstr "" - -#: pumpio.php:289 -msgid "Post to pump.io by default" -msgstr "" - -#: pumpio.php:294 -msgid "Should posts be public?" -msgstr "" - -#: pumpio.php:299 -msgid "Mirror all public posts" -msgstr "" - -#: pumpio.php:304 -msgid "Check to delete this preset" -msgstr "" - -#: pumpio.php:314 +#: pumpio.php:237 msgid "Save Settings" msgstr "" -#: pumpio.php:983 +#: pumpio.php:239 +msgid "Delete this preset" +msgstr "" + +#: pumpio.php:245 +msgid "Authenticate your pump.io connection" +msgstr "" + +#: pumpio.php:252 +msgid "Pump.io servername (without \"http://\" or \"https://\" )" +msgstr "" + +#: pumpio.php:253 +msgid "Pump.io username (without the servername)" +msgstr "" + +#: pumpio.php:254 +msgid "Import the remote timeline" +msgstr "" + +#: pumpio.php:255 +msgid "Enable Pump.io Post Addon" +msgstr "" + +#: pumpio.php:256 +msgid "Post to Pump.io by default" +msgstr "" + +#: pumpio.php:257 +msgid "Should posts be public?" +msgstr "" + +#: pumpio.php:258 +msgid "Mirror all public posts" +msgstr "" + +#: pumpio.php:263 +msgid "Pump.io Import/Export/Mirror" +msgstr "" + +#: pumpio.php:920 msgid "status" msgstr "" -#: pumpio.php:987 +#: pumpio.php:924 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" diff --git a/qcomment/lang/C/messages.po b/qcomment/lang/C/messages.po index a76eea1f9..2c9ba17aa 100644 --- a/qcomment/lang/C/messages.po +++ b/qcomment/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,32 +17,28 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: qcomment.php:42 +#: qcomment.php:45 msgid ":-)" msgstr "" -#: qcomment.php:42 +#: qcomment.php:45 msgid ":-(" msgstr "" -#: qcomment.php:42 +#: qcomment.php:45 msgid "lol" msgstr "" -#: qcomment.php:47 -msgid "Quick Comment Settings" -msgstr "" - -#: qcomment.php:48 +#: qcomment.php:49 msgid "" "Quick comments are found near comment boxes, sometimes hidden. Click them to " "provide simple replies." msgstr "" -#: qcomment.php:49 -msgid "Save Settings" -msgstr "" - #: qcomment.php:50 msgid "Enter quick comments, one per line" msgstr "" + +#: qcomment.php:55 +msgid "Quick Comment Settings" +msgstr "" diff --git a/randplace/lang/C/messages.po b/randplace/lang/C/messages.po index 419123e4b..e1a955484 100644 --- a/randplace/lang/C/messages.po +++ b/randplace/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: randplace.php:166 -msgid "Randplace Settings" -msgstr "" - -#: randplace.php:168 +#: randplace.php:161 msgid "Enable Randplace Addon" msgstr "" -#: randplace.php:174 -msgid "Save Settings" +#: randplace.php:166 +msgid "Randplace Settings" msgstr "" diff --git a/securemail/lang/C/messages.po b/securemail/lang/C/messages.po index 7cb81e20f..b985ae83a 100644 --- a/securemail/lang/C/messages.po +++ b/securemail/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,34 +17,34 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: securemail.php:51 -msgid "\"Secure Mail\" Settings" -msgstr "" - -#: securemail.php:52 -msgid "Save Settings" -msgstr "" - -#: securemail.php:53 securemail.php:80 -msgid "Save and send test" -msgstr "" - -#: securemail.php:54 +#: securemail.php:50 msgid "Enable Secure Mail" msgstr "" -#: securemail.php:55 +#: securemail.php:51 msgid "Public key" msgstr "" -#: securemail.php:55 +#: securemail.php:51 msgid "Your public PGP key, ascii armored format" msgstr "" -#: securemail.php:88 +#: securemail.php:56 +msgid "\"Secure Mail\" Settings" +msgstr "" + +#: securemail.php:59 +msgid "Save Settings" +msgstr "" + +#: securemail.php:60 +msgid "Save and send test" +msgstr "" + +#: securemail.php:93 msgid "Test email sent" msgstr "" -#: securemail.php:90 +#: securemail.php:95 msgid "There was an error sending the test email" msgstr "" diff --git a/showmore/lang/C/messages.po b/showmore/lang/C/messages.po index 2060eb1ab..17b9b17c3 100644 --- a/showmore/lang/C/messages.po +++ b/showmore/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: showmore.php:35 showmore.php:39 -msgid "\"Show more\" Settings" -msgstr "" - -#: showmore.php:44 +#: showmore.php:37 msgid "Enable Show More" msgstr "" -#: showmore.php:47 -msgid "Cutting posts after how much characters" +#: showmore.php:38 +msgid "Cutting posts after how many characters" msgstr "" -#: showmore.php:51 -msgid "Save Settings" +#: showmore.php:43 +msgid "\"Show more\" Settings" msgstr "" -#: showmore.php:129 +#: showmore.php:119 msgid "show more" msgstr "" diff --git a/showmore_dyn/lang/C/messages.po b/showmore_dyn/lang/C/messages.po index 4bf4c94ff..81dec1845 100644 --- a/showmore_dyn/lang/C/messages.po +++ b/showmore_dyn/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: showmore_dyn.php:59 -msgid "Save Settings" -msgstr "" - -#: showmore_dyn.php:60 -msgid "Show More Dynamic" -msgstr "" - -#: showmore_dyn.php:61 msgid "Limit Height" msgstr "" -#: showmore_dyn.php:61 +#: showmore_dyn.php:59 msgid "" "The maximal pixel height of posts before the Show More link is added, 0 to " "disable" msgstr "" -#: showmore_dyn.php:69 +#: showmore_dyn.php:64 +msgid "Show More Dynamic" +msgstr "" + +#: showmore_dyn.php:72 msgid "Show more..." msgstr "" diff --git a/startpage/lang/C/messages.po b/startpage/lang/C/messages.po index 1636361ef..8a0114031 100644 --- a/startpage/lang/C/messages.po +++ b/startpage/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: startpage.php:74 startpage.php:78 -msgid "Startpage" -msgstr "" - -#: startpage.php:81 +#: startpage.php:70 msgid "Home page to load after login - leave blank for profile wall" msgstr "" -#: startpage.php:84 -msgid "Examples: "network" or "notifications/system"" +#: startpage.php:70 +msgid "Examples: \"network\" or \"notifications/system\"" msgstr "" -#: startpage.php:88 -msgid "Save Settings" +#: startpage.php:75 +msgid "Startpage" msgstr "" diff --git a/statusnet/lang/C/messages.po b/statusnet/lang/C/messages.po index d5bce1410..04d481be7 100644 --- a/statusnet/lang/C/messages.po +++ b/statusnet/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,105 +17,30 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: statusnet.php:95 +#: statusnet.php:97 msgid "Post to GNU Social" msgstr "" -#: statusnet.php:146 +#: statusnet.php:148 msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" -#: statusnet.php:175 +#: statusnet.php:176 msgid "We could not contact the GNU Social API with the Path you entered." msgstr "" -#: statusnet.php:248 statusnet.php:252 -msgid "GNU Social Import/Export/Mirror" -msgstr "" - -#: statusnet.php:267 -msgid "Globally Available GNU Social OAuthKeys" -msgstr "" - -#: statusnet.php:268 -msgid "" -"There are preconfigured OAuth key pairs for some GNU Social servers " -"available. If you are using one of them, please use these credentials. If " -"not feel free to connect to any other GNU Social instance (see below)." -msgstr "" - -#: statusnet.php:274 statusnet.php:291 statusnet.php:318 statusnet.php:325 -#: statusnet.php:372 statusnet.php:698 +#: statusnet.php:243 statusnet.php:656 msgid "Save Settings" msgstr "" -#: statusnet.php:276 -msgid "Provide your own OAuth Credentials" +#: statusnet.php:255 +#, php-format +msgid "Currently connected to: %s" msgstr "" -#: statusnet.php:277 -msgid "" -"No consumer key pair for GNU Social found. Register your Friendica Account " -"as an desktop client on your GNU Social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " -"key pair ask the administrator if there is already a key pair for this " -"Friendica installation at your favorited GNU Social installation." -msgstr "" - -#: statusnet.php:279 -msgid "OAuth Consumer Key" -msgstr "" - -#: statusnet.php:282 -msgid "OAuth Consumer Secret" -msgstr "" - -#: statusnet.php:285 statusnet.php:678 statusnet.php:690 -msgid "Base API Path (remember the trailing /)" -msgstr "" - -#: statusnet.php:310 -msgid "" -"To connect to your GNU Social account click the button below to get a " -"security code from GNU Social which you have to copy into the input box " -"below and submit the form. Only your public posts will be " -"posted to GNU Social." -msgstr "" - -#: statusnet.php:311 -msgid "Log in with GNU Social" -msgstr "" - -#: statusnet.php:313 -msgid "Copy the security code from GNU Social here" -msgstr "" - -#: statusnet.php:319 -msgid "Cancel Connection Process" -msgstr "" - -#: statusnet.php:321 -msgid "Current GNU Social API is" -msgstr "" - -#: statusnet.php:322 -msgid "Cancel GNU Social Connection" -msgstr "" - -#: statusnet.php:334 -msgid "Currently connected to: " -msgstr "" - -#: statusnet.php:336 -msgid "" -"If enabled all your public postings can be posted to the " -"associated GNU Social account. You can choose to do so by default (here) or " -"for every posting separately in the posting options when writing the entry." -msgstr "" - -#: statusnet.php:338 +#: statusnet.php:260 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -123,47 +48,126 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "" -#: statusnet.php:341 -msgid "Allow posting to GNU Social" -msgstr "" - -#: statusnet.php:344 -msgid "Send public postings to GNU Social by default" -msgstr "" - -#: statusnet.php:348 -msgid "" -"Mirror all posts from GNU Social that are no replies or repeated messages" -msgstr "" - -#: statusnet.php:354 -msgid "Import the remote timeline" -msgstr "" - -#: statusnet.php:358 -msgid "Disabled" -msgstr "" - -#: statusnet.php:359 -msgid "Full Timeline" -msgstr "" - -#: statusnet.php:360 -msgid "Only Mentions" -msgstr "" - -#: statusnet.php:369 +#: statusnet.php:263 msgid "Clear OAuth configuration" msgstr "" -#: statusnet.php:689 +#: statusnet.php:275 +msgid "Cancel GNU Social Connection" +msgstr "" + +#: statusnet.php:283 +msgid "Globally Available GNU Social OAuthKeys" +msgstr "" + +#: statusnet.php:284 +msgid "" +"There are preconfigured OAuth key pairs for some GNU Social servers " +"available. If you are using one of them, please use these credentials. If " +"not feel free to connect to any other GNU Social instance (see below)." +msgstr "" + +#: statusnet.php:285 +msgid "Provide your own OAuth Credentials" +msgstr "" + +#: statusnet.php:286 +msgid "" +"No consumer key pair for GNU Social found. Register your Friendica Account " +"as a desktop application on your GNU Social account, copy the consumer key " +"pair here and enter the API base root.
Before you register your own " +"OAuth key pair ask the administrator if there is already a key pair for this " +"Friendica installation at your favorite GNU Social installation." +msgstr "" + +#: statusnet.php:287 +msgid "" +"To connect to your GNU Social account click the button below to get a " +"security code from GNU Social which you have to copy into the input box " +"below and submit the form. Only your public posts will be " +"posted to GNU Social." +msgstr "" + +#: statusnet.php:288 +msgid "Log in with GNU Social" +msgstr "" + +#: statusnet.php:289 +msgid "Cancel Connection Process" +msgstr "" + +#: statusnet.php:290 +#, php-format +msgid "Current GNU Social API is: %s" +msgstr "" + +#: statusnet.php:307 +msgid "OAuth Consumer Key" +msgstr "" + +#: statusnet.php:308 +msgid "OAuth Consumer Secret" +msgstr "" + +#: statusnet.php:310 statusnet.php:636 statusnet.php:648 +msgid "Base API Path (remember the trailing /)" +msgstr "" + +#: statusnet.php:311 +msgid "Copy the security code from GNU Social here" +msgstr "" + +#: statusnet.php:313 +msgid "Allow posting to GNU Social" +msgstr "" + +#: statusnet.php:313 +msgid "" +"If enabled all your public postings can be posted to the " +"associated GNU Social account. You can choose to do so by default (here) or " +"for every posting separately in the posting options when writing the entry." +msgstr "" + +#: statusnet.php:314 +msgid "Post to GNU Social by default" +msgstr "" + +#: statusnet.php:315 +msgid "Mirror all public posts" +msgstr "" + +#: statusnet.php:316 +msgid "Automatically create contacts" +msgstr "" + +#: statusnet.php:317 +msgid "Import the remote timeline" +msgstr "" + +#: statusnet.php:318 +msgid "Disabled" +msgstr "" + +#: statusnet.php:319 +msgid "Full Timeline" +msgstr "" + +#: statusnet.php:320 +msgid "Only Mentions" +msgstr "" + +#: statusnet.php:326 +msgid "GNU Social Import/Export/Mirror" +msgstr "" + +#: statusnet.php:647 msgid "Site name" msgstr "" -#: statusnet.php:691 +#: statusnet.php:649 msgid "Consumer Secret" msgstr "" -#: statusnet.php:692 +#: statusnet.php:650 msgid "Consumer Key" msgstr "" diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po index 50f078684..6c09db62e 100644 --- a/superblock/lang/C/messages.po +++ b/superblock/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: superblock.php:38 superblock.php:42 +#: superblock.php:35 +msgid "Comma separated profile URLs to block" +msgstr "" + +#: superblock.php:40 msgid "Superblock" msgstr "" -#: superblock.php:45 -msgid "Comma separated profile URLS to block" -msgstr "" - -#: superblock.php:49 -msgid "Save Settings" -msgstr "" - -#: superblock.php:138 +#: superblock.php:129 msgid "Block Completely" msgstr "" diff --git a/tumblr/lang/C/messages.po b/tumblr/lang/C/messages.po index 22292f373..83434406b 100644 --- a/tumblr/lang/C/messages.po +++ b/tumblr/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:15+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,54 +17,54 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tumblr.php:40 +#: tumblr.php:39 msgid "Permission denied." msgstr "" -#: tumblr.php:70 tumblr.php:284 +#: tumblr.php:69 msgid "Save Settings" msgstr "" -#: tumblr.php:72 +#: tumblr.php:71 msgid "Consumer Key" msgstr "" -#: tumblr.php:73 +#: tumblr.php:72 msgid "Consumer Secret" msgstr "" -#: tumblr.php:178 +#: tumblr.php:177 msgid "You are now authenticated to tumblr." msgstr "" -#: tumblr.php:179 +#: tumblr.php:178 msgid "return to the connector page" msgstr "" -#: tumblr.php:195 +#: tumblr.php:194 msgid "Post to Tumblr" msgstr "" -#: tumblr.php:225 tumblr.php:229 -msgid "Tumblr Export" +#: tumblr.php:225 +msgid "Post to page:" msgstr "" -#: tumblr.php:233 +#: tumblr.php:231 msgid "(Re-)Authenticate your tumblr page" msgstr "" +#: tumblr.php:232 +msgid "You are not authenticated to tumblr" +msgstr "" + #: tumblr.php:237 msgid "Enable Tumblr Post Addon" msgstr "" -#: tumblr.php:243 +#: tumblr.php:238 msgid "Post to Tumblr by default" msgstr "" -#: tumblr.php:264 -msgid "Post to page:" -msgstr "" - -#: tumblr.php:278 -msgid "You are not authenticated to tumblr" +#: tumblr.php:244 +msgid "Tumblr Export" msgstr "" diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po index d943b4f1d..1154c1c9b 100644 --- a/twitter/lang/C/messages.po +++ b/twitter/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-23 18:33-0500\n" +"POT-Creation-Date: 2021-11-27 10:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,17 +27,13 @@ msgid "" "one." msgstr "" -#: twitter.php:318 twitter.php:322 -msgid "Twitter Import/Export/Mirror" -msgstr "" - -#: twitter.php:329 +#: twitter.php:321 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: twitter.php:341 +#: twitter.php:334 msgid "" "At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -46,42 +42,26 @@ msgid "" "be posted to Twitter." msgstr "" -#: twitter.php:342 +#: twitter.php:335 msgid "Log in with Twitter" msgstr "" -#: twitter.php:344 +#: twitter.php:337 msgid "Copy the PIN from Twitter here" msgstr "" -#: twitter.php:349 twitter.php:404 twitter.php:924 -msgid "Save Settings" -msgstr "" - -#: twitter.php:351 twitter.php:406 +#: twitter.php:345 twitter.php:388 msgid "An error occured: " msgstr "" -#: twitter.php:368 -msgid "Currently connected to: " -msgstr "" - -#: twitter.php:369 twitter.php:379 -msgid "Disconnect" -msgstr "" - -#: twitter.php:386 -msgid "Allow posting to Twitter" -msgstr "" - -#: twitter.php:386 +#: twitter.php:359 +#, php-format msgid "" -"If enabled all your public postings can be posted to the " -"associated Twitter account. You can choose to do so by default (here) or for " -"every posting separately in the posting options when writing the entry." +"Currently connected to: %1$s" msgstr "" -#: twitter.php:389 +#: twitter.php:365 msgid "" "Note: Due to your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -89,23 +69,42 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "" -#: twitter.php:392 +#: twitter.php:372 +msgid "Invalid Twitter info" +msgstr "" + +#: twitter.php:373 +msgid "Disconnect" +msgstr "" + +#: twitter.php:378 +msgid "Allow posting to Twitter" +msgstr "" + +#: twitter.php:378 +msgid "" +"If enabled all your public postings can be posted to the " +"associated Twitter account. You can choose to do so by default (here) or for " +"every posting separately in the posting options when writing the entry." +msgstr "" + +#: twitter.php:379 msgid "Send public postings to Twitter by default" msgstr "" -#: twitter.php:395 +#: twitter.php:380 msgid "Mirror all posts from twitter that are no replies" msgstr "" -#: twitter.php:398 +#: twitter.php:381 msgid "Import the remote timeline" msgstr "" -#: twitter.php:401 +#: twitter.php:382 msgid "Automatically create contacts" msgstr "" -#: twitter.php:401 +#: twitter.php:382 msgid "" "This will automatically create a contact in Friendica as soon as you receive " "a message from an existing contact via the Twitter network. If you do not " @@ -113,25 +112,33 @@ msgid "" "from whom you would like to see posts here." msgstr "" -#: twitter.php:557 +#: twitter.php:395 +msgid "Twitter Import/Export/Mirror" +msgstr "" + +#: twitter.php:547 msgid "" "Please connect a Twitter account in your Social Network settings to import " "Twitter posts." msgstr "" -#: twitter.php:564 +#: twitter.php:554 msgid "Twitter post not found." msgstr "" -#: twitter.php:926 +#: twitter.php:914 +msgid "Save Settings" +msgstr "" + +#: twitter.php:916 msgid "Consumer key" msgstr "" -#: twitter.php:927 +#: twitter.php:917 msgid "Consumer secret" msgstr "" -#: twitter.php:1123 +#: twitter.php:1113 #, php-format msgid "%s on Twitter" msgstr "" diff --git a/windowsphonepush/lang/C/messages.po b/windowsphonepush/lang/C/messages.po index 0e0cf1f20..819735ce6 100644 --- a/windowsphonepush/lang/C/messages.po +++ b/windowsphonepush/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:16+0000\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,18 +17,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: windowsphonepush.php:108 -msgid "WindowsPhonePush Settings" -msgstr "" - -#: windowsphonepush.php:111 +#: windowsphonepush.php:102 msgid "Enable WindowsPhonePush Addon" msgstr "" -#: windowsphonepush.php:116 +#: windowsphonepush.php:103 msgid "Push text of new item" msgstr "" -#: windowsphonepush.php:121 -msgid "Save Settings" +#: windowsphonepush.php:104 +msgid "Device URL" +msgstr "" + +#: windowsphonepush.php:109 +msgid "WindowsPhonePush Settings" msgstr "" diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po index cc3ed548f..fea16eee3 100644 --- a/wppost/lang/C/messages.po +++ b/wppost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:16+0100\n" +"POT-Creation-Date: 2021-11-21 19:18-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,56 +17,52 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: wppost.php:39 +#: wppost.php:41 msgid "Post to Wordpress" msgstr "" -#: wppost.php:80 wppost.php:84 -msgid "Wordpress Export" +#: wppost.php:65 +msgid "Enable Wordpress Post Addon" msgstr "" -#: wppost.php:87 -msgid "Enable WordPress Post Addon" +#: wppost.php:66 +msgid "Wordpress username" msgstr "" -#: wppost.php:93 -msgid "WordPress username" +#: wppost.php:67 +msgid "Wordpress password" msgstr "" -#: wppost.php:98 -msgid "WordPress password" -msgstr "" - -#: wppost.php:103 +#: wppost.php:68 msgid "WordPress API URL" msgstr "" -#: wppost.php:108 -msgid "Post to WordPress by default" +#: wppost.php:69 +msgid "Post to Wordpress by default" msgstr "" -#: wppost.php:114 +#: wppost.php:70 msgid "Provide a backlink to the Friendica post" msgstr "" -#: wppost.php:119 +#: wppost.php:71 msgid "" "Text for the backlink, e.g. Read the original post and comment stream on " "Friendica." msgstr "" -#: wppost.php:124 +#: wppost.php:72 msgid "Don't post messages that are too short" msgstr "" -#: wppost.php:131 -msgid "Save Settings" +#: wppost.php:77 +msgid "Wordpress Export" msgstr "" -#: wppost.php:231 +#: wppost.php:182 msgid "Read the orig­i­nal post and com­ment stream on Friendica" msgstr "" -#: wppost.php:289 +#: wppost.php:240 msgid "Post from Friendica" msgstr ""