diff options
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 2 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 8da4c3ddb..9c8dbbb7d 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -353,7 +353,7 @@ "status.reply": "Reply", "status.replyAll": "Reply to thread", "status.report": "Report @{name}", - "status.sensitive_warning": "Sensitive content", + "status.sensitive_warning": "Reveal", "status.sensitive_toggle": "Reveal", "status.share": "Share", "status.show_less": "Hide", diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 42911b52a..9005ec768 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -216,6 +216,7 @@ class Formatter end def format_markdown(html) + html = html.gsub("\r\n", "\n").gsub("\r", "\n") html = reformat(markdown_formatter.render(html)) html.delete("\r").delete("\n") end |