Fallback to default when requested language is missing, rather than p…

…anicking (#16)
XAMPPRocky · Jul 21, 2020 · 0264258 · 0264258
1 parent f4af159
commit 0264258
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/templates/src/loader/arc_loader.rs b/templates/src/loader/arc_loader.rs
@@ -109,9 +109,11 @@ impl super::Loader for ArcLoader {
         text_id: &str,
         args: Option<&HashMap<String, FluentValue>>,
     ) -> String {
-        for l in self.fallbacks.get(lang).expect("language not found") {
-            if let Some(val) = self.lookup_single_language(l, text_id, args) {
-                return val;
+        if let Some(fallbacks) = self.fallbacks.get(lang) {
+            for l in fallbacks {
+                if let Some(val) = self.lookup_single_language(l, text_id, args) {
+                    return val;
+                }
             }
         }
         if *lang != self.fallback {
@@ -168,7 +170,7 @@ impl ArcLoader {
                 None
             }
         } else {
-            panic!("Unknown language {}", lang)
+            None
         }
     }
 }
diff --git a/templates/src/loader/static_loader.rs b/templates/src/loader/static_loader.rs
@@ -69,9 +69,11 @@ impl StaticLoader {
         text_id: &str,
         args: Option<&HashMap<String, FluentValue>>,
     ) -> Option<String> {
-        for l in self.fallbacks.get(lang).expect("language not found") {
-            if let Some(val) = self.lookup_single_language(l, text_id, args) {
-                return Some(val);
+        if let Some(fallbacks) = self.fallbacks.get(lang) {
+            for l in fallbacks {
+                if let Some(val) = self.lookup_single_language(l, text_id, args) {
+                    return Some(val);
+                }
             }
         }
 
@@ -87,9 +89,11 @@ impl super::Loader for StaticLoader {
         text_id: &str,
         args: Option<&HashMap<String, FluentValue>>,
     ) -> String {
-        for l in self.fallbacks.get(lang).expect("language not found") {
-            if let Some(val) = self.lookup_single_language(l, text_id, args) {
-                return val;
+        if let Some(fallbacks) = self.fallbacks.get(lang) {
+            for l in fallbacks {
+                if let Some(val) = self.lookup_single_language(l, text_id, args) {
+                    return val;
+                }
             }
         }
         if *lang != self.fallback {