Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Fix crash showing localized alert for partial migrations #2585

Merged
merged 1 commit into from
Jan 4, 2019
Merged
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
fix crash showing localized alert for partial migrations
  • Loading branch information
rnystrom committed Jan 4, 2019
commit 85004d92a6cce1e93bb20396d536c0ea60636445
4 changes: 2 additions & 2 deletions Classes/Bookmark/BookmarkViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ BookmarkHeaderSectionControllerDelegate {

let messageFormat: String
if errors == 1 {
messageFormat = NSLocalizedString("%@ bookmark could not be migrated due to OAuth restrictions on one or more repos. We're sorry for any inconvenience!", comment: "")
messageFormat = NSLocalizedString("%i bookmark could not be migrated due to OAuth restrictions on one or more repos. We're sorry for any inconvenience!", comment: "")
} else {
messageFormat = NSLocalizedString("%@ bookmarks could not be migrated due to OAuth restrictions on one or more repos. We're sorry for any inconvenience!", comment: "")
messageFormat = NSLocalizedString("%i bookmarks could not be migrated due to OAuth restrictions on one or more repos. We're sorry for any inconvenience!", comment: "")
}

let alert = UIAlertController(
Expand Down
6 changes: 3 additions & 3 deletions Freetime.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3683,7 +3683,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GLOBAL_APP_VERSION = 1.27.0;
GLOBAL_APP_VERSION = 1.27.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -3738,7 +3738,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GLOBAL_APP_VERSION = 1.27.0;
GLOBAL_APP_VERSION = 1.27.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -3910,7 +3910,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GLOBAL_APP_VERSION = 1.27.0;
GLOBAL_APP_VERSION = 1.27.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand Down