diff --git a/mod/babel.php b/mod/babel.php index 3352366bd5..fcd63113e8 100644 --- a/mod/babel.php +++ b/mod/babel.php @@ -6,8 +6,10 @@ use Friendica\Content\Text; use Friendica\Core\L10n; -function visible_lf($s) +function visible_whitespace($s) { + $s = str_replace(' ', ' ', $s); + return str_replace("\n", '
', $s); } @@ -20,19 +22,19 @@ function babel_content() $bbcode = trim($_REQUEST['text']); $results[] = [ 'title' => L10n::t('Source input'), - 'content' => visible_lf($bbcode) + 'content' => visible_whitespace($bbcode) ]; $plain = Text\BBCode::toPlaintext($bbcode, false); $results[] = [ 'title' => L10n::t('BBCode::toPlaintext'), - 'content' => visible_lf($plain) + 'content' => visible_whitespace($plain) ]; $html = Text\BBCode::convert($bbcode); $results[] = [ - 'title' => L10n::t("BBCode::convert \x28raw HTML\x29"), - 'content' => htmlspecialchars($html) + 'title' => L10n::t('BBCode::convert (raw HTML)'), + 'content' => visible_whitespace(htmlspecialchars($html)) ]; $results[] = [ @@ -43,13 +45,13 @@ function babel_content() $bbcode2 = Text\HTML::toBBCode($html); $results[] = [ 'title' => L10n::t('BBCode::convert => HTML::toBBCode'), - 'content' => visible_lf($bbcode2) + 'content' => visible_whitespace($bbcode2) ]; $markdown = Text\BBCode::toMarkdown($bbcode); $results[] = [ 'title' => L10n::t('BBCode::toMarkdown'), - 'content' => visible_lf($markdown) + 'content' => visible_whitespace($markdown) ]; $html2 = Text\Markdown::convert($markdown); @@ -61,22 +63,33 @@ function babel_content() $bbcode3 = Text\Markdown::toBBCode($markdown); $results[] = [ 'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'), - 'content' => visible_lf($bbcode3) + 'content' => visible_whitespace($bbcode3) ]; $bbcode4 = Text\HTML::toBBCode($html2); $results[] = [ 'title' => L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'), - 'content' => visible_lf($bbcode4) + 'content' => visible_whitespace($bbcode4) ]; break; case 'markdown': $markdown = trim($_REQUEST['text']); $results[] = [ - 'title' => L10n::t('Source input \x28Diaspora format\x29'), + 'title' => L10n::t('Source input (Diaspora format)'), 'content' => '
' . $markdown . '
' ]; + $html = Text\Markdown::convert($markdown); + $results[] = [ + 'title' => L10n::t('Markdown::convert (raw HTML)'), + 'content' => htmlspecialchars($html) + ]; + + $results[] = [ + 'title' => L10n::t('Markdown::convert'), + 'content' => $html + ]; + $bbcode = Text\Markdown::toBBCode($markdown); $results[] = [ 'title' => L10n::t('Markdown::toBBCode'), @@ -86,7 +99,7 @@ function babel_content() case 'html' : $html = trim($_REQUEST['text']); $results[] = [ - 'title' => L10n::t("Raw HTML input"), + 'title' => L10n::t('Raw HTML input'), 'content' => htmlspecialchars($html) ]; @@ -98,7 +111,7 @@ function babel_content() $bbcode = Text\HTML::toBBCode($html); $results[] = [ 'title' => L10n::t('HTML::toBBCode'), - 'content' => visible_lf($bbcode) + 'content' => visible_whitespace($bbcode) ]; $text = Text\HTML::toPlaintext($html);