From 2a47dbba4a3f035ad8990021573017560b52c0fc Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:19:05 -0500 Subject: [PATCH 1/7] spelling: accessibility Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Localizations/en.lproj/Localizable.strings | 4 ++-- View Controllers/TableViewController.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index 4689fa21..5d49ab62 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -327,9 +327,9 @@ "status.favorite-button.accessibility-label" = "Favorite"; "status.favorite-button.undo.accessibility-label" = "Unfavorite"; "status.show-more" = "Show More"; -"status.show-more-all-button.accessibilty-label" = "Show more for all"; +"status.show-more-all-button.accessibility-label" = "Show more for all"; "status.show-less" = "Show Less"; -"status.show-less-all-button.accessibilty-label" = "Show less for all"; +"status.show-less-all-button.accessibility-label" = "Show less for all"; "status.show-thread" = "Show thread"; "status.spoiler-text-placeholder" = "Write your warning here"; "status.unbookmark" = "Unbookmark"; diff --git a/View Controllers/TableViewController.swift b/View Controllers/TableViewController.swift index 5b09c670..ba321d92 100644 --- a/View Controllers/TableViewController.swift +++ b/View Controllers/TableViewController.swift @@ -187,12 +187,12 @@ class TableViewController: UITableViewController { navigationItem.rightBarButtonItem = nil case .expand: navigationItem.rightBarButtonItem = UIBarButtonItem( - title: NSLocalizedString("status.show-more-all-button.accessibilty-label", comment: ""), + title: NSLocalizedString("status.show-more-all-button.accessibility-label", comment: ""), image: UIImage(systemName: "eye"), primaryAction: UIAction { [weak self] _ in self?.viewModel.toggleExpandAll() }) case .collapse: navigationItem.rightBarButtonItem = UIBarButtonItem( - title: NSLocalizedString("status.show-less-all-button.accessibilty-label", comment: ""), + title: NSLocalizedString("status.show-less-all-button.accessibility-label", comment: ""), image: UIImage(systemName: "eye.slash"), primaryAction: UIAction { [weak self] _ in self?.viewModel.toggleExpandAll() }) } From 16832f72644796b69c2ad2587b39b19db8479b7b Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:31 -0500 Subject: [PATCH 2/7] spelling: activities Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Extensions/SystemEmoji+Extensions.swift | 4 ++-- Localizations/en.lproj/Localizable.strings | 2 +- ServiceLayer/Sources/ServiceLayer/Entities/SystemEmoji.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Extensions/SystemEmoji+Extensions.swift b/Extensions/SystemEmoji+Extensions.swift index 9a55c8f7..291a54e9 100644 --- a/Extensions/SystemEmoji+Extensions.swift +++ b/Extensions/SystemEmoji+Extensions.swift @@ -36,8 +36,8 @@ extension SystemEmoji.Group { return "emoji.system-group.food-and-drink" case .travelAndPlaces: return "emoji.system-group.travel-and-places" - case .activites: - return "emoji.system-group.activites" + case .activities: + return "emoji.system-group.activities" case .objects: return "emoji.system-group.objects" case .symbols: diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index 5d49ab62..1c37e8ed 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -139,7 +139,7 @@ "emoji.system-group.animals-and-nature" = "Animals & Nature"; "emoji.system-group.food-and-drink" = "Food & Drink"; "emoji.system-group.travel-and-places" = "Travel & Places"; -"emoji.system-group.activites" = "Activities"; +"emoji.system-group.activities" = "Activities"; "emoji.system-group.objects" = "Objects"; "emoji.system-group.symbols" = "Symbols"; "emoji.system-group.flags" = "Flags"; diff --git a/ServiceLayer/Sources/ServiceLayer/Entities/SystemEmoji.swift b/ServiceLayer/Sources/ServiceLayer/Entities/SystemEmoji.swift index 9d75c5ee..4655c62e 100644 --- a/ServiceLayer/Sources/ServiceLayer/Entities/SystemEmoji.swift +++ b/ServiceLayer/Sources/ServiceLayer/Entities/SystemEmoji.swift @@ -31,7 +31,7 @@ public extension SystemEmoji { case animalsAndNature case foodAndDrink case travelAndPlaces - case activites + case activities case objects case symbols case flags From 3002725428facdb44251812d0ea8e15e771ba5b5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:32 -0500 Subject: [PATCH 3/7] spelling: identity Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Data Sources/IdentitiesDataSource.swift | 12 ++++++------ View Controllers/IdentitiesViewController.swift | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Data Sources/IdentitiesDataSource.swift b/Data Sources/IdentitiesDataSource.swift index 7520d683..26553fcb 100644 --- a/Data Sources/IdentitiesDataSource.swift +++ b/Data Sources/IdentitiesDataSource.swift @@ -11,7 +11,7 @@ enum IdentitiesSection: Hashable { enum IdentitiesItem: Hashable { case add - case identitiy(Identity) + case identity(Identity) } final class IdentitiesDataSource: UITableViewDiffableDataSource { @@ -39,7 +39,7 @@ final class IdentitiesDataSource: UITableViewDiffableDataSource() let sections = [ (section: IdentitiesSection.identities(NSLocalizedString("identities.accounts", comment: "")), - identities: identities.filter { $0.authenticated && !$0.pending }.map(IdentitiesItem.identitiy)), + identities: identities.filter { $0.authenticated && !$0.pending }.map(IdentitiesItem.identity)), (section: IdentitiesSection.identities(NSLocalizedString("identities.browsing", comment: "")), - identities: identities.filter { !$0.authenticated && !$0.pending }.map(IdentitiesItem.identitiy)), + identities: identities.filter { !$0.authenticated && !$0.pending }.map(IdentitiesItem.identity)), (section: IdentitiesSection.identities(NSLocalizedString("identities.pending", comment: "")), - identities: identities.filter { $0.pending }.map(IdentitiesItem.identitiy)) + identities: identities.filter { $0.pending }.map(IdentitiesItem.identity)) ] .filter { !$0.identities.isEmpty } @@ -107,7 +107,7 @@ private extension IdentitiesItem { switch self { case .add: return String(describing: UITableViewCell.self) - case .identitiy: + case .identity: return String(describing: IdentityTableViewCell.self) } } diff --git a/View Controllers/IdentitiesViewController.swift b/View Controllers/IdentitiesViewController.swift index 22d9e6ac..a2b0c888 100644 --- a/View Controllers/IdentitiesViewController.swift +++ b/View Controllers/IdentitiesViewController.swift @@ -37,7 +37,7 @@ final class IdentitiesViewController: UITableViewController { } override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool { - if case let .identitiy(identityViewModel) = dataSource.itemIdentifier(for: indexPath) { + if case let .identity(identityViewModel) = dataSource.itemIdentifier(for: indexPath) { return identityViewModel.id != viewModel.identityContext.identity.id } @@ -55,7 +55,7 @@ final class IdentitiesViewController: UITableViewController { let addIdentityViewController = UIHostingController(rootView: addIdentityView) show(addIdentityViewController, sender: self) - case let .identitiy(identityViewModel): + case let .identity(identityViewModel): rootViewModel.identitySelected(id: identityViewModel.id) } } @@ -68,7 +68,7 @@ final class IdentitiesViewController: UITableViewController { let logOutAction = UIContextualAction( style: .destructive, title: NSLocalizedString("identities.log-out", comment: "")) { [weak self] _, _, completionHandler in - guard let self = self, case let .identitiy(identity) = self.dataSource.itemIdentifier(for: indexPath) else { + guard let self = self, case let .identity(identity) = self.dataSource.itemIdentifier(for: indexPath) else { completionHandler(false) return From c168c82f248a58108f11246c35c4ea02958c3e1f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:32 -0500 Subject: [PATCH 4/7] spelling: maximum Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Transitions/ZoomDismissalInteractionController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Transitions/ZoomDismissalInteractionController.swift b/Transitions/ZoomDismissalInteractionController.swift index 3a3b0e2e..415f08d8 100644 --- a/Transitions/ZoomDismissalInteractionController.swift +++ b/Transitions/ZoomDismissalInteractionController.swift @@ -107,9 +107,9 @@ final class ZoomDismissalInteractionController: NSObject { let totalAvailableAlpha = startingAlpha - finalAlpha let maximumDelta = view.bounds.height / 4.0 - let deltaAsPercentageOfMaximun = min(abs(verticalDelta) / maximumDelta, 1.0) + let deltaAsPercentageOfMaximum = min(abs(verticalDelta) / maximumDelta, 1.0) - return startingAlpha - (deltaAsPercentageOfMaximun * totalAvailableAlpha) + return startingAlpha - (deltaAsPercentageOfMaximum * totalAvailableAlpha) } func scaleFor(view: UIView, withPanningVerticalDelta verticalDelta: CGFloat) -> CGFloat { @@ -118,9 +118,9 @@ final class ZoomDismissalInteractionController: NSObject { let totalAvailableScale = startingScale - finalScale let maximumDelta = view.bounds.height / 2.0 - let deltaAsPercentageOfMaximun = min(abs(verticalDelta) / maximumDelta, 1.0) + let deltaAsPercentageOfMaximum = min(abs(verticalDelta) / maximumDelta, 1.0) - return startingScale - (deltaAsPercentageOfMaximun * totalAvailableScale) + return startingScale - (deltaAsPercentageOfMaximum * totalAvailableScale) } } From e0ca0ac06eab4810796aa8df73e830391af06b51 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:33 -0500 Subject: [PATCH 5/7] spelling: multiple Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Localizations/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index 1c37e8ed..a6ce23a2 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -117,7 +117,7 @@ "compose.emoji-button" = "Emoji picker"; "compose.mark-media-sensitive" = "Mark media as sensitive"; "compose.photo-library" = "Photo Library"; -"compose.poll.accessibility.multiple-choices-allowed" = "Mutliple choices allowed"; +"compose.poll.accessibility.multiple-choices-allowed" = "Multiple choices allowed"; "compose.poll.add-choice" = "Add a choice"; "compose.poll.allow-multiple-choices" = "Allow multiple choices"; "compose.poll-button.accessibility-label" = "Add a poll"; From 9160ec32d3e9203938033d92c65ae61a0f2d5ec3 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:33 -0500 Subject: [PATCH 6/7] spelling: relative Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .../Sources/ViewModels/Extensions/Date+Extensions.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ViewModels/Sources/ViewModels/Extensions/Date+Extensions.swift b/ViewModels/Sources/ViewModels/Extensions/Date+Extensions.swift index 94e5c91c..6ce9f18c 100644 --- a/ViewModels/Sources/ViewModels/Extensions/Date+Extensions.swift +++ b/ViewModels/Sources/ViewModels/Extensions/Date+Extensions.swift @@ -37,7 +37,7 @@ extension Date { if let oneWeekAgo = calendar.date(byAdding: DateComponents(weekOfMonth: -1), to: now), oneWeekAgo < self { - return Self.realtiveTimeFormatter.localizedString(for: self, relativeTo: Date()) + return Self.relativeTimeFormatter.localizedString(for: self, relativeTo: Date()) } return Self.accessibilityFullDateComponentsFormatter.string(from: self) @@ -92,7 +92,7 @@ private extension Date { return dateFormatter }() - private static let realtiveTimeFormatter: RelativeDateTimeFormatter = { + private static let relativeTimeFormatter: RelativeDateTimeFormatter = { let dateFormatter = RelativeDateTimeFormatter() dateFormatter.unitsStyle = .full From 844bb9e42634188cd79eefc80d72574c05b86671 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 8 Nov 2022 19:16:33 -0500 Subject: [PATCH 7/7] spelling: visibility Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- Localizations/en.lproj/Localizable.strings | 2 +- Views/SwiftUI/PreferencesView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index a6ce23a2..8ba43ef9 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -217,7 +217,7 @@ "preferences.media.autoplay.wifi" = "On Wi-Fi"; "preferences.media.autoplay.never" = "Never"; "preferences.use-preferences-from-server" = "Use preferences from server"; -"preferences.posting-default-visiblility" = "Default visibility"; +"preferences.posting-default-visibility" = "Default visibility"; "preferences.posting-default-sensitive" = "Mark content sensitive by default"; "preferences.reading-expand-media" = "Expand media"; "preferences.expand-media.default" = "Hide sensitive"; diff --git a/Views/SwiftUI/PreferencesView.swift b/Views/SwiftUI/PreferencesView.swift index f9e68e57..b79b5413 100644 --- a/Views/SwiftUI/PreferencesView.swift +++ b/Views/SwiftUI/PreferencesView.swift @@ -42,7 +42,7 @@ struct PreferencesView: View { Toggle("preferences.use-preferences-from-server", isOn: $viewModel.preferences.useServerPostingReadingPreferences) Group { - Picker("preferences.posting-default-visiblility", + Picker("preferences.posting-default-visibility", selection: $viewModel.preferences.postingDefaultVisibility) { Text("status.visibility.public").tag(Status.Visibility.public) Text("status.visibility.unlisted").tag(Status.Visibility.unlisted)