From 92fed8451d3eeb9773e90b48b30e13e03b743aad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 19 May 2024 00:06:13 +0000 Subject: [PATCH 1/5] Automated bump of chrome version --- eng/testing/BrowserVersions.props | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/testing/BrowserVersions.props b/eng/testing/BrowserVersions.props index b4679386270159..08d0faffe0378d 100644 --- a/eng/testing/BrowserVersions.props +++ b/eng/testing/BrowserVersions.props @@ -1,13 +1,13 @@ - 124.0.6367.201 - 1274542 - https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1274543 - 12.4.254 - 124.0.6367.201 - 1274542 - https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1274569 - 12.4.254 + 125.0.6422.60 + 1287751 + https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1287757 + 12.5.227 + 125.0.6422.60 + 1287751 + https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/1287751 + 12.5.227 125.0.1 0.34.0 125.0.1 From 25b99c9265b9d387dd7a363648c86dd0be905cdf Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Mon, 20 May 2024 18:01:17 +0200 Subject: [PATCH 2/5] Update expected values in chrome v=125. --- .../DateTimeFormatInfoAMDesignator.cs | 12 +- ...FormatInfoAbbreviatedMonthGenitiveNames.cs | 6 +- ...DateTimeFormatInfoAbbreviatedMonthNames.cs | 10 +- .../DateTimeFormatInfoFullDateTimePattern.cs | 16 +- ...DateTimeFormatInfoGetAbbreviatedEraName.cs | 2 +- .../DateTimeFormatInfoLongDatePattern.cs | 377 +++++++++--------- .../DateTimeFormatInfoLongTimePattern.cs | 6 +- .../DateTimeFormatInfoMonthGenitiveNames.cs | 2 +- .../DateTimeFormatInfoMonthNames.cs | 2 +- .../DateTimeFormatInfoPMDesignator.cs | 12 +- .../DateTimeFormatInfoShortDatePattern.cs | 6 +- .../DateTimeFormatInfoShortTimePattern.cs | 4 +- .../DateTimeFormatInfoShortestDayNames.cs | 4 +- .../DateTimeFormatInfoYearMonthPattern.cs | 2 +- 14 files changed, 231 insertions(+), 230 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs index 0eeb6d9c4a7380..9139e0f33c63e7 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs @@ -137,9 +137,9 @@ public static IEnumerable AMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "am" }; yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "am" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "a.\u00A0m." }; + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "a.m." }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "a.\u00A0m." }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "a.\u00A0m." }; + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "a.m." }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "AM" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "قبل‌ازظهر" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "ap." }; @@ -188,10 +188,10 @@ public static IEnumerable AMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("sw-KE").DateTimeFormat, "AM" }; yield return new object[] { new CultureInfo("sw-TZ").DateTimeFormat, "AM" }; yield return new object[] { new CultureInfo("sw-UG").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "முற்பகல்" }; - yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "முற்பகல்" }; - yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "முற்பகல்" }; - yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "முற்பகல்" }; + yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "AM" }; // முற்பகல் + yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "AM" }; // முற்பகல் + yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "AM" }; // முற்பகல் + yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "AM" }; // முற்பகல் yield return new object[] { new CultureInfo("te-IN").DateTimeFormat, "AM" }; yield return new object[] { new CultureInfo("th-TH").DateTimeFormat, "ก่อนเที่ยง" }; yield return new object[] { new CultureInfo("tr-CY").DateTimeFormat, "ÖÖ" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs index 0330708cdc97a9..84899abcf2cae5 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs @@ -12,7 +12,7 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { "ar-SA", new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { "am-ET", new string[] { "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; + yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" yield return new object[] { "bg-BG", new string[] { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "" } }; //"яну", "фев", "март", "апр", "май", "юни", "юли", "авг", "сеп", "окт", "ное", "дек", "" yield return new object[] { "bn-BD", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রি", "মে", "জুন", "জুল", "আগ", "সেপ", "অক্টো", "নভে", "ডিসে", "" } }; // "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" yield return new object[] { "bn-IN", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রি", "মে", "জুন", "জুল", "আগ", "সেপ্টেঃ", "অক্টোঃ", "নভেঃ", "ডিসেঃ", "" } }; // "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" @@ -133,7 +133,7 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H yield return new object[] { "en-ZW", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "es-419", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "es-ES", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" - yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "et-EE", new string[] { "jaan", "veebr", "märts", "apr", "mai", "juuni", "juuli", "aug", "sept", "okt", "nov", "dets", "" } }; yield return new object[] { "fa-IR", new string[] { "فروردین", "اردیبهشت", "خرداد", "تیر", "مرداد", "شهریور", "مهر", "آبان", "آذر", "دی", "بهمن", "اسفند", "" } }; yield return new object[] { "fi-FI", new string[] { "tammik.", "helmik.", "maalisk.", "huhtik.", "toukok.", "kesäk.", "heinäk.", "elok.", "syysk.", "lokak.", "marrask.", "jouluk.", "" } }; @@ -192,7 +192,7 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H yield return new object[] { "tr-CY", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "tr-TR", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "uk-UA", new string[] { "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.", "лип.", "серп.", "вер.", "жовт.", "лист.", "груд.", "" } }; - yield return new object[] { "vi-VN", new string[] { "Thg 1", "Thg 2", "Thg 3", "Thg 4", "Thg 5", "Thg 6", "Thg 7", "Thg 8", "Thg 9", "Thg 10", "Thg 11", "Thg 12", "" } }; // thg + yield return new object[] { "vi-VN", new string[] { "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12", "" } }; // thg yield return new object[] { "zh-CN", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-Hans-HK", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-SG", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs index 4687babcb259ae..82a0ced7829dd1 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs @@ -32,7 +32,7 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { "ar-SA", new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { "am-ET", new string[] { "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; + yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" yield return new object[] { "bg-BG", new string[] { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "" } }; // "яну", "фев", "март", "апр", "май", "юни", "юли", "авг", "сеп", "окт", "ное", "дек", "" yield return new object[] { "bn-BD", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; // "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" yield return new object[] { "bn-IN", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেঃ", "অক্টোঃ", "নভেঃ", "ডিসেঃ", "" } }; // BUG. JS returns Genitive even though we expect Nominative; "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" @@ -54,7 +54,7 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "en-AI", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-AS", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" } }; yield return new object[] { "en-AT", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" - yield return new object[] { "en-AU", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; + yield return new object[] { "en-AU", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Jun", "Jul" yield return new object[] { "en-BB", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-BE", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-BI", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" } }; @@ -153,7 +153,7 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "en-ZW", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "es-419", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "es-ES", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" - yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "et-EE", new string[] { "jaanuar", "veebruar", "märts", "aprill", "mai", "juuni", "juuli", "august", "september", "oktoober", "november", "detsember", "" } }; // "jaan", "veebr", "märts", "apr", "mai", "juuni", "juuli", "aug", "sept", "okt", "nov", "dets", "" yield return new object[] { "fa-IR", new string[] { "فروردین", "اردیبهشت", "خرداد", "تیر", "مرداد", "شهریور", "مهر", "آبان", "آذر", "دی", "بهمن", "اسفند", "" } }; yield return new object[] { "fi-FI", new string[] { "tammi", "helmi", "maalis", "huhti", "touko", "kesä", "heinä", "elo", "syys", "loka", "marras", "joulu", "" } }; @@ -211,8 +211,8 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "th-TH", new string[] { "ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค.", "" } }; yield return new object[] { "tr-CY", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "tr-TR", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; - yield return new object[] { "uk-UA", new string[] { "січ", "лют", "бер", "кві", "тра", "чер", "лип", "сер", "вер", "жов", "лис", "гру", "" } }; - yield return new object[] { "vi-VN", new string[] { "Thg 1", "Thg 2", "Thg 3", "Thg 4", "Thg 5", "Thg 6", "Thg 7", "Thg 8", "Thg 9", "Thg 10", "Thg 11", "Thg 12", "" } }; + yield return new object[] { "uk-UA", new string[] { "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.", "лип.", "серп.", "вер.", "жовт.", "лист.", "груд.", "" } }; // "січ", "лют", "бер", "кві", "тра", "чер", "лип", "сер", "вер", "жов", "лис", "гру", "" + yield return new object[] { "vi-VN", new string[] { "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12", "" } }; yield return new object[] { "zh-CN", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-Hans-HK", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-SG", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs index 97759781e2c561..f66b68d977a808 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs @@ -28,11 +28,11 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba { yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "dddd، d MMMM yyyy h:mm:ss tt" }; // dddd، d MMMM yyyy g h:mm:ss tt yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "yyyy MMMM d, dddd h:mm:ss tt" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "dddd, d MMMM yyyy г. H:mm:ss ч." }; // dddd, d MMMM yyyy 'г'. H:mm:ss + yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "dddd, d MMMM yyyy г. H:mm:ss" }; // dddd, d MMMM yyyy 'г'. H:mm:ss yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "dddd, d MMMM, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "dddd, d MMMM, yyyy h:mm:ss tt" }; - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "dddd, d de MMMM de yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, "dddd, d de MMMM de yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss + yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "dddd, d de MMMM del yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss + yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, "dddd, d de MMMM del yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, "dddd d. MMMM yyyy H:mm:ss" }; yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, "dddd den d. MMMM yyyy HH.mm.ss" }; // dddd 'den' d. MMMM yyyy HH.mm.ss yield return new object[] { new CultureInfo("de-AT").DateTimeFormat, "dddd, d. MMMM yyyy HH:mm:ss" }; @@ -49,7 +49,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-AI").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-AS").DateTimeFormat, "dddd, MMMM d, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-AT").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; + yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, "dddd d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-BB").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-BE").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-BI").DateTimeFormat, "dddd, MMMM d, yyyy HH:mm:ss" }; @@ -72,7 +72,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-FJ").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-FK").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-FM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; - yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; + yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, "dddd d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-GD").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-GG").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-GH").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; @@ -84,7 +84,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-IE").DateTimeFormat, "dddd d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-IL").DateTimeFormat, "dddd, d MMMM yyyy H:mm:ss" }; yield return new object[] { new CultureInfo("en-IM").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; - yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, "dddd, d MMMM, yyyy h:mm:ss tt" }; + yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, "dddd d MMMM, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-IO").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-JE").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-JM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; @@ -146,9 +146,9 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; // dddd, dd MMMM yyyy HH:mm:ss yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; // dddd, dd MMMM yyyy HH:mm:ss - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "dddd, d de MMMM de yyyy HH:mm:ss" }; // dddd, d 'de' MMMM 'de' yyyy HH:mm:ss + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "dddd, d de MMMM de yyyy h:mm:ss tt" }; // dddd, d 'de' MMMM 'de' yyyy HH:mm:ss yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "dddd, d de MMMM de yyyy H:mm:ss" }; // dddd, d 'de' MMMM 'de' yyyy H:mm:ss - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "dddd, d de MMMM de yyyy HH:mm:ss" }; // dddd, d 'de' MMMM 'de' yyyy H:mm:ss + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "dddd, d de MMMM de yyyy h:mm:ss tt" }; // dddd, d 'de' MMMM 'de' yyyy H:mm:ss yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "dddd, d. MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "yyyy MMMM d, dddd H:mm:ss" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "dddd d. MMMM yyyy H.mm.ss" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs index d0b2af309ea04f..3643729a4a5b98 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs @@ -199,7 +199,7 @@ public static IEnumerable GetAbbreviatedEraName_TestData() yield return new object[] { "tr-CY", 1, "MS" }; yield return new object[] { "tr-TR", 1, "MS" }; yield return new object[] { "uk-UA", 1, "н.е." }; - yield return new object[] { "vi-VN", 1, "sau CN" }; + yield return new object[] { "vi-VN", 1, "CN" }; // sau CN yield return new object[] { "zh-CN", 1, "公元" }; yield return new object[] { "zh-Hans-HK", 1, "公元" }; yield return new object[] { "zh-SG", 1, "公元" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs index dd8eebdefce34d..bdee8e9a108497 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs @@ -28,199 +28,200 @@ public static IEnumerable LongDatePattern_Set_TestData() public static IEnumerable LongDatePattern_Get_TestData_HybridGlobalization() { // see the comments on the right to check the non-Hybrid result, if it differs - yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "dddd، d MMMM yyyy" }; // dddd، d MMMM yyyy g - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "yyyy MMMM d, dddd" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." - yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // "dddd, d MMMM 'de' yyyy" - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // "dddd, d MMMM 'de' yyyy" - yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, "dddd d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, "dddd den d. MMMM yyyy" }; // dddd 'den' d. MMMM yyyy - yield return new object[] { new CultureInfo("de-AT").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-BE").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-CH").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-DE").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-IT").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-LI").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("de-LU").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("el-CY").DateTimeFormat, "dddd d MMMM yyyy" }; // "dddd, d MMMM yyyy" - yield return new object[] { new CultureInfo("el-GR").DateTimeFormat, "dddd d MMMM yyyy" }; // "dddd, d MMMM yyyy" - yield return new object[] { new CultureInfo("en-AE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-AG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-AI").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-AS").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-AT").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-BB").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-BE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-BI").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-BM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-BS").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-BW").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" - yield return new object[] { new CultureInfo("en-BZ").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" - yield return new object[] { new CultureInfo("en-CA").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-CC").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-CH").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-CK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-CM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-CX").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-CY").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-DE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-DK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-DM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-ER").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-FI").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-FJ").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-FK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-FM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GD").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GH").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GI").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-GU").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-GY").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-HK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-IE").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-IL").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-IM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("en-IO").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-JE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-JM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-KE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-KI").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-KN").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-KY").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-LC").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-LR").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-LS").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MH").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-MO").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MP").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-MS").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MT").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MU").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MW").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-MY").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NA").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NF").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NL").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NR").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NU").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-NZ").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-PG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-PH").DateTimeFormat, "dddd, MMMM d, yyyy" }; // "dddd, d MMMM yyyy" - yield return new object[] { new CultureInfo("en-PK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-PN").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-PR").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-PW").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-RW").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SB").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SC").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SD").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SH").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SI").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SL").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SS").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SX").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-SZ").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TC").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TK").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TO").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TT").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TV").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-TZ").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-UG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-UM").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-US").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-VC").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-VG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-VI").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("en-VU").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-WS").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" - yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" - yield return new object[] { new CultureInfo("en-US").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy - yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy - yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "dddd, d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "yyyy MMMM d, dddd" }; - yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "dddd d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("fil-PH").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("fr-BE").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("fr-CA").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("fr-CH").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("gu-IN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("he-IL").DateTimeFormat, "dddd, d בMMMM yyyy" }; - yield return new object[] { new CultureInfo("hi-IN").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("hr-BA").DateTimeFormat, "dddd, d. MMMM yyyy." }; - yield return new object[] { new CultureInfo("hr-HR").DateTimeFormat, "dddd, d. MMMM yyyy." }; - yield return new object[] { new CultureInfo("hu-HU").DateTimeFormat, "yyyy. MMMM d., dddd" }; - yield return new object[] { new CultureInfo("id-ID").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" - yield return new object[] { new CultureInfo("it-CH").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("it-IT").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("ja-JP").DateTimeFormat, "yyyy年M月d日dddd" }; - yield return new object[] { new CultureInfo("kn-IN").DateTimeFormat, "dddd, MMMM d, yyyy" }; - yield return new object[] { new CultureInfo("ko-KR").DateTimeFormat, "yyyy년 M월 d일 dddd" }; - yield return new object[] { new CultureInfo("lt-LT").DateTimeFormat, "yyyy m. MMMM d d., dddd" }; // "yyyy 'm'. MMMM d 'd'., dddd" - yield return new object[] { new CultureInfo("lv-LV").DateTimeFormat, "dddd, yyyy. gada d. MMMM" }; // "dddd, yyyy. 'gada' d. MMMM" - yield return new object[] { new CultureInfo("ml-IN").DateTimeFormat, "yyyy, MMMM d, dddd" }; - yield return new object[] { new CultureInfo("mr-IN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("ms-BN").DateTimeFormat, "dddd, d MMMM yyyy" }; // "dd MMMM yyyy" - yield return new object[] { new CultureInfo("ms-MY").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("ms-SG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("nb-NO").DateTimeFormat, "dddd d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("no-NO").DateTimeFormat, "dddd d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("nl-AW").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("nl-BE").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("nl-NL").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("pl-PL").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("pt-BR").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy - yield return new object[] { new CultureInfo("pt-PT").DateTimeFormat, "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy - yield return new object[] { new CultureInfo("ro-RO").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("ru-RU").DateTimeFormat, "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." - yield return new object[] { new CultureInfo("sk-SK").DateTimeFormat, "dddd d. MMMM yyyy" }; - yield return new object[] { new CultureInfo("sl-SI").DateTimeFormat, "dddd, d. MMMM yyyy" }; // "dddd, dd. MMMM yyyy" - yield return new object[] { new CultureInfo("sr-Cyrl-RS").DateTimeFormat, "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" - yield return new object[] { new CultureInfo("sr-Latn-RS").DateTimeFormat, "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" - yield return new object[] { new CultureInfo("sv-AX").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("sv-SE").DateTimeFormat, "dddd d MMMM yyyy" }; - yield return new object[] { new CultureInfo("sw-CD").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("sw-KE").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("sw-TZ").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("sw-UG").DateTimeFormat, "dddd, d MMMM yyyy" }; - yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("te-IN").DateTimeFormat, "d, MMMM yyyy, dddd" }; - yield return new object[] { new CultureInfo("th-TH").DateTimeFormat, "ddddที่ d MMMM g yyyy" }; - yield return new object[] { new CultureInfo("tr-CY").DateTimeFormat, "d MMMM yyyy dddd" }; - yield return new object[] { new CultureInfo("tr-TR").DateTimeFormat, "d MMMM yyyy dddd" }; - yield return new object[] { new CultureInfo("uk-UA").DateTimeFormat, "dddd, d MMMM yyyy р." }; // "dddd, d MMMM yyyy 'р'." - yield return new object[] { new CultureInfo("vi-VN").DateTimeFormat, "dddd, d MMMM, yyyy" }; - yield return new object[] { new CultureInfo("zh-CN").DateTimeFormat, "yyyy年M月d日dddd" }; - yield return new object[] { new CultureInfo("zh-Hans-HK").DateTimeFormat, "yyyy年M月d日dddd" }; - yield return new object[] { new CultureInfo("zh-SG").DateTimeFormat, "yyyy年M月d日dddd" }; - yield return new object[] { new CultureInfo("zh-HK").DateTimeFormat, "yyyy年M月d日dddd" }; - yield return new object[] { new CultureInfo("zh-TW").DateTimeFormat, "yyyy年M月d日 dddd" }; + yield return new object[] {"ar-SA", "dddd، d MMMM yyyy" }; // dddd، d MMMM yyyy g + yield return new object[] {"am-ET", "yyyy MMMM d, dddd" }; + yield return new object[] {"bg-BG", "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." + yield return new object[] {"bn-BD", "dddd, d MMMM, yyyy" }; + yield return new object[] {"bn-IN", "dddd, d MMMM, yyyy" }; + yield return new object[] {"ca-AD", "dddd, d de MMMM del yyyy" }; // "dddd, d MMMM 'de' yyyy" + yield return new object[] {"ca-ES", "dddd, d de MMMM del yyyy" }; // "dddd, d MMMM 'de' yyyy" + yield return new object[] {"cs-CZ", "dddd d. MMMM yyyy" }; + yield return new object[] {"da-DK", "dddd den d. MMMM yyyy" }; // dddd 'den' d. MMMM yyyy + yield return new object[] {"de-AT", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-BE", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-CH", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-DE", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-IT", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-LI", "dddd, d. MMMM yyyy" }; + yield return new object[] {"de-LU", "dddd, d. MMMM yyyy" }; + yield return new object[] {"el-CY", "dddd d MMMM yyyy" }; // "dddd, d MMMM yyyy" + yield return new object[] {"el-GR", "dddd d MMMM yyyy" }; // "dddd, d MMMM yyyy" + yield return new object[] {"en-AE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-AG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-AI", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-AS", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-AT", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-AU", "dddd d MMMM yyyy" }; + yield return new object[] {"en-BB", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-BE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-BI", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-BM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-BS", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-BW", "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" + yield return new object[] {"en-BZ", "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" + yield return new object[] {"en-CA", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-CC", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-CH", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-CK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-CM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-CX", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-CY", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-DE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-DK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-DM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-ER", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-FI", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-FJ", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-FK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-FM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GB", "dddd d MMMM yyyy" }; + yield return new object[] {"en-GD", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GH", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GI", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-GU", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-GY", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-HK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-IE", "dddd d MMMM yyyy" }; + yield return new object[] {"en-IL", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-IM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-IN", "dddd d MMMM, yyyy" }; // dddd, d MMMM, yyyy + yield return new object[] {"en-IO", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-JE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-JM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-KE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-KI", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-KN", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-KY", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-LC", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-LR", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-LS", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MH", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-MO", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MP", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-MS", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MT", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MU", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MW", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-MY", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NA", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NF", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NL", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NR", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NU", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-NZ", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-PG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-PH", "dddd, MMMM d, yyyy" }; // "dddd, d MMMM yyyy" + yield return new object[] {"en-PK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-PN", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-PR", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-PW", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-RW", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SB", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SC", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SD", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SE", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SH", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SI", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SL", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SS", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SX", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-SZ", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TC", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TK", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TO", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TT", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TV", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-TZ", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-UG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-UM", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-US", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-VC", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-VG", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-VI", "dddd, MMMM d, yyyy" }; + yield return new object[] {"en-VU", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-WS", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-ZA", "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" + yield return new object[] {"en-ZM", "dddd, d MMMM yyyy" }; + yield return new object[] {"en-ZW", "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" + yield return new object[] {"en-US", "dddd, MMMM d, yyyy" }; + yield return new object[] {"es-419", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy + yield return new object[] {"es-ES", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy + yield return new object[] {"es-MX", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy + yield return new object[] {"et-EE", "dddd, d. MMMM yyyy" }; + yield return new object[] {"fa-IR", "yyyy MMMM d, dddd" }; + yield return new object[] {"fi-FI", "dddd d. MMMM yyyy" }; + yield return new object[] {"fil-PH", "dddd, MMMM d, yyyy" }; + yield return new object[] {"fr-BE", "dddd d MMMM yyyy" }; + yield return new object[] {"fr-CA", "dddd d MMMM yyyy" }; + yield return new object[] {"fr-CH", "dddd, d MMMM yyyy" }; + yield return new object[] {"fr-FR", "dddd d MMMM yyyy" }; + yield return new object[] {"gu-IN", "dddd, d MMMM, yyyy" }; + yield return new object[] {"he-IL", "dddd, d בMMMM yyyy" }; + yield return new object[] {"hi-IN", "dddd, d MMMM yyyy" }; + yield return new object[] {"hr-BA", "dddd, d. MMMM yyyy." }; + yield return new object[] {"hr-HR", "dddd, d. MMMM yyyy." }; + yield return new object[] {"hu-HU", "yyyy. MMMM d., dddd" }; + yield return new object[] {"id-ID", "dddd, d MMMM yyyy" }; // "dddd, dd MMMM yyyy" + yield return new object[] {"it-CH", "dddd, d MMMM yyyy" }; + yield return new object[] {"it-IT", "dddd d MMMM yyyy" }; + yield return new object[] {"ja-JP", "yyyy年M月d日dddd" }; + yield return new object[] {"kn-IN", "dddd, MMMM d, yyyy" }; + yield return new object[] {"ko-KR", "yyyy년 M월 d일 dddd" }; + yield return new object[] {"lt-LT", "yyyy m. MMMM d d., dddd" }; // "yyyy 'm'. MMMM d 'd'., dddd" + yield return new object[] {"lv-LV", "dddd, yyyy. gada d. MMMM" }; // "dddd, yyyy. 'gada' d. MMMM" + yield return new object[] {"ml-IN", "yyyy, MMMM d, dddd" }; + yield return new object[] {"mr-IN", "dddd, d MMMM, yyyy" }; + yield return new object[] {"ms-BN", "dddd, d MMMM yyyy" }; // "dd MMMM yyyy" + yield return new object[] {"ms-MY", "dddd, d MMMM yyyy" }; + yield return new object[] {"ms-SG", "dddd, d MMMM yyyy" }; + yield return new object[] {"nb-NO", "dddd d. MMMM yyyy" }; + yield return new object[] {"no-NO", "dddd d. MMMM yyyy" }; + yield return new object[] {"nl-AW", "dddd d MMMM yyyy" }; + yield return new object[] {"nl-BE", "dddd d MMMM yyyy" }; + yield return new object[] {"nl-NL", "dddd d MMMM yyyy" }; + yield return new object[] {"pl-PL", "dddd, d MMMM yyyy" }; + yield return new object[] {"pt-BR", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy + yield return new object[] {"pt-PT", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy + yield return new object[] {"ro-RO", "dddd, d MMMM yyyy" }; + // yield return new object[] {"ru-RU", "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." + // yield return new object[] {"sk-SK", "dddd d. MMMM yyyy" }; + // yield return new object[] {"sl-SI", "dddd, d. MMMM yyyy" }; // "dddd, dd. MMMM yyyy" + // yield return new object[] {"sr-Cyrl-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" + // yield return new object[] {"sr-Latn-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" + // yield return new object[] {"sv-AX", "dddd d MMMM yyyy" }; + // yield return new object[] {"sv-SE", "dddd d MMMM yyyy" }; + // yield return new object[] {"sw-CD", "dddd, d MMMM yyyy" }; + // yield return new object[] {"sw-KE", "dddd, d MMMM yyyy" }; + // yield return new object[] {"sw-TZ", "dddd, d MMMM yyyy" }; + // yield return new object[] {"sw-UG", "dddd, d MMMM yyyy" }; + // yield return new object[] {"ta-IN", "dddd, d MMMM, yyyy" }; + // yield return new object[] {"ta-LK", "dddd, d MMMM, yyyy" }; + // yield return new object[] {"ta-MY", "dddd, d MMMM, yyyy" }; + // yield return new object[] {"ta-SG", "dddd, d MMMM, yyyy" }; + // yield return new object[] {"te-IN", "d, MMMM yyyy, dddd" }; + // yield return new object[] {"th-TH", "ddddที่ d MMMM g yyyy" }; + // yield return new object[] {"tr-CY", "d MMMM yyyy dddd" }; + // yield return new object[] {"tr-TR", "d MMMM yyyy dddd" }; + // yield return new object[] {"uk-UA", "dddd, d MMMM yyyy р." }; // "dddd, d MMMM yyyy 'р'." + // yield return new object[] {"vi-VN", "dddd, d MMMM, yyyy" }; + // yield return new object[] {"zh-CN", "yyyy年M月d日dddd" }; + // yield return new object[] {"zh-Hans-HK", "yyyy年M月d日dddd" }; + // yield return new object[] {"zh-SG", "yyyy年M月d日dddd" }; + // yield return new object[] {"zh-HK", "yyyy年M月d日dddd" }; + // yield return new object[] {"zh-TW", "yyyy年M月d日 dddd" }; } [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsHybridGlobalizationOnBrowser))] [MemberData(nameof(LongDatePattern_Get_TestData_HybridGlobalization))] - public void LongDatePattern_Get_ReturnsExpected_HybridGlobalization(DateTimeFormatInfo format, string expected) + public void LongDatePattern_Get_ReturnsExpected_HybridGlobalization(string cultureName, string expected) { - Assert.Equal(expected, format.LongDatePattern); + var format = new CultureInfo(cultureName).DateTimeFormat; + Assert.True(expected == format.LongDatePattern, $"Failed for culture: {cultureName}. Expected: {expected}, Actual: {format.LongDatePattern}"); } [Theory] diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs index 5992624b1e10f6..ebb9d9a98194df 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs @@ -19,7 +19,7 @@ public static IEnumerable LongTimePattern_Get_TestData_HybridGlobaliza // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "h:mm:ss tt" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "H:mm:ss ч." }; + yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "H:mm:ss" }; // H:mm:ss ч. ToDo: this can be a bug as well yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "H:mm:ss" }; @@ -137,9 +137,9 @@ public static IEnumerable LongTimePattern_Get_TestData_HybridGlobaliza yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "HH:mm:ss" }; yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "HH:mm:ss" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "HH:mm:ss" }; + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "h:mm:ss tt" }; // HH:mm:ss yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "H:mm:ss" }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "HH:mm:ss" }; // H:mm:ss + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "h:mm:ss tt" }; // H:mm:ss yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "HH:mm:ss" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "H:mm:ss" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "H.mm.ss" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs index 1587c514e827be..38318a739176ac 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs @@ -35,7 +35,7 @@ public static IEnumerable MonthGenitiveNames_Get_TestData() { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември", "" } }; yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs index f7c18161dd6dee..c0fc7634e87551 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs @@ -32,7 +32,7 @@ public static IEnumerable MonthNames_Get_TestData_HybridGlobalization( { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември", "" } }; yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs index 5eeea693a400a5..046a4da4f07497 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs @@ -137,9 +137,9 @@ public static IEnumerable PMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "pm" }; yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "pm" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "pm" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "p.\u00A0m." }; // p.m. + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "p.m." }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "p.\u00A0m." }; // p.m. - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "p.\u00A0m." }; // p.m. + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "p.m." }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "بعدازظهر" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "ip." }; @@ -188,10 +188,10 @@ public static IEnumerable PMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("sw-KE").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("sw-TZ").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("sw-UG").DateTimeFormat, "PM" }; - yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "பிற்பகல்" }; - yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "பிற்பகல்" }; - yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "பிற்பகல்" }; - yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "பிற்பகல்" }; + yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "PM" }; // பிற்பகல் + yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "PM" }; // பிற்பகல் + yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "PM" }; // பிற்பகல் + yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "PM" }; // பிற்பகல் yield return new object[] { new CultureInfo("te-IN").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("th-TH").DateTimeFormat, "หลังเที่ยง" }; yield return new object[] { new CultureInfo("tr-CY").DateTimeFormat, "ÖS" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs index 089640f0ccfccd..46df4358647030 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs @@ -101,7 +101,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "en-NL", "dd/MM/yyyy" }; yield return new object[] { "en-NR", "dd/MM/yyyy" }; yield return new object[] { "en-NU", "dd/MM/yyyy" }; - yield return new object[] { "en-NZ", "d/MM/yyyy" }; + yield return new object[] { "en-NZ", "dd/MM/yyyy" }; // "d/MM/yyyy" yield return new object[] { "en-PG", "dd/MM/yyyy" }; yield return new object[] { "en-PH", "M/d/yyyy" }; // "dd/MM/yyyy" yield return new object[] { "en-PK", "dd/MM/yyyy" }; @@ -179,7 +179,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "ro-RO", "dd.MM.yyyy" }; yield return new object[] { "ru-RU", "dd.MM.yyyy" }; yield return new object[] { "sk-SK", "d. M. yyyy" }; - yield return new object[] { "sl-SI", "d. MM. yyyy" }; + yield return new object[] { "sl-SI", "d. M. yyyy" }; // "d. MM. yyyy" yield return new object[] { "sr-Cyrl-RS", "d.M.yyyy." }; yield return new object[] { "sr-Latn-RS", "d.M.yyyy." }; yield return new object[] { "sv-AX", "yyyy-MM-dd" }; @@ -197,7 +197,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "tr-CY", "d.MM.yyyy" }; yield return new object[] { "tr-TR", "d.MM.yyyy" }; yield return new object[] { "uk-UA", "dd.MM.yyyy" }; - yield return new object[] { "vi-VN", "dd/MM/yyyy" }; + yield return new object[] { "vi-VN", "d/M/yyyy" }; // "dd/MM/yyyy" yield return new object[] { "zh-CN", "yyyy/M/d" }; yield return new object[] { "zh-Hans-HK", "d/M/yyyy" }; yield return new object[] { "zh-SG", "dd/MM/yyyy" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs index 6afd8293248e89..eec63521af47d6 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs @@ -138,9 +138,9 @@ public static IEnumerable ShortTimePattern_Get_TestData_HybridGlobaliz yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "h:mm tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "HH:mm" }; yield return new object[] { new CultureInfo("en-US").DateTimeFormat, "h:mm tt" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "HH:mm" }; + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "h:mm tt" }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "H:mm" }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "HH:mm" }; // H:mm + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "h:mm tt" }; // H:mm yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "HH:mm" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "H:mm" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "H.mm" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs index 0640ea3e2547aa..0d84ce5b23ca9d 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs @@ -34,12 +34,12 @@ public static IEnumerable ShortestDayNames_Get_TestData_HybridGlobaliz yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "እ", "ሰ", "ማ", "ረ", "ሐ", "ዓ", "ቅ" } }; yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "н", "п", "в", "с", "ч", "п", "с" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "র", "সো", "ম", "বু", "বৃ", "শু", "শ" } }; - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, new string[] { "dg", "dl", "dt", "dc", "dj", "dv", "ds" } }; + yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, new string[] { "dg.", "dl.", "dt.", "dc.", "dj.", "dv.", "ds." } }; yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, new string[] { "N", "P", "Ú", "S", "Č", "P", "S" } }; yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, new string[] { "S", "M", "T", "O", "T", "F", "L" } }; yield return new object[] { new CultureInfo("de-LU").DateTimeFormat, new string[] { "S", "M", "D", "M", "D", "F", "S" } }; yield return new object[] { new CultureInfo("el-CY").DateTimeFormat, new string[] { "Κ", "Δ", "Τ", "Τ", "Π", "Π", "Σ" } }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, new string[] { "Su.", "M.", "Tu.", "W.", "Th.", "F.", "Sa." } }; + yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, new string[] { "S", "M", "T", "W", "T", "F", "S" } }; // "Su.", "M.", "Tu.", "W.", "Th.", "F.", "Sa." yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, new string[] { "S", "M", "T", "W", "T", "F", "S" } }; yield return new object[] { new CultureInfo("es-419").DateTimeFormat, new string[] { "D", "L", "M", "M", "J", "V", "S" } }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, new string[] { "D", "L", "M", "X", "J", "V", "S" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs index a80c65a7bbf64d..7fbea8bb55c193 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs @@ -17,7 +17,7 @@ public static IEnumerable YearMonthPattern_Get_TestData() // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "MMMM yyyy" }; // "MMMM yyyy g" yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "MMMM yyyy \u0433." }; // ICU: "MMMM yyyy '\u0433'." - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" + yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "MMMM del yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" From bb1c5181d77c64508aa84a5f004f4124358d4048 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Tue, 21 May 2024 09:05:55 +0200 Subject: [PATCH 3/5] Missing fix for chrome. --- .../DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs index a2c69d95081aed..f2f550e4c0637e 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs @@ -387,8 +387,8 @@ public static IEnumerable GetEraName_TestData() yield return new object[] { "tr-TR", 1, "MS" }; yield return new object[] { "uk-UA", 0, "н. е." }; yield return new object[] { "uk-UA", 1, "н. е." }; - yield return new object[] { "vi-VN", 0, "CN" }; // sau CN - yield return new object[] { "vi-VN", 1, "CN" }; // sau CN + yield return new object[] { "vi-VN", 0, "SCN" }; // sau CN + yield return new object[] { "vi-VN", 1, "SCN" }; // sau CN yield return new object[] { "zh-CN", 0, "公元" }; yield return new object[] { "zh-CN", 1, "公元" }; yield return new object[] { "zh-Hans-HK", 0, "公元" }; From b7a5aaa53a13c7db2ad065bd7107142bf45f1f0a Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Tue, 21 May 2024 09:24:09 +0200 Subject: [PATCH 4/5] Remove comment. --- .../DateTimeFormatInfoLongDatePattern.cs | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs index bdee8e9a108497..af68e92059dc24 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs @@ -188,32 +188,32 @@ public static IEnumerable LongDatePattern_Get_TestData_HybridGlobaliza yield return new object[] {"pt-BR", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy yield return new object[] {"pt-PT", "dddd, d de MMMM de yyyy" }; // dddd, d 'de' MMMM 'de' yyyy yield return new object[] {"ro-RO", "dddd, d MMMM yyyy" }; - // yield return new object[] {"ru-RU", "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." - // yield return new object[] {"sk-SK", "dddd d. MMMM yyyy" }; - // yield return new object[] {"sl-SI", "dddd, d. MMMM yyyy" }; // "dddd, dd. MMMM yyyy" - // yield return new object[] {"sr-Cyrl-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" - // yield return new object[] {"sr-Latn-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" - // yield return new object[] {"sv-AX", "dddd d MMMM yyyy" }; - // yield return new object[] {"sv-SE", "dddd d MMMM yyyy" }; - // yield return new object[] {"sw-CD", "dddd, d MMMM yyyy" }; - // yield return new object[] {"sw-KE", "dddd, d MMMM yyyy" }; - // yield return new object[] {"sw-TZ", "dddd, d MMMM yyyy" }; - // yield return new object[] {"sw-UG", "dddd, d MMMM yyyy" }; - // yield return new object[] {"ta-IN", "dddd, d MMMM, yyyy" }; - // yield return new object[] {"ta-LK", "dddd, d MMMM, yyyy" }; - // yield return new object[] {"ta-MY", "dddd, d MMMM, yyyy" }; - // yield return new object[] {"ta-SG", "dddd, d MMMM, yyyy" }; - // yield return new object[] {"te-IN", "d, MMMM yyyy, dddd" }; - // yield return new object[] {"th-TH", "ddddที่ d MMMM g yyyy" }; - // yield return new object[] {"tr-CY", "d MMMM yyyy dddd" }; - // yield return new object[] {"tr-TR", "d MMMM yyyy dddd" }; - // yield return new object[] {"uk-UA", "dddd, d MMMM yyyy р." }; // "dddd, d MMMM yyyy 'р'." - // yield return new object[] {"vi-VN", "dddd, d MMMM, yyyy" }; - // yield return new object[] {"zh-CN", "yyyy年M月d日dddd" }; - // yield return new object[] {"zh-Hans-HK", "yyyy年M月d日dddd" }; - // yield return new object[] {"zh-SG", "yyyy年M月d日dddd" }; - // yield return new object[] {"zh-HK", "yyyy年M月d日dddd" }; - // yield return new object[] {"zh-TW", "yyyy年M月d日 dddd" }; + yield return new object[] {"ru-RU", "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." + yield return new object[] {"sk-SK", "dddd d. MMMM yyyy" }; + yield return new object[] {"sl-SI", "dddd, d. MMMM yyyy" }; // "dddd, dd. MMMM yyyy" + yield return new object[] {"sr-Cyrl-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" + yield return new object[] {"sr-Latn-RS", "dddd, d. MMMM yyyy." }; // "dddd, dd. MMMM yyyy" + yield return new object[] {"sv-AX", "dddd d MMMM yyyy" }; + yield return new object[] {"sv-SE", "dddd d MMMM yyyy" }; + yield return new object[] {"sw-CD", "dddd, d MMMM yyyy" }; + yield return new object[] {"sw-KE", "dddd, d MMMM yyyy" }; + yield return new object[] {"sw-TZ", "dddd, d MMMM yyyy" }; + yield return new object[] {"sw-UG", "dddd, d MMMM yyyy" }; + yield return new object[] {"ta-IN", "dddd, d MMMM, yyyy" }; + yield return new object[] {"ta-LK", "dddd, d MMMM, yyyy" }; + yield return new object[] {"ta-MY", "dddd, d MMMM, yyyy" }; + yield return new object[] {"ta-SG", "dddd, d MMMM, yyyy" }; + yield return new object[] {"te-IN", "d, MMMM yyyy, dddd" }; + yield return new object[] {"th-TH", "ddddที่ d MMMM g yyyy" }; + yield return new object[] {"tr-CY", "d MMMM yyyy dddd" }; + yield return new object[] {"tr-TR", "d MMMM yyyy dddd" }; + yield return new object[] {"uk-UA", "dddd, d MMMM yyyy р." }; // "dddd, d MMMM yyyy 'р'." + yield return new object[] {"vi-VN", "dddd, d MMMM, yyyy" }; + yield return new object[] {"zh-CN", "yyyy年M月d日dddd" }; + yield return new object[] {"zh-Hans-HK", "yyyy年M月d日dddd" }; + yield return new object[] {"zh-SG", "yyyy年M月d日dddd" }; + yield return new object[] {"zh-HK", "yyyy年M月d日dddd" }; + yield return new object[] {"zh-TW", "yyyy年M月d日 dddd" }; } [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsHybridGlobalizationOnBrowser))] From 39d1021e5ecb30bdc2585e43bca154eb29f7398c Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Tue, 21 May 2024 10:47:07 +0200 Subject: [PATCH 5/5] Firefox still behaves like chrome before the update. --- .../DateTimeFormatInfoAMDesignator.cs | 379 +++++++++--------- ...FormatInfoAbbreviatedMonthGenitiveNames.cs | 15 +- ...DateTimeFormatInfoAbbreviatedMonthNames.cs | 22 +- .../DateTimeFormatInfoFullDateTimePattern.cs | 18 +- ...DateTimeFormatInfoGetAbbreviatedEraName.cs | 2 +- .../DateTimeFormatInfoGetEraName.cs | 4 +- .../DateTimeFormatInfoLongDatePattern.cs | 11 +- .../DateTimeFormatInfoLongTimePattern.cs | 7 +- .../DateTimeFormatInfoMonthGenitiveNames.cs | 9 +- .../DateTimeFormatInfoMonthNames.cs | 9 +- .../DateTimeFormatInfoPMDesignator.cs | 14 +- .../DateTimeFormatInfoShortDatePattern.cs | 6 +- .../DateTimeFormatInfoShortTimePattern.cs | 5 +- .../DateTimeFormatInfoShortestDayNames.cs | 13 +- .../DateTimeFormatInfoYearMonthPattern.cs | 2 +- 15 files changed, 285 insertions(+), 231 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs index 9139e0f33c63e7..3bc6ad88fb349f 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAMDesignator.cs @@ -17,199 +17,202 @@ public void AMDesignator_GetInvariantInfo_ReturnsExpected() public static IEnumerable AMDesignator_Get_TestData_HybridGlobalization() { // see the comments on the right to check the non-Hybrid result, if it differs - yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "ص" }; - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "ጥዋት" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "пр.об." }; - yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "a.\u00A0m." }; - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, "a.\u00A0m." }; - yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, "dop." }; - yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-AT").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-BE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-CH").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-DE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-IT").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-LI").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("de-LU").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("el-CY").DateTimeFormat, "π.μ." }; - yield return new object[] { new CultureInfo("el-GR").DateTimeFormat, "π.μ." }; - yield return new object[] { new CultureInfo("en-AE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-AG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-AI").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-AS").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-AT").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BB").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BE").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BI").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-BM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BS").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-BZ").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CA").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("en-CC").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CH").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CX").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-CY").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-DE").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-DK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-DM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-ER").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-FI").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-FJ").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-FK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-FM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GD").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GH").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GI").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-GU").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-GY").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-HK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-IE").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("en-IL").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-IM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-IO").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-JE").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-JM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-KE").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-KI").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-KN").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-KY").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-LC").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-LR").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-LS").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MH").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-MO").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MP").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-MS").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MT").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MU").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-MY").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NA").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NF").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NL").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NR").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NU").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-NZ").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-PG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-PH").DateTimeFormat, "AM" }; // am - yield return new object[] { new CultureInfo("en-PK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-PN").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-PR").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-PW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-RW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SB").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SC").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SD").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SE").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SH").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SI").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SL").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SS").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SX").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-SZ").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TC").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TK").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TO").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TT").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TV").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-TZ").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-UG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-UM").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-US").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-VC").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-VG").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-VI").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("en-VU").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-WS").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "a.\u00A0m." }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "قبل‌ازظهر" }; - yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "ap." }; - yield return new object[] { new CultureInfo("fil-PH").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("fr-BE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("fr-CA").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("fr-CH").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("gu-IN").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("he-IL").DateTimeFormat, "לפנה״צ" }; - yield return new object[] { new CultureInfo("hi-IN").DateTimeFormat, "am" }; - yield return new object[] { new CultureInfo("hr-BA").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("hr-HR").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("hu-HU").DateTimeFormat, "de." }; - yield return new object[] { new CultureInfo("id-ID").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("it-CH").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("it-IT").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("ja-JP").DateTimeFormat, "午前" }; - yield return new object[] { new CultureInfo("kn-IN").DateTimeFormat, "ಪೂರ್ವಾಹ್ನ" }; - yield return new object[] { new CultureInfo("ko-KR").DateTimeFormat, "오전" }; - yield return new object[] { new CultureInfo("lt-LT").DateTimeFormat, "priešpiet" }; - yield return new object[] { new CultureInfo("lv-LV").DateTimeFormat, "priekšpusdienā" }; - yield return new object[] { new CultureInfo("ml-IN").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("mr-IN").DateTimeFormat, "AM" }; // म.पू. - yield return new object[] { new CultureInfo("ms-BN").DateTimeFormat, "PG" }; - yield return new object[] { new CultureInfo("ms-MY").DateTimeFormat, "PG" }; - yield return new object[] { new CultureInfo("ms-SG").DateTimeFormat, "PG" }; - yield return new object[] { new CultureInfo("nb-NO").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("no").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("no-NO").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("nl-AW").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("nl-BE").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("nl-NL").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("pl-PL").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("pt-BR").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("pt-PT").DateTimeFormat, "da manhã" }; - yield return new object[] { new CultureInfo("ro-RO").DateTimeFormat, "a.m." }; - yield return new object[] { new CultureInfo("ru-RU").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("sk-SK").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("sl-SI").DateTimeFormat, "dop." }; - yield return new object[] { new CultureInfo("sr-Cyrl-RS").DateTimeFormat, "AM" }; // пре подне - yield return new object[] { new CultureInfo("sr-Latn-RS").DateTimeFormat, "AM" }; // pre podne - yield return new object[] { new CultureInfo("sv-AX").DateTimeFormat, "fm" }; - yield return new object[] { new CultureInfo("sv-SE").DateTimeFormat, "fm" }; - yield return new object[] { new CultureInfo("sw-CD").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("sw-KE").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("sw-TZ").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("sw-UG").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "AM" }; // முற்பகல் - yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "AM" }; // முற்பகல் - yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "AM" }; // முற்பகல் - yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "AM" }; // முற்பகல் - yield return new object[] { new CultureInfo("te-IN").DateTimeFormat, "AM" }; - yield return new object[] { new CultureInfo("th-TH").DateTimeFormat, "ก่อนเที่ยง" }; - yield return new object[] { new CultureInfo("tr-CY").DateTimeFormat, "ÖÖ" }; - yield return new object[] { new CultureInfo("tr-TR").DateTimeFormat, "ÖÖ" }; - yield return new object[] { new CultureInfo("uk-UA").DateTimeFormat, "дп" }; - yield return new object[] { new CultureInfo("vi-VN").DateTimeFormat, "SA" }; - yield return new object[] { new CultureInfo("zh-CN").DateTimeFormat, "上午" }; - yield return new object[] { new CultureInfo("zh-Hans-HK").DateTimeFormat, "上午" }; - yield return new object[] { new CultureInfo("zh-SG").DateTimeFormat, "上午" }; - yield return new object[] { new CultureInfo("zh-HK").DateTimeFormat, "上午" }; - yield return new object[] { new CultureInfo("zh-TW").DateTimeFormat, "上午" }; + yield return new object[] { "ar-SA", "ص" }; + yield return new object[] { "am-ET", "ጥዋት" }; + yield return new object[] { "bg-BG", "пр.об." }; + yield return new object[] { "bn-BD", "AM" }; + yield return new object[] { "bn-IN", "AM" }; + yield return new object[] { "ca-AD", "a.\u00A0m." }; + yield return new object[] { "ca-ES", "a.\u00A0m." }; + yield return new object[] { "cs-CZ", "dop." }; + yield return new object[] { "da-DK", "AM" }; + yield return new object[] { "de-AT", "AM" }; + yield return new object[] { "de-BE", "AM" }; + yield return new object[] { "de-CH", "AM" }; + yield return new object[] { "de-DE", "AM" }; + yield return new object[] { "de-IT", "AM" }; + yield return new object[] { "de-LI", "AM" }; + yield return new object[] { "de-LU", "AM" }; + yield return new object[] { "el-CY", "π.μ." }; + yield return new object[] { "el-GR", "π.μ." }; + yield return new object[] { "en-AE", "AM" }; + yield return new object[] { "en-AG", "am" }; + yield return new object[] { "en-AI", "am" }; + yield return new object[] { "en-AS", "AM" }; + yield return new object[] { "en-AT", "am" }; + yield return new object[] { "en-AU", "am" }; + yield return new object[] { "en-BB", "am" }; + yield return new object[] { "en-BE", "am" }; + yield return new object[] { "en-BI", "AM" }; + yield return new object[] { "en-BM", "am" }; + yield return new object[] { "en-BS", "am" }; + yield return new object[] { "en-BW", "am" }; + yield return new object[] { "en-BZ", "am" }; + yield return new object[] { "en-CA", "a.m." }; + yield return new object[] { "en-CC", "am" }; + yield return new object[] { "en-CH", "am" }; + yield return new object[] { "en-CK", "am" }; + yield return new object[] { "en-CM", "am" }; + yield return new object[] { "en-CX", "am" }; + yield return new object[] { "en-CY", "am" }; + yield return new object[] { "en-DE", "am" }; + yield return new object[] { "en-DK", "am" }; + yield return new object[] { "en-DM", "am" }; + yield return new object[] { "en-ER", "am" }; + yield return new object[] { "en-FI", "am" }; + yield return new object[] { "en-FJ", "am" }; + yield return new object[] { "en-FK", "am" }; + yield return new object[] { "en-FM", "am" }; + yield return new object[] { "en-GB", "am" }; + yield return new object[] { "en-GD", "am" }; + yield return new object[] { "en-GG", "am" }; + yield return new object[] { "en-GH", "am" }; + yield return new object[] { "en-GI", "am" }; + yield return new object[] { "en-GM", "am" }; + yield return new object[] { "en-GU", "AM" }; + yield return new object[] { "en-GY", "am" }; + yield return new object[] { "en-HK", "am" }; + yield return new object[] { "en-IE", "a.m." }; + yield return new object[] { "en-IL", "am" }; + yield return new object[] { "en-IM", "am" }; + yield return new object[] { "en-IN", "am" }; + yield return new object[] { "en-IO", "am" }; + yield return new object[] { "en-JE", "am" }; + yield return new object[] { "en-JM", "am" }; + yield return new object[] { "en-KE", "am" }; + yield return new object[] { "en-KI", "am" }; + yield return new object[] { "en-KN", "am" }; + yield return new object[] { "en-KY", "am" }; + yield return new object[] { "en-LC", "am" }; + yield return new object[] { "en-LR", "am" }; + yield return new object[] { "en-LS", "am" }; + yield return new object[] { "en-MG", "am" }; + yield return new object[] { "en-MH", "AM" }; + yield return new object[] { "en-MO", "am" }; + yield return new object[] { "en-MP", "AM" }; + yield return new object[] { "en-MS", "am" }; + yield return new object[] { "en-MT", "am" }; + yield return new object[] { "en-MU", "am" }; + yield return new object[] { "en-MW", "am" }; + yield return new object[] { "en-MY", "am" }; + yield return new object[] { "en-NA", "am" }; + yield return new object[] { "en-NF", "am" }; + yield return new object[] { "en-NG", "am" }; + yield return new object[] { "en-NL", "am" }; + yield return new object[] { "en-NR", "am" }; + yield return new object[] { "en-NU", "am" }; + yield return new object[] { "en-NZ", "am" }; + yield return new object[] { "en-PG", "am" }; + yield return new object[] { "en-PH", "AM" }; // am + yield return new object[] { "en-PK", "am" }; + yield return new object[] { "en-PN", "am" }; + yield return new object[] { "en-PR", "AM" }; + yield return new object[] { "en-PW", "am" }; + yield return new object[] { "en-RW", "am" }; + yield return new object[] { "en-SB", "am" }; + yield return new object[] { "en-SC", "am" }; + yield return new object[] { "en-SD", "am" }; + yield return new object[] { "en-SE", "am" }; + yield return new object[] { "en-SG", "am" }; + yield return new object[] { "en-SH", "am" }; + yield return new object[] { "en-SI", "am" }; + yield return new object[] { "en-SL", "am" }; + yield return new object[] { "en-SS", "am" }; + yield return new object[] { "en-SX", "am" }; + yield return new object[] { "en-SZ", "am" }; + yield return new object[] { "en-TC", "am" }; + yield return new object[] { "en-TK", "am" }; + yield return new object[] { "en-TO", "am" }; + yield return new object[] { "en-TT", "am" }; + yield return new object[] { "en-TV", "am" }; + yield return new object[] { "en-TZ", "am" }; + yield return new object[] { "en-UG", "am" }; + yield return new object[] { "en-UM", "AM" }; + yield return new object[] { "en-US", "AM" }; + yield return new object[] { "en-VC", "am" }; + yield return new object[] { "en-VG", "am" }; + yield return new object[] { "en-VI", "AM" }; + yield return new object[] { "en-VU", "am" }; + yield return new object[] { "en-WS", "am" }; + yield return new object[] { "en-ZA", "am" }; + yield return new object[] { "en-ZM", "am" }; + yield return new object[] { "en-ZW", "am" }; + string latinAmericaSpanishAMDesignator = PlatformDetection.IsFirefox ? "a.\u00A0m." : "a.m."; + yield return new object[] { "es-419", latinAmericaSpanishAMDesignator }; + yield return new object[] { "es-ES", "a.\u00A0m." }; + yield return new object[] { "es-MX", latinAmericaSpanishAMDesignator }; + yield return new object[] { "et-EE", "AM" }; + yield return new object[] { "fa-IR", "قبل‌ازظهر" }; + yield return new object[] { "fi-FI", "ap." }; + yield return new object[] { "fil-PH", "AM" }; + yield return new object[] { "fr-BE", "AM" }; + yield return new object[] { "fr-CA", "a.m." }; + yield return new object[] { "fr-CH", "AM" }; + yield return new object[] { "fr-FR", "AM" }; + yield return new object[] { "gu-IN", "AM" }; + yield return new object[] { "he-IL", "לפנה״צ" }; + yield return new object[] { "hi-IN", "am" }; + yield return new object[] { "hr-BA", "AM" }; + yield return new object[] { "hr-HR", "AM" }; + yield return new object[] { "hu-HU", "de." }; + yield return new object[] { "id-ID", "AM" }; + yield return new object[] { "it-CH", "AM" }; + yield return new object[] { "it-IT", "AM" }; + yield return new object[] { "ja-JP", "午前" }; + yield return new object[] { "kn-IN", "ಪೂರ್ವಾಹ್ನ" }; + yield return new object[] { "ko-KR", "오전" }; + yield return new object[] { "lt-LT", "priešpiet" }; + yield return new object[] { "lv-LV", "priekšpusdienā" }; + yield return new object[] { "ml-IN", "AM" }; + yield return new object[] { "mr-IN", "AM" }; // म.पू. + yield return new object[] { "ms-BN", "PG" }; + yield return new object[] { "ms-MY", "PG" }; + yield return new object[] { "ms-SG", "PG" }; + yield return new object[] { "nb-NO", "a.m." }; + yield return new object[] { "no", "a.m." }; + yield return new object[] { "no-NO", "a.m." }; + yield return new object[] { "nl-AW", "a.m." }; + yield return new object[] { "nl-BE", "a.m." }; + yield return new object[] { "nl-NL", "a.m." }; + yield return new object[] { "pl-PL", "AM" }; + yield return new object[] { "pt-BR", "AM" }; + yield return new object[] { "pt-PT", "da manhã" }; + yield return new object[] { "ro-RO", "a.m." }; + yield return new object[] { "ru-RU", "AM" }; + yield return new object[] { "sk-SK", "AM" }; + yield return new object[] { "sl-SI", "dop." }; + yield return new object[] { "sr-Cyrl-RS", "AM" }; // пре подне + yield return new object[] { "sr-Latn-RS", "AM" }; // pre podne + yield return new object[] { "sv-AX", "fm" }; + yield return new object[] { "sv-SE", "fm" }; + yield return new object[] { "sw-CD", "AM" }; + yield return new object[] { "sw-KE", "AM" }; + yield return new object[] { "sw-TZ", "AM" }; + yield return new object[] { "sw-UG", "AM" }; + string tamilAMDesignator = PlatformDetection.IsFirefox ? "முற்பகல்" : "AM"; // முற்பகல் + yield return new object[] { "ta-IN", tamilAMDesignator }; + yield return new object[] { "ta-LK", tamilAMDesignator }; + yield return new object[] { "ta-MY", tamilAMDesignator }; + yield return new object[] { "ta-SG", tamilAMDesignator }; + yield return new object[] { "te-IN", "AM" }; + yield return new object[] { "th-TH", "ก่อนเที่ยง" }; + yield return new object[] { "tr-CY", "ÖÖ" }; + yield return new object[] { "tr-TR", "ÖÖ" }; + yield return new object[] { "uk-UA", "дп" }; + yield return new object[] { "vi-VN", "SA" }; + yield return new object[] { "zh-CN", "上午" }; + yield return new object[] { "zh-Hans-HK", "上午" }; + yield return new object[] { "zh-SG", "上午" }; + yield return new object[] { "zh-HK", "上午" }; + yield return new object[] { "zh-TW", "上午" }; } [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsHybridGlobalizationOnBrowser))] [MemberData(nameof(AMDesignator_Get_TestData_HybridGlobalization))] - public void AMDesignator_Get_ReturnsExpected_HybridGlobalization(DateTimeFormatInfo format, string value) + public void AMDesignator_Get_ReturnsExpected_HybridGlobalization(string cultureName, string expected) { - Assert.Equal(value, format.AMDesignator); + var format = new CultureInfo(cultureName).DateTimeFormat; + Assert.True(expected == format.AMDesignator, $"Failed for culture: {cultureName}. Expected: {expected}, Actual: {format.AMDesignator}"); } [Theory] diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs index 84899abcf2cae5..e7a66fa2f83a0d 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs @@ -12,7 +12,16 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { "ar-SA", new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" + if (PlatformDetection.IsFirefox) + { + yield return new object[] { "am-ET", new string[] { "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + } + else + { + yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + } yield return new object[] { "bg-BG", new string[] { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "" } }; //"яну", "фев", "март", "апр", "май", "юни", "юли", "авг", "сеп", "окт", "ное", "дек", "" yield return new object[] { "bn-BD", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রি", "মে", "জুন", "জুল", "আগ", "সেপ", "অক্টো", "নভে", "ডিসে", "" } }; // "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" yield return new object[] { "bn-IN", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রি", "মে", "জুন", "জুল", "আগ", "সেপ্টেঃ", "অক্টোঃ", "নভেঃ", "ডিসেঃ", "" } }; // "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" @@ -133,7 +142,6 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H yield return new object[] { "en-ZW", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "es-419", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "es-ES", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" - yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "et-EE", new string[] { "jaan", "veebr", "märts", "apr", "mai", "juuni", "juuli", "aug", "sept", "okt", "nov", "dets", "" } }; yield return new object[] { "fa-IR", new string[] { "فروردین", "اردیبهشت", "خرداد", "تیر", "مرداد", "شهریور", "مهر", "آبان", "آذر", "دی", "بهمن", "اسفند", "" } }; yield return new object[] { "fi-FI", new string[] { "tammik.", "helmik.", "maalisk.", "huhtik.", "toukok.", "kesäk.", "heinäk.", "elok.", "syysk.", "lokak.", "marrask.", "jouluk.", "" } }; @@ -192,7 +200,8 @@ public static IEnumerable AbbreviatedMonthGenitiveNames_Get_TestData_H yield return new object[] { "tr-CY", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "tr-TR", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "uk-UA", new string[] { "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.", "лип.", "серп.", "вер.", "жовт.", "лист.", "груд.", "" } }; - yield return new object[] { "vi-VN", new string[] { "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12", "" } }; // thg + string vietnameseAbbrMonth = PlatformDetection.IsFirefox ? "Thg" : "Tháng"; // thg + yield return new object[] { "vi-VN", new string[] { $"{vietnameseAbbrMonth} 1", $"{vietnameseAbbrMonth} 2", $"{vietnameseAbbrMonth} 3", $"{vietnameseAbbrMonth} 4", $"{vietnameseAbbrMonth} 5", $"{vietnameseAbbrMonth} 6", $"{vietnameseAbbrMonth} 7", $"{vietnameseAbbrMonth} 8", $"{vietnameseAbbrMonth} 9", $"{vietnameseAbbrMonth} 10", $"{vietnameseAbbrMonth} 11", $"{vietnameseAbbrMonth} 12", "" } }; yield return new object[] { "zh-CN", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-Hans-HK", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-SG", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs index 82a0ced7829dd1..186977451db44a 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoAbbreviatedMonthNames.cs @@ -32,7 +32,22 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { "ar-SA", new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" + if (PlatformDetection.IsFirefox) + { + yield return new object[] { "am-ET", new string[] { "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; + yield return new object[] { "en-AU", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + yield return new object[] { "uk-UA", new string[] { "січ", "лют", "бер", "кві", "тра", "чер", "лип", "сер", "вер", "жов", "лис", "гру", "" } }; + yield return new object[] { "vi-VN", new string[] { "Thg 1", "Thg 2", "Thg 3", "Thg 4", "Thg 5", "Thg 6", "Thg 7", "Thg 8", "Thg 9", "Thg 10", "Thg 11", "Thg 12", "" } }; + } + else + { + yield return new object[] { "am-ET", new string[] { "ጃን", "ፌብ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" } }; // "ጃንዩ", "ፌብሩ", "ማርች", "ኤፕሪ", "ሜይ", "ጁን", "ጁላይ", "ኦገስ", "ሴፕቴ", "ኦክቶ", "ኖቬም", "ዲሴም", "" + yield return new object[] { "en-AU", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Jun", "Jul" + yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" + yield return new object[] { "uk-UA", new string[] { "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.", "лип.", "серп.", "вер.", "жовт.", "лист.", "груд.", "" } }; // "січ", "лют", "бер", "кві", "тра", "чер", "лип", "сер", "вер", "жов", "лис", "гру", "" + yield return new object[] { "vi-VN", new string[] { "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12", "" } }; + } yield return new object[] { "bg-BG", new string[] { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "" } }; // "яну", "фев", "март", "апр", "май", "юни", "юли", "авг", "сеп", "окт", "ное", "дек", "" yield return new object[] { "bn-BD", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; // "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" yield return new object[] { "bn-IN", new string[] { "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেঃ", "অক্টোঃ", "নভেঃ", "ডিসেঃ", "" } }; // BUG. JS returns Genitive even though we expect Nominative; "জানু", "ফেব", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" @@ -54,7 +69,6 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "en-AI", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-AS", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" } }; yield return new object[] { "en-AT", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" - yield return new object[] { "en-AU", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Jun", "Jul" yield return new object[] { "en-BB", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-BE", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "en-BI", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" } }; @@ -153,7 +167,6 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "en-ZW", new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec", "" } }; // "Sep" yield return new object[] { "es-419", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "es-ES", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sept", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" - yield return new object[] { "es-MX", new string[] { "ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic", "" } }; // "ene.", "feb.", "mar.", "abr.", "may.", "jun.", "jul.", "ago.", "sep.", "oct.", "nov.", "dic.", "" yield return new object[] { "et-EE", new string[] { "jaanuar", "veebruar", "märts", "aprill", "mai", "juuni", "juuli", "august", "september", "oktoober", "november", "detsember", "" } }; // "jaan", "veebr", "märts", "apr", "mai", "juuni", "juuli", "aug", "sept", "okt", "nov", "dets", "" yield return new object[] { "fa-IR", new string[] { "فروردین", "اردیبهشت", "خرداد", "تیر", "مرداد", "شهریور", "مهر", "آبان", "آذر", "دی", "بهمن", "اسفند", "" } }; yield return new object[] { "fi-FI", new string[] { "tammi", "helmi", "maalis", "huhti", "touko", "kesä", "heinä", "elo", "syys", "loka", "marras", "joulu", "" } }; @@ -211,8 +224,7 @@ public static IEnumerable AbbreviatedMonthNames_Get_TestData_HybridGlo yield return new object[] { "th-TH", new string[] { "ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค.", "" } }; yield return new object[] { "tr-CY", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; yield return new object[] { "tr-TR", new string[] { "Oca", "Şub", "Mar", "Nis", "May", "Haz", "Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara", "" } }; - yield return new object[] { "uk-UA", new string[] { "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.", "лип.", "серп.", "вер.", "жовт.", "лист.", "груд.", "" } }; // "січ", "лют", "бер", "кві", "тра", "чер", "лип", "сер", "вер", "жов", "лис", "гру", "" - yield return new object[] { "vi-VN", new string[] { "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12", "" } }; + yield return new object[] { "zh-CN", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-Hans-HK", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; yield return new object[] { "zh-SG", new string[] { "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs index f66b68d977a808..a0b998ac31b3e3 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoFullDateTimePattern.cs @@ -28,11 +28,12 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba { yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "dddd، d MMMM yyyy h:mm:ss tt" }; // dddd، d MMMM yyyy g h:mm:ss tt yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "yyyy MMMM d, dddd h:mm:ss tt" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "dddd, d MMMM yyyy г. H:mm:ss" }; // dddd, d MMMM yyyy 'г'. H:mm:ss + yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, PlatformDetection.IsFirefox ? "dddd, d MMMM yyyy г. H:mm:ss ч." : "dddd, d MMMM yyyy г. H:mm:ss" }; // dddd, d MMMM yyyy 'г'. H:mm:ss yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "dddd, d MMMM, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "dddd, d MMMM, yyyy h:mm:ss tt" }; - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "dddd, d de MMMM del yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, "dddd, d de MMMM del yyyy H:mm:ss" }; // dddd, d MMMM 'de' yyyy H:mm:ss + string catalanPattern = PlatformDetection.IsFirefox ? "dddd, d de MMMM de yyyy H:mm:ss" : "dddd, d de MMMM del yyyy H:mm:ss"; + yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, catalanPattern }; // dddd, d MMMM 'de' yyyy H:mm:ss + yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, catalanPattern }; // dddd, d MMMM 'de' yyyy H:mm:ss yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, "dddd d. MMMM yyyy H:mm:ss" }; yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, "dddd den d. MMMM yyyy HH.mm.ss" }; // dddd 'den' d. MMMM yyyy HH.mm.ss yield return new object[] { new CultureInfo("de-AT").DateTimeFormat, "dddd, d. MMMM yyyy HH:mm:ss" }; @@ -49,7 +50,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-AI").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-AS").DateTimeFormat, "dddd, MMMM d, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-AT").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, "dddd d MMMM yyyy h:mm:ss tt" }; + yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, PlatformDetection.IsFirefox ? "dddd, d MMMM yyyy h:mm:ss tt" : "dddd d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-BB").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-BE").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-BI").DateTimeFormat, "dddd, MMMM d, yyyy HH:mm:ss" }; @@ -72,7 +73,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-FJ").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-FK").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-FM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; - yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, "dddd d MMMM yyyy HH:mm:ss" }; + yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, PlatformDetection.IsFirefox ? "dddd, d MMMM yyyy HH:mm:ss" : "dddd d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-GD").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-GG").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-GH").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; @@ -84,7 +85,7 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-IE").DateTimeFormat, "dddd d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-IL").DateTimeFormat, "dddd, d MMMM yyyy H:mm:ss" }; yield return new object[] { new CultureInfo("en-IM").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; - yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, "dddd d MMMM, yyyy h:mm:ss tt" }; + yield return new object[] { new CultureInfo("en-IN").DateTimeFormat, PlatformDetection.IsFirefox ? "dddd, d MMMM, yyyy h:mm:ss tt" : "dddd d MMMM, yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-IO").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-JE").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("en-JM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; @@ -146,9 +147,10 @@ public static IEnumerable FullDateTimePattern_Get_TestData_HybridGloba yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; // dddd, dd MMMM yyyy HH:mm:ss yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "dddd, d MMMM yyyy h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "dddd, d MMMM yyyy HH:mm:ss" }; // dddd, dd MMMM yyyy HH:mm:ss - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "dddd, d de MMMM de yyyy h:mm:ss tt" }; // dddd, d 'de' MMMM 'de' yyyy HH:mm:ss + string latinAmericaSpanishFormat = PlatformDetection.IsFirefox ? "dddd, d de MMMM de yyyy HH:mm:ss" : "dddd, d de MMMM de yyyy h:mm:ss tt"; // dddd, d 'de' MMMM 'de' yyyy HH:mm:ss + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, latinAmericaSpanishFormat }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "dddd, d de MMMM de yyyy H:mm:ss" }; // dddd, d 'de' MMMM 'de' yyyy H:mm:ss - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "dddd, d de MMMM de yyyy h:mm:ss tt" }; // dddd, d 'de' MMMM 'de' yyyy H:mm:ss + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, latinAmericaSpanishFormat }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "dddd, d. MMMM yyyy HH:mm:ss" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "yyyy MMMM d, dddd H:mm:ss" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "dddd d. MMMM yyyy H.mm.ss" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs index 3643729a4a5b98..9b41129d472d37 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedEraName.cs @@ -199,7 +199,7 @@ public static IEnumerable GetAbbreviatedEraName_TestData() yield return new object[] { "tr-CY", 1, "MS" }; yield return new object[] { "tr-TR", 1, "MS" }; yield return new object[] { "uk-UA", 1, "н.е." }; - yield return new object[] { "vi-VN", 1, "CN" }; // sau CN + yield return new object[] { "vi-VN", 1, PlatformDetection.IsFirefox ? "sau CN" : "CN" }; // sau CN yield return new object[] { "zh-CN", 1, "公元" }; yield return new object[] { "zh-Hans-HK", 1, "公元" }; yield return new object[] { "zh-SG", 1, "公元" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs index f2f550e4c0637e..9b97330ef0f4d8 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoGetEraName.cs @@ -387,8 +387,8 @@ public static IEnumerable GetEraName_TestData() yield return new object[] { "tr-TR", 1, "MS" }; yield return new object[] { "uk-UA", 0, "н. е." }; yield return new object[] { "uk-UA", 1, "н. е." }; - yield return new object[] { "vi-VN", 0, "SCN" }; // sau CN - yield return new object[] { "vi-VN", 1, "SCN" }; // sau CN + yield return new object[] { "vi-VN", 0, PlatformDetection.IsFirefox ? "CN" : "SCN" }; // sau CN + yield return new object[] { "vi-VN", 1, PlatformDetection.IsFirefox ? "CN" : "SCN" }; // sau CN yield return new object[] { "zh-CN", 0, "公元" }; yield return new object[] { "zh-CN", 1, "公元" }; yield return new object[] { "zh-Hans-HK", 0, "公元" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs index af68e92059dc24..1e2a7ca09b71b3 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongDatePattern.cs @@ -33,8 +33,9 @@ public static IEnumerable LongDatePattern_Get_TestData_HybridGlobaliza yield return new object[] {"bg-BG", "dddd, d MMMM yyyy г." }; // "dddd, d MMMM yyyy 'г'." yield return new object[] {"bn-BD", "dddd, d MMMM, yyyy" }; yield return new object[] {"bn-IN", "dddd, d MMMM, yyyy" }; - yield return new object[] {"ca-AD", "dddd, d de MMMM del yyyy" }; // "dddd, d MMMM 'de' yyyy" - yield return new object[] {"ca-ES", "dddd, d de MMMM del yyyy" }; // "dddd, d MMMM 'de' yyyy" + string catalanianPattern = PlatformDetection.IsFirefox ? "dddd, d de MMMM de yyyy" : "dddd, d de MMMM del yyyy"; // "dddd, d MMMM 'de' yyyy" + yield return new object[] {"ca-AD", catalanianPattern }; + yield return new object[] {"ca-ES", catalanianPattern }; yield return new object[] {"cs-CZ", "dddd d. MMMM yyyy" }; yield return new object[] {"da-DK", "dddd den d. MMMM yyyy" }; // dddd 'den' d. MMMM yyyy yield return new object[] {"de-AT", "dddd, d. MMMM yyyy" }; @@ -51,7 +52,7 @@ public static IEnumerable LongDatePattern_Get_TestData_HybridGlobaliza yield return new object[] {"en-AI", "dddd, d MMMM yyyy" }; yield return new object[] {"en-AS", "dddd, MMMM d, yyyy" }; yield return new object[] {"en-AT", "dddd, d MMMM yyyy" }; - yield return new object[] {"en-AU", "dddd d MMMM yyyy" }; + yield return new object[] {"en-AU", PlatformDetection.IsFirefox ? "dddd, d MMMM yyyy" : "dddd d MMMM yyyy" }; yield return new object[] {"en-BB", "dddd, d MMMM yyyy" }; yield return new object[] {"en-BE", "dddd, d MMMM yyyy" }; yield return new object[] {"en-BI", "dddd, MMMM d, yyyy" }; @@ -74,7 +75,7 @@ public static IEnumerable LongDatePattern_Get_TestData_HybridGlobaliza yield return new object[] {"en-FJ", "dddd, d MMMM yyyy" }; yield return new object[] {"en-FK", "dddd, d MMMM yyyy" }; yield return new object[] {"en-FM", "dddd, d MMMM yyyy" }; - yield return new object[] {"en-GB", "dddd d MMMM yyyy" }; + yield return new object[] {"en-GB", PlatformDetection.IsFirefox ? "dddd, d MMMM yyyy" :"dddd d MMMM yyyy" }; yield return new object[] {"en-GD", "dddd, d MMMM yyyy" }; yield return new object[] {"en-GG", "dddd, d MMMM yyyy" }; yield return new object[] {"en-GH", "dddd, d MMMM yyyy" }; @@ -86,7 +87,7 @@ public static IEnumerable LongDatePattern_Get_TestData_HybridGlobaliza yield return new object[] {"en-IE", "dddd d MMMM yyyy" }; yield return new object[] {"en-IL", "dddd, d MMMM yyyy" }; yield return new object[] {"en-IM", "dddd, d MMMM yyyy" }; - yield return new object[] {"en-IN", "dddd d MMMM, yyyy" }; // dddd, d MMMM, yyyy + yield return new object[] {"en-IN", PlatformDetection.IsFirefox ? "dddd, d MMMM, yyyy" : "dddd d MMMM, yyyy" }; // dddd, d MMMM, yyyy yield return new object[] {"en-IO", "dddd, d MMMM yyyy" }; yield return new object[] {"en-JE", "dddd, d MMMM yyyy" }; yield return new object[] {"en-JM", "dddd, d MMMM yyyy" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs index ebb9d9a98194df..122eff9b4a77ee 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoLongTimePattern.cs @@ -19,7 +19,7 @@ public static IEnumerable LongTimePattern_Get_TestData_HybridGlobaliza // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, "h:mm:ss tt" }; - yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "H:mm:ss" }; // H:mm:ss ч. ToDo: this can be a bug as well + yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, PlatformDetection.IsFirefox ? "H:mm:ss ч." : "H:mm:ss" }; // H:mm:ss ч. yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "H:mm:ss" }; @@ -137,9 +137,10 @@ public static IEnumerable LongTimePattern_Get_TestData_HybridGlobaliza yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "HH:mm:ss" }; yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "h:mm:ss tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "HH:mm:ss" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "h:mm:ss tt" }; // HH:mm:ss + string latinAmericaSpanishPattern = PlatformDetection.IsFirefox ? "HH:mm:ss" : "h:mm:ss tt"; // H:mm:ss + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, latinAmericaSpanishPattern }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "H:mm:ss" }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "h:mm:ss tt" }; // H:mm:ss + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, latinAmericaSpanishPattern }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "HH:mm:ss" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "H:mm:ss" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "H.mm.ss" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs index 38318a739176ac..1c6784cfdfe41f 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthGenitiveNames.cs @@ -35,7 +35,14 @@ public static IEnumerable MonthGenitiveNames_Get_TestData() { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" + if (PlatformDetection.IsFirefox) + { + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; + } + else + { + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" + } yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември", "" } }; yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs index c0fc7634e87551..d6644f92303b79 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoMonthNames.cs @@ -32,7 +32,14 @@ public static IEnumerable MonthNames_Get_TestData_HybridGlobalization( { // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, new string[] { "محرم", "صفر", "ربيع الأول", "ربيع الآخر", "جمادى الأولى", "جمادى الآخرة", "رجب", "شعبان", "رمضان", "شوال", "ذو القعدة", "ذو الحجة", "" } }; - yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" + if (PlatformDetection.IsFirefox) + { + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; + } + else + { + yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "ጃንዋሪ", "ፌብሩዋሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" } }; // "ጃንዩወሪ", "ፌብሩወሪ", "ማርች", "ኤፕሪል", "ሜይ", "ጁን", "ጁላይ", "ኦገስት", "ሴፕቴምበር", "ኦክቶበር", "ኖቬምበር", "ዲሴምበር", "" + } yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември", "" } }; yield return new object[] { new CultureInfo("bn-BD").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "জানুয়ারী", "ফেব্রুয়ারী", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর", "" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs index 046a4da4f07497..937dae6b7b248b 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoPMDesignator.cs @@ -137,9 +137,10 @@ public static IEnumerable PMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("en-ZA").DateTimeFormat, "pm" }; yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "pm" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "pm" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "p.m." }; + string latinAmericaSpanishDesignator = PlatformDetection.IsFirefox ? "p.\u00A0m." : "p.m."; // p.m. + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, latinAmericaSpanishDesignator }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "p.\u00A0m." }; // p.m. - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "p.m." }; + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, latinAmericaSpanishDesignator }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "بعدازظهر" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "ip." }; @@ -188,10 +189,11 @@ public static IEnumerable PMDesignator_Get_TestData_HybridGlobalizatio yield return new object[] { new CultureInfo("sw-KE").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("sw-TZ").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("sw-UG").DateTimeFormat, "PM" }; - yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, "PM" }; // பிற்பகல் - yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, "PM" }; // பிற்பகல் - yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, "PM" }; // பிற்பகல் - yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, "PM" }; // பிற்பகல் + string tamilDesignator = PlatformDetection.IsFirefox ? "பிற்பகல்" : "PM"; // பிற்பகல் + yield return new object[] { new CultureInfo("ta-IN").DateTimeFormat, tamilDesignator }; + yield return new object[] { new CultureInfo("ta-LK").DateTimeFormat, tamilDesignator }; + yield return new object[] { new CultureInfo("ta-MY").DateTimeFormat, tamilDesignator }; + yield return new object[] { new CultureInfo("ta-SG").DateTimeFormat, tamilDesignator }; yield return new object[] { new CultureInfo("te-IN").DateTimeFormat, "PM" }; yield return new object[] { new CultureInfo("th-TH").DateTimeFormat, "หลังเที่ยง" }; yield return new object[] { new CultureInfo("tr-CY").DateTimeFormat, "ÖS" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs index 46df4358647030..c4e3dbcbdc3bc5 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortDatePattern.cs @@ -101,7 +101,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "en-NL", "dd/MM/yyyy" }; yield return new object[] { "en-NR", "dd/MM/yyyy" }; yield return new object[] { "en-NU", "dd/MM/yyyy" }; - yield return new object[] { "en-NZ", "dd/MM/yyyy" }; // "d/MM/yyyy" + yield return new object[] { "en-NZ", PlatformDetection.IsFirefox ? "d/MM/yyyy" : "dd/MM/yyyy" }; // "d/MM/yyyy" yield return new object[] { "en-PG", "dd/MM/yyyy" }; yield return new object[] { "en-PH", "M/d/yyyy" }; // "dd/MM/yyyy" yield return new object[] { "en-PK", "dd/MM/yyyy" }; @@ -179,7 +179,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "ro-RO", "dd.MM.yyyy" }; yield return new object[] { "ru-RU", "dd.MM.yyyy" }; yield return new object[] { "sk-SK", "d. M. yyyy" }; - yield return new object[] { "sl-SI", "d. M. yyyy" }; // "d. MM. yyyy" + yield return new object[] { "sl-SI", PlatformDetection.IsFirefox ? "d. MM. yyyy" : "d. M. yyyy" }; // "d. MM. yyyy" yield return new object[] { "sr-Cyrl-RS", "d.M.yyyy." }; yield return new object[] { "sr-Latn-RS", "d.M.yyyy." }; yield return new object[] { "sv-AX", "yyyy-MM-dd" }; @@ -197,7 +197,7 @@ public static IEnumerable ShortDatePattern_Get_TestData_HybridGlobaliz yield return new object[] { "tr-CY", "d.MM.yyyy" }; yield return new object[] { "tr-TR", "d.MM.yyyy" }; yield return new object[] { "uk-UA", "dd.MM.yyyy" }; - yield return new object[] { "vi-VN", "d/M/yyyy" }; // "dd/MM/yyyy" + yield return new object[] { "vi-VN", PlatformDetection.IsFirefox ? "dd/MM/yyyy" : "d/M/yyyy" }; // "dd/MM/yyyy" yield return new object[] { "zh-CN", "yyyy/M/d" }; yield return new object[] { "zh-Hans-HK", "d/M/yyyy" }; yield return new object[] { "zh-SG", "dd/MM/yyyy" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs index eec63521af47d6..e9a891fb7ade71 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortTimePattern.cs @@ -138,9 +138,10 @@ public static IEnumerable ShortTimePattern_Get_TestData_HybridGlobaliz yield return new object[] { new CultureInfo("en-ZM").DateTimeFormat, "h:mm tt" }; yield return new object[] { new CultureInfo("en-ZW").DateTimeFormat, "HH:mm" }; yield return new object[] { new CultureInfo("en-US").DateTimeFormat, "h:mm tt" }; - yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "h:mm tt" }; + string latinAmericanSpanishPattern = PlatformDetection.IsFirefox ? "HH:mm" : "h:mm tt"; // "HH:mm" + yield return new object[] { new CultureInfo("es-419").DateTimeFormat, latinAmericanSpanishPattern }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "H:mm" }; - yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "h:mm tt" }; // H:mm + yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, latinAmericanSpanishPattern }; yield return new object[] { new CultureInfo("et-EE").DateTimeFormat, "HH:mm" }; yield return new object[] { new CultureInfo("fa-IR").DateTimeFormat, "H:mm" }; yield return new object[] { new CultureInfo("fi-FI").DateTimeFormat, "H.mm" }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs index 0d84ce5b23ca9d..357762222de8c4 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoShortestDayNames.cs @@ -34,12 +34,21 @@ public static IEnumerable ShortestDayNames_Get_TestData_HybridGlobaliz yield return new object[] { new CultureInfo("am-ET").DateTimeFormat, new string[] { "እ", "ሰ", "ማ", "ረ", "ሐ", "ዓ", "ቅ" } }; yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, new string[] { "н", "п", "в", "с", "ч", "п", "с" } }; yield return new object[] { new CultureInfo("bn-IN").DateTimeFormat, new string[] { "র", "সো", "ম", "বু", "বৃ", "শু", "শ" } }; - yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, new string[] { "dg.", "dl.", "dt.", "dc.", "dj.", "dv.", "ds." } }; + if (PlatformDetection.IsFirefox) + { + yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, new string[] { "dg", "dl", "dt", "dc", "dj", "dv", "ds" } }; + yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, new string[] { "Su.", "M.", "Tu.", "W.", "Th.", "F.", "Sa." } }; + } + else + { + yield return new object[] { new CultureInfo("ca-ES").DateTimeFormat, new string[] { "dg.", "dl.", "dt.", "dc.", "dj.", "dv.", "ds." } }; + yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, new string[] { "S", "M", "T", "W", "T", "F", "S" } }; // "Su.", "M.", "Tu.", "W.", "Th.", "F.", "Sa." + } + yield return new object[] { new CultureInfo("cs-CZ").DateTimeFormat, new string[] { "N", "P", "Ú", "S", "Č", "P", "S" } }; yield return new object[] { new CultureInfo("da-DK").DateTimeFormat, new string[] { "S", "M", "T", "O", "T", "F", "L" } }; yield return new object[] { new CultureInfo("de-LU").DateTimeFormat, new string[] { "S", "M", "D", "M", "D", "F", "S" } }; yield return new object[] { new CultureInfo("el-CY").DateTimeFormat, new string[] { "Κ", "Δ", "Τ", "Τ", "Π", "Π", "Σ" } }; - yield return new object[] { new CultureInfo("en-AU").DateTimeFormat, new string[] { "S", "M", "T", "W", "T", "F", "S" } }; // "Su.", "M.", "Tu.", "W.", "Th.", "F.", "Sa." yield return new object[] { new CultureInfo("en-GB").DateTimeFormat, new string[] { "S", "M", "T", "W", "T", "F", "S" } }; yield return new object[] { new CultureInfo("es-419").DateTimeFormat, new string[] { "D", "L", "M", "M", "J", "V", "S" } }; yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, new string[] { "D", "L", "M", "X", "J", "V", "S" } }; diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs index 7fbea8bb55c193..f445f291754d03 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/DateTimeFormatInfo/DateTimeFormatInfoYearMonthPattern.cs @@ -17,7 +17,7 @@ public static IEnumerable YearMonthPattern_Get_TestData() // see the comments on the right to check the non-Hybrid result, if it differs yield return new object[] { new CultureInfo("ar-SA").DateTimeFormat, "MMMM yyyy" }; // "MMMM yyyy g" yield return new object[] { new CultureInfo("bg-BG").DateTimeFormat, "MMMM yyyy \u0433." }; // ICU: "MMMM yyyy '\u0433'." - yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, "MMMM del yyyy" }; // ICU: "MMMM 'de' yyyy" + yield return new object[] { new CultureInfo("ca-AD").DateTimeFormat, PlatformDetection.IsFirefox ? "MMMM de yyyy" : "MMMM del yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-419").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-ES").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy" yield return new object[] { new CultureInfo("es-MX").DateTimeFormat, "MMMM de yyyy" }; // ICU: "MMMM 'de' yyyy"