From 4f7d74231dab4e9de522770df7e4fae40ac52d57 Mon Sep 17 00:00:00 2001 From: bartreardon Date: Thu, 23 Oct 2014 15:38:21 +1100 Subject: [PATCH 1/2] fix preinstall_alert and preuninstall_alert unicode support --- .../Managed Software Center/MSCMainWindowController.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py index ff5a4f3b..2d709b63 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py @@ -939,7 +939,12 @@ class MSCMainWindowController(NSWindowController): # show the alert sheet self.window().makeKeyAndOrderFront_(self) - alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(alertTitle, cancelLabel, OKLabel, nil, alertDetail) + alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_( + alertTitle, + cancelLabel, + OKLabel, + nil, + u"%@", NSLocalizedString(alertDetail, u'alertDetail text')) alert.beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_(self.window(), self, self.actionAlertDidEnd_returnCode_contextInfo_, nil) def actionAlertDidEnd_returnCode_contextInfo_(self, alert, returncode, contextinfo): From 77879453f7fe161f41d550f426c5d08107eaf20d Mon Sep 17 00:00:00 2001 From: bartreardon Date: Fri, 24 Oct 2014 09:12:04 +1100 Subject: [PATCH 2/2] removed incorrect usage of NSLocalisedString --- .../Managed Software Center/MSCMainWindowController.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py index 2d709b63..968b734a 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py +++ b/code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py @@ -944,7 +944,7 @@ class MSCMainWindowController(NSWindowController): cancelLabel, OKLabel, nil, - u"%@", NSLocalizedString(alertDetail, u'alertDetail text')) + u"%@", alertDetail) alert.beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_(self.window(), self, self.actionAlertDidEnd_returnCode_contextInfo_, nil) def actionAlertDidEnd_returnCode_contextInfo_(self, alert, returncode, contextinfo):