Merge branch 'main' into iOS-18

Dimillian · Sep 6, 2024 · aa91d16 · aa91d16
2 parents e5fb928 + 904cd3d
commit aa91d16
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/IceCubesApp/Resources/Localization/Localizable.xcstrings b/IceCubesApp/Resources/Localization/Localizable.xcstrings
@@ -29185,11 +29185,23 @@
     },
     "Feature Requests" : {
       "localizations" : {
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Solicitudes de funciones"
+          }
+        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Richieste di funzionalità"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "功能请求"
+          }
         }
       }
     },
@@ -42040,11 +42052,23 @@
     },
     "Privacy Policy" : {
       "localizations" : {
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Política de Privacidad"
+          }
+        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Privacy policy"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "隐私政策"
+          }
         }
       }
     },
@@ -78940,21 +78964,45 @@
     },
     "Telemetry" : {
       "localizations" : {
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetría"
+          }
+        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Telemetria"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "数据采集"
+          }
         }
       }
     },
     "Telemetry by TelemetryDeck" : {
       "localizations" : {
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Telemetría de TelemetryDeck"
+          }
+        },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Telemetria di TelemetryDeck"
           }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "数据采集服务由 TelemetryDeck 提供"
+          }
         }
       }
     },
@@ -83912,4 +83960,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/Packages/Env/Sources/Env/Ext/TranslationView.swift b/Packages/Env/Sources/Env/Ext/TranslationView.swift
@@ -5,11 +5,15 @@ import SwiftUI
 
   public extension View {
     func addTranslateView(isPresented: Binding<Bool>, text: String) -> some View {
+      #if targetEnvironment(macCatalyst)
+        return self
+      #else
       if #available(iOS 17.4, *) {
         return self.translationPresentation(isPresented: isPresented, text: text)
       } else {
         return self
       }
+      #endif
     }
   }
 #endif