pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Removed workaround that replaced %s with %@

Browse source 
It is now not necessary because Twine always generates %@

Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2023-05-19 00:24:38 +02:00 • committed by Alexander Borsuk
parent 65ea608420
commit 105fae8554
5 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
iphone/Maps/Categories/String+Format.swift
View file

@ -1,18 +0,0 @@
extension String {
init(coreFormat: String, arguments: [CVarArg]) {
let format = coreFormat.replacingOccurrences(of: "%s", with: "%@")
self.init(format: format, arguments: arguments.map { "\($0)" })
}
}
extension NSString {
@objc
static func string(coreFormat: String, arguments: [AnyObject]) -> NSString {
return NSString(coreFormat: coreFormat, arguments: arguments)
}
@objc
convenience init(coreFormat: String, arguments: [AnyObject]) {
self.init(string: String(coreFormat: coreFormat, arguments: arguments as! [CVarArg]))
}
}

2
iphone/Maps/Classes/CarPlay/CarPlayRouter.swift
View file

@ -261,7 +261,7 @@ extension CarPlayRouter {
if routeInfo.roundExitNumber != 0 {
let ordinalExitNumber = NumberFormatter.localizedString(from: NSNumber(value: routeInfo.roundExitNumber),
number: .ordinal)
let exitNumber = String(coreFormat: L("carplay_roundabout_exit"),
let exitNumber = String(format: L("carplay_roundabout_exit"),
arguments: [ordinalExitNumber])
instructionVariant = instructionVariant.isEmpty ? exitNumber : (exitNumber + ", " + instructionVariant)
}

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift
View file

@ -152,7 +152,7 @@ final class BaseRoutePreviewStatus: SolidTouchView {
@objc func onNavigationInfoUpdated(_ info: MWMNavigationDashboardEntity) {
navigationInfo = info
updateResultsLabel()
arriveLabel?.text = String(coreFormat: L("routing_arrive"), arguments: [info.arrival])
arriveLabel?.text = String(format: L("routing_arrive"), arguments: [info.arrival])
}
override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections {

4
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -79,7 +79,6 @@
3472B5D3200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5D1200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift */; };
3472B5E1200F86C800DC6CD5 /* MWMEditorHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5DF200F86C800DC6CD5 /* MWMEditorHelper.mm */; };
34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */; };
34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F051F3092E700F4D2D3 /* String+Format.swift */; };
34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; };
34845DB31E165E24003D55B9 /* SearchNoResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */; };
34845DB71E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; };
@ -811,7 +810,6 @@
34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeech.mm; sourceTree = "<group>"; };
34763EE91F2F394D00F4D2D3 /* MWMTextToSpeech+CPP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTextToSpeech+CPP.h"; sourceTree = "<group>"; };
34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeechObserver.h; sourceTree = "<group>"; };
34763F051F3092E700F4D2D3 /* String+Format.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Format.swift"; sourceTree = "<group>"; };
34763F0B1F30CCAC00F4D2D3 /* MWMEditorCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorCellType.h; sourceTree = "<group>"; };
347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = "<group>"; };
34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = "<group>"; };
@ -2033,7 +2031,6 @@
3454D79E1E07F045004AF2AD /* NSString+Categories.h */,
3454D79F1E07F045004AF2AD /* NSString+Categories.m */,
3457C4241F680F1900028233 /* String+BoundingRect.swift */,
34763F051F3092E700F4D2D3 /* String+Format.swift */,
3454D7A01E07F045004AF2AD /* UIButton+Orientation.h */,
3454D7A11E07F045004AF2AD /* UIButton+Orientation.m */,
34D3AFF41E37A36A004100F9 /* UICollectionView+Cells.swift */,
@ -3962,7 +3959,6 @@
34AB66831FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */,
F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */,
34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */,
993F5513237C622700545511 /* DeepLinkHandler.swift in Sources */,
993DF11223F6BDB100AC231A /* UIImageRenderer.swift in Sources */,
F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.m in Sources */,

8
iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm
View file

@ -70,8 +70,7 @@ using namespace storage;
{
_updateSize = updateSize;
self.primaryButton.localizedText =
[NSString stringWithCoreFormat:L(@"whats_new_auto_update_button_size")
arguments:@[self.updateSize]];
[NSString stringWithFormat:L(@"whats_new_auto_update_button_size"), self.updateSize];
}
- (void)stateDownloading
@ -125,8 +124,7 @@ using namespace storage;
NSString * percent = [numberFormatter stringFromNumber:@(prog)];
NSString * downloadedSize = formattedSize(progress.m_bytesDownloaded);
NSString * totalSize = formattedSize(progress.m_bytesTotal);
self.progressLabel.text = [NSString stringWithCoreFormat:L(@"downloader_percent")
arguments:@[percent, downloadedSize, totalSize]];
self.progressLabel.text = [NSString stringWithFormat:L(@"downloader_percent"), percent, downloadedSize, totalSize];
}
else
{
@ -135,7 +133,7 @@ using namespace storage;
BOOL const isApplying = nodeAttrs.m_status == storage::NodeStatus::Applying;
NSString * format = L(isApplying ? @"downloader_applying" : @"downloader_process");
self.legendLabel.text = [NSString stringWithCoreFormat:format arguments:@[nodeName]];
self.legendLabel.text = [NSString stringWithFormat:format, nodeName];
}
@end