From 742e272b092fd56ededea636b75b07d9020855ca Mon Sep 17 00:00:00 2001 From: David Jennes Date: Sun, 3 Mar 2019 20:49:35 +0100 Subject: [PATCH] Update docs --- Documentation/templates/strings/flat-swift3.md | 4 ++-- Documentation/templates/strings/flat-swift4.md | 14 +++++++++----- .../templates/strings/structured-swift3.md | 4 ++-- .../templates/strings/structured-swift4.md | 4 ++-- README.md | 18 +++++++++++------- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Documentation/templates/strings/flat-swift3.md b/Documentation/templates/strings/flat-swift3.md index 2b21ffef..b6db10f4 100644 --- a/Documentation/templates/strings/flat-swift3.md +++ b/Documentation/templates/strings/flat-swift3.md @@ -39,8 +39,8 @@ enum L10n { return L10n.tr("Localizable", "apples.count", p1) } /// Those %d bananas belong to %@. - static func bananasOwner(_ p1: Int, _ p2: String) -> String { - return L10n.tr("Localizable", "bananas.owner", p1, p2) + static func bananasOwner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("Localizable", "bananas.owner", p1, String(describing: p2)) } ``` diff --git a/Documentation/templates/strings/flat-swift4.md b/Documentation/templates/strings/flat-swift4.md index c1bf6bbe..cc120517 100644 --- a/Documentation/templates/strings/flat-swift4.md +++ b/Documentation/templates/strings/flat-swift4.md @@ -28,15 +28,19 @@ You can customize some elements of this template by overriding the following par **Extract:** ```swift -enum L10n { +internal enum L10n { /// Some alert body there - case alertMessage + internal static let alertMessage = L10n.tr("Localizable", "alert__message") /// Title of the alert - case alertTitle + internal static let alertTitle = L10n.tr("Localizable", "alert__title") /// You have %d apples - case applesCount(Int) + internal static func applesCount(_ p1: Int) -> String { + return L10n.tr("Localizable", "apples.count", p1) + } /// Those %d bananas belong to %@. - case bananasOwner(Int, String) + internal static func bananasOwner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("Localizable", "bananas.owner", p1, String(describing: p2)) + } } ``` diff --git a/Documentation/templates/strings/structured-swift3.md b/Documentation/templates/strings/structured-swift3.md index b160830f..e56fdc09 100644 --- a/Documentation/templates/strings/structured-swift3.md +++ b/Documentation/templates/strings/structured-swift3.md @@ -50,8 +50,8 @@ enum L10n { enum Bananas { /// Those %d bananas belong to %@. - static func owner(_ p1: Int, _ p2: String) -> String { - return L10n.tr("bananas.owner", p1, p2) + static func owner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("bananas.owner", p1, String(describing: p2)) } } } diff --git a/Documentation/templates/strings/structured-swift4.md b/Documentation/templates/strings/structured-swift4.md index aa592639..b84a0798 100644 --- a/Documentation/templates/strings/structured-swift4.md +++ b/Documentation/templates/strings/structured-swift4.md @@ -49,8 +49,8 @@ enum L10n { enum Bananas { /// Those %d bananas belong to %@. - static func owner(_ p1: Int, _ p2: String) -> String { - return L10n.tr("bananas.owner", p1, p2) + static func owner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("bananas.owner", p1, String(describing: p2)) } } } diff --git a/README.md b/README.md index 91cd4b2c..c167b56e 100644 --- a/README.md +++ b/README.md @@ -711,8 +711,8 @@ enum L10n { enum Bananas { /// Those %d bananas belong to %@. - static func owner(_ p1: Int, _ p2: String) -> String { - return L10n.tr("bananas.owner", p1, p2) + static func owner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("bananas.owner", p1, String(describing: p2)) } } } @@ -741,15 +741,19 @@ SwiftGen also has a template to support flat strings files (i.e. no dot syntax). Example of code generated by the flat bundled template ```swift -enum L10n { +internal enum L10n { /// Some alert body there - case alertMessage + internal static let alertMessage = L10n.tr("Localizable", "alert__message") /// Title of the alert - case alertTitle + internal static let alertTitle = L10n.tr("Localizable", "alert__title") /// You have %d apples - case applesCount(Int) + internal static func applesCount(_ p1: Int) -> String { + return L10n.tr("Localizable", "apples.count", p1) + } /// Those %d bananas belong to %@. - case bananasOwner(Int, String) + internal static func bananasOwner(_ p1: Int, _ p2: Any) -> String { + return L10n.tr("Localizable", "bananas.owner", p1, String(describing: p2)) + } } ```