summaryrefslogtreecommitdiff
path: root/harness
diff options
context:
space:
mode:
authorAndré Bargull <andre.bargull@gmail.com>2017-12-21 12:08:12 -0800
committerRick Waldron <waldron.rick@gmail.com>2017-12-21 16:46:55 -0500
commit52980ef496a7312f6a32f45813d3b592471f8f3d (patch)
tree1659350114c8eca0dfaaa2877912732230742c27 /harness
parent017fa6d55ff27fa108d622b1f00e5b07ac479e15 (diff)
downloadqtdeclarative-testsuites-52980ef496a7312f6a32f45813d3b592471f8f3d.tar.gz
Move test data for getLocaleSupportInfo into getLocaleSupportInfo
Diffstat (limited to 'harness')
-rw-r--r--harness/testIntl.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/harness/testIntl.js b/harness/testIntl.js
index eb63b23ac..3f04db24f 100644
--- a/harness/testIntl.js
+++ b/harness/testIntl.js
@@ -97,12 +97,6 @@ function taintArray() {
}
-// auxiliary data for getLocaleSupportInfo
-var languages = ["zh", "es", "en", "hi", "ur", "ar", "ja", "pa"];
-var scripts = ["Latn", "Hans", "Deva", "Arab", "Jpan", "Hant"];
-var countries = ["CN", "IN", "US", "PK", "JP", "TW", "HK", "SG"];
-
-
/**
* Gets locale support info for the given constructor object, which must be one
* of Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat.
@@ -113,6 +107,10 @@ var countries = ["CN", "IN", "US", "PK", "JP", "TW", "HK", "SG"];
* unsupported: array of unsupported language tags
*/
function getLocaleSupportInfo(Constructor) {
+ var languages = ["zh", "es", "en", "hi", "ur", "ar", "ja", "pa"];
+ var scripts = ["Latn", "Hans", "Deva", "Arab", "Jpan", "Hant"];
+ var countries = ["CN", "IN", "US", "PK", "JP", "TW", "HK", "SG"];
+
var allTags = [];
var i, j, k;
var language, script, country;
@@ -139,7 +137,7 @@ function getLocaleSupportInfo(Constructor) {
for (i = 0; i < allTags.length; i++) {
var request = allTags[i];
var result = new Constructor([request], {localeMatcher: "lookup"}).resolvedOptions().locale;
- if (request === result) {
+ if (request === result) {
supported.push(request);
} else if (request.indexOf(result) === 0) {
byFallback.push(request);