aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmoagx <post@wickenrode.com>2011-08-26 22:48:20 +0000
committerdmoagx <post@wickenrode.com>2011-08-26 22:48:20 +0000
commit937786724187f7301b429673b77579912cae62c9 (patch)
treec210476af5ed439456343e6242a92d818d66b757
parentaccb42e79d6f4c968b6219f05d4ffd669ad96fc3 (diff)
downloadsequelpro-937786724187f7301b429673b77579912cae62c9.tar.gz
sequelpro-937786724187f7301b429673b77579912cae62c9.tar.bz2
sequelpro-937786724187f7301b429673b77579912cae62c9.zip
* Fixes some strings that were not really localizable the way they were constructed.
-rw-r--r--Resources/English.lproj/ExportDialog.stringsbin24626 -> 24888 bytes
-rw-r--r--Resources/English.lproj/Localizable.stringsbin221400 -> 223016 bytes
-rw-r--r--Source/SPTableContent.m32
3 files changed, 21 insertions, 11 deletions
diff --git a/Resources/English.lproj/ExportDialog.strings b/Resources/English.lproj/ExportDialog.strings
index 15ad4cda..f807e881 100644
--- a/Resources/English.lproj/ExportDialog.strings
+++ b/Resources/English.lproj/ExportDialog.strings
Binary files differ
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 775c3b64..64310f40 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 533b28c3..ba774615 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -2170,26 +2170,36 @@
[[SPQueryController sharedQueryController] setAllowConsoleUpdate:consoleUpdateStatus];
if (errors) {
- NSArray *message;
+ NSMutableString *messageText = [NSMutableString stringWithCapacity:50];
+ NSString *messageTitle = NSLocalizedString(@"Unexpected number of rows removed!", @"Table Content : Remove Row : Result : n Error title");
if (errors < 0) {
- message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"),
- [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ more %@ deleted! Please check the Console and inform the Sequel Pro team!", @"message of panel when more rows were deleted"), (long)(errors *- 1), ((errors *-1 ) > 1) ? @"s" : @"", (errors>1) ? @"were" : @"was"],
- nil];
+ long numErrors = (long)(errors *- 1);
+ if(numErrors == 1)
+ [messageText appendString:NSLocalizedString(@"One additional row was removed!",@"Table Content : Remove Row : Result : Too Many : Part 1 : n+1 rows instead of n selected were deleted.")];
+ else
+ [messageText appendFormat:NSLocalizedString(@"%ld additional rows were removed!",@"Table Content : Remove Row : Result : Too Many : Part 1 : n+y (y!=1) rows instead of n selected were deleted."),numErrors];
+
+ [messageText appendString:NSLocalizedString(@" Please check the Console and inform the Sequel Pro team!",@"Table Content : Remove Row : Result : Too Many : Part 2 : Generic text")];
+
}
else {
+ //part 1 number of rows not deleted
+ if(errors == 1)
+ [messageText appendString:NSLocalizedString(@"One row was not removed.",@"Table Content : Remove Row : Result : Too Few : Part 1 : Only n-1 of n selected rows were deleted.")];
+ else
+ [messageText appendFormat:NSLocalizedString(@"%ld rows were not removed.",@"Table Content : Remove Row : Result : Too Few : Part 1 : n-x (x!=1) of n selected rows were deleted."),errors];
+ //part 2 generic help text
+ [messageText appendString:NSLocalizedString(@" Reload the table to be sure that the contents have not changed in the meantime.",@"Table Content : Remove Row : Result : Too Few : Part 2 : Generic help message")];
+ //part 3 primary keys
if (primaryKeyFieldNames == nil)
- message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"),
- [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been deleted. Reload the table to be sure that the rows exist and use a primary key for your table.", @"message of panel when not all selected fields have been deleted"), (long)errors, (errors > 1) ? @"s" : @"", (errors > 1) ? @"ve" : @"s"],
- nil];
+ [messageText appendString:NSLocalizedString(@" You should also add a primary key to this table!",@"Table Content : Remove Row : Result : Too Few : Part 3 : no primary key in table generic message")];
else
- message = [NSArray arrayWithObjects:NSLocalizedString(@"Warning", @"warning"),
- [NSString stringWithFormat:NSLocalizedString(@"%ld row%@ ha%@ not been deleted. Reload the table to be sure that the rows exist and check the Console for possible errors inside the primary key%@ for your table.", @"message of panel when not all selected fields have been deleted by using primary keys"), (long)errors, (errors > 1) ? @"s" : @"", (errors > 1) ? @"ve" : @"s", (errors > 1) ? @"s" : @""],
- nil];
+ [messageText appendString:NSLocalizedString(@" Check the Console for possible errors inside the primary key(s) of this table!",@"Table Content : Remove Row : Result : Too Few : Part 3 : Row not deleted when using primary key for DELETE statement.")];
}
[self performSelector:@selector(showErrorSheetWith:)
- withObject:message
+ withObject:[NSArray arrayWithObjects:messageTitle,messageText,nil]
afterDelay:0.3];
}