зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1736017 - Remove MozLocale; r=platform-i18n-reviewers,gregtatum
Differential Revision: https://phabricator.services.mozilla.com/D129213
This commit is contained in:
Dan Minor
Родитель
690f8a34f1
Коммит
2266940c0d
|
|
@ -1,55 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; 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 "mozilla/intl/MozLocale.h"
|
||||
|
||||
using namespace mozilla::intl;
|
||||
using namespace mozilla::intl::ffi;
|
||||
|
||||
MozLocale::MozLocale(const nsACString& aLocale)
|
||||
: mRaw(unic_langid_new(&aLocale, &mIsWellFormed)) {}
|
||||
|
||||
const nsCString MozLocale::AsString() const {
|
||||
nsCString tag;
|
||||
unic_langid_as_string(mRaw.get(), &tag);
|
||||
return tag;
|
||||
}
|
||||
|
||||
const nsDependentCSubstring MozLocale::GetLanguage() const {
|
||||
nsDependentCSubstring sub;
|
||||
unic_langid_get_language(mRaw.get(), &sub);
|
||||
return sub;
|
||||
}
|
||||
|
||||
const nsDependentCSubstring MozLocale::GetScript() const {
|
||||
nsDependentCSubstring sub;
|
||||
unic_langid_get_script(mRaw.get(), &sub);
|
||||
return sub;
|
||||
}
|
||||
|
||||
const nsDependentCSubstring MozLocale::GetRegion() const {
|
||||
nsDependentCSubstring sub;
|
||||
unic_langid_get_region(mRaw.get(), &sub);
|
||||
return sub;
|
||||
}
|
||||
|
||||
void MozLocale::GetVariants(nsTArray<nsCString>& aRetVal) const {
|
||||
unic_langid_get_variants(mRaw.get(), &aRetVal);
|
||||
}
|
||||
|
||||
bool MozLocale::Matches(const MozLocale& aOther, bool aThisRange,
|
||||
bool aOtherRange) const {
|
||||
if (!IsWellFormed() || !aOther.IsWellFormed()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return unic_langid_matches(mRaw.get(), aOther.Raw(), aThisRange, aOtherRange);
|
||||
}
|
||||
|
||||
bool MozLocale::Maximize() { return unic_langid_maximize(mRaw.get()); }
|
||||
|
||||
void MozLocale::ClearVariants() { unic_langid_clear_variants(mRaw.get()); }
|
||||
|
||||
void MozLocale::ClearRegion() { unic_langid_clear_region(mRaw.get()); }
|
||||
|
|
@ -1,160 +0,0 @@
|
|||
/* -*- 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/. */
|
||||
|
||||
#ifndef mozilla_intl_MozLocale_h__
|
||||
#define mozilla_intl_MozLocale_h__
|
||||
|
||||
#include "nsString.h"
|
||||
#include "nsTArray.h"
|
||||
#include "MozLocaleBindings.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace intl {
|
||||
|
||||
/**
|
||||
* Locale class is a core representation of a single locale.
|
||||
*
|
||||
* A locale is a data object representing a combination of language, script,
|
||||
* region, variant and a set of regional extension preferences that may further
|
||||
* specify particular user choices like calendar, numbering system, etc.
|
||||
*
|
||||
* A locale can be expressed as a language tag string, like a simple "fr" for
|
||||
* French, or a more specific "sr-Cyrl-RS-u-hc-h12" for Serbian in Russia with a
|
||||
* Cyrylic script, and hour cycle selected to be `h12`.
|
||||
*
|
||||
* The format of the language tag follows BCP47 standard and implements a subset
|
||||
* of it. In the future we expect to extend this class to cover more subtags and
|
||||
* extensions.
|
||||
*
|
||||
* BCP47: https://tools.ietf.org/html/bcp47
|
||||
*
|
||||
* The aim of this class it aid in validation, parsing and canonicalization of
|
||||
* the string.
|
||||
*
|
||||
* It allows the user to input any well-formed BCP47 language tag and operate
|
||||
* on its subtags in a canonicalized form.
|
||||
*
|
||||
* It should be used for all operations on language tags, and together with
|
||||
* LocaleService::NegotiateLanguages for language negotiation.
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* MozLocale loc = MozLocale("de-at");
|
||||
*
|
||||
* ASSERT_TRUE(loc.GetLanguage().Equals("de"));
|
||||
* ASSERT_TRUE(loc.GetScript().IsEmpty());
|
||||
* ASSERT_TRUE(loc.GetRegion().Equals("AT")); // canonicalized to upper case
|
||||
*/
|
||||
class MozLocale {
|
||||
public:
|
||||
/**
|
||||
* The constructor expects the input to be a well-formed BCP47-style locale
|
||||
* string.
|
||||
*
|
||||
* Two operations are performed on the well-formed language tags:
|
||||
*
|
||||
* * Case normalization to conform with BCP47 (e.g. "eN-uS" -> "en-US")
|
||||
* * Underscore delimiters replaced with dashed (e.g. "en_US" -> "en-US")
|
||||
*
|
||||
* If the input language tag string is not well-formed, the Locale will be
|
||||
* created with its flag `mWellFormed` set to false which will make the Locale
|
||||
* never match.
|
||||
*/
|
||||
explicit MozLocale(const nsACString& aLocale);
|
||||
explicit MozLocale(const char* aLocale)
|
||||
: MozLocale(nsDependentCString(aLocale)){};
|
||||
|
||||
const nsDependentCSubstring GetLanguage() const;
|
||||
const nsDependentCSubstring GetScript() const;
|
||||
const nsDependentCSubstring GetRegion() const;
|
||||
void GetVariants(nsTArray<nsCString>& aRetVal) const;
|
||||
|
||||
/**
|
||||
* Returns a `true` if the locale is well-formed, such that the
|
||||
* Locale object can validly be matched against others.
|
||||
*/
|
||||
bool IsWellFormed() const { return mIsWellFormed; }
|
||||
|
||||
/**
|
||||
* Returns a canonicalized language tag string of the locale.
|
||||
*/
|
||||
const nsCString AsString() const;
|
||||
|
||||
/**
|
||||
* Compares two locales optionally treating one or both of
|
||||
* the locales as a range.
|
||||
*
|
||||
* In case one of the locales is treated as a range, its
|
||||
* empty fields are considered to match all possible
|
||||
* values of the same field on the other locale.
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* Locale("en").Matches(Locale("en-US"), false, false) // false
|
||||
* Locale("en").Matches(Locale("en-US"), true, false) // true
|
||||
*
|
||||
* The latter returns true because the region field on the "en"
|
||||
* locale is being treated as a range and matches any region field
|
||||
* value including "US" of the other locale.
|
||||
*/
|
||||
bool Matches(const MozLocale& aOther, bool aThisRange,
|
||||
bool aOtherRange) const;
|
||||
|
||||
/**
|
||||
* This operation uses CLDR data to build a more specific version
|
||||
* of a generic locale.
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
* Locale("en").Maximize().AsString(); // "en-Latn-US"
|
||||
*/
|
||||
bool Maximize();
|
||||
|
||||
/**
|
||||
* Clears the variants field of the Locale object.
|
||||
*/
|
||||
void ClearVariants();
|
||||
|
||||
/**
|
||||
* Clears the region field of the Locale object.
|
||||
*/
|
||||
void ClearRegion();
|
||||
|
||||
/**
|
||||
* Marks the locale as invalid which in turns makes
|
||||
* it to be skipped by most LocaleService operations.
|
||||
*/
|
||||
void Invalidate() { mIsWellFormed = false; }
|
||||
|
||||
/**
|
||||
* Compares two locales expecting all fields to match each other.
|
||||
*/
|
||||
bool operator==(const MozLocale& aOther) {
|
||||
// Note: non-well-formed Locale objects are never
|
||||
// treated as equal to anything
|
||||
// (even other non-well-formed ones).
|
||||
return Matches(aOther, false, false);
|
||||
}
|
||||
|
||||
MozLocale(MozLocale&& aOther)
|
||||
: mIsWellFormed(aOther.mIsWellFormed), mRaw(std::move(aOther.mRaw)) {}
|
||||
|
||||
ffi::LanguageIdentifier* Raw() { return mRaw.get(); }
|
||||
const ffi::LanguageIdentifier* Raw() const { return mRaw.get(); }
|
||||
|
||||
private:
|
||||
bool mIsWellFormed;
|
||||
|
||||
// Notice. We had to remove `const` to allow for move constructor, but
|
||||
// that makes it possible to nullptr `mRaw`. Just don't.
|
||||
UniquePtr<ffi::LanguageIdentifier> mRaw;
|
||||
};
|
||||
|
||||
} // namespace intl
|
||||
} // namespace mozilla
|
||||
|
||||
MOZ_DECLARE_RELOCATE_USING_MOVE_CONSTRUCTOR(mozilla::intl::MozLocale)
|
||||
|
||||
#endif /* mozilla_intl_MozLocale_h__ */
|
||||
|
|
@ -32,7 +32,6 @@ EXPORTS += [
|
|||
|
||||
EXPORTS.mozilla.intl += [
|
||||
"LocaleService.h",
|
||||
"MozLocale.h",
|
||||
"MozLocaleBindings.h",
|
||||
"OSPreferences.h",
|
||||
"Quotes.h",
|
||||
|
|
@ -41,7 +40,6 @@ EXPORTS.mozilla.intl += [
|
|||
UNIFIED_SOURCES += [
|
||||
"DateTimeFormat.cpp",
|
||||
"LocaleService.cpp",
|
||||
"MozLocale.cpp",
|
||||
"nsLanguageAtomService.cpp",
|
||||
"nsUConvPropertySearch.cpp",
|
||||
"OSPreferences.cpp",
|
||||
|
|
|
|||
|
|
@ -1,123 +0,0 @@
|
|||
/* -*- 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 "gtest/gtest.h"
|
||||
#include "mozilla/intl/MozLocale.h"
|
||||
|
||||
using namespace mozilla::intl;
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, MozLocale)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US");
|
||||
|
||||
ASSERT_TRUE(loc.GetLanguage().Equals("en"));
|
||||
ASSERT_TRUE(loc.GetRegion().Equals("US"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, AsString)
|
||||
{
|
||||
MozLocale loc = MozLocale("ja-jp-windows");
|
||||
|
||||
ASSERT_TRUE(loc.AsString().Equals("ja-JP-windows"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, GetSubTags)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-latn-us-macos");
|
||||
|
||||
ASSERT_TRUE(loc.GetLanguage().Equals("en"));
|
||||
ASSERT_TRUE(loc.GetScript().Equals("Latn"));
|
||||
ASSERT_TRUE(loc.GetRegion().Equals("US"));
|
||||
|
||||
nsTArray<nsCString> variants;
|
||||
loc.GetVariants(variants);
|
||||
ASSERT_TRUE(variants.Length() == 1);
|
||||
ASSERT_TRUE(variants[0].Equals("macos"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, Matches)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US");
|
||||
|
||||
MozLocale loc2 = MozLocale("en-GB");
|
||||
ASSERT_FALSE(loc == loc2);
|
||||
|
||||
MozLocale loc3 = MozLocale("en-US");
|
||||
ASSERT_TRUE(loc == loc3);
|
||||
|
||||
MozLocale loc4 = MozLocale("En_us");
|
||||
ASSERT_TRUE(loc == loc4);
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, MatchesRange)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US");
|
||||
|
||||
MozLocale loc2 = MozLocale("en-Latn-US");
|
||||
ASSERT_FALSE(loc == loc2);
|
||||
ASSERT_TRUE(loc.Matches(loc2, true, false));
|
||||
ASSERT_FALSE(loc.Matches(loc2, false, true));
|
||||
ASSERT_FALSE(loc.Matches(loc2, false, false));
|
||||
ASSERT_TRUE(loc.Matches(loc2, true, true));
|
||||
|
||||
MozLocale loc3 = MozLocale("en");
|
||||
ASSERT_FALSE(loc == loc3);
|
||||
ASSERT_TRUE(loc.Matches(loc3, false, true));
|
||||
ASSERT_FALSE(loc.Matches(loc3, true, false));
|
||||
ASSERT_FALSE(loc.Matches(loc3, false, false));
|
||||
ASSERT_TRUE(loc.Matches(loc3, true, true));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, Variants)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US-UniFon-BasicEng");
|
||||
|
||||
// Make sure that we canonicalize and sort variant tags
|
||||
ASSERT_TRUE(loc.AsString().Equals("en-US-basiceng-unifon"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, InvalidMozLocale)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-verylongsubtag");
|
||||
ASSERT_FALSE(loc.IsWellFormed());
|
||||
|
||||
MozLocale loc2 = MozLocale("p-te");
|
||||
ASSERT_FALSE(loc2.IsWellFormed());
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, ClearRegion)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US");
|
||||
loc.ClearRegion();
|
||||
ASSERT_TRUE(loc.AsString().Equals("en"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, ClearVariants)
|
||||
{
|
||||
MozLocale loc = MozLocale("en-US-windows");
|
||||
loc.ClearVariants();
|
||||
ASSERT_TRUE(loc.AsString().Equals("en-US"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, jaJPmac)
|
||||
{
|
||||
MozLocale loc = MozLocale("ja-JP-mac");
|
||||
ASSERT_TRUE(loc.AsString().Equals("ja-JP-macos"));
|
||||
}
|
||||
|
||||
TEST(Intl_MozLocale_MozLocale, Maximize)
|
||||
{
|
||||
MozLocale loc = MozLocale("en");
|
||||
|
||||
ASSERT_TRUE(loc.GetLanguage().Equals("en"));
|
||||
ASSERT_TRUE(loc.GetScript().IsEmpty());
|
||||
ASSERT_TRUE(loc.GetRegion().IsEmpty());
|
||||
|
||||
ASSERT_TRUE(loc.Maximize());
|
||||
|
||||
ASSERT_TRUE(loc.GetLanguage().Equals("en"));
|
||||
ASSERT_TRUE(loc.GetScript().Equals("Latn"));
|
||||
ASSERT_TRUE(loc.GetRegion().Equals("US"));
|
||||
}
|
||||
|
|
@ -8,7 +8,6 @@ UNIFIED_SOURCES += [
|
|||
"TestDateTimeFormat.cpp",
|
||||
"TestLocaleService.cpp",
|
||||
"TestLocaleServiceNegotiate.cpp",
|
||||
"TestMozLocale.cpp",
|
||||
"TestOSPreferences.cpp",
|
||||
]
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче