Merge pull request #107 from dyoo/refactor-messages

Prepare `extract_messages` to return translator comments
google · Feb 20, 2024 · 35be9ad · 35be9ad
2 parents 3012f1d + 5d87006
commit 35be9ad
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 57 deletions.
diff --git a/fuzz/fuzz_targets/group_events.rs b/fuzz/fuzz_targets/group_events.rs
@@ -9,7 +9,7 @@ fuzz_target!(|text: String| {
     let flattened_groups = group_events(&events)
         .into_iter()
         .flat_map(|group| match group {
-            Group::Translate(events) | Group::Skip(events) => events,
+            Group::Translate { events, .. } | Group::Skip(events) => events,
         })
         .collect::<Vec<_>>();
 

diff --git a/i18n-helpers/src/directives.rs b/i18n-helpers/src/directives.rs
@@ -4,7 +4,7 @@ use std::sync::OnceLock;
 #[derive(Debug, PartialEq)]
 pub enum Directive {
     Skip,
-    TranslatorComment(String),
+    Comment(String),
 }
 
 pub fn find(html: &str) -> Option<Directive> {
@@ -30,7 +30,7 @@ pub fn find(html: &str) -> Option<Directive> {
                 command.find("comment").unwrap() + "comment".len() + 1,
                 command.len(),
             );
-            Some(Directive::TranslatorComment(
+            Some(Directive::Comment(
                 command[start_of_comment_offset..].trim().into(),
             ))
         }
@@ -83,19 +83,19 @@ mod tests {
     }
 
     #[test]
-    fn test_translator_comment() {
+    fn test_comment() {
         assert!(match find("<!-- i18n:comment: hello world! -->") {
-            Some(Directive::TranslatorComment(s)) => {
+            Some(Directive::Comment(s)) => {
                 s == "hello world!"
             }
             _ => false,
         });
     }
 
     #[test]
-    fn test_translator_empty_comment_does_nothing() {
+    fn test_empty_comment_does_nothing() {
         assert!(match find("<!-- i18n:comment -->") {
-            Some(Directive::TranslatorComment(s)) => {
+            Some(Directive::Comment(s)) => {
                 s.is_empty()
             }
             _ => false,