8222980: Upgrade IANA Language Subtag Registry to Version 2019-04-03
Reviewed-by: bpb, lancea
--- a/make/data/lsrdata/language-subtag-registry.txt Fri Apr 26 18:56:15 2019 +0300
+++ b/make/data/lsrdata/language-subtag-registry.txt Fri Apr 26 09:09:39 2019 -0700
@@ -1,4 +1,4 @@
-File-Date: 2018-11-30
+File-Date: 2019-04-03
%%
Type: language
Subtag: aa
@@ -43008,6 +43008,7 @@
Description: Lyons Sign Language
Added: 2009-07-29
Deprecated: 2018-03-08
+Preferred-Value: lsg
Prefix: sgn
%%
Type: extlang
@@ -43406,6 +43407,7 @@
Description: Rennellese Sign Language
Added: 2009-07-29
Deprecated: 2017-02-23
+Preferred-Value: rsi
Prefix: sgn
%%
Type: extlang
@@ -43760,6 +43762,7 @@
Description: Yiddish Sign Language
Added: 2009-07-29
Deprecated: 2015-02-12
+Preferred-Value: yds
Prefix: sgn
%%
Type: extlang
@@ -46537,16 +46540,16 @@
Description: Eastern Armenian
Added: 2006-09-18
Deprecated: 2018-03-24
-Preferred-Value: hy
Prefix: hy
+Comments: Preferred tag is hy
%%
Type: variant
Subtag: arevmda
Description: Western Armenian
Added: 2006-09-18
Deprecated: 2018-03-24
-Preferred-Value: hyw
Prefix: hy
+Comments: Preferred tag is hyw
%%
Type: variant
Subtag: asante
@@ -46642,6 +46645,12 @@
Comments: Jargon embedded in American English
%%
Type: variant
+Subtag: bornholm
+Description: Bornholmsk
+Added: 2019-03-27
+Prefix: da
+%%
+Type: variant
Subtag: cisaup
Description: Cisalpine
Added: 2018-04-22
--- a/test/jdk/java/util/Locale/Bug8040211.java Fri Apr 26 18:56:15 2019 +0300
+++ b/test/jdk/java/util/Locale/Bug8040211.java Fri Apr 26 09:09:39 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
/*
* @test
- * @bug 8040211 8191404 8203872
+ * @bug 8040211 8191404 8203872 8222980
* @summary Checks the IANA language subtag registry data update
- * (LSR Revision: 2018-04-23) with Locale and Locale.LanguageRange
+ * (LSR Revision: 2019-04-03) with Locale and Locale.LanguageRange
* class methods.
* @run main Bug8040211
*/
@@ -115,7 +115,6 @@
expected.add(new LanguageRange("taj", 0.9));
expected.add(new LanguageRange("tsf", 0.9));
expected.add(new LanguageRange("ar-hyw", 0.8));
- expected.add(new LanguageRange("ar-arevmda", 0.8));
expected.add(new LanguageRange("yug", 0.5));
expected.add(new LanguageRange("yuu", 0.5));
expected.add(new LanguageRange("gfx", 0.4));
@@ -188,7 +187,7 @@
List<Locale> tagList = generateLocales(tags);
String actualLocales
= showLocales(Locale.filter(priorityList, tagList, mode));
- String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict, nts, pij, ar-arevela";
+ String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict, nts, pij";
if (!expectedLocales.equals(actualLocales)) {
error = true;