github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use number formatter for all numbers in search dialog

Browse Source
This commit is contained in:
Allan Odgaard
2014-10-17 15:28:03 +02:00
parent 65e72d9ed2
commit 207c642614
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Frameworks/Find/src/Find.mm
View File

@@ -254,7 +254,7 @@ NSString* const FFFindWasTriggeredByEnter = @"FFFindWasTriggeredByEnter";
++fileCount;
}
}
self.windowController.statusString = [NSString stringWithFormat:MSG_REPLACE_ALL_RESULTS, replaceCount, fileCount];
self.windowController.statusString = [NSString stringWithFormat:MSG_REPLACE_ALL_RESULTS, [NSNumberFormatter localizedStringFromNumber:@(replaceCount) numberStyle:NSNumberFormatterDecimalStyle], [NSNumberFormatter localizedStringFromNumber:@(fileCount) numberStyle:NSNumberFormatterDecimalStyle]];
}
break;
@@ -456,8 +456,13 @@ NSString* const FFFindWasTriggeredByEnter = @"FFFindWasTriggeredByEnter";
}
else
{
self.windowController.statusString = [msg stringByAppendingFormat:([_documentSearch scannedFileCount] == 1 ? MSG_SEARCHED_FILES_ONE : MSG_SEARCHED_FILES_MULTIPLE), [NSNumberFormatter localizedStringFromNumber:@([_documentSearch scannedFileCount]) numberStyle:NSNumberFormatterDecimalStyle], [_documentSearch searchDuration]];
self.windowController.alternateStatusString = [msg stringByAppendingFormat:MSG_SEARCHED_BYTES, [NSString stringWithCxxString:text::format_size([_documentSearch scannedByteCount])], [_documentSearch searchDuration]];
NSNumberFormatter* formatter = [NSNumberFormatter new];
formatter.numberStyle = NSNumberFormatterDecimalStyle;
formatter.maximumFractionDigits = 1;
NSString* seconds = [formatter stringFromNumber:@([_documentSearch searchDuration])];
self.windowController.statusString = [msg stringByAppendingFormat:([_documentSearch scannedFileCount] == 1 ? MSG_SEARCHED_FILES_ONE : MSG_SEARCHED_FILES_MULTIPLE), [NSNumberFormatter localizedStringFromNumber:@([_documentSearch scannedFileCount]) numberStyle:NSNumberFormatterDecimalStyle], seconds];
self.windowController.alternateStatusString = [msg stringByAppendingFormat:MSG_SEARCHED_BYTES, [NSString stringWithCxxString:text::format_size([_documentSearch scannedByteCount])], seconds];
}
}

8
Frameworks/Find/src/Strings.h
View File

@@ -12,9 +12,9 @@
#define MSG_SHOWING_ONE_MATCH_FMT FFString(@"Showing one result for “%@”.", @"Status text for one match.")
#define MSG_SHOWING_MULTIPLE_MATCHES_FMT FFString(@"Showing %2$@ results for “%1$@”.", @"Status text for multiple matches.")
#define MSG_SEARCHED_FILES_ONE FFString(@" (searched one file in %2$.1f seconds)", @"Find all completion status, one file")
#define MSG_SEARCHED_FILES_MULTIPLE FFString(@" (searched %@ files in %.1f seconds)", @"Find all completion status, multiple files")
#define MSG_SEARCHED_BYTES FFString(@" (searched %@ in %.1f seconds)", @"Find all completion status, quantity in bytes")
#define MSG_SEARCHED_FILES_ONE FFString(@" (searched one file in %2$@ seconds)", @"Find all completion status, one file")
#define MSG_SEARCHED_FILES_MULTIPLE FFString(@" (searched %@ files in %@ seconds)", @"Find all completion status, multiple files")
#define MSG_SEARCHED_BYTES FFString(@" (searched %@ in %@ seconds)", @"Find all completion status, quantity in bytes")
#define MSG_SEARCHING_FOLDER_FMT FFString(@"Searching “%@”…", @"Find all progress status.")
#define MSG_SEARCHING_FMT FFString(@"Searching…", @"Find all initial progress status.")
@@ -25,7 +25,7 @@
#define MSG_FIND_ALL_RESULTS FFString(@"Find All Results in “%@” matching “%@”", @"Find all in files, results list header text.")
#define MSG_FIND_ALL_RESULTS_OPEN_FILES FFString(@"Find All Results in Open Documents", @"Find all in open documents, results list header text.")
#define MSG_REPLACE_ALL_RESULTS FFString(@"%d replacements made across %d file(s).", @"Replace all, replacement count status text")
#define MSG_REPLACE_ALL_RESULTS FFString(@"%@ replacements made across %@ file(s).", @"Replace all, replacement count status text")
#define MSG_WINDOW_TITLE FFString(@"Find", @"Default window title.")
#define MSG_FIND_IN_FOLDER_WINDOW_TITLE FFString(@"Find — %@", @"Find in folder, window title with path.")