Merge branch 'Lakr233:main' into main

Zach677 · Sep 12, 2024 · 53bd026 · 53bd026
2 parents c45f112 + c26ac83
commit 53bd026
Show file tree

Hide file tree

Showing 5 changed files with 424 additions and 24 deletions.
diff --git a/NotchDrop.xcodeproj/project.pbxproj b/NotchDrop.xcodeproj/project.pbxproj
@@ -220,6 +220,7 @@
 				"zh-Hans",
 				"zh-Hant",
 				ja,
+				fr,
 			);
 			mainGroup = 504381772C3A86EA000ED325;
 			packageReferences = (
@@ -419,7 +420,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 38;
 				DEVELOPMENT_TEAM = 964G86XT2P;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -433,7 +434,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.12;
+				MARKETING_VERSION = 2.14;
 				PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.NotchDrop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -450,7 +451,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 38;
 				DEVELOPMENT_TEAM = 964G86XT2P;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -464,7 +465,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.12;
+				MARKETING_VERSION = 2.14;
 				PRODUCT_BUNDLE_IDENTIFIER = wiki.qaq.NotchDrop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/NotchDrop/InfoPlist.xcstrings b/NotchDrop/InfoPlist.xcstrings
@@ -10,6 +10,12 @@
             "value" : "NotchDrop"
           }
         },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NotchDrop"
+          }
+        },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
@@ -40,6 +46,12 @@
             "value" : "NotchDrop"
           }
         },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "NotchDrop"
+          }
+        },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
@@ -70,6 +82,12 @@
             "value" : "Copyright © 2024 Lakr Aream. All rights reserved."
           }
         },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Copyright © 2024 Lakr Aream. All rights reserved."
+          }
+        },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",

diff --git a/NotchDrop/Language.swift b/NotchDrop/Language.swift
@@ -14,6 +14,7 @@ enum Language: String, CaseIterable, Identifiable, Codable {
     case simplifiedChinese = "Simplified Chinese"
     case traditionalChinese = "Traditional Chinese"
     case japanese = "Japanese"
+    case french = "French"
 
     var id: String { rawValue }
 
@@ -34,6 +35,8 @@ enum Language: String, CaseIterable, Identifiable, Codable {
                 languageCode = "zh-Hant"
             } else if region == "CN" {
                 languageCode = "zh-Hans"
+            } else if region == "FR" {
+                languageCode = "fr"
             } else {
                 languageCode = "en"
             }
@@ -47,31 +50,42 @@ enum Language: String, CaseIterable, Identifiable, Codable {
             languageCode = "zh-Hant"
         case .japanese:
             languageCode = "ja"
+        case .french:
+            languageCode = "fr"
         }
 
         Bundle.setLanguage(languageCode)
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             NSAlert.popRestart(
                 NSLocalizedString("The language has been changed. The app will restart for the changes to take effect.", comment: ""),
-                completion: restartApp
+                completion: relaunchApp
             )
         }
     }
 }
 
-private func restartApp() {
-    guard let appPath = Bundle.main.executablePath else { return }
-    NSApp.terminate(nil)
-
-    DispatchQueue.global().asyncAfter(deadline: .now() + 0.5) {
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: appPath)
-        try? process.run()
-        exit(0)
-    }
+private func relaunchApp() {
+    let path = Bundle.main.bundlePath
+    let task = Process()
+    task.launchPath = "/usr/bin/open"
+    task.arguments = ["-n", path]
+    task.launch()
+    exit(0)
 }
 
+// private func restartApp() {
+//     guard let appPath = Bundle.main.executablePath else { return }
+//     NSApp.terminate(nil)
+
+//     DispatchQueue.global().asyncAfter(deadline: .now() + 0.5) {
+//         let process = Process()
+//         process.executableURL = URL(fileURLWithPath: appPath)
+//         try? process.run()
+//         exit(0)
+//     }
+// }
+
 private extension Bundle {
     private static var onLanguageDispatchOnce: () -> Void = {
         object_setClass(Bundle.main, PrivateBundle.self)