Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 392407: appstrings.properties should not be using branded strings

Browse Source 
r+sr=bzbarsky, ui-r=beltzner, a=blocking1.9


git-svn-id: svn://10.0.0.236/trunk@242449 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkmelin+mozilla%iki.fi
2008-01-05 13:40:49 +00:00
parent 8e876b26bf
commit 043c89d113
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -8644,13 +8644,20 @@ nsDocShell::ConfirmRepost(PRBool * aRepost)
nsXPIDLString brandName;
rv = brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
getter_Copies(brandName));
if (NS_FAILED(rv)) return rv;
const PRUnichar *formatStrings[] = { brandName.get() };
nsXPIDLString msgString, button0Title;
rv = appBundle->FormatStringFromName(NS_LITERAL_STRING("confirmRepost").get(),
formatStrings, NS_ARRAY_LENGTH(formatStrings),
getter_Copies(msgString));
if (NS_FAILED(rv)) { // No brand, use the generic version.
rv = appBundle->GetStringFromName(NS_LITERAL_STRING("confirmRepostPrompt").get(),
getter_Copies(msgString));
}
else {
// Brand available - if the app has an override file with formatting, the app name will
// be included. Without an override, the prompt will look like the generic version.
const PRUnichar *formatStrings[] = { brandName.get() };
rv = appBundle->FormatStringFromName(NS_LITERAL_STRING("confirmRepostPrompt").get(),
formatStrings, NS_ARRAY_LENGTH(formatStrings),
getter_Copies(msgString));
}
if (NS_FAILED(rv)) return rv;
rv = appBundle->GetStringFromName(NS_LITERAL_STRING("resendButton.label").get(),