Revert locale change

Author: danielsaidi

Sources/RichTextKit/Bundle/Bundle+RichTextKit.swift

@@ -69,7 +69,7 @@ extension Bundle {
     }
 
     func bundlePath(for locale: Locale) -> String? {
-        bundlePath(named: locale.identifier) ?? bundlePath(named: locale.language.languageCode?.identifier)
+        bundlePath(named: locale.identifier) ?? bundlePath(named: locale.languageCode)
     }
 
     func bundlePath(named name: String?) -> String? {

Sources/RichTextKit/Component/RichTextViewComponent+Pasting.swift

@@ -59,7 +59,9 @@ public extension RichTextViewComponent {
         at index: Int,
         moveCursorToPastedContent move: Bool = false
     ) {
-        #if iOS || os(tvOS) || os(macOS) || os(visionOS)
+        #if os(watchOS)
+        assertionFailure("Image pasting is not supported on this platform")
+        #else
         guard validateImageInsertion(for: imagePasteConfiguration) else { return }
         let items = images.count * 2 // The number of inserted "items" is the images and a newline for each
         let insertRange = NSRange(location: index, length: 0)
@@ -74,8 +76,6 @@ public extension RichTextViewComponent {
                 self.moveInputCursor(to: self.selectedRange.location)
             }
         }
-        #else
-        assertionFailure("Image pasting is not supported on this platform")
         #endif
     }
 
@@ -113,7 +113,7 @@ public extension RichTextViewComponent {
     }
 }
 
-#if iOS || os(tvOS) || os(macOS) || os(visionOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 private extension RichTextViewComponent {
 
     func getAttachmentString(

Sources/RichTextKit/Coordinator/RichTextCoordinator.swift

@@ -132,7 +132,7 @@ import UIKit
 
 extension RichTextCoordinator: UITextViewDelegate {}
 
-#elseif os(macOS)
+#elseif macOS
 import AppKit
 
 extension RichTextCoordinator: NSTextViewDelegate {}

Sources/RichTextKit/Images/RichTextImageAttachment.swift

@@ -14,7 +14,7 @@ import UIKit
 import AppKit
 #endif
 
-#if iOS || os(tvOS) || os(macOS) || os(visionOS)
+#if iOS || macOS || os(tvOS) || os(visionOS)
 import UniformTypeIdentifiers
 
 /**

Sources/RichTextKit/Pdf/RichTextPdfDataReader.swift

@@ -31,7 +31,7 @@ public extension RichTextPdfDataReader {
     func richTextPdfData(configuration: PdfPageConfiguration = .standard) throws -> Data {
         #if iOS || os(visionOS)
         try richText.iosPdfData(for: configuration)
-        #elseif os(macOS)
+        #elseif macOS
         try richText.macosPdfData(for: configuration)
         #else
         throw PdfDataError.unsupportedPlatform

Tests/RichTextKitTests/RichTextCoordinator+SubscriptionsTests.swift

@@ -56,7 +56,7 @@ final class RichTextCoordinator_SubscriptionsTests: XCTestCase {
         eventually {
             #if iOS || os(tvOS)
             XCTAssertEqual(self.textView.richTextFontName, ".SFUI-Regular")
-            #elseif os(macOS)
+            #elseif macOS
             XCTAssertEqual(self.textView.richTextFontName, ".AppleSystemUIFont")
             #endif
         }

Tests/RichTextKitTests/RichTextCoordinatorTests.swift

@@ -70,7 +70,7 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertEqual(context.selectedRange, view.selectedRange)
         #if iOS || os(tvOS)
         XCTAssertEqual(context.textAlignment, view.richTextAlignment)
-        #elseif os(macOS)
+        #elseif macOS
         XCTAssertEqual(context.textAlignment, macOSAlignment)
         #endif
     }
@@ -100,7 +100,7 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertFalse(context.isEditingText)
     }
 
-    #elseif os(macOS)
+    #elseif macOS
 
     let notification = Notification(
         name: NSText.didEndEditingNotification,

Tests/RichTextKitTests/RichTextViewRepresentable+AlignmentTests.swift

@@ -64,7 +64,7 @@ final class RichTextViewComponent_AlignmentTests: XCTestCase {
         assertEqualAlignment(textView.richTextAttributes(at: selectedRange)[.paragraphStyle])
         #if iOS || os(tvOS)
         assertEqualAlignment(textView.typingAttributes[.paragraphStyle])
-        #elseif os(macOS)
+        #elseif macOS
         assertNonEqualAlignment(textView.typingAttributes[.paragraphStyle])
         #endif
     }
@@ -77,7 +77,7 @@ final class RichTextViewComponent_AlignmentTests: XCTestCase {
         assertEqualAlignment(textView.richTextAttributes(at: selectedRange)[.paragraphStyle])
         #if iOS || os(tvOS)
         assertEqualAlignment(textView.typingAttributes[.paragraphStyle])
-        #elseif os(macOS)
+        #elseif macOS
         assertNonEqualAlignment(textView.typingAttributes[.paragraphStyle])
         #endif
     }
@@ -90,7 +90,7 @@ final class RichTextViewComponent_AlignmentTests: XCTestCase {
         assertNonEqualAlignment(textView.richTextAttributes(at: secondRowRange)[.paragraphStyle])
         #if iOS || os(tvOS)
         assertEqualAlignment(textView.typingAttributes[.paragraphStyle])
-        #elseif os(macOS)
+        #elseif macOS
         assertNonEqualAlignment(textView.typingAttributes[.paragraphStyle])
         #endif
     }

Tests/RichTextKitTests/RichTextViewRepresentableTests.swift

@@ -56,7 +56,7 @@ final class RichTextViewComponentTests: XCTestCase {
         #if iOS || os(tvOS)
         XCTAssertEqual(view.spellCheckingType, .no)
         XCTAssertEqual(view.textColor, .label)
-        #elseif os(macOS)
+        #elseif macOS
         XCTAssertEqual(view.textColor, .textColor)
         #endif
     }
@@ -74,7 +74,7 @@ final class RichTextViewComponentTests: XCTestCase {
         #if iOS || os(tvOS)
         XCTAssertEqual(view.spellCheckingType, .no)
         XCTAssertEqual(view.textColor, nil)
-        #elseif os(macOS)
+        #elseif macOS
         XCTAssertEqual(view.textColor, nil)
         #endif
     }

Tests/RichTextKitTests/Styles/RichTextStyleTests.swift

@@ -33,7 +33,7 @@ final class RichTextStyleTests: XCTestCase {
         XCTAssertEqual(traits(for: .italic), .traitItalic)
         XCTAssertNil(traits(for: .underlined))
     }
-    #elseif os(macOS)
+    #elseif macOS
     func traits(for style: RichTextStyle) -> NSFontDescriptor.SymbolicTraits? {
         style.symbolicTraits
     }