Merge branch 'tyiu/notifications' into tyiu/translations

2023-02-27 10:58:10 +13:00
parent bacd9b3c38 77bcd1b715
commit 240fda2429
6 changed files with 209 additions and 37 deletions
--- a/damus/Util/LocalizationUtil.swift
+++ b/damus/Util/LocalizationUtil.swift
@@ -7,7 +7,11 @@

 import Foundation

-func bundleForLocale(locale: Locale) -> Bundle {
-    let path = Bundle.main.path(forResource: locale.identifier, ofType: "lproj")
+func bundleForLocale(locale: Locale?) -> Bundle {
+    if locale == nil {
+        return Bundle.main
+    }
+
+    let path = Bundle.main.path(forResource: locale!.identifier, ofType: "lproj")
    return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main
 }