Cleanup and string fixes (#684)

* Setup UI tweaks.

* Protection level string

* Toolbar cleanup

* More strings.
This commit is contained in:
Max Goedjen 2025-09-09 23:00:26 -07:00 committed by GitHub
parent 8c516e128a
commit a5b43ea046
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 36 additions and 574 deletions

View File

@ -411,83 +411,6 @@
} }
} }
}, },
"agent_setup_notice_title" : {
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Inicialitza Secretive"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secretive Einrichten"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Setup Secretive"
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Asenna Secretive"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Configurer Secretive"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Imposta Secretive"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secretiveをセットアップ"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secretive 설치"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Konfiguracja Secretive"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Configurar Secretive"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Настроить Secretive"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "设置 Secretive"
}
}
}
},
"agentDetailsLocationTitle" : { "agentDetailsLocationTitle" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -653,83 +576,6 @@
} }
} }
}, },
"app_menu_setup_button" : {
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Inicialitza Secretive"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secretive Einrichten"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Setup Secretive"
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Asenna Secretive"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Configurer Secretive"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Imposta Secretive"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "セットアップ"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secretive 설치"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Skonfiguruj Scretive"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Configurar Secretive"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Настроить Secretive"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "设置 Secretive"
}
}
}
},
"app_not_in_applications_notice_detail_description" : { "app_not_in_applications_notice_detail_description" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -962,84 +808,6 @@
} }
} }
}, },
"auth_context_persist_for_duration_unknown" : {
"comment" : "When the user clicks the notification to leave a secret unlocked, they are shown a prompt to approve the action. This is the description, showing which secret will used. The placeholder is the name of the secret. This is a fallback used when a duration is unable to be specified.",
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "desbloqueja el secret \"%1$(secretName)@\""
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Secret \"%1$(secretName)@\" entsperren"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "unlock secret “%1$(secretName)@\""
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "avaa salaisuuden \"%1$(secretName)@\" lukitus"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "déverrouiller le secret \"%1$(secretName)@\""
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "sblocca il Segreto \"%1$(secretName)@\""
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "シークレット“%1$(secretName)@”のロックを解除します"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "비밀 \"%1$(secretName)@\" 잠금 해제"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "odblokuj sekret “%1$(secretName)@”"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "destravar secreto \"%1$(secretName)@\""
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "разблокировать секрет \"%1$(secretName)@\""
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "解锁密钥串 \"%1$(secretName)@\""
}
}
}
},
"auth_context_request_deny_button" : { "auth_context_request_deny_button" : {
"comment" : "When the user chooses to perform an action that requires Touch ID/password authentication, they are shown a prompt to approve the action. This is the deny button for that prompt.", "comment" : "When the user chooses to perform an action that requires Touch ID/password authentication, they are shown a prompt to approve the action. This is the deny button for that prompt.",
"extractionState" : "manual", "extractionState" : "manual",
@ -1196,95 +964,6 @@
} }
} }
}, },
"auth_context_request_verify_description" : {
"comment" : "When the user performs a signature verification action using a secret, they are shown a prompt to approve the action. This is the description, showing which secret will be used. The placeholder is the name of the secret. NOTE: This is currently not exposed in UI.",
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "verifica una signatura usant el secret \"%1$(secretName)@\""
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "eine Signatur mit dem Secret \"%1$(secretName)@\" verifizieren"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "verify a signature using secret \"%1$(secretName)@“"
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "varmista allekirjoitus käyttäen salaisuutta \"%1$(secretName)@\""
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "vérifier une signature en utilisant le secret \"%1$(secretName)@\""
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "verifica una firma usando il segreto \"%1$(secretName)@\""
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "シークレット“%1$(secretName)@”を使って署名を検証します"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "비밀 \"%1$(secretName)@\"를 사용하여 서명 검증"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "zweryfikuj sygnaturę za pomocą sekretu “%1$(secretName)@”"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "verificar a assinatura utilizando o segredo \"%1$(secretName)@\""
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "верифицировать подпись используя секрет \"%1$(secretName)@\""
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "使用密钥串 \"%1$(secretName)@\" 认证"
}
}
}
},
"copy_button" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Copy"
}
}
}
},
"copyable_click_to_copy_button" : { "copyable_click_to_copy_button" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -1967,6 +1646,17 @@
} }
} }
}, },
"create_secret_protection_level_title" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Protection Level"
}
}
}
},
"create_secret_require_authentication_biometric_current_description" : { "create_secret_require_authentication_biometric_current_description" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -2297,83 +1987,6 @@
} }
} }
}, },
"delete_confirmation_confirm_name_label" : {
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Confirma el nom"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Name bestätigen"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Confirm Name"
}
},
"fi" : {
"stringUnit" : {
"state" : "translated",
"value" : "Vahvista nimi"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Confirmer le nom"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Conferma nome"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "名前の確認"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "확인 이름"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Powtórz nazwę"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Confirmar Nome"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Подтвердить название"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "确认名称"
}
}
}
},
"delete_confirmation_delete_button" : { "delete_confirmation_delete_button" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -4776,77 +4389,6 @@
} }
} }
}, },
"setup_ssh_added_manually_button" : {
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "L'he afegida manualment"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Ich habe es Manuell Eingefügt"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "I Added it Manually"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Je l'ai ajouté manuellement"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Lho aggiunta manualmente"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "手動で追加する"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "내가 수동으로 추가했습니다"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Dodałem to samodzielnie"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Eu adicionei manualmente"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Добавлено мною вручную"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "我自行手动添加"
}
}
}
},
"setup_updates_description" : { "setup_updates_description" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {
@ -4989,77 +4531,6 @@
} }
} }
}, },
"setup_updates_readmore" : {
"extractionState" : "manual",
"localizations" : {
"ca" : {
"stringUnit" : {
"state" : "translated",
"value" : "Llegiu més ací."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Lies hier mehr darüber."
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Read more about this here."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Pour en savoir plus, cliquez ici."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"value" : "Leggi di più a riguardo qui."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "詳細はこちら"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "이에 대한 자세한 내용은 여기를 참조하세요."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Przeczytaj więcej tutaj."
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Leia mais sobre isto aqui."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"value" : "Больше подробностей здесь."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "在此处查看详情。"
}
}
}
},
"setup_updates_title" : { "setup_updates_title" : {
"extractionState" : "manual", "extractionState" : "manual",
"localizations" : { "localizations" : {

View File

@ -56,11 +56,9 @@ extension SecureEnclave {
formatter.unitsStyle = .spellOut formatter.unitsStyle = .spellOut
formatter.allowedUnits = [.hour, .minute, .day] formatter.allowedUnits = [.hour, .minute, .day]
if let durationString = formatter.string(from: duration) {
newContext.localizedReason = String(localized: .authContextPersistForDuration(secretName: secret.name, duration: durationString)) let durationString = formatter.string(from: duration)!
} else { newContext.localizedReason = String(localized: .authContextPersistForDuration(secretName: secret.name, duration: durationString))
newContext.localizedReason = String(localized: .authContextPersistForDurationUnknown(secretName: secret.name))
}
let success = try await newContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: newContext.localizedReason) let success = try await newContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: newContext.localizedReason)
guard success else { return } guard success else { return }
let context = PersistentAuthenticationContext(secret: secret, context: newContext, duration: duration) let context = PersistentAuthenticationContext(secret: secret, context: newContext, duration: duration)

View File

@ -21,9 +21,10 @@ struct SetupView: View {
StepView( StepView(
title: .setupAgentTitle, title: .setupAgentTitle,
description: .setupAgentDescription, description: .setupAgentDescription,
detail: .setupAgentActivityMonitorDescription,
systemImage: "lock.laptopcomputer", systemImage: "lock.laptopcomputer",
) { ) {
setupButton( SetupButton(
.setupAgentInstallButton, .setupAgentInstallButton,
complete: installed, complete: installed,
width: buttonWidth width: buttonWidth
@ -40,7 +41,7 @@ struct SetupView: View {
description: .setupUpdatesDescription, description: .setupUpdatesDescription,
systemImage: "network.badge.shield.half.filled", systemImage: "network.badge.shield.half.filled",
) { ) {
setupButton( SetupButton(
.setupUpdatesOkButton, .setupUpdatesOkButton,
complete: updates, complete: updates,
width: buttonWidth width: buttonWidth
@ -54,7 +55,7 @@ struct SetupView: View {
description: .setupIntegrationsDescription, description: .setupIntegrationsDescription,
systemImage: "firewall", systemImage: "firewall",
) { ) {
setupButton( SetupButton(
.setupIntegrationsButton, .setupIntegrationsButton,
complete: integrations, complete: integrations,
width: buttonWidth width: buttonWidth
@ -63,7 +64,7 @@ struct SetupView: View {
} }
} }
} }
.onPreferenceChange(setupButton.WidthKey.self) { width in .onPreferenceChange(SetupButton.WidthKey.self) { width in
buttonWidth = width buttonWidth = width
} }
.background(.white.opacity(0.1), in: RoundedRectangle(cornerRadius: 10)) .background(.white.opacity(0.1), in: RoundedRectangle(cornerRadius: 10))
@ -88,7 +89,7 @@ struct SetupView: View {
} }
} }
struct setupButton: View { struct SetupButton: View {
struct WidthKey: @MainActor PreferenceKey { struct WidthKey: @MainActor PreferenceKey {
@MainActor static var defaultValue: CGFloat? = nil @MainActor static var defaultValue: CGFloat? = nil
@ -144,12 +145,20 @@ struct StepView<Content: View>: View {
let title: LocalizedStringResource let title: LocalizedStringResource
let icon: Image let icon: Image
let description: LocalizedStringResource let description: LocalizedStringResource
let detail: LocalizedStringResource?
let actions: Content let actions: Content
init(title: LocalizedStringResource, description: LocalizedStringResource, systemImage: String, actions: () -> Content) { init(
title: LocalizedStringResource,
description: LocalizedStringResource,
detail: LocalizedStringResource? = nil,
systemImage: String,
actions: () -> Content
) {
self.title = title self.title = title
self.icon = Image(systemName: systemImage) self.icon = Image(systemName: systemImage)
self.description = description self.description = description
self.detail = detail
self.actions = actions() self.actions = actions()
} }
@ -165,6 +174,11 @@ struct StepView<Content: View>: View {
Text(title) Text(title)
.bold() .bold()
Text(description) Text(description)
if let detail {
Text(detail)
.font(.callout)
.italic()
}
} }
Spacer(minLength: 20) Spacer(minLength: 20)
actions actions

View File

@ -28,7 +28,7 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
Section { Section {
TextField(String(localized: .createSecretNameLabel), text: $name, prompt: Text(.createSecretNamePlaceholder)) TextField(String(localized: .createSecretNameLabel), text: $name, prompt: Text(.createSecretNamePlaceholder))
VStack(alignment: .leading, spacing: 10) { VStack(alignment: .leading, spacing: 10) {
Picker(.createSecretRequireAuthenticationTitle, selection: $authenticationRequirement) { Picker(.createSecretProtectionLevelTitle, selection: $authenticationRequirement) {
ForEach(authenticationOptions) { option in ForEach(authenticationOptions) { option in
HStack { HStack {
switch option { switch option {

View File

@ -55,19 +55,11 @@ extension ContentView {
} }
} }
var needsSetup: Bool {
runningSetup || !hasRunSetup
}
/// Item either showing a "everything's good, here's more info" or "something's wrong, re-run setup" message /// Item either showing a "everything's good, here's more info" or "something's wrong, re-run setup" message
/// These two are mutually exclusive /// These two are mutually exclusive
@ViewBuilder @ViewBuilder
var runningOrRunSetupView: some View { var runningOrRunSetupView: some View {
if needsSetup { agentStatusToolbarView
setupNoticeView
} else {
agentStatusToolbarView
}
} }
var updateNoticeContent: (LocalizedStringResource, Color)? { var updateNoticeContent: (LocalizedStringResource, Color)? {
@ -134,19 +126,6 @@ extension ContentView {
} }
} }
@ViewBuilder
var setupNoticeView: some View {
Button(action: {
runningSetup = true
}, label: {
if !hasRunSetup {
Text(.agentSetupNoticeTitle)
.font(.headline)
}
})
.buttonStyle(ToolbarButtonStyle(color: .orange))
}
@ViewBuilder @ViewBuilder
var agentStatusToolbarView: some View { var agentStatusToolbarView: some View {
Button(action: { Button(action: {