From c041fd7504bb7661efa6a332e6dce27a47789fb1 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 19 Aug 2019 15:42:58 -0400 Subject: [PATCH] fix language locale loading --- .../app/desktop/safari/SafariExtensionViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/app/desktop/safari/SafariExtensionViewController.swift index 9f8cf0ece0..fb1ac68db3 100644 --- a/src/safari/app/desktop/safari/SafariExtensionViewController.swift +++ b/src/safari/app/desktop/safari/SafariExtensionViewController.swift @@ -75,9 +75,9 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe UserDefaults.standard.removeObject(forKey: m!.data!) replyMessage(message: m!) } else if command == "getLocaleStrings" { - let language = m!.data + let language = m!.data ?? "en" let bundleURL = Bundle.main.resourceURL!.absoluteURL - let messagesUrl = bundleURL.appendingPathComponent("app/_locales/en/messages.json") + let messagesUrl = bundleURL.appendingPathComponent("app/_locales/\(language)/messages.json") do { let json = try String(contentsOf: messagesUrl, encoding: .utf8) webView.evaluateJavaScript("window.bitwardenLocaleStrings = \(json);", completionHandler: nil)