Changeset 1273

Timestamp:

02/18/10 23:26:20 (5 months ago)

Author:

astrange

Message:

Reformat error strings in pref pane.
Also fix a typo causing some text to not be shown if there was an update.

Files:

• trunk/CPFPerianPrefPaneController.m (modified) (4 diffs)

trunk/CPFPerianPrefPaneController.m

@@ -484 +484 @@
                 ret = YES;
         else
-                [errorString appendFormat:NSLocalizedString(@"Extraction for %@ failed\n", @""), archivePath];
+                [errorString appendFormat:NSLocalizedString(@"extraction of %@ failed\n", @""), [finalPath lastPathComponent]];
         
         unsetenv("SRC_ARCHIVE");
@@ -521 +521 @@
                         ret = YES;
                 else
-                        [errorString appendFormat:NSLocalizedString(@"Extraction for %@ failed\n", @""), archivePath];
-        }
-        else
-                [errorString appendFormat:NSLocalizedString(@"Authentication failed for extraction for %@\n", @""), archivePath];
+                        [errorString appendFormat:NSLocalizedString(@"extraction of %@ failed\n", @""), [finalPath lastPathComponent]];
+        }
+        else
+                [errorString appendFormat:NSLocalizedString(@"authentication failed while extracting %@\n", @""), [finalPath lastPathComponent]];
                 
         unsetenv("SRC_ARCHIVE");
@@ -552 +552 @@
                         ret = YES;
                 else
-                        [errorString appendFormat:NSLocalizedString(@"Removal for %@ failed\n", @""), componentPath];
-        }
-        else
-                [errorString appendFormat:NSLocalizedString(@"Authentication failed for removal for %@\n", @""), componentPath];
+                        [errorString appendFormat:NSLocalizedString(@"removal of %@ failed\n", @""), [componentPath lastPathComponent]];
+        }
+        else
+                [errorString appendFormat:NSLocalizedString(@"authentication failed while removing %@\n", @""), [componentPath lastPathComponent]];
         
         unsetenv("COMP_PATH");
@@ -821 +821 @@
         } else if ([status isEqualToString:@"NoUpdates"]) {
                 [textField_updateStatus setStringValue:@"There are no updates."];
-        } else if ([status isEqualToString:@"NoUpdates"]) {
+        } else if ([status isEqualToString:@"YesUpdates"]) {
                 [textField_updateStatus setStringValue:@"Updates found!"];
         }