Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion Permission.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.default_subspec = 'Core'

s.subspec 'Core' do |co|
co.source_files = 'Source/**/*.{swift, h}'
co.source_files = "Source/**/*.{swift, h}"
end

s.subspec 'Bluetooth' do |bl|
Expand Down
6 changes: 5 additions & 1 deletion Permission.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
de,
es,
"es-419",
fr,
"zh-Hans",
);
mainGroup = 6D86A9A81BEBDC7C00E3DD5A;
productRefGroup = 6D86A9B31BEBDC7D00E3DD5A /* Products */;
Expand Down
23 changes: 11 additions & 12 deletions Source/PermissionAlert.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ class DisabledAlert: PermissionAlert {
override init(permission: Permission) {
super.init(permission: permission)

title = "\(permission) is currently disabled"
message = "Please enable access to \(permission) in the Settings app."
cancel = "OK"
title = String.localizedStringWithFormat(NSLocalizedString("Permission.Disabled.Title", comment: ""), permission)
message = String.localizedStringWithFormat(NSLocalizedString("Permission.Request.Message", comment: ""), permission)
cancel = NSLocalizedString("Permission.Disabled.Ok", comment: "")
}
}

Expand All @@ -112,10 +112,10 @@ class DeniedAlert: PermissionAlert {
override init(permission: Permission) {
super.init(permission: permission)

title = "Permission for \(permission) was denied"
message = "Please enable access to \(permission) in the Settings app."
cancel = "Cancel"
settings = "Settings"
title = String.localizedStringWithFormat(NSLocalizedString("Permission.Denied.Title", comment: ""), permission)
message = String.localizedStringWithFormat(NSLocalizedString("Permission.Denied.Message", comment: ""), permission)
cancel = NSLocalizedString("Permission.Cancel", comment: "")
settings = NSLocalizedString("Permission.Button.Settings", comment: "")
}

@objc func settingsHandler() {
Expand Down Expand Up @@ -148,11 +148,10 @@ class PrePermissionAlert: PermissionAlert {

override init(permission: Permission) {
super.init(permission: permission)

title = "\(Bundle.main.name) would like to access your \(permission)"
message = "Please enable access to \(permission)."
cancel = "Cancel"
confirm = "Confirm"
title = String.localizedStringWithFormat(NSLocalizedString("Permission.Request.Title", comment: ""), Bundle.main.name, permission)
message = String.localizedStringWithFormat(NSLocalizedString("Permission.Request.Message", comment: ""), permission)
cancel = NSLocalizedString("Permission.Cancel", comment: "")
confirm = NSLocalizedString("Permission.Confirm", comment: "")
}

private func confirmHandler(_ action: UIAlertAction) {
Expand Down