Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resourced out error string.

Browse Source
This commit is contained in:
sgehani%netscape.com 1999-09-21 10:08:22 +00:00
parent b217e5ba0e
commit 512e9e8f06
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpinstall/res/locale/en-US/xpinstall.properties
View File

@ -45,3 +45,9 @@ Uninstall=Uninstalling: %s
ShouldWeInstallMsg=Attempting to download and install software. Do you feel lucky punk?
FinishingInstallMsg=Finishing install... please wait.
#--------------------------------------------------------------------
# Miscellaneous
#--------------------------------------------------------------------
ERROR=ERROR

19
xpinstall/src/nsInstall.cpp
View File

@ -1805,13 +1805,18 @@ nsInstall::ScheduleForInstall(nsInstallObject* ob)
else if ( mNotifier )
{
// error in preparation step -- log it
char* errprefix = PR_smprintf("ERROR (%d): ",error);
nsString errstr = errprefix;
errstr += objString;
char* errRsrc = GetResourcedString("ERROR");
if (errRsrc)
{
char* errprefix = PR_smprintf("%s (%d): ", errRsrc, error);
nsString errstr = errprefix;
errstr += objString;
mNotifier->LogComment( errstr.GetUnicode() );
mNotifier->LogComment( errstr.GetUnicode() );
PR_smprintf_free(errprefix);
PR_smprintf_free(errprefix);
nsCRT::free(errRsrc);
}
}
if (objString)
@ -2229,8 +2234,8 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedNa
* Obtains the string resource for actions and messages that are displayed
* in user interface confirmation and progress dialogs.
*
* @param aResName - property name/identifier of string resource
* @return rscdStr - corresponding resourced value in the string bundle
* @param aResName - property name/identifier of string resource
* @return rscdStr - corresponding resourced value in the string bundle
*/
char*
nsInstall::GetResourcedString(const nsString& aResName)