diff options
| author | dmoagx <post@wickenrode.com> | 2010-09-26 23:55:32 +0000 |
|---|---|---|
| committer | dmoagx <post@wickenrode.com> | 2010-09-26 23:55:32 +0000 |
| commit | 37fadd868cd6bc80cafac2645d33a69e38d6741b (patch) | |
| tree | ad8eeffe8c9b5ce6fc421dd95524285c7265dd0e /Source/SPDataImport.m | |
| parent | 2281746fdc1f1a2ff93fc28fc0182614445d5938 (diff) | |
| download | sequelpro-37fadd868cd6bc80cafac2645d33a69e38d6741b.tar.gz sequelpro-37fadd868cd6bc80cafac2645d33a69e38d6741b.tar.bz2 sequelpro-37fadd868cd6bc80cafac2645d33a69e38d6741b.zip | |
* One label was too short in Content Filter Manager
* Changed some NSLocalizedString() comments to be more descriptive - keep in mind that the comment is the only thing that can provide context here.
Diffstat (limited to 'Source/SPDataImport.m')
| -rw-r--r-- | Source/SPDataImport.m | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index 11113a58..f0d1a853 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -45,6 +45,8 @@ #import "SPEncodingPopupAccessory.h" #import <UniversalDetector/UniversalDetector.h> +#define SP_FILE_READ_ERROR_STRING NSLocalizedString(@"File read error", @"File read error title (Import Dialog)") + @interface SPDataImport (PrivateAPI) - (void) _importBackgroundProcess:(NSString *)filename; @@ -436,7 +438,7 @@ [mySQLConnection queryString:[NSString stringWithFormat:@"SET NAMES '%@'", connectionEncodingToRestore]]; } [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld queries were executed.\n\n(%@)", @"SQL read error, including detail from system"), (long)queriesPerformed, [exception reason]]); @@ -486,7 +488,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:sqlEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read in the encoding you selected (%@).\n\nOnly %ld queries were executed.", @"SQL encoding read error"), displayEncoding, (long)queriesPerformed]); @@ -763,7 +765,7 @@ // Report file read errors, and bail @catch (NSException *exception) { [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld rows were imported.\n\n(%@)", @"CSV read error, including detail string from system"), (long)rowsImported, [exception reason]]); @@ -812,7 +814,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:csvEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read using the encoding you selected (%@).\n\nOnly %ld rows were imported.", @"CSV encoding read error"), displayEncoding, (long)rowsImported]); |