feat(templ): new unicode escape delimiter

And fix hp.
mdn · Oct 15, 2024 · 5740118 · 5740118
1 parent 0a41adc
commit 5740118
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/crates/rari-doc/src/pages/types/contributors.rs b/crates/rari-doc/src/pages/types/contributors.rs
@@ -181,7 +181,7 @@ impl PageLike for ContributorSpotlight {
     }
 
     fn locale(&self) -> Locale {
-        Locale::EnUs
+        self.meta.locale
     }
 
     fn content(&self) -> &str {

diff --git a/crates/rari-md/src/ext.rs b/crates/rari-md/src/ext.rs
@@ -3,5 +3,5 @@ pub(crate) enum Flag {
     None,
 }
 
-pub static DELIM_START: &str = ";!::::";
-pub static DELIM_END: &str = ";!::::";
+pub static DELIM_START: &str = "⟬";
+pub static DELIM_END: &str = "⟭";
diff --git a/crates/rari-md/src/p.rs b/crates/rari-md/src/p.rs
@@ -54,11 +54,9 @@ mod test {
 
     #[test]
     fn test_only_escaped_templ() {
-        let b = b";!::::0;!::::";
+        let b = "⟬0⟭".as_bytes();
         assert!(only_escaped_templ(b, 0));
-        let b = b";!::::0;!::::;!::::1;!::::";
+        let b = "⟬0⟭⟬1⟭".as_bytes();
         assert!(only_escaped_templ(b, 0));
-        let b = b"foo ;!::::0;!::::;!::::1::::!;";
-        assert!(!only_escaped_templ(b, 0));
     }
 }
diff --git a/crates/rari-types/src/locale.rs b/crates/rari-types/src/locale.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 use serde_variant::to_variant_name;
 use thiserror::Error;
 
-use crate::globals::settings;
+use crate::globals::{content_translated_root, settings};
 
 #[derive(PartialEq, Debug, Clone, Copy, Deserialize, Serialize, Default, PartialOrd, Eq, Ord)]
 pub enum Native {
@@ -138,7 +138,11 @@ impl Locale {
     }
 
     pub fn for_generic_and_spas() -> &'static [Self] {
-        &LOCALES_FOR_GENERICS_AND_SPAS
+        if content_translated_root().is_none() {
+            [Locale::EnUs].as_slice()
+        } else {
+            &LOCALES_FOR_GENERICS_AND_SPAS
+        }
     }
 }