X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDebug%2FBabel.php;h=35037f45e41254cfa1cfad4c6637eb5c0fb9e4ad;hb=e80d68ba53776bed047d897f52db7e25b35a479d;hp=b9b629f0736574ee43ef555cc7d413777df0e034;hpb=a507963c7f11bc6106065edee145babc22479276;p=friendica.git diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php index b9b629f073..35037f45e4 100644 --- a/src/Module/Debug/Babel.php +++ b/src/Module/Debug/Babel.php @@ -1,11 +1,30 @@ . + * + */ namespace Friendica\Module\Debug; use Friendica\BaseModule; use Friendica\Content\Text; -use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Util\XML; @@ -14,7 +33,7 @@ use Friendica\Util\XML; */ class Babel extends BaseModule { - public static function content() + public static function content(array $parameters = []) { function visible_whitespace($s) { @@ -25,58 +44,62 @@ class Babel extends BaseModule $results = []; if (!empty($_REQUEST['text'])) { - switch (defaults($_REQUEST, 'type', 'bbcode')) { + switch (($_REQUEST['type'] ?? '') ?: 'bbcode') { case 'bbcode': $bbcode = trim($_REQUEST['text']); $results[] = [ - 'title' => L10n::t('Source input'), + 'title' => DI::l10n()->t('Source input'), 'content' => visible_whitespace($bbcode) ]; $plain = Text\BBCode::toPlaintext($bbcode, false); $results[] = [ - 'title' => L10n::t('BBCode::toPlaintext'), + 'title' => DI::l10n()->t('BBCode::toPlaintext'), 'content' => visible_whitespace($plain) ]; $html = Text\BBCode::convert($bbcode); $results[] = [ - 'title' => L10n::t('BBCode::convert (raw HTML)'), + 'title' => DI::l10n()->t('BBCode::convert (raw HTML)'), 'content' => visible_whitespace(htmlspecialchars($html)) ]; $results[] = [ - 'title' => L10n::t('BBCode::convert'), + 'title' => DI::l10n()->t('BBCode::convert'), 'content' => $html ]; $bbcode2 = Text\HTML::toBBCode($html); $results[] = [ - 'title' => L10n::t('BBCode::convert => HTML::toBBCode'), + 'title' => DI::l10n()->t('BBCode::convert => HTML::toBBCode'), 'content' => visible_whitespace($bbcode2) ]; $markdown = Text\BBCode::toMarkdown($bbcode); $results[] = [ - 'title' => L10n::t('BBCode::toMarkdown'), - 'content' => visible_whitespace($markdown) + 'title' => DI::l10n()->t('BBCode::toMarkdown'), + 'content' => visible_whitespace(htmlspecialchars($markdown)) ]; $html2 = Text\Markdown::convert($markdown); $results[] = [ - 'title' => L10n::t('BBCode::toMarkdown => Markdown::convert'), + 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert (raw HTML)'), + 'content' => visible_whitespace(htmlspecialchars($html2)) + ]; + $results[] = [ + 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert'), 'content' => $html2 ]; $bbcode3 = Text\Markdown::toBBCode($markdown); $results[] = [ - 'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'), + 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::toBBCode'), 'content' => visible_whitespace($bbcode3) ]; $bbcode4 = Text\HTML::toBBCode($html2); $results[] = [ - 'title' => L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'), + 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'), 'content' => visible_whitespace($bbcode4) ]; @@ -87,88 +110,88 @@ class Babel extends BaseModule Item::setHashtags($item); $results[] = [ - 'title' => L10n::t('Item Body'), + 'title' => DI::l10n()->t('Item Body'), 'content' => visible_whitespace($item['body']) ]; $results[] = [ - 'title' => L10n::t('Item Tags'), + 'title' => DI::l10n()->t('Item Tags'), 'content' => $item['tag'] ]; break; case 'markdown': $markdown = trim($_REQUEST['text']); $results[] = [ - 'title' => L10n::t('Source input (Diaspora format)'), + 'title' => DI::l10n()->t('Source input (Diaspora format)'), 'content' => '
' . htmlspecialchars($markdown) . '' ]; $html = Text\Markdown::convert(html_entity_decode($markdown,ENT_COMPAT, 'UTF-8')); $results[] = [ - 'title' => L10n::t('Markdown::convert (raw HTML)'), + 'title' => DI::l10n()->t('Markdown::convert (raw HTML)'), 'content' => visible_whitespace(htmlspecialchars($html)) ]; $results[] = [ - 'title' => L10n::t('Markdown::convert'), + 'title' => DI::l10n()->t('Markdown::convert'), 'content' => $html ]; $bbcode = Text\Markdown::toBBCode(XML::unescape($markdown)); $results[] = [ - 'title' => L10n::t('Markdown::toBBCode'), + 'title' => DI::l10n()->t('Markdown::toBBCode'), 'content' => '
' . $bbcode . '' ]; break; case 'html' : $html = trim($_REQUEST['text']); $results[] = [ - 'title' => L10n::t('Raw HTML input'), + 'title' => DI::l10n()->t('Raw HTML input'), 'content' => htmlspecialchars($html) ]; $results[] = [ - 'title' => L10n::t('HTML Input'), + 'title' => DI::l10n()->t('HTML Input'), 'content' => $html ]; $bbcode = Text\HTML::toBBCode($html); $results[] = [ - 'title' => L10n::t('HTML::toBBCode'), + 'title' => DI::l10n()->t('HTML::toBBCode'), 'content' => visible_whitespace($bbcode) ]; $html2 = Text\BBCode::convert($bbcode); $results[] = [ - 'title' => L10n::t('HTML::toBBCode => BBCode::convert'), + 'title' => DI::l10n()->t('HTML::toBBCode => BBCode::convert'), 'content' => $html2 ]; $results[] = [ - 'title' => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'), + 'title' => DI::l10n()->t('HTML::toBBCode => BBCode::convert (raw HTML)'), 'content' => htmlspecialchars($html2) ]; $bbcode2plain = Text\BBCode::toPlaintext($bbcode); $results[] = [ - 'title' => L10n::t('HTML::toBBCode => BBCode::toPlaintext'), + 'title' => DI::l10n()->t('HTML::toBBCode => BBCode::toPlaintext'), 'content' => '
' . $bbcode2plain . '' ]; $markdown = Text\HTML::toMarkdown($html); $results[] = [ - 'title' => L10n::t('HTML::toMarkdown'), + 'title' => DI::l10n()->t('HTML::toMarkdown'), 'content' => visible_whitespace($markdown) ]; - $text = Text\HTML::toPlaintext($html); + $text = Text\HTML::toPlaintext($html, 0); $results[] = [ - 'title' => L10n::t('HTML::toPlaintext'), + 'title' => DI::l10n()->t('HTML::toPlaintext'), 'content' => '
' . $text . '' ]; $text = Text\HTML::toPlaintext($html, 0, true); $results[] = [ - 'title' => L10n::t('HTML::toPlaintext (compact)'), + 'title' => DI::l10n()->t('HTML::toPlaintext (compact)'), 'content' => '
' . $text . '' ]; } @@ -176,10 +199,10 @@ class Babel extends BaseModule $tpl = Renderer::getMarkupTemplate('babel.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$text' => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''], - '$type_bbcode' => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'], - '$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'], - '$type_html' => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'], + '$text' => ['text', DI::l10n()->t('Source text'), $_REQUEST['text'] ?? '', ''], + '$type_bbcode' => ['type', DI::l10n()->t('BBCode'), 'bbcode', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'bbcode'], + '$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'], + '$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'], '$results' => $results ]);