From b9beb7aec43ab945b57324ca263c63d28ded1462 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Mon, 16 Sep 2024 16:15:20 +1000
Subject: [PATCH] Use English strings as the default strings & update build
 number

---
 Session.xcodeproj/project.pbxproj              |  4 ++--
 SessionUtilitiesKit/General/Localization.swift | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
index 82dda5b50..ec073f3cc 100644
--- a/Session.xcodeproj/project.pbxproj
+++ b/Session.xcodeproj/project.pbxproj
@@ -7797,7 +7797,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 490;
+				CURRENT_PROJECT_VERSION = 491;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -7869,7 +7869,7 @@
 				CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 490;
+				CURRENT_PROJECT_VERSION = 491;
 				DEVELOPMENT_TEAM = SUQ8J2PCT7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/SessionUtilitiesKit/General/Localization.swift b/SessionUtilitiesKit/General/Localization.swift
index 4cfa983d5..693b2b239 100644
--- a/SessionUtilitiesKit/General/Localization.swift
+++ b/SessionUtilitiesKit/General/Localization.swift
@@ -30,8 +30,17 @@ final public class LocalizationHelper: CustomStringConvertible {
     }
 
     public func localized() -> String {
+        // Use English as the default string if the translation is empty
+        let defaultString: String = {
+            if let englishPath = Bundle.main.path(forResource: "en", ofType: "lproj"), let englishBundle = Bundle(path: englishPath) {
+                return englishBundle.localizedString(forKey: template, value: nil, table: nil)
+            } else {
+                return ""
+            }
+        }()
+        
         // If the localized string matches the key provided then the localisation failed
-        var localizedString: String = NSLocalizedString(template, comment: "")
+        var localizedString: String = NSLocalizedString(template, value: defaultString, comment: "")
         
         // Deal with plurals
         // Note: We have to deal with plurals first, so we can get the correct string