Skip to content

Commit 2638f07

Browse files
authored
Merge pull request #2 from num42/android_placeholder_support
Android placeholder support
2 parents 5b6ca45 + 1f3af52 commit 2638f07

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Sources/StringCatalogConverterLibrary/StringCatalog+Conversion.swift

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ extension StringCatalog {
1111
static func cleanupValueForAndroid(_ value: String) -> String {
1212
value
1313
.replacingOccurrences(of: "'", with: "\\'")
14+
.replacingOccurrences(of: "%@", with: "%1$s")
15+
.replacingOccurrences(of: "%d", with: "%2$d")
1416
}
1517

1618
public func converted(

Tests/StringCatalogConverterLibraryTests/Resources/SimpleTest/Output.de.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<resources>
22
<string name="child_button">Child Tap</string>
33
<string name="collection_empty_message">Es sind keine Elemente anzuzeigen</string>
4-
<string name="collection_item">Element %@</string>
4+
<string name="collection_item">Element %1$s</string>
55
<string name="counter_button">Tap</string>
6-
<string name="counter_status_text">Anzahl der Child Taps: %d</string>
6+
<string name="counter_status_text">Anzahl der Child Taps: %2$d</string>
77
<string name="counter_website">Number42 Website</string>
88
<string name="error_request">Bei der Anfrage ist ein Fehler aufgetreten.</string>
99
<string name="error_universal">Fehler</string>

Tests/StringCatalogConverterLibraryTests/Resources/SimpleTest/Output.en.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<resources>
22
<string name="child_button">Child Tap</string>
33
<string name="collection_empty_message">There are no items to show</string>
4-
<string name="collection_item">Item %@</string>
4+
<string name="collection_item">Item %1$s</string>
55
<string name="counter_button">Tap</string>
6-
<string name="counter_status_text">Number of Child Taps: %d</string>
6+
<string name="counter_status_text">Number of Child Taps: %2$d</string>
77
<string name="counter_website">Number42 Website</string>
88
<string name="error_request">An error occurred during this request.</string>
99
<string name="error_universal">Error</string>

0 commit comments

Comments
 (0)