mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
f582d96b98
This is straightforward, with only two notable things. - `#include "nsXPIDLString.h" is replaced with `#include "nsString.h"` throughout, because all nsXPIDLString.h did was include nsString.h. The exception is for files which already include nsString.h, in which case the patch just removes the nsXPIDLString.h inclusion. - The patch removes the |xpidl_string| gtest, but improves the |voided| test to cover some of its ground, e.g. testing Adopt(nullptr). --HG-- extra : rebase_source : 452cc4a08046a1adb1a8099a7e85a1917de5add8
65 lines
1.7 KiB
C++
65 lines
1.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsIServiceManager.h"
|
|
#include "nsIStringBundle.h"
|
|
#include "nsString.h"
|
|
#include "nsParserMsgUtils.h"
|
|
#include "nsNetCID.h"
|
|
#include "mozilla/Services.h"
|
|
|
|
static nsresult GetBundle(const char * aPropFileName, nsIStringBundle **aBundle)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPropFileName);
|
|
NS_ENSURE_ARG_POINTER(aBundle);
|
|
|
|
// Create a bundle for the localization
|
|
|
|
nsCOMPtr<nsIStringBundleService> stringService =
|
|
mozilla::services::GetStringBundleService();
|
|
if (!stringService)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
return stringService->CreateBundle(aPropFileName, aBundle);
|
|
}
|
|
|
|
nsresult
|
|
nsParserMsgUtils::GetLocalizedStringByName(const char * aPropFileName, const char* aKey, nsString& oVal)
|
|
{
|
|
oVal.Truncate();
|
|
|
|
NS_ENSURE_ARG_POINTER(aKey);
|
|
|
|
nsCOMPtr<nsIStringBundle> bundle;
|
|
nsresult rv = GetBundle(aPropFileName,getter_AddRefs(bundle));
|
|
if (NS_SUCCEEDED(rv) && bundle) {
|
|
nsAutoString valUni;
|
|
rv = bundle->GetStringFromName(aKey, valUni);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
oVal.Assign(valUni);
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsParserMsgUtils::GetLocalizedStringByID(const char * aPropFileName, uint32_t aID, nsString& oVal)
|
|
{
|
|
oVal.Truncate();
|
|
|
|
nsCOMPtr<nsIStringBundle> bundle;
|
|
nsresult rv = GetBundle(aPropFileName,getter_AddRefs(bundle));
|
|
if (NS_SUCCEEDED(rv) && bundle) {
|
|
nsAutoString valUni;
|
|
rv = bundle->GetStringFromID(aID, valUni);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
oVal.Assign(valUni);
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|