From 6d4a6715fa9f56d84a166a188ad8813e6bcebc08 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Tue, 20 Aug 2024 14:42:28 +1000 Subject: [PATCH] clean --- Scripts/LintLocalizableStrings.swift | 18 ++++++++--------- Scripts/ProcessIP2CountryData.swift | 20 +++++++++---------- .../Settings/BlockedContactsViewModel.swift | 2 +- .../General/Localization.swift | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Scripts/LintLocalizableStrings.swift b/Scripts/LintLocalizableStrings.swift index ed0ec4ab7..2d0f5f3e3 100755 --- a/Scripts/LintLocalizableStrings.swift +++ b/Scripts/LintLocalizableStrings.swift @@ -6,9 +6,9 @@ // /// This script is based on https://github.com/ginowu7/CleanSwiftLocalizableExample /// The main differences are: -/// 1. Changes to the localised usage regex -/// 2. Addition to excluded unlocalised cases -/// 3. Functionality to update and copy localised permission requirement strings to infoPlist.xcstrings +/// 1. Changes to the localized usage regex +/// 2. Addition to excluded unlocalized cases +/// 3. Functionality to update and copy localized permission requirement strings to infoPlist.xcstrings import Foundation @@ -48,7 +48,7 @@ extension ProjectState { "external/" // External dependencies ] static let excludedPhrases: Set = [ "", " ", " ", ",", ", ", "null", "\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ] - static let excludedUnlocalisedStringLineMatching: Set = [ + static let excludedUnlocalizedStringLineMatching: Set = [ .contains(ProjectState.lintSuppression, caseSensitive: false), .prefix("#import", caseSensitive: false), .prefix("@available(", caseSensitive: false), @@ -221,12 +221,12 @@ enum ScriptAction: String { print("------------ Processing \(projectState.sourceFiles.count) Source File(s) ------------") projectState.sourceFiles.forEach { file in - // Add logs for unlocalised strings + // Add logs for unlocalized strings file.unlocalizedPhrases.forEach { phrase in Output.warning(phrase, "Found unlocalized string '\(phrase.key)'") } - // Add errors for missing localised strings + // Add errors for missing localized strings let missingKeys: Set = Set(file.keyPhrase.keys).subtracting(Set(allKeys)) missingKeys.forEach { key in switch file.keyPhrase[key] { @@ -487,7 +487,7 @@ extension ProjectState { // been suppressed or it's explicitly excluded due to the rules at the top of the file guard trimmedLine.contains("\"") && - !ProjectState.excludedUnlocalisedStringLineMatching + !ProjectState.excludedUnlocalizedStringLineMatching .contains(where: { $0.matches(trimmedLine, lineNumber, lines) }) else { return } @@ -500,7 +500,7 @@ extension ProjectState { line.components(separatedBy: commentMatches[0])[0] ) - // Use regex to find `NSLocalizedString("", "")`, `"".localised()` and any other `""` + // Use regex to find `NSLocalizedString("", "")`, `"".localized()` and any other `""` // values in the source code // // Note: It's more complex because we need to exclude escaped quotation marks from @@ -545,7 +545,7 @@ extension ProjectState { /// **Note:** While it'd be nice to have the regex automatically exclude the quotes doing so makes it _far_ less /// efficient (approx. by a factor of 8 times) so we remove those ourselves) if allMatches.isEmpty { - // Find strings which are just not localised + // Find strings which are just not localized let potentialUnlocalizedStrings: [String] = Regex .matches("\\\"[^\\\"\\\\]*(?:\\\\.[^\\\"\\\\]*)*(?:\\\")", content: targetLine) // Remove the leading and trailing quotation marks diff --git a/Scripts/ProcessIP2CountryData.swift b/Scripts/ProcessIP2CountryData.swift index e2161d08e..9397ebd38 100644 --- a/Scripts/ProcessIP2CountryData.swift +++ b/Scripts/ProcessIP2CountryData.swift @@ -106,7 +106,7 @@ class Processor { guard keepRunning else { return } /// Filter down the files to find the country name files - let localisedCountryNameFileUrls: [URL] = fileUrls.filter { fileUrl in + let localizedCountryNameFileUrls: [URL] = fileUrls.filter { fileUrl in ((try? fileUrl.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == false) && fileUrl.lastPathComponent.lowercased().hasPrefix(countryNameFilePrefix.lowercased()) && fileUrl.lastPathComponent.lowercased().hasSuffix(".csv") @@ -114,11 +114,11 @@ class Processor { guard keepRunning else { return } - let languageCodes: String = localisedCountryNameFileUrls + let languageCodes: String = localizedCountryNameFileUrls .map { url in String(url.lastPathComponent.dropFirst(countryNameFilePrefix.count).dropLast(".csv".count)) } .sorted() .joined(separator: ", ") - print("Found \(localisedCountryNameFileUrls.count) language files ✅ (\(languageCodes))") + print("Found \(localizedCountryNameFileUrls.count) language files ✅ (\(languageCodes))") guard keepRunning else { return } @@ -166,16 +166,16 @@ class Processor { /// Structure of the data should be `geoname_id,locale_code,continent_code,continent_name,country_iso_code,country_name,is_in_european_union` let languagesPrefix: String = "Processing languages: " - localisedCountryNameFileUrls.enumerated().forEach { fileIndex, fileUrl in + localizedCountryNameFileUrls.enumerated().forEach { fileIndex, fileUrl in guard keepRunning else { return } guard - let localisedData: Data = try? Data(contentsOf: fileUrl), - let localisedDataString: String = String(data: localisedData, encoding: .utf8) - else { fatalError("Could not load localised country name file") } + let localizedData: Data = try? Data(contentsOf: fileUrl), + let localizedDataString: String = String(data: localizedData, encoding: .utf8) + else { fatalError("Could not load localized country name file") } /// Header line plus at least one line of content - let lines: [String] = localisedDataString.components(separatedBy: "\n") - guard lines.count > 1 else { fatalError("Localised country file had no content") } + let lines: [String] = localizedDataString.components(separatedBy: "\n") + guard lines.count > 1 else { fatalError("localized country file had no content") } lines[1...].enumerated().forEach { index, line in let values: [String] = line @@ -187,7 +187,7 @@ class Processor { cache.countryLocationsGeonameId.append(values[0]) cache.countryLocationsCountryName.append(values[5].trimmingCharacters(in: CharacterSet(charactersIn: "\""))) - let progress = (Double((fileIndex * lines.count) + index) / Double(localisedCountryNameFileUrls.count * lines.count)) + let progress = (Double((fileIndex * lines.count) + index) / Double(localizedCountryNameFileUrls.count * lines.count)) printProgressBar(prefix: languagesPrefix, progress: progress, total: (terminalWidth - 10)) } } diff --git a/Session/Settings/BlockedContactsViewModel.swift b/Session/Settings/BlockedContactsViewModel.swift index 0eaa3ffc9..315217f18 100644 --- a/Session/Settings/BlockedContactsViewModel.swift +++ b/Session/Settings/BlockedContactsViewModel.swift @@ -184,7 +184,7 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo let name: String = contactNames.first ?? "" switch contactNames.count { case 1: - return "blockUnblockDescription" + return "blockUnblockName" .put(key: "name", value: name) .localized() case 2: diff --git a/SessionUtilitiesKit/General/Localization.swift b/SessionUtilitiesKit/General/Localization.swift index fe012a4d7..d0f69a2c7 100644 --- a/SessionUtilitiesKit/General/Localization.swift +++ b/SessionUtilitiesKit/General/Localization.swift @@ -245,7 +245,7 @@ final public class LocalizationHelper: CustomStringConvertible { // MARK: - CustomStringConvertible public var description: String { - // Fallback to the localised + // Fallback to the localized return self.localized() } }