Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/StringTransliteration/BUILD

@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "StringTransliteration",
+    enable_modules = True,
+    module_name = "StringTransliteration",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/StringTransliteration/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "StringTransliteration",
+    platforms: [.macOS(.v10_13)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "StringTransliteration",
+            targets: ["StringTransliteration"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "StringTransliteration",
+            dependencies: [],
+            path: ".",
+            exclude: ["BUILD"],
+            publicHeadersPath: "PublicHeaders",
+            cSettings: [
+                .headerSearchPath("PublicHeaders")
+            ]),
+    ]
+)

submodules/StringTransliteration/PublicHeaders/StringTransliteration/StringTransliteration.h

@@ -0,0 +1,8 @@
+#ifndef StringTransliteration_h
+#define StringTransliteration_h
+
+#import <Foundation/Foundation.h>
+
+NSString *postboxTransformedString(CFStringRef string, bool replaceWithTransliteratedVersion, bool appendTransliteratedVersion);
+
+#endif

submodules/StringTransliteration/Sources/StringTransliteration.m

@@ -0,0 +1,19 @@
+#import <StringTransliteration/StringTransliteration.h>
+
+NSString *postboxTransformedString(CFStringRef string, bool replaceWithTransliteratedVersion, bool appendTransliteratedVersion) {
+    NSMutableString *mutableString = [[NSMutableString alloc] initWithString:(__bridge NSString * _Nonnull)(string)];
+    CFStringTransform((CFMutableStringRef)mutableString, NULL, kCFStringTransformStripCombiningMarks, false);
+    
+    if (replaceWithTransliteratedVersion || appendTransliteratedVersion) {
+        NSMutableString *transliteratedString = [[NSMutableString alloc] initWithString:mutableString];
+        CFStringTransform((CFMutableStringRef)transliteratedString, NULL, kCFStringTransformToLatin, false);
+        if (replaceWithTransliteratedVersion) {
+            return transliteratedString;
+        } else {
+            [mutableString appendString:@" "];
+            [mutableString appendString:transliteratedString];
+        }
+    }
+    
+    return mutableString;
+}