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.

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

(related to #86) Updating string keys for AppView.swift #121

Merged
merged 48 commits into from Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8c1cd03
Replaced all strings with keys
Wind-Explorer Jul 22, 2022
b8d9368
Wiped all previous translations
Wind-Explorer Jul 22, 2022
4f3d9ce
Tuned code for proper building
Wind-Explorer Jul 22, 2022
0e7f62f
Attempting to resolve conflict
Wind-Explorer Jul 22, 2022
5557e9a
Reverted whatever I just did
Wind-Explorer Jul 22, 2022
c3940d8
nuked all conflicts - ready to merge
Wind-Explorer Jul 22, 2022
dc5d006
;-; forgot to stage a file
Wind-Explorer Jul 22, 2022
3f83d5c
Resolve more conflicts
Wind-Explorer Jul 22, 2022
72feef1
resolving EVEN more conflicts (DEPALLL!!!!)
Wind-Explorer Jul 23, 2022
a717cbc
Updated locales to work with #91
Wind-Explorer Jul 24, 2022
85f90ad
Reverted unintentional changes to code
Wind-Explorer Jul 24, 2022
eaa3406
Salvaged some german locales
Wind-Explorer Jul 25, 2022
525e0b2
Restored french translation of sound alert
Wind-Explorer Jul 25, 2022
e7d91fd
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 25, 2022
fef69c1
Tuned some UI aspect of things
Wind-Explorer Jul 26, 2022
9f1465e
Added Chinese locales
Wind-Explorer Jul 26, 2022
ab68b0d
Ironed out locales formatting
Wind-Explorer Jul 27, 2022
a70bf3c
Repositioned crash button
Wind-Explorer Jul 28, 2022
686d1a7
Remove unnecessary imports
Wind-Explorer Jul 28, 2022
cfe32c9
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 28, 2022
012d208
Making changes according to isaac
Wind-Explorer Jul 29, 2022
38a4333
Changed grammar errors and cleaned code
Wind-Explorer Jul 29, 2022
914223c
Pulling from upstream
Wind-Explorer Jul 29, 2022
32c304c
Merge branch 'feature/revamped-string-keys' of https://github.com/Win…
Wind-Explorer Jul 29, 2022
8870c81
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 29, 2022
e12bd92
Modded upstream code to match current changes
Wind-Explorer Jul 29, 2022
d6acdad
Updated locale to work with #108
Wind-Explorer Jul 29, 2022
2d54ffc
Removed unnecessary @State attribute
Wind-Explorer Jul 29, 2022
0147550
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 30, 2022
1fa5a8d
Removed "private" attrib for code building
Wind-Explorer Jul 30, 2022
b895445
Changed locale based on suggestions
Wind-Explorer Jul 30, 2022
f3d6bf0
Reverted UI changes
Wind-Explorer Jul 30, 2022
037e5f1
Updated locale to work with latest PR
Wind-Explorer Jul 30, 2022
d91fc76
Changed locale based on suggestions
Wind-Explorer Jul 30, 2022
af0d021
Reverted UI changes
Wind-Explorer Jul 30, 2022
e4856bb
Merge branch 'feature/revamped-string-keys' of https://github.com/Win…
Wind-Explorer Jul 30, 2022
de00985
ignore project.pbxproj
Wind-Explorer Jul 31, 2022
c0f23ab
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 31, 2022
6fcbb70
Revert "ignore project.pbxproj"
Wind-Explorer Jul 31, 2022
b2d9c1b
Reverted UI change suggested by Depal
Wind-Explorer Jul 31, 2022
0bddee2
Reverted more UI suggested by Isaac
Wind-Explorer Jul 31, 2022
12c072e
Merge branch 'develop' of https://github.com/PlayCover/PlayCover into…
Wind-Explorer Jul 31, 2022
3b57b9a
Reverted UI from Isaac's comments
Wind-Explorer Jul 31, 2022
908cc8a
Revert "Remove unnecessary imports"
Wind-Explorer Jul 31, 2022
41d006d
Addes keys to AppView.swift
Wind-Explorer Jul 31, 2022
f983515
Updating locale for #95
Wind-Explorer Jul 31, 2022
1f0fc0f
Update locale for #95
Wind-Explorer Jul 31, 2022
30a700e
Updated keys to work with locale
Wind-Explorer Jul 31, 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
4 changes: 2 additions & 2 deletions PlayCover/View/AppSettingsView.swift
Expand Up @@ -71,10 +71,10 @@ struct AppSettingsView: View {
Divider().padding(.leading, 36).padding(.trailing, 36)
VStack(alignment: .leading, spacing: 0) {
Toggle(isOn: $disableTimeout) {
Text("Disable Display Sleep")
Text("settings.toggle.disableDisplaySleep")
}
.padding()
.help("Prevent display from turning off while this app is running")
.help("settings.toggle.disableDisplaySleep.info")
Spacer()
Divider().padding(.leading, 36).padding(.trailing, 36)
Spacer()
Expand Down
28 changes: 13 additions & 15 deletions PlayCover/View/AppsView.swift
Expand Up @@ -29,21 +29,21 @@ struct AppsView: View {
}
if !xcodeCliInstalled {
VStack(spacing: 12) {
Text("You need to install Xcode Commandline tools and restart this App.")
Text("xcode.install.message")
.font(.title3)
Button("Install") {
Button("button.Install") {
do {
_ = try shell.sh("xcode-select --install")
alertTitle = NSLocalizedString("Xcode tools installation succeeded", comment: "")
alertBtn = NSLocalizedString("Close", comment: "")
alertText = NSLocalizedString("Please follow the given instructions, and restart the App.", comment: "")
alertTitle = NSLocalizedString("xcode.install.success", comment: "")
alertBtn = NSLocalizedString("button.Close", comment: "")
alertText = NSLocalizedString("alert.followInstructionsAndRestartApp", comment: "")
alertAction = {
exit(0)
}
showAlert = true
} catch {
alertTitle = NSLocalizedString("Xcode tools intallation failed", comment: "")
alertBtn = NSLocalizedString("OK", comment: "")
alertTitle = NSLocalizedString("xcode.install.failed", comment: "")
alertBtn = NSLocalizedString("button.OK", comment: "")
alertText = error.localizedDescription
alertAction = {}
showAlert = true
Expand Down Expand Up @@ -104,7 +104,7 @@ struct AppAddView: View {
.font(.system(size: 38.0, weight: .thin))
.frame(width: 64, height: 68).padding(.top).foregroundColor(
install.installing ? Color.gray : Color.accentColor)
Text("Add app").padding(.horizontal)
Text("playapp.add").padding(.horizontal)
.frame(width: 150, height: 50)
.padding(.bottom)
.lineLimit(nil)
Expand All @@ -115,8 +115,8 @@ struct AppAddView: View {
.frame(width: 150, height: 150).onHover(perform: { hovering in
isHover = hovering
}).alert(isPresented: $showWrongfileTypeAlert) {
Alert(title: Text("Wrong file type"),
message: Text("Choose an .ipa file"), dismissButton: .default(Text("OK")))
Alert(title: Text("alert.wrongFileType"),
message: Text("alert.wrongFileType.message"), dismissButton: .default(Text("button.OK")))
}
.onTapGesture {
if install.installing {
Expand Down Expand Up @@ -162,17 +162,15 @@ struct AppAddView: View {
} else {
showWrongfileTypeAlert = true
}
}.help("Drag or open an app file to install. IPAs from Configurator or iMazing won't work! " +
"You should get decrypted IPAs, either from the top right button, Discord, AppDb," +
" or a jailbroken device.")
}.help("playapp.add.help")
}

private func installApp() {
Installer.install(ipaUrl: uif.ipaUrl!, returnCompletion: { (_) in
DispatchQueue.main.async {
AppsVM.shared.fetchApps()
NotifyService.shared.notify(NSLocalizedString("App installed!", comment: ""),
NSLocalizedString("Check it out in 'My Apps'", comment: ""))
NotifyService.shared.notify(NSLocalizedString("notification.appInstalled", comment: ""),
NSLocalizedString("notification.appInstalled.message", comment: ""))
}
})
}
Expand Down
18 changes: 9 additions & 9 deletions PlayCover/View/SetupView.swift
Expand Up @@ -70,26 +70,26 @@ struct SetupView: View {

VStack(alignment: .leading, spacing: 5) {
Group {
Text("setupView.1")
Text("setupView.2")
Text("setupView.3")
Text("setupView.4")
Text("setupView.5")
Text("setupView.step1")
Text("setupView.step2")
Text("setupView.step3")
Text("setupView.step4")
Text("setupView.step5")
HStack(spacing: 4) {
Text("setupView.6")
Text("setupView.step6")
Text("csrutil disable").textSelection(.enabled).font(.monospaced(.body)())
.padding(.horizontal, 4)
.padding(.vertical, 2)
.background(Color(red: 0.25, green: 0.25, blue: 0.25))
.cornerRadius(5)
.foregroundColor(Color(hex: 0xFFFFFF))
}
Text("setupView.7")
Text("setupView.8")
Text("setupView.step7")
Text("setupView.step8")

Spacer()

Text("setupView.9").font(.callout)
Text("setupView.step9").font(.callout)
}

GroupBox(label: Label(NSLocalizedString("setupView.vidTutorials", comment: ""),
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/de.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/en.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/es.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/fr.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/id.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/it.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/ja.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/ko.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/ru.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/vi.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "Enable Jailbreak Bypass (Alpha)";
"settings.toggle.jbBypass.info" = "Attempts to bypass Jailbreak Detection in some games (No guarentee to work all the time)";
"settings.toggle.autoWindowResize" = "Enable auto window resize";
"settings.toggle.disableDisplaySleep" = "Disable display sleep";
"settings.toggle.disableDisplaySleep.info" = "Prevent display from turning off while this app is running"

"settings.picker.displayRefreshRate" = "Screen refresh rate";
"settings.picker.screenSize" = "Display resolution";
Expand Down
2 changes: 2 additions & 0 deletions PlayCover/zh-Hans.lproj/Localizable.strings
Expand Up @@ -80,6 +80,8 @@
"settings.toggle.jbBypass" = "启用绕过越狱检测(预览)";
"settings.toggle.jbBypass.info" = "尝试绕过游戏的防越狱系统(不一定总是有效)";
"settings.toggle.autoWindowResize" = "启用自动窗口大小调整";
"settings.toggle.disableDisplaySleep" = "禁用显示器息屏";
"settings.toggle.disableDisplaySleep.info" = "防止显示器在此应用运行时息屏"

"settings.picker.displayRefreshRate" = "屏幕刷新率";
"settings.picker.screenSize" = "屏幕分辨率";
Expand Down