Merge remote-tracking branch 'origin/master'

Voultapher · Apr 26, 2021 · f36df87 · f36df87
2 parents 25809c3 + 933304a
commit f36df87
Show file tree

Hide file tree

Showing 7 changed files with 410 additions and 69 deletions.
diff --git a/fluent-fallback/src/errors.rs b/fluent-fallback/src/errors.rs
@@ -14,9 +14,11 @@ pub enum LocalizationError {
     },
     MissingMessage {
         id: String,
+        locale: Option<LanguageIdentifier>,
     },
     MissingValue {
         id: String,
+        locale: Option<LanguageIdentifier>,
     },
     SyncRequestInAsyncMode,
 }
@@ -41,8 +43,24 @@ impl std::fmt::Display for LocalizationError {
                     errors.join(", ")
                 )
             }
-            Self::MissingMessage { id } => write!(f, "[fluent] Missing message: {}", id),
-            Self::MissingValue { id } => write!(f, "[fluent] Missing value in message: {}", id),
+            Self::MissingMessage {
+                id,
+                locale: Some(locale),
+            } => write!(f, "[fluent] Missing message in locale {}: {}", locale, id),
+            Self::MissingMessage { id, locale: None } => {
+                write!(f, "[fluent] Couldn't find a message: {}", id)
+            }
+            Self::MissingValue {
+                id,
+                locale: Some(locale),
+            } => write!(
+                f,
+                "[fluent] Message has no value in locale {}: {}",
+                locale, id
+            ),
+            Self::MissingValue { id, locale: None } => {
+                write!(f, "[fluent] Couldn't find a message with value: {}", id)
+            }
             Self::SyncRequestInAsyncMode => {
                 write!(f, "Triggered synchronous format while in async mode")
             }

diff --git a/fluent-fallback/src/lib.rs b/fluent-fallback/src/lib.rs
@@ -97,4 +97,5 @@ mod localization;
 mod pin_cell;
 pub mod types;
 
+pub use errors::LocalizationError;
 pub use localization::Localization;