Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

The catalog tests refuse a straight apostrophe outside Dutch

Țugui Dragoș92d513f0562d
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3dbd7dda..6b8a0bf1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -200,8 +200,9 @@ read in one sitting.
serial comma. A checkbox is selected or deselected, never ticked.
- **No em or en dashes**, in the interface, in comments, or in documents, and no spaced hyphen standing in for
one. A colon, a comma, or parentheses say the same thing, and a range reads "3 to 4". Interface text writes the
- curly apostrophe (’), as macOS does; the `peel` tool writes its own words in plain ASCII, and names, paths,
- and macOS's own error messages as they are, in UTF-8, with what could hide or reorder text shown as `?`.
+ curly apostrophe (’), as macOS does, and a translation the marks macOS writes in its language: Dutch keeps the
+ straight apostrophe, as Apple's Dutch does. The `peel` tool writes its own words in plain ASCII, and names,
+ paths, and macOS's own error messages as they are, in UTF-8, with what could hide or reorder text shown as `?`.
- **Every translation lives in `Localization/`.** Peel is translated into 17 languages, in the words macOS itself
uses in each. Write new or changed interface text in English, and run `python3 Scripts/sync_localizations.py`
after a Debug build so the catalog lists it. The translations are added before your change is merged; until
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
index 297529f3..d99f63af 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/StringCatalogTests.swift
@@ -172,6 +172,9 @@ import Testing
"Run `brew unpin`": ["localizations": ["ro": unit("Rulați brew unpin")]],
"Uses [a tool](peel-license:tool)": ["localizations": ["ro": unit("Folosește [un instrument](peel-license:instrument)")]],
"OrbStack": ["localizations": ["ro": unit("OrbStack"), "fr": unit("OrbStack")]],
+ "Don't": ["localizations": ["ro": unit("Nu"), "fr": unit("Non")]],
+ "Can’t open %@": ["localizations": ["ro": unit("Nu se poate deschide %@"), "fr": unit("Impossible d'ouvrir %@")]],
+ "Open in Photos": ["localizations": ["ro": unit("Deschide în Poze"), "fr": unit("Ouvrir dans Photos"), "nl": unit("Open in Foto's")]],
]
let catalog: [String: Any] = ["sourceLanguage": "en", "strings": strings, "version": "1.0"]
try JSONSerialization.data(withJSONObject: catalog).write(to: folder.appending(path: "Localization/Peel/Localizable.xcstrings"))
@@ -201,6 +204,9 @@ import Testing
#expect(caught["markdown"]?.contains("Run `brew unpin`") == true)
#expect(caught["markdown"]?.contains("Uses [a tool](peel-license:tool)") == true, "a link's address changed")
#expect(caught["sameEverywhere"]?.contains("OrbStack") == true, "a name or a command, never to translate")
+ #expect(caught["apostrophe"]?.contains("Don't") == true, "the English writes the curly apostrophe")
+ #expect(caught["apostrophe"]?.contains("Can’t open %@") == true, "French writes its own apostrophe")
+ #expect(caught["apostrophe"]?.contains("Open in Photos") != true, "Dutch writes the straight one, as its macOS does")
}
/// Text the user reads always goes through the catalogs. `Text(verbatim:)` is only for what is not words, or
@@ -271,6 +277,9 @@ struct CatalogChecker {
"cs": ["one", "few", "many", "other"],
]
static let dashes: Set<Character> = ["\u{2012}", "\u{2013}", "\u{2014}", "\u{2015}", "\u{2E3A}", "\u{2E3B}", "\u{FE31}", "\u{FE32}", "\u{FE58}"]
+ /// The languages whose macOS writes the straight apostrophe, inside words and as its quotes: Apple's Dutch writes
+ /// `Foto's` and `de map 'Apps'`. Every other language, English included, writes its own typographic marks.
+ static let straightApostrophe: Set<String> = ["nl"]
/// Keys whose numbers are positions, with no word that changes with them, so they need no plural variation.
static let countsWithoutAgreement: Set<String> = ["Step %lld of %lld"]
/// Languages where `one` covers more than 1, so a `one` form without the number would also show for other
@@ -428,6 +437,7 @@ struct CatalogChecker {
}
// A key with a value of its own (`Unknown (extension state)`) is translated from that value.
let source = englishValue(localizations) ?? key
+ if source.contains("'") { fail(path, key, "en", "apostrophe", "the straight apostrophe: write ’, as macOS does") }
// The same words in every language are a name or a command, which no translator should be asked for.
let values = required.map { ((localizations[$0] as? [String: Any])?["stringUnit"] as? [String: Any])?["value"] as? String }
if !required.isEmpty, source.contains(where: \.isLetter), values.allSatisfy({ $0 == source }) {
@@ -492,6 +502,9 @@ struct CatalogChecker {
if let dash = text.first(where: { Self.dashes.contains($0) }) {
fail(path, key, language, "dash", "U+\(String(dash.unicodeScalars.first!.value, radix: 16, uppercase: true))")
}
+ if text.contains("'"), !Self.straightApostrophe.contains(language) {
+ fail(path, key, language, "apostrophe", "the straight apostrophe: write this language's own, as its macOS does")
+ }
if text.contains("...") { fail(path, key, language, "ellipsis", "three full stops") }
let ellipsis: Character = language == "zh-Hant" ? "\u{22EF}" : "…"
if Self.menuWords[key] == nil, text.filter({ $0 == ellipsis }).count != source.filter({ $0 == "…" }).count {