From 878519d2927185ae248b37cd5969360f5e8679c8 Mon Sep 17 00:00:00 2001 From: Gerson Noboa Date: Mon, 14 Aug 2023 11:33:17 +0300 Subject: [PATCH] fixup! Deprecate old strings resources --- swiftgen-deprecated-strings.stencil | 107 ---------------------------- swiftgen.yml | 7 -- 2 files changed, 114 deletions(-) delete mode 100644 swiftgen-deprecated-strings.stencil diff --git a/swiftgen-deprecated-strings.stencil b/swiftgen-deprecated-strings.stencil deleted file mode 100644 index 97222513d..000000000 --- a/swiftgen-deprecated-strings.stencil +++ /dev/null @@ -1,107 +0,0 @@ -// swiftlint:disable all -// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen - -{% if tables.count > 0 %} -{% set accessModifier %}{% if param.publicAccess %}public{% else %}internal{% endif %}{% endset %} -import Foundation - -// swiftlint:disable superfluous_disable_command file_length implicit_return prefer_self_in_static_references - -// MARK: - Strings - -{% macro parametersBlock types %} - {%- for type in types -%} - {%- if type == "String" -%} - _ p{{forloop.counter}}: Any - {%- else -%} - _ p{{forloop.counter}}: {{type}} - {%- endif -%} - {{ ", " if not forloop.last }} - {%- endfor -%} -{% endmacro %} -{% macro argumentsBlock types %} - {%- for type in types -%} - {%- if type == "String" -%} - String(describing: p{{forloop.counter}}) - {%- elif type == "UnsafeRawPointer" -%} - Int(bitPattern: p{{forloop.counter}}) - {%- else -%} - p{{forloop.counter}} - {%- endif -%} - {{ ", " if not forloop.last }} - {%- endfor -%} -{% endmacro %} -{% macro recursiveBlock table item %} - {% for string in item.strings %} - {% if not param.noComments %} - {% for line in string.comment|default:string.translation|split:"\n" %} - /// {{line}} - {% endfor %} - {% endif %} - {% set translation string.translation|replace:'"','\"'|replace:' ','\t' %} - {% if string.types %} - {{accessModifier}} static func {{string.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}({% call parametersBlock string.types %}) -> String { - return {{enumName}}.tr("{{table}}", "{{string.key}}", {%+ call argumentsBlock string.types %}, fallback: "{{translation}}") - } - {% elif param.lookupFunction %} - {{accessModifier}} static var {{string.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}: String { return {{enumName}}.tr("{{table}}", "{{string.key}}", fallback: "{{translation}}") } - {% else %} - {{accessModifier}} static let {{string.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}} = {{enumName}}.tr("{{table}}", "{{string.key}}", fallback: "{{translation}}") - {% endif %} - {% endfor %} - {% for child in item.children %} - {{accessModifier}} enum {{child.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} { - {% filter indent:2," ",true %}{% call recursiveBlock table child %}{% endfilter %} - } - {% endfor %} -{% endmacro %} -// swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length -// swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces - -@available(*, deprecated) -{% set enumName %}{{param.enumName|default:"L10n"}}{% endset %} -{{accessModifier}} enum {{enumName}} { - {% if tables.count > 1 or param.forceFileNameEnum %} - {% for table in tables %} - {{accessModifier}} enum {{table.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} { - {% filter indent:2," ",true %}{% call recursiveBlock table.name table.levels %}{% endfilter %} - } - {% endfor %} - {% else %} - {% call recursiveBlock tables.first.name tables.first.levels %} - {% endif %} -} -// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length -// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces - -// MARK: - Implementation Details - -extension {{enumName}} { - private static func tr(_ table: String, _ key: String, _ args: CVarArg..., fallback value: String) -> String { - {% if param.lookupFunction %} - let format = {{ param.lookupFunction }}(key, table, value) - {% else %} - let format = {{param.bundle|default:"BundleToken.bundle"}}.localizedString(forKey: key, value: value, table: table) - {% endif %} - return String(format: format, locale: Locale.current, arguments: args) - } -} -{% if not param.bundle and not param.lookupFunction %} - -// swiftlint:disable convenience_type -private final class BundleToken { - static let bundle: Bundle = { - #if SWIFT_PACKAGE - return Bundle.module - #else - return Bundle(for: BundleToken.self) - #endif - }() -} -// swiftlint:enable convenience_type -{% endif %} -{% else %} -// No string found -{% endif %} - -// swiftlint:enable all diff --git a/swiftgen.yml b/swiftgen.yml index 6eeb9d886..3acf9dc9e 100644 --- a/swiftgen.yml +++ b/swiftgen.yml @@ -6,13 +6,6 @@ strings: params: publicAccess: false enumName: Localization - - inputs: GliaWidgets/Resources/en.lproj/Deprecated.strings - outputs: - - templatePath: swiftgen-deprecated-strings.stencil - output: GliaWidgets/L10n.swift - params: - publicAccess: true - enumName: L10n xcassets: inputs: