fix: support static lib localization (#141) (#142)

* fix: add default value for localized string * fix: add more default values for localized strings * fix: support static lib localization
guoyingtao · Nov 5, 2021 · fd2de0f · fd2de0f
1 parent d355578
commit fd2de0f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/Mantis.podspec b/Mantis.podspec
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/guoyingtao/Mantis.git", :tag => "#{s.version}" }
   s.source_files  = "Sources/**/*.{h,swift}"
   s.resource_bundles = {
-    "Resource" => ["Sources/**/*.lproj/*.strings"]
+    "MantisResource" => ["Sources/**/*.lproj/*.strings"]
   }
 
   s.pod_target_xcconfig = {

diff --git a/Sources/Mantis/CropViewController/CropToolbar.swift b/Sources/Mantis/CropViewController/CropToolbar.swift
@@ -56,7 +56,7 @@ public class CropToolbar: UIView, CropToolbarProtocol {
     }
 
     private func createCancelButton() {
-        let cancelText = LocalizedHelper.getString("Mantis.Cancel")
+        let cancelText = LocalizedHelper.getString("Mantis.Cancel", value: "Cancel")
 
         cancelButton = createOptionButton(withTitle: cancelText, andAction: #selector(cancel))
     }
@@ -81,7 +81,7 @@ public class CropToolbar: UIView, CropToolbarProtocol {
             resetButton = createOptionButton(withTitle: nil, andAction: #selector(reset))
             resetButton?.setImage(image, for: .normal)
         } else {
-            let resetText = LocalizedHelper.getString("Mantis.Reset")
+            let resetText = LocalizedHelper.getString("Mantis.Reset", value: "Reset")
             resetButton = createOptionButton(withTitle: resetText, andAction: #selector(reset))
         }
     }
@@ -92,7 +92,7 @@ public class CropToolbar: UIView, CropToolbarProtocol {
     }
 
     private func createCropButton() {
-        let doneText = LocalizedHelper.getString("Mantis.Done")
+        let doneText = LocalizedHelper.getString("Mantis.Done", value: "Done")
         cropButton = createOptionButton(withTitle: doneText, andAction: #selector(crop))
     }
 

diff --git a/Sources/Mantis/CropViewController/FixedRatioManager.swift b/Sources/Mantis/CropViewController/FixedRatioManager.swift
@@ -28,7 +28,7 @@ class FixedRatioManager {
         }
 
         if ratioOptions.contains(.square) {
-            let squareText = LocalizedHelper.getString("Mantis.Square")
+            let squareText = LocalizedHelper.getString("Mantis.Square", value: "Square")
             let square = (squareText, 1.0, squareText, 1.0)
             appendToTail(ratioItem: square)
         }
@@ -45,7 +45,7 @@ class FixedRatioManager {
     }
 
     func getOriginalRatioItem() -> RatioItemType {
-        let originalText = LocalizedHelper.getString("Mantis.Original")
+        let originalText = LocalizedHelper.getString("Mantis.Original", value: "Original")
         return (originalText, originalRatioH, originalText, originalRatioH)
     }
 }

diff --git a/Sources/Mantis/CropViewController/RatioPresenter.swift b/Sources/Mantis/CropViewController/RatioPresenter.swift
@@ -65,7 +65,7 @@ class RatioPresenter {
 
         actionSheet.handlePopupInBigScreenIfNeeded(sourceView: sourceView)
 
-        let cancelText = LocalizedHelper.getString("Mantis.Cancel")
+        let cancelText = LocalizedHelper.getString("Mantis.Cancel", value: "Cancel")
         let cancelAction = UIAlertAction(title: cancelText, style: .cancel)
         actionSheet.addAction(cancelAction)
 

diff --git a/Sources/Mantis/Helpers/LocalizedHelper.swift b/Sources/Mantis/Helpers/LocalizedHelper.swift
@@ -9,14 +9,23 @@
 import Foundation
 
 struct LocalizedHelper {
+    private static var bundle: Bundle?
+
+    static func setBundle(_ bundle: Bundle) {
+        guard let resourceBundleURL = bundle.url(
+            forResource: "MantisResource", withExtension: "bundle")
+            else { return }
+        LocalizedHelper.bundle = Bundle(url: resourceBundleURL)
+    }
+
     static func getString(
         _ key: String,
         localizationConfig: LocalizationConfig = Mantis.localizationConfig,
         value: String? = nil
     ) -> String {
         let value = value ?? key
 
-        guard let bundle = localizationConfig.bundle ?? Mantis.bundle else {
+        guard let bundle = LocalizedHelper.bundle ?? (localizationConfig.bundle ?? Mantis.bundle) else {
             return value
         }
 

diff --git a/Sources/Mantis/Mantis.swift b/Sources/Mantis/Mantis.swift
@@ -26,7 +26,7 @@ import UIKit
 
 private(set) var bundle: Bundle? = {
     return Mantis.Config.bundle
-} ()
+}()
 
 internal var localizationConfig = LocalizationConfig()
 
@@ -48,6 +48,10 @@ public func cropCustomizableViewController(image: UIImage,
                               cropToolbar: cropToolbar)
 }
 
+public func locateResourceBundle(by hostClass: AnyClass) {
+    LocalizedHelper.setBundle(Bundle(for: hostClass))
+}
+
 public func getCroppedImage(byCropInfo info: CropInfo, andImage image: UIImage) -> UIImage? {
     return image.getCroppedImage(byCropInfo: info)
 }
@@ -168,19 +172,19 @@ public struct Config {
 
     static private var bundleIdentifier: String = {
         return "com.echo.framework.Mantis"
-    } ()
+    }()
 
     static private(set) var bundle: Bundle? = {
         guard let bundle = Bundle(identifier: bundleIdentifier) else {
             return nil
         }
 
-        if let url = bundle.url(forResource: "Resource", withExtension: "bundle") {
+        if let url = bundle.url(forResource: "MantisResource", withExtension: "bundle") {
             let bundle = Bundle(url: url)
             return bundle
         }
         return nil
-    } ()
+    }()
 
     public init() {
     }
@@ -203,4 +207,3 @@ public struct Config {
         }
     }
 }
-