Remove unwrap on system language parsing

vizia · Jul 20, 2022 · ed840e9 · ed840e9
1 parent 73a5fda
commit ed840e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/environment.rs b/core/src/environment.rs
@@ -18,7 +18,7 @@ impl Default for Environment {
 
 impl Environment {
     pub fn new() -> Self {
-        let locale = sys_locale::get_locale().map(|l| l.parse().unwrap()).unwrap_or_default();
+        let locale = sys_locale::get_locale().map(|l| l.parse().ok()).flatten().unwrap_or_default();
 
         Self { locale, include_default_theme: true }
     }

diff --git a/core/src/resource.rs b/core/src/resource.rs
@@ -76,7 +76,7 @@ pub struct ResourceManager {
 
 impl ResourceManager {
     pub fn new() -> Self {
-        let locale = sys_locale::get_locale().map(|l| l.parse().unwrap()).unwrap_or_default();
+        let locale = sys_locale::get_locale().map(|l| l.parse().ok()).flatten().unwrap_or_default();
 
         ResourceManager {
             stylesheets: Vec::new(),
@@ -100,7 +100,8 @@ impl ResourceManager {
             .filter(|&x| x != &LanguageIdentifier::default())
             .collect::<Vec<_>>();
         let locale = sys_locale::get_locale()
-            .map(|l| l.parse().unwrap())
+            .map(|l| l.parse().ok())
+            .flatten()
             .unwrap_or_else(|| available.first().copied().cloned().unwrap_or_default());
         let default = LanguageIdentifier::default();
         let default_ref = &default; // ???