Fix quotes (#1544)

rafalp · Apr 4, 2023 · 06ccd62 · 06ccd62
1 parent d69016b
commit 06ccd62
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/frontend/src/style/misago/markup.less b/frontend/src/style/misago/markup.less
@@ -3,7 +3,8 @@
 // --------------------------------------------------
 
 // Set font-size
-.misago-markup {
+.misago-markup,
+.misago-markup blockquote {
   font-size: @misago-markup-font-size;
 }
 

diff --git a/misago/markup/finalize.py b/misago/markup/finalize.py
@@ -4,7 +4,7 @@
 
 QUOTE_HEADER_RE = re.compile(
     r"""
-<div class="quote-heading">(?P<title>.*?)</div>
+<div class="quote-heading" data-noquote="1">(?P<title>.*?)</div>
 """.strip(),
     re.IGNORECASE | re.MULTILINE | re.DOTALL,
 )
@@ -24,16 +24,7 @@ def replace_quote_headers(matchobj):
         quote_title = _("%(title)s has written:") % {"title": title}
     else:
         quote_title = _("Quoted message:")
-    return '<div class="quote-heading">%s</div>' % quote_title
-
-
-def replace_spoiler_headers(matchobj):
-    title = matchobj.group("title")
-    if title:
-        spoiler_title = _("%(title)s:") % {"title": title}
-    else:
-        spoiler_title = _("Spoiler:")
-    return '<div class="spoiler-heading">%s</div>' % spoiler_title
+    return '<div class="quote-heading" data-noquote="1">%s</div>' % quote_title
 
 
 def replace_spoiler_reveal_buttons(post):

diff --git a/misago/markup/tests/snapshots/snap_test_finalization.py b/misago/markup/tests/snapshots/snap_test_finalization.py
@@ -8,8 +8,8 @@
 snapshots = Snapshot()
 
 snapshots[
-    "test_finalization_sets_translation_strings_in_quotes 1"
-] = '<div class="quote-heading">Quoted message:</div>'
+    "test_finalization_sets_translation_strings_in_empty_quotes_headings 1"
+] = '<div class="quote-heading" data-noquote="1">Quoted message:</div>'
 
 snapshots[
     "test_finalization_sets_translation_strings_in_spoilers_buttons 1"

diff --git a/misago/markup/tests/test_finalization.py b/misago/markup/tests/test_finalization.py
@@ -1,8 +1,14 @@
 from ..finalize import finalize_markup
 
 
-def test_finalization_sets_translation_strings_in_quotes(snapshot):
-    test_text = '<div class="quote-heading"></div>'
+def test_finalization_sets_translation_strings_in_empty_quotes_headings(snapshot):
+    test_text = '<div class="quote-heading" data-noquote="1">Lorem ipsum</div>'
+    finalized_text = finalize_markup(test_text)
+    snapshot.assert_match(finalized_text)
+
+
+def test_finalization_sets_translation_strings_in_empty_quotes_headings(snapshot):
+    test_text = '<div class="quote-heading" data-noquote="1"></div>'
     finalized_text = finalize_markup(test_text)
     snapshot.assert_match(finalized_text)
 

diff --git a/misago/static/misago/css/misago.css b/misago/static/misago/css/misago.css
diff --git a/misago/static/misago/css/misago.css.map b/misago/static/misago/css/misago.css.map