From c64f1fdd87685619d44b9ba3f54557f394128b78 Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 14 Sep 2009 13:52:24 +0000 Subject: [PATCH] Part of Mantis 3319 Monotone-Parent: f937b6e53d17591dc176dff07b8c090e39c4f6ca Monotone-Revision: fb103a10a9193093e53b3259aed36bc0c4b4dccb Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-09-14T13:52:24 Monotone-Branch: ca.inverse.sogo --- UI/Common/UIxPageFrame.m | 11 +++++++++-- UI/WebServerResources/generic.js | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 83f4d5d71..a9ee3fbdc 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -209,8 +209,15 @@ static NSString *siteFavicon = nil; - (NSString *) commonLocalizableStrings { - return [NSString stringWithFormat: @"var clabels = %@;", - [self _stringsForFramework: nil]]; + NSString *rc; + + if (isPopup) + rc = @""; + else + rc = [NSString stringWithFormat: @"var clabels = %@;", + [self _stringsForFramework: nil]]; + + return rc; } - (NSString *) productLocalizableStrings diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index ba76f928e..b965e2f64 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1696,12 +1696,17 @@ AIM = { function label (title) { var rc = title; + if (!logWindow) { + logWindow = window; + while (logWindow.opener) + logWindow = logWindow.opener; + } if (labels[title]) { rc = labels[title]; } - else if (clabels[title]) { - rc = clabels[title]; + else if (logWindow.clabels[title]) { + rc = logWindow.clabels[title]; } return rc;