From 6a80eda2de50fd08f44607089d11b2fa043db7d7 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Tue, 18 Jun 2002 17:44:22 +0000 Subject: [PATCH] Localize text and buttons (bug 148556) --- camino/CHPreferenceManager.mm | 7 +++-- camino/Chimera.pbproj/project.pbxproj | 30 +++++++++++++++++++ .../projects/Chimera.pbproj/project.pbxproj | 30 +++++++++++++++++++ camino/src/preferences/PreferenceManager.mm | 7 +++-- chimera/CHPreferenceManager.mm | 7 +++-- chimera/Chimera.pbproj/project.pbxproj | 30 +++++++++++++++++++ .../projects/Chimera.pbproj/project.pbxproj | 30 +++++++++++++++++++ chimera/src/preferences/PreferenceManager.mm | 7 +++-- 8 files changed, 136 insertions(+), 12 deletions(-) diff --git a/camino/CHPreferenceManager.mm b/camino/CHPreferenceManager.mm index f25d5fee8cd..5e99c6646b2 100644 --- a/camino/CHPreferenceManager.mm +++ b/camino/CHPreferenceManager.mm @@ -137,9 +137,10 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); if (NS_FAILED(rv)) { if (rv == NS_ERROR_FILE_ACCESS_DENIED) { //horrible, horrible, bad, fixed strings. need localization string file. - NSRunAlertPanel(@"Cannot Launch Navigator", - @"Navigator is already running on this system. Only one version may be run at any time.", - @"Quit",nil,nil); + NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@""); + NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@""); + NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@""); + NSRunAlertPanel(alert,message,quit,nil,nil); [NSApp terminate:self]; } return NO; diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj index f429080f1e3..806496fbfbb 100644 --- a/camino/Chimera.pbproj/project.pbxproj +++ b/camino/Chimera.pbproj/project.pbxproj @@ -218,6 +218,7 @@ F564872E023B954E010001CA, F50EA33D02BAAAB701000103, 089C165CFE840E0CC02AAC07, + F52CE65C02BFA8B701026D5D, F51B70B4026EC8A601A80166, ); isa = PBXGroup; @@ -514,6 +515,7 @@ F50EA34902BAAAB701000103, F50EA34A02BAAAB701000103, F50EA34B02BAAAB701000103, + F52CE65D02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -1872,6 +1874,33 @@ settings = { }; }; + F52CE65902BFA88701026D5D = { + isa = PBXFileReference; + name = English; + path = English.lproj/Localizable.strings; + refType = 4; + }; + F52CE65C02BFA8B701026D5D = { + children = ( + F52CE65902BFA88701026D5D, + ); + isa = PBXVariantGroup; + name = Localizable.strings; + path = ""; + refType = 4; + }; + F52CE65D02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F52CE65E02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; path = CHAutoCompleteTextField.h; @@ -4356,6 +4385,7 @@ F50EA35002BAB1E401000103, F50EA35102BAB1E401000103, F50EA35202BAB1E401000103, + F52CE65E02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj index f429080f1e3..806496fbfbb 100644 --- a/camino/projects/Chimera.pbproj/project.pbxproj +++ b/camino/projects/Chimera.pbproj/project.pbxproj @@ -218,6 +218,7 @@ F564872E023B954E010001CA, F50EA33D02BAAAB701000103, 089C165CFE840E0CC02AAC07, + F52CE65C02BFA8B701026D5D, F51B70B4026EC8A601A80166, ); isa = PBXGroup; @@ -514,6 +515,7 @@ F50EA34902BAAAB701000103, F50EA34A02BAAAB701000103, F50EA34B02BAAAB701000103, + F52CE65D02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -1872,6 +1874,33 @@ settings = { }; }; + F52CE65902BFA88701026D5D = { + isa = PBXFileReference; + name = English; + path = English.lproj/Localizable.strings; + refType = 4; + }; + F52CE65C02BFA8B701026D5D = { + children = ( + F52CE65902BFA88701026D5D, + ); + isa = PBXVariantGroup; + name = Localizable.strings; + path = ""; + refType = 4; + }; + F52CE65D02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F52CE65E02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; path = CHAutoCompleteTextField.h; @@ -4356,6 +4385,7 @@ F50EA35002BAB1E401000103, F50EA35102BAB1E401000103, F50EA35202BAB1E401000103, + F52CE65E02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; diff --git a/camino/src/preferences/PreferenceManager.mm b/camino/src/preferences/PreferenceManager.mm index f25d5fee8cd..5e99c6646b2 100644 --- a/camino/src/preferences/PreferenceManager.mm +++ b/camino/src/preferences/PreferenceManager.mm @@ -137,9 +137,10 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); if (NS_FAILED(rv)) { if (rv == NS_ERROR_FILE_ACCESS_DENIED) { //horrible, horrible, bad, fixed strings. need localization string file. - NSRunAlertPanel(@"Cannot Launch Navigator", - @"Navigator is already running on this system. Only one version may be run at any time.", - @"Quit",nil,nil); + NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@""); + NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@""); + NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@""); + NSRunAlertPanel(alert,message,quit,nil,nil); [NSApp terminate:self]; } return NO; diff --git a/chimera/CHPreferenceManager.mm b/chimera/CHPreferenceManager.mm index f25d5fee8cd..5e99c6646b2 100644 --- a/chimera/CHPreferenceManager.mm +++ b/chimera/CHPreferenceManager.mm @@ -137,9 +137,10 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); if (NS_FAILED(rv)) { if (rv == NS_ERROR_FILE_ACCESS_DENIED) { //horrible, horrible, bad, fixed strings. need localization string file. - NSRunAlertPanel(@"Cannot Launch Navigator", - @"Navigator is already running on this system. Only one version may be run at any time.", - @"Quit",nil,nil); + NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@""); + NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@""); + NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@""); + NSRunAlertPanel(alert,message,quit,nil,nil); [NSApp terminate:self]; } return NO; diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj index f429080f1e3..806496fbfbb 100644 --- a/chimera/Chimera.pbproj/project.pbxproj +++ b/chimera/Chimera.pbproj/project.pbxproj @@ -218,6 +218,7 @@ F564872E023B954E010001CA, F50EA33D02BAAAB701000103, 089C165CFE840E0CC02AAC07, + F52CE65C02BFA8B701026D5D, F51B70B4026EC8A601A80166, ); isa = PBXGroup; @@ -514,6 +515,7 @@ F50EA34902BAAAB701000103, F50EA34A02BAAAB701000103, F50EA34B02BAAAB701000103, + F52CE65D02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -1872,6 +1874,33 @@ settings = { }; }; + F52CE65902BFA88701026D5D = { + isa = PBXFileReference; + name = English; + path = English.lproj/Localizable.strings; + refType = 4; + }; + F52CE65C02BFA8B701026D5D = { + children = ( + F52CE65902BFA88701026D5D, + ); + isa = PBXVariantGroup; + name = Localizable.strings; + path = ""; + refType = 4; + }; + F52CE65D02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F52CE65E02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; path = CHAutoCompleteTextField.h; @@ -4356,6 +4385,7 @@ F50EA35002BAB1E401000103, F50EA35102BAB1E401000103, F50EA35202BAB1E401000103, + F52CE65E02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj index f429080f1e3..806496fbfbb 100644 --- a/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/chimera/projects/Chimera.pbproj/project.pbxproj @@ -218,6 +218,7 @@ F564872E023B954E010001CA, F50EA33D02BAAAB701000103, 089C165CFE840E0CC02AAC07, + F52CE65C02BFA8B701026D5D, F51B70B4026EC8A601A80166, ); isa = PBXGroup; @@ -514,6 +515,7 @@ F50EA34902BAAAB701000103, F50EA34A02BAAAB701000103, F50EA34B02BAAAB701000103, + F52CE65D02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; @@ -1872,6 +1874,33 @@ settings = { }; }; + F52CE65902BFA88701026D5D = { + isa = PBXFileReference; + name = English; + path = English.lproj/Localizable.strings; + refType = 4; + }; + F52CE65C02BFA8B701026D5D = { + children = ( + F52CE65902BFA88701026D5D, + ); + isa = PBXVariantGroup; + name = Localizable.strings; + path = ""; + refType = 4; + }; + F52CE65D02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; + F52CE65E02BFA8B701026D5D = { + fileRef = F52CE65C02BFA8B701026D5D; + isa = PBXBuildFile; + settings = { + }; + }; F52D5CCF027A887001A80166 = { isa = PBXFileReference; path = CHAutoCompleteTextField.h; @@ -4356,6 +4385,7 @@ F50EA35002BAB1E401000103, F50EA35102BAB1E401000103, F50EA35202BAB1E401000103, + F52CE65E02BFA8B701026D5D, ); isa = PBXResourcesBuildPhase; name = "Bundle Resources"; diff --git a/chimera/src/preferences/PreferenceManager.mm b/chimera/src/preferences/PreferenceManager.mm index f25d5fee8cd..5e99c6646b2 100644 --- a/chimera/src/preferences/PreferenceManager.mm +++ b/chimera/src/preferences/PreferenceManager.mm @@ -137,9 +137,10 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); if (NS_FAILED(rv)) { if (rv == NS_ERROR_FILE_ACCESS_DENIED) { //horrible, horrible, bad, fixed strings. need localization string file. - NSRunAlertPanel(@"Cannot Launch Navigator", - @"Navigator is already running on this system. Only one version may be run at any time.", - @"Quit",nil,nil); + NSString *alert = NSLocalizedString(@"AlreadyRunningAlert",@""); + NSString *message = NSLocalizedString(@"AlreadyRunningMsg",@""); + NSString *quit = NSLocalizedString(@"AlreadyRunningButton",@""); + NSRunAlertPanel(alert,message,quit,nil,nil); [NSApp terminate:self]; } return NO;