Make the localization keys clear strings

Dimillian · May 13, 2024 · 7de6a0f · 7de6a0f
1 parent 643ad75
commit 7de6a0f
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 71 deletions.
diff --git a/IceCubesApp/App/Tabs/Settings/TranslationSettingsView.swift b/IceCubesApp/App/Tabs/Settings/TranslationSettingsView.swift
@@ -109,7 +109,7 @@ struct TranslationSettingsView: View {
        !apiKey.isEmpty
     {
       Section {
-        Text("settings.translation.api-key-still-stored")
+        Text("The DeepL API Key is still stored!")
         if preferences.preferredTranslationType == .useServerIfPossible {
           Text("It can however still be used as a fallback for your instance's translation service.")
         }

diff --git a/IceCubesApp/Resources/Localization/Localizable.xcstrings b/IceCubesApp/Resources/Localization/Localizable.xcstrings
@@ -20424,40 +20424,6 @@
         }
       }
     },
-    "alert.translation-error.deepl" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "DeepL konnte nicht erreicht werden!\nIst der API-Schlüssel korrekt?"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "DeepL couldn't be reached!\nIs the API Key correct?"
-          }
-        }
-      }
-    },
-    "alert.translation-error.instance" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Der Übersetzung-Service deiner Instanz konnte nicht erreicht werden!"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "The Translation Service of your Instance couldn't be reached!"
-          }
-        }
-      }
-    },
     "An error occured while posting to Mastodon, please try again." : {
       "localizations" : {
         "de" : {
@@ -22178,6 +22144,23 @@
         }
       }
     },
+    "DeepL couldn't be reached!\nIs the API Key correct?" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DeepL konnte nicht erreicht werden! Ist der API-Schlüssel korrekt?"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DeepL couldn't be reached!\nIs the API Key correct?"
+          }
+        }
+      }
+    },
     "design.tag.n-posts-from-n-participants %lld %lld" : {
       "comment" : "MARK: Package: DesignSystem",
       "extractionState" : "manual",
@@ -26314,23 +26297,6 @@
         }
       }
     },
-    "enum.translation-type.use-server-if-possible" : {
-      "extractionState" : "manual",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Instanz"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Instance"
-          }
-        }
-      }
-    },
     "env.poll-vote-frequency.multiple" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -30978,6 +30944,17 @@
         }
       }
     },
+    "Instance" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Instanz"
+          }
+        }
+      }
+    },
     "instance.info.domains" : {
       "comment" : "MARK: Instances",
       "localizations" : {
@@ -60051,22 +60028,6 @@
         }
       }
     },
-    "settings.translation.api-key-still-stored" : {
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Der DeepL-API-Schlüssel ist noch gespeichert!"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "The DeepL API Key is still stored!"
-          }
-        }
-      }
-    },
     "settings.translation.api-key-type" : {
       "localizations" : {
         "be" : {
@@ -76925,6 +76886,28 @@
         }
       }
     },
+    "The DeepL API Key is still stored!" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Der DeepL-API-Schlüssel ist noch gespeichert!"
+          }
+        }
+      }
+    },
+    "The Translation Service of your Instance couldn't be reached!" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Der Übersetzung-Service deiner Instanz konnte nicht erreicht werden!"
+          }
+        }
+      }
+    },
     "timeline-new-posts %lld" : {
       "comment" : "Turkish does not have \"-ler\" on words in the sentence, so it follows the singular word.",
       "extractionState" : "manual",

diff --git a/Packages/Env/Sources/Env/TranslationType.swift b/Packages/Env/Sources/Env/TranslationType.swift
@@ -8,7 +8,7 @@ public enum TranslationType: String, CaseIterable {
   public var description: LocalizedStringKey {
     switch self {
     case .useServerIfPossible:
-      "enum.translation-type.use-server-if-possible"
+      "Instance"
     case .useDeepl:
       "DeepL"
     case .useApple:

diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
@@ -233,14 +233,14 @@ public struct StatusRowView: View {
       StatusDataControllerProvider.shared.dataController(for: viewModel.finalStatus,
                                                          client: viewModel.client)
     )
-    .alert("alert.translation-error.deepl", isPresented: $viewModel.deeplTranslationError) {
+    .alert("DeepL couldn't be reached!\nIs the API Key correct?", isPresented: $viewModel.deeplTranslationError) {
       Button("alert.button.ok", role: .cancel) {}
       Button("settings.general.translate") {
         RouterPath.settingsStartingPoint = .translation
         routerPath.presentedSheet = .settings
       }
     }
-    .alert("alert.translation-error.instance", isPresented: $viewModel.instanceTranslationError) {
+    .alert("The Translation Service of your Instance couldn't be reached!", isPresented: $viewModel.instanceTranslationError) {
       Button("alert.button.ok", role: .cancel) {}
       Button("settings.general.translate") {
         RouterPath.settingsStartingPoint = .translation