javier
9774454bba
This PR contains the work done to get the Website service building and running correctly in its Linux container. The service depends on the local _Localization_ package, whose String-Catalog localization was Darwin-only and broke the Docker build. Thus the localization internals have been reworked to be platform-agnostic and fixes the container build context so the local package is actually available during the build. * Localization package * Replaced the Darwin-only `String.LocalizationValue` / `String(localized:)` path with a StringCatalog type that reads raw JSON from a given `.xcstrings` file, so lookups resolve identically on macOS and Linux. * The `LanguageList` now derives available languages from the catalog instead of `Bundle.localizations` * The `Negotiate` does explicit _Accept-Language_ matching (exact tag, then primary subtag) instead of the Linux-broken `Bundle.preferredLocalizations`. * Switched the catalog resource rule from `.process` to `.copy` (in both Localization and Website manifests) so the raw `.xcstrings` ships verbatim on every platform. * Introduced a `CatalogResolving` protocol as a seam between the localizers and the storage backend, enabling test injection and a future native-Apple backend without changing callers. * Website Docker build * Build context moved to the repository root so the relative-path `Localization` package is inside the context; `Dockerfile`, `docker-compose.override.yml`, and the _img-release_ make target updated to the new context/paths. * Added a root `.dockerignore` to keep the context lean. Reviewed-on: rock-n-code/loud-amsterdam#12 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
62 lines
2.0 KiB
Swift
62 lines
2.0 KiB
Swift
import Foundation
|
|
|
|
/// A reusable, bundle-bound localizer that resolves String Catalog entries for an explicit locale.
|
|
///
|
|
/// A server has no single "current" locale, so each lookup must name the locale to use. An instance
|
|
/// is bound to the bundle whose catalog holds the strings, then invoked like a function to resolve a
|
|
/// key in a chosen locale.
|
|
public struct Localize: Sendable {
|
|
|
|
// MARK: Properties
|
|
|
|
/// The backend that resolves keys against the catalog.
|
|
private let resolver: any CatalogResolving
|
|
|
|
// MARK: Initializers
|
|
|
|
/// Creates a localizer backed by the String Catalog in the given bundle.
|
|
/// - Parameters:
|
|
/// - bundle: the bundle whose String Catalog contains the keys to resolve.
|
|
/// - table: the name of the String Catalog resource, without the `.xcstrings` extension.
|
|
public init(
|
|
bundle: Bundle,
|
|
table: String = "Localizable"
|
|
) {
|
|
self.init(resolver: StringCatalog(
|
|
bundle: bundle,
|
|
table: table
|
|
))
|
|
}
|
|
|
|
/// Creates a localizer backed by the given resolver.
|
|
///
|
|
/// The seam for tests and alternative backends; the public API resolves against a bundled catalog.
|
|
/// - Parameter resolver: the backend that resolves keys to localized strings.
|
|
init(
|
|
resolver: any CatalogResolving
|
|
) {
|
|
self.resolver = resolver
|
|
}
|
|
|
|
// MARK: Methods
|
|
|
|
/// Resolves a catalog key in the given locale.
|
|
///
|
|
/// Invoked by calling the instance directly, for example `localize("index.title", locale: locale)`.
|
|
/// - Parameters:
|
|
/// - key: the String Catalog key to look up.
|
|
/// - locale: the locale to resolve the key in.
|
|
/// - Returns: the localized string for the locale, the source-language string when the locale has no
|
|
/// entry, or the key itself when the catalog has no entry for it.
|
|
public func callAsFunction(
|
|
_ key: String,
|
|
locale: Locale
|
|
) -> String {
|
|
resolver.string(
|
|
for: key,
|
|
in: locale
|
|
)
|
|
}
|
|
|
|
}
|