Remvoe all custom localization from Frameworks

Common/RuuviPresenters/Sources/RuuviPresenters/Activity/RuuviLogo/View/ActivityPresenterView.swift

@@ -1,11 +1,8 @@
+import RuuviLocalization
 import SwiftUI
 import UIKit
 
 private enum ActivityPresenterAssets {
-    static let activityOngoingDefault = "activity_ongoing_generic"
-    static let activitySuccessDefault = "activity_success_generic"
-    static let activityFailedDefault = "activity_failed_generic"
-
     static let activityLogoRuuvi = "ruuvi_activity_presenter_logo"
 }
 
@@ -84,25 +81,22 @@ struct ActivityPresenterContentView: View {
             if let message {
                 message
             } else {
-                ActivityPresenterAssets
-                    .activityOngoingDefault
-                    .localized(for: ActivityPresenterViewProvider.self)
+                RuuviLocalization
+                    .activityOngoingGeneric
             }
         case let .success(message):
             if let message {
                 message
             } else {
-                ActivityPresenterAssets
-                    .activitySuccessDefault
-                    .localized(for: ActivityPresenterViewProvider.self)
+                RuuviLocalization
+                    .activitySuccessGeneric
             }
         case let .failed(message):
             if let message {
                 message
             } else {
-                ActivityPresenterAssets
-                    .activityFailedDefault
-                    .localized(for: ActivityPresenterViewProvider.self)
+                RuuviLocalization
+                    .activityFailedGeneric
             }
         case .dismiss:
             "" // Placeholder for dismiss state

Common/RuuviPresenters/Sources/RuuviPresenters/Error/Alert/ErrorPresenterAlert.swift

@@ -1,3 +1,4 @@
+import RuuviLocalization
 import UIKit
 
 public final class ErrorPresenterAlert: ErrorPresenter {
@@ -8,13 +9,13 @@ public final class ErrorPresenterAlert: ErrorPresenter {
     }
 
     private func presentAlert(error: Error) {
-        var title: String? = "ErrorPresenterAlert.Error".localized(for: Self.self)
+        var title: String? = RuuviLocalization.ErrorPresenterAlert.error
         if let localizedError = error as? LocalizedError {
-            title = localizedError.failureReason ?? "ErrorPresenterAlert.Error".localized(for: Self.self)
+            title = localizedError.failureReason ?? RuuviLocalization.ErrorPresenterAlert.error
         }
         let alert = UIAlertController(title: title, message: error.localizedDescription, preferredStyle: .alert)
         let action = UIAlertAction(
-            title: "ErrorPresenterAlert.OK".localized(for: Self.self),
+            title: RuuviLocalization.ErrorPresenterAlert.ok,
             style: .cancel,
             handler: nil
         )

Common/RuuviPresenters/Sources/RuuviPresenters/Permission/Alert/PermissionPresenterAlert.swift

@@ -1,33 +1,34 @@
+import RuuviLocalization
 import UIKit
 
 public final class PermissionPresenterAlert: PermissionPresenter {
     public init() {}
 
     public func presentNoPhotoLibraryPermission() {
-        let message = "PermissionPresenter.NoPhotoLibraryAccess.message".localized(for: Self.self)
+        let message = RuuviLocalization.PermissionPresenter.NoPhotoLibraryAccess.message
         presentAlert(with: message)
     }
 
     public func presentNoCameraPermission() {
-        let message = "PermissionPresenter.NoCameraAccess.message".localized(for: Self.self)
+        let message = RuuviLocalization.PermissionPresenter.NoCameraAccess.message
         presentAlert(with: message)
     }
 
     public func presentNoLocationPermission() {
-        let message = "PermissionPresenter.NoLocationAccess.message".localized(for: Self.self)
+        let message = RuuviLocalization.PermissionPresenter.NoLocationAccess.message
         presentAlert(with: message)
     }
 
     public func presentNoPushNotificationsPermission() {
-        let message = "PermissionPresenter.NoPushNotificationsPermission.message".localized(for: Self.self)
+        let message = RuuviLocalization.PermissionPresenter.NoPushNotificationsPermission.message
         presentAlert(with: message)
     }
 
     private func presentAlert(with message: String) {
         guard let viewController = UIApplication.shared.topViewController() else { return }
         let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
-        let cancel = UIAlertAction(title: "Cancel".localized(for: Self.self), style: .cancel, handler: nil)
-        let actionTitle = "PermissionPresenter.settings".localized(for: Self.self)
+        let cancel = UIAlertAction(title: RuuviLocalization.cancel, style: .cancel, handler: nil)
+        let actionTitle = RuuviLocalization.PermissionPresenter.settings
         let settings = UIAlertAction(title: actionTitle, style: .default) { _ in
             if let settingsUrl = URL(string: UIApplication.openSettingsURLString) {
                 UIApplication.shared.open(settingsUrl, options: [:])

Common/RuuviPresenters/Sources/RuuviPresenters/Util/RuuviBundleUtils.swift

@@ -35,40 +35,6 @@ public extension UIImage {
     }
 }
 
-extension String {
-    public func localized(for clazz: AnyClass) -> String {
-        let bundle: Bundle
-        #if SWIFT_PACKAGE
-            bundle = Bundle.module
-        #else
-            bundle = Bundle.pod(clazz)
-        #endif
-        if let module = NSStringFromClass(clazz).components(separatedBy: ".").first {
-            if let path = bundle.path(forResource: currentLanguage(), ofType: "lproj"),
-               let bundle = Bundle(path: path) {
-                return bundle.localizedString(forKey: self, value: nil, table: module)
-            } else if let path = bundle.path(forResource: "Base", ofType: "lproj"),
-                      let bundle = Bundle(path: path) {
-                return bundle.localizedString(forKey: self, value: nil, table: module)
-            } else {
-                assertionFailure()
-                return self
-            }
-        } else {
-            assertionFailure()
-            return self
-        }
-    }
-
-    private func currentLanguage() -> String {
-        if let preferred = Bundle.main.preferredLocalizations.first {
-            preferred
-        } else {
-            "Base"
-        }
-    }
-}
-
 public extension UIStoryboard {
     static func named(_ name: String, for clazz: AnyClass) -> UIStoryboard {
         let bundle: Bundle