Revision: 14938
http://sourceforge.net/p/skim-app/code/14938
Author: hofman
Date: 2025-03-04 17:25:51 +0000 (Tue, 04 Mar 2025)
Log Message:
-----------
Provide description for print errors. Make error description parameters nonnull.
Modified Paths:
--------------
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/de.lproj/Localizable.strings
trunk/en.lproj/Localizable.strings
trunk/es.lproj/Localizable.strings
trunk/fr.lproj/Localizable.strings
trunk/it.lproj/Localizable.strings
trunk/ja.lproj/Localizable.strings
trunk/nl.lproj/Localizable.strings
trunk/pl.lproj/Localizable.strings
trunk/ru.lproj/Localizable.strings
trunk/zh_CN.lproj/Localizable.strings
trunk/zh_TW.lproj/Localizable.strings
Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h 2025-03-04 17:01:49 UTC (rev 14937)
+++ trunk/NSError_SKExtensions.h 2025-03-04 17:25:51 UTC (rev 14938)
@@ -52,12 +52,12 @@
@interface NSError (SKExtensions)
-+ (instancetype)writeFileErrorWithLocalizedDescription:(nullable NSString
*)description;
-+ (instancetype)readFileErrorWithLocalizedDescription:(nullable NSString
*)description;
-+ (instancetype)readPasteboardErrorWithLocalizedDescription:(nullable NSString
*)description;
++ (instancetype)writeFileErrorWithLocalizedDescription:(NSString *)description;
++ (instancetype)readFileErrorWithLocalizedDescription:(NSString *)description;
++ (instancetype)readPasteboardErrorWithLocalizedDescription:(NSString
*)description;
++ (instancetype)printDocumentErrorWithLocalizedDescription:(NSString
*)description;
++ (instancetype)failedToCommitErrorWithLocalizedDescription:(NSString
*)description;
+ (instancetype)userCancelledErrorWithUnderlyingError:(nullable NSError
*)error;
-+ (instancetype)printDocumentErrorWithLocalizedDescription:(nullable NSString
*)description;
-+ (instancetype)failedToCommitErrorWithLocalizedDescription:(nullable NSString
*)description;
+ (nullable NSError *)combineErrors:(NSArray<NSError *> *)errors
maximum:(NSUInteger)max;
Modified: trunk/NSError_SKExtensions.m
===================================================================
--- trunk/NSError_SKExtensions.m 2025-03-04 17:01:49 UTC (rev 14937)
+++ trunk/NSError_SKExtensions.m 2025-03-04 17:25:51 UTC (rev 14938)
@@ -45,23 +45,23 @@
@implementation NSError (SKExtensions)
+ (instancetype)writeFileErrorWithLocalizedDescription:(NSString *)description
{
- return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
+ return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:@{NSLocalizedDescriptionKey: description}];
}
+ (instancetype)readFileErrorWithLocalizedDescription:(NSString *)description {
- return [NSError errorWithDomain:SKDocumentErrorDomain code:SKReadFileError
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:description,
NSLocalizedDescriptionKey, nil]];
+ return [NSError errorWithDomain:SKDocumentErrorDomain code:SKReadFileError
userInfo:@{NSLocalizedDescriptionKey: description}];
}
+ (instancetype)readPasteboardErrorWithLocalizedDescription:(NSString
*)description {
- return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadPasteboardError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
+ return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadPasteboardError userInfo:@{NSLocalizedDescriptionKey: description}];
}
+ (instancetype)printDocumentErrorWithLocalizedDescription:(NSString
*)description {
- return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKPrintDocumentError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
+ return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKPrintDocumentError userInfo:@{NSLocalizedDescriptionKey: description}];
}
+ (instancetype)failedToCommitErrorWithLocalizedDescription:(NSString
*)description {
- return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKFailedToCommitError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:description, NSLocalizedDescriptionKey, nil]];
+ return [NSError errorWithDomain:SKDocumentErrorDomain
code:SKFailedToCommitError userInfo:@{NSLocalizedDescriptionKey: description}];
}
+ (instancetype)userCancelledErrorWithUnderlyingError:(NSError *)error {
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-03-04 17:01:49 UTC (rev 14937)
+++ trunk/SKMainDocument.m 2025-03-04 17:25:51 UTC (rev 14938)
@@ -1029,7 +1029,7 @@
[printOperation setJobTitle:[self displayName]];
if (printOperation == nil && outError)
- *outError = [NSError printDocumentErrorWithLocalizedDescription:nil];
+ *outError = [NSError
printDocumentErrorWithLocalizedDescription:NSLocalizedString(@"Unable to
print", @"Error description")];
return printOperation;
}
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2025-03-04 17:01:49 UTC (rev 14937)
+++ trunk/SKNotesDocument.m 2025-03-04 17:25:51 UTC (rev 14938)
@@ -496,7 +496,7 @@
[printOperation setJobTitle:[self displayName]];
if (printOperation == nil && outError)
- *outError = [NSError printDocumentErrorWithLocalizedDescription:nil];
+ *outError = [NSError
printDocumentErrorWithLocalizedDescription:NSLocalizedString(@"Unable to
print", @"Error description")];
return printOperation;
}
Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
