Rename mgl_transliteratedStringWithScript: → mgl_stringByTransliteratingIntoScript:upstream/fb-accessibility-string-transliteration

4 files changed, 31 insertions, 31 deletions

diff --git a/platform/darwin/src/NSString+MGLAdditions.h b/platform/darwin/src/NSString+MGLAdditions.h
index 66e89fc66d..75c593c10b 100644
--- a/platform/darwin/src/NSString+MGLAdditions.h
+++ b/platform/darwin/src/NSString+MGLAdditions.h
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param script The four-letter code representing the name of the script, as
     specified by ISO 15924.
  */
-- (NSString *)mgl_transliteratedStringWithScript:(NSString *)script;
+- (NSString *)mgl_stringByTransliteratingIntoScript:(NSString *)script;
 
 @end
 
diff --git a/platform/darwin/src/NSString+MGLAdditions.m b/platform/darwin/src/NSString+MGLAdditions.m
index 86cb546571..8c9bbe3e21 100644
--- a/platform/darwin/src/NSString+MGLAdditions.m
+++ b/platform/darwin/src/NSString+MGLAdditions.m
@@ -41,7 +41,7 @@
     return string;
 }
 
-- (NSString *)mgl_transliteratedStringWithScript:(NSString *)script {
+- (NSString *)mgl_stringByTransliteratingIntoScript:(NSString *)script {
     if (@available(iOS 9.0, *)) {
         NSMutableString *string = self.mutableCopy;
         NSStringTransform transform;
diff --git a/platform/darwin/test/MGLNSStringAdditionsTests.m b/platform/darwin/test/MGLNSStringAdditionsTests.m
index ea6eb974cf..2a8715d991 100644
--- a/platform/darwin/test/MGLNSStringAdditionsTests.m
+++ b/platform/darwin/test/MGLNSStringAdditionsTests.m
@@ -41,35 +41,35 @@
 
 - (void)testTransliteratedString {
     if (@available(iOS 9.0, *)) {
-        XCTAssertEqualObjects([@"Portland" mgl_transliteratedStringWithScript:@"Latn"], @"Portland");
-        XCTAssertEqualObjects([@"Portland" mgl_transliteratedStringWithScript:@"Hans"], @"Portland");
-        XCTAssertEqualObjects([@"Portland" mgl_transliteratedStringWithScript:@"Cyrl"], @"Портланд");
-        XCTAssertEqualObjects([@"Portland" mgl_transliteratedStringWithScript:@"Arab"], @"پُرتلَند");
-        XCTAssertEqualObjects([@"Portland" mgl_transliteratedStringWithScript:@"Fake"], @"Portland");
-
-        XCTAssertEqualObjects([@"北京" mgl_transliteratedStringWithScript:@"Latn"], @"běi jīng");
-        XCTAssertEqualObjects([@"北京" mgl_transliteratedStringWithScript:@"Hans"], @"北京");
-        XCTAssertEqualObjects([@"北京" mgl_transliteratedStringWithScript:@"Cyrl"], @"бе̌и йӣнг");
-        XCTAssertEqualObjects([@"北京" mgl_transliteratedStringWithScript:@"Arab"], @"بِِ̌ جِينگ");
-        XCTAssertEqualObjects([@"北京" mgl_transliteratedStringWithScript:@"Fake"], @"北京");
-
-        XCTAssertEqualObjects([@"Mосква" mgl_transliteratedStringWithScript:@"Latn"], @"Moskva");
-        XCTAssertEqualObjects([@"Mосква" mgl_transliteratedStringWithScript:@"Hans"], @"Mосква");
-        XCTAssertEqualObjects([@"Mосква" mgl_transliteratedStringWithScript:@"Cyrl"], @"Москва");
-        XCTAssertEqualObjects([@"Mосква" mgl_transliteratedStringWithScript:@"Arab"], @"مُسكڤَ");
-        XCTAssertEqualObjects([@"Mосква" mgl_transliteratedStringWithScript:@"Fake"], @"Mосква");
-
-        XCTAssertEqualObjects([@"ロンドン" mgl_transliteratedStringWithScript:@"Latn"], @"rondon");
-        XCTAssertEqualObjects([@"ロンドン" mgl_transliteratedStringWithScript:@"Hans"], @"ロンドン");
-        XCTAssertEqualObjects([@"ロンドン" mgl_transliteratedStringWithScript:@"Cyrl"], @"рондон");
-        XCTAssertEqualObjects([@"ロンドン" mgl_transliteratedStringWithScript:@"Arab"], @"رُندُن");
-        XCTAssertEqualObjects([@"ロンドン" mgl_transliteratedStringWithScript:@"Fake"], @"ロンドン");
+        XCTAssertEqualObjects([@"Portland" mgl_stringByTransliteratingIntoScript:@"Latn"], @"Portland");
+        XCTAssertEqualObjects([@"Portland" mgl_stringByTransliteratingIntoScript:@"Hans"], @"Portland");
+        XCTAssertEqualObjects([@"Portland" mgl_stringByTransliteratingIntoScript:@"Cyrl"], @"Портланд");
+        XCTAssertEqualObjects([@"Portland" mgl_stringByTransliteratingIntoScript:@"Arab"], @"پُرتلَند");
+        XCTAssertEqualObjects([@"Portland" mgl_stringByTransliteratingIntoScript:@"Fake"], @"Portland");
+
+        XCTAssertEqualObjects([@"北京" mgl_stringByTransliteratingIntoScript:@"Latn"], @"běi jīng");
+        XCTAssertEqualObjects([@"北京" mgl_stringByTransliteratingIntoScript:@"Hans"], @"北京");
+        XCTAssertEqualObjects([@"北京" mgl_stringByTransliteratingIntoScript:@"Cyrl"], @"бе̌и йӣнг");
+        XCTAssertEqualObjects([@"北京" mgl_stringByTransliteratingIntoScript:@"Arab"], @"بِِ̌ جِينگ");
+        XCTAssertEqualObjects([@"北京" mgl_stringByTransliteratingIntoScript:@"Fake"], @"北京");
+
+        XCTAssertEqualObjects([@"Mосква" mgl_stringByTransliteratingIntoScript:@"Latn"], @"Moskva");
+        XCTAssertEqualObjects([@"Mосква" mgl_stringByTransliteratingIntoScript:@"Hans"], @"Mосква");
+        XCTAssertEqualObjects([@"Mосква" mgl_stringByTransliteratingIntoScript:@"Cyrl"], @"Москва");
+        XCTAssertEqualObjects([@"Mосква" mgl_stringByTransliteratingIntoScript:@"Arab"], @"مُسكڤَ");
+        XCTAssertEqualObjects([@"Mосква" mgl_stringByTransliteratingIntoScript:@"Fake"], @"Mосква");
+
+        XCTAssertEqualObjects([@"ロンドン" mgl_stringByTransliteratingIntoScript:@"Latn"], @"rondon");
+        XCTAssertEqualObjects([@"ロンドン" mgl_stringByTransliteratingIntoScript:@"Hans"], @"ロンドン");
+        XCTAssertEqualObjects([@"ロンドン" mgl_stringByTransliteratingIntoScript:@"Cyrl"], @"рондон");
+        XCTAssertEqualObjects([@"ロンドン" mgl_stringByTransliteratingIntoScript:@"Arab"], @"رُندُن");
+        XCTAssertEqualObjects([@"ロンドン" mgl_stringByTransliteratingIntoScript:@"Fake"], @"ロンドン");
     } else {
-        XCTAssertEqualObjects([@"Made-up Place" mgl_transliteratedStringWithScript:@"Latn"], @"Made-up Place");
-        XCTAssertEqualObjects([@"Made-up Place" mgl_transliteratedStringWithScript:@"Hans"], @"Made-up Place");
-        XCTAssertEqualObjects([@"Made-up Place" mgl_transliteratedStringWithScript:@"Cyrl"], @"Made-up Place");
-        XCTAssertEqualObjects([@"Made-up Place" mgl_transliteratedStringWithScript:@"Arab"], @"Made-up Place");
-        XCTAssertEqualObjects([@"Made-up Place" mgl_transliteratedStringWithScript:@"Fake"], @"Made-up Place");
+        XCTAssertEqualObjects([@"Made-up Place" mgl_stringByTransliteratingIntoScript:@"Latn"], @"Made-up Place");
+        XCTAssertEqualObjects([@"Made-up Place" mgl_stringByTransliteratingIntoScript:@"Hans"], @"Made-up Place");
+        XCTAssertEqualObjects([@"Made-up Place" mgl_stringByTransliteratingIntoScript:@"Cyrl"], @"Made-up Place");
+        XCTAssertEqualObjects([@"Made-up Place" mgl_stringByTransliteratingIntoScript:@"Arab"], @"Made-up Place");
+        XCTAssertEqualObjects([@"Made-up Place" mgl_stringByTransliteratingIntoScript:@"Fake"], @"Made-up Place");
     }
 }
 
diff --git a/platform/ios/src/MGLMapAccessibilityElement.mm b/platform/ios/src/MGLMapAccessibilityElement.mm
index 26de4f67e7..79dcda4054 100644
--- a/platform/ios/src/MGLMapAccessibilityElement.mm
+++ b/platform/ios/src/MGLMapAccessibilityElement.mm
@@ -58,7 +58,7 @@
         // the original string if no transform exists or if transformation fails.
         if (@available(iOS 9.0, *)) {
             NSString *dominantScript = [NSOrthography mgl_dominantScriptForMapboxStreetsLanguage:languageCode];
-            name = [name mgl_transliteratedStringWithScript:dominantScript];
+            name = [name mgl_stringByTransliteratingIntoScript:dominantScript];
         }
 
         self.accessibilityLabel = name;