Merge branch 'lang-attribute'

kitconcept · Mar 1, 2024 · ea59653 · ea59653
2 parents 16b3c1a + 3618274
commit ea59653
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/news/23.breaking b/news/23.breaking
@@ -0,0 +1 @@
+- fix quotation marks using `lang` attribute from blockquote instead of the html ones
diff --git a/src/components/View.jsx b/src/components/View.jsx
@@ -12,7 +12,7 @@ const View = (props) => {
     slateSettings: {
       ...config.settings.slate,
       toolbarButtons: config.settings.slate.toolbarButtons.filter(
-        (index) => index - config.settings.slate.toolbarButtons,
+        (index) => index - config.settings.slate.toolbarButtons
       ),
     },
   };
@@ -37,7 +37,7 @@ const View = (props) => {
         <blockquote
           className={data.plaintext?.length < 1 && 'isEmpty'}
           cite={data.cite}
-          lang={data.quotationLanguage || intl.locale}
+          lang={data.quotationLanguage != intl.locale && data.quotationLanguage}
         >
           {!isEditMode ? (
             <TextBlockView {...props} />

diff --git a/src/theme/main.less b/src/theme/main.less
@@ -6,27 +6,30 @@
   margin-bottom: 1em;
 }
 
-.block.quote blockquote:not(.isEmpty) {
+html {
   &[lang='de'] {
-    p {
-      &::before {
-        content: '„';
-      }
+    .block.quote blockquote:not(.isEmpty) {
+      p {
+        &::before {
+          content: '„';
+        }
 
-      &::after {
-        content: '“';
+        &::after {
+          content: '“';
+        }
       }
     }
   }
-
   &[lang='en'] {
-    p {
-      &::before {
-        content: '"';
-      }
+    .block.quote blockquote:not(.isEmpty) {
+      p {
+        &::before {
+          content: '"';
+        }
 
-      &::after {
-        content: '"';
+        &::after {
+          content: '"';
+        }
       }
     }
   }