Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adopt localized resources #82

Closed
wants to merge 3 commits into from
Closed

Adopt localized resources #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62d8b52
adopt localized resources
Aug 11, 2022
f37bb8d
delete dead code
Aug 18, 2022
d81bf75
Sync fork
Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 16 additions & 22 deletions Example/Preferences.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
objects = {

/* Begin PBXBuildFile section */
1C83C8FE28A5768500D38612 /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = 1C83C8FD28A5768500D38612 /* Preferences */; };
502B68E72254947B00789D9F /* PreferencesStyle+UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B68E52254944600789D9F /* PreferencesStyle+UserDefaults.swift */; };
E3194E4122573FF3006FE775 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3194E4022573FF3006FE775 /* Utilities.swift */; };
E340668C28ADAFF3002F8EA9 /* Preferences in Frameworks */ = {isa = PBXBuildFile; productRef = E340668B28ADAFF3002F8EA9 /* Preferences */; };
E34E9EEA20E6149B002F8F86 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E34E9EE920E6149B002F8F86 /* AppDelegate.swift */; };
E34E9EEC20E6149D002F8F86 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E34E9EEB20E6149D002F8F86 /* Assets.xcassets */; };
E34E9EEF20E6149D002F8F86 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E34E9EED20E6149D002F8F86 /* MainMenu.xib */; };
Expand All @@ -20,23 +20,10 @@
E7059F1323C2AC7400F84762 /* AccountsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7059F1123C2AC3700F84762 /* AccountsScreen.swift */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
E34E9EF920E61508002F8F86 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1C000DB328AE7A3100F2844C /* Preferences */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Preferences; path = ..; sourceTree = "<group>"; };
502B68E52254944600789D9F /* PreferencesStyle+UserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "PreferencesStyle+UserDefaults.swift"; sourceTree = "<group>"; usesTabs = 1; };
E3194E4022573FF3006FE775 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Utilities.swift; sourceTree = "<group>"; usesTabs = 1; };
E340668928ADAFD5002F8EA9 /* Preferences */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Preferences; path = ..; sourceTree = "<group>"; };
E34E9EE720E6149B002F8F86 /* PreferencesExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PreferencesExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E34E9EE920E6149B002F8F86 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = "<group>"; usesTabs = 1; };
E34E9EEB20E6149D002F8F86 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -54,17 +41,24 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E340668C28ADAFF3002F8EA9 /* Preferences in Frameworks */,
1C83C8FE28A5768500D38612 /* Preferences in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
E340668A28ADAFF3002F8EA9 /* Frameworks */ = {
1C83C8FA28A5763E00D38612 /* Packages */ = {
isa = PBXGroup;
children = (
1C000DB328AE7A3100F2844C /* Preferences */,
);
name = Packages;
sourceTree = "<group>";
};
1C83C8FC28A5768500D38612 /* Frameworks */ = {
isa = PBXGroup;
children = (
E340668928ADAFD5002F8EA9 /* Preferences */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -98,9 +92,10 @@
OBJ_5 = {
isa = PBXGroup;
children = (
1C83C8FA28A5763E00D38612 /* Packages */,
E34E9EE820E6149B002F8F86 /* Example */,
E340668A28ADAFF3002F8EA9 /* Frameworks */,
OBJ_12 /* Products */,
1C83C8FC28A5768500D38612 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -114,15 +109,14 @@
E34E9EE320E6149B002F8F86 /* Sources */,
E34E9EE420E6149B002F8F86 /* Frameworks */,
E34E9EE520E6149B002F8F86 /* Resources */,
E34E9EF920E61508002F8F86 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = PreferencesExample;
packageProductDependencies = (
E340668B28ADAFF3002F8EA9 /* Preferences */,
1C83C8FD28A5768500D38612 /* Preferences */,
);
productName = PreferencesExample;
productReference = E34E9EE720E6149B002F8F86 /* PreferencesExample.app */;
Expand Down Expand Up @@ -406,7 +400,7 @@
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
E340668B28ADAFF3002F8EA9 /* Preferences */ = {
1C83C8FD28A5768500D38612 /* Preferences */ = {
isa = XCSwiftPackageProductDependency;
productName = Preferences;
};
Expand Down
4 changes: 3 additions & 1 deletion Package.swift
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ import PackageDescription

let package = Package(
name: "Preferences",
defaultLocalization: "fr",
platforms: [
.macOS(.v10_13)
],
Expand All @@ -16,7 +17,8 @@ let package = Package(
],
targets: [
.target(
name: "Preferences"
name: "Preferences",
resources: [.process("Resources")]
)
]
)
135 changes: 0 additions & 135 deletions Sources/Preferences/Localization.swift
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ar.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "تفضيلات";
"settings" = "الإعدادات";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ca.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferències";
"settings" = "Configuració";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/cs.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Předvolby";
"settings" = "Nastavení";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/da.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Indstillinger";
"settings" = "Indstillinger";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/de.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Einstellungen";
"settings" = "Einstellungen";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/el.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Προτιμήσεις";
"settings" = "Ρυθμίσεις";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/en-AU.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferences";
"settings" = "Settings";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/en-GB.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferences";
"settings" = "Settings";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/en.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferences";
"settings" = "Settings";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/es-419.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferencias";
"settings" = "Ajustes";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/es.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferencias";
"settings" = "Ajustes";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/fi.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Asetukset";
"settings" = "Asetukset";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/fr-CA.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Préférences";
"settings" = "Réglages";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/fr.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Préférences";
"settings" = "Réglages";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/he.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "העדפות";
"settings" = "הגדרות";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/hi.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "प्राथमिकता";
"settings" = "समायोजन";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/hr.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Postavke";
"settings" = "Postavke";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/hu.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Beállítások";
"settings" = "Beállítások";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/id.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferensi";
"settings" = "Pengaturan";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/it.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferenze";
"settings" = "Impostazioni";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ja.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "環境設定";
"settings" = "設定";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ko.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "환경설정";
"settings" = "설정";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ms.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Keutamaan";
"settings" = "Tetapan";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/nl.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Voorkeuren";
"settings" = "Instellingen";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/no.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Valg";
"settings" = "Innstillinger";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/pl.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferencje";
"settings" = "Ustawienia";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/pt-PT.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferências";
"settings" = "Definições";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/pt.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferências";
"settings" = "Ajustes";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ro.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Preferințe";
"settings" = "Configurări";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/ru.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Настройки";
"settings" = "Настройки";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/sk.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Nastavenia";
"settings" = "Nastavenia";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/sv.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Inställningar";
"settings" = "Inställningar";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/th.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "การตั้งค่า";
"settings" = "ค่าติดตั้ง";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/tr.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Tercihler";
"settings" = "Ayarlar";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/uk.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Параметри";
"settings" = "Параметри";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/vi.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "Tùy chọn";
"settings" = "Cài đặt";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/zh-CN.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "偏好设置";
"settings" = "设置";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/zh-HK.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "偏好設定";
"settings" = "設定";
2 changes: 2 additions & 0 deletions Sources/Preferences/Resources/zh-TW.lproj/Localizable.strings
View file
Open in desktop
@@ -0,0 +1,2 @@
"preferences" = "偏好設定";
"settings" = "設定";
4 changes: 2 additions & 2 deletions Sources/Preferences/SettingsTabViewController.swift
View file
Open in desktop
Expand Up @@ -95,9 +95,9 @@ final class SettingsTabViewController: NSViewController, SettingsStyleController
} else {
let settings: String
if #available(macOS 13, *) {
settings = Localization[.settings]
settings = NSLocalizedString("settings", bundle: .module, comment: "")
} else {
settings = Localization[.preferences]
settings = NSLocalizedString("preferences", bundle: .module, comment: "")
}

let appName = Bundle.main.appName
Expand Down