[Pkg-javascript-commits] [dojo] 02/10: fix issue in date formating with CLDR 25. Add test. Fixes #18408.

David Prévot taffit at moszumanska.debian.org
Thu Jan 22 21:00:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository dojo.

commit 5cbf05bb3c6bb68368ce8609a17d589d7bd85f6d
Author: Christophe Jolif <cjolif at gmail.com>
Date:   Mon Dec 8 13:22:07 2014 +0100

    fix issue in date formating with CLDR 25. Add test. Fixes #18408.
---
 cldr/nls/ca/gregorian.js      | 22 +++++++++-------------
 cldr/nls/da/gregorian.js      |  4 +---
 cldr/nls/de/gregorian.js      | 30 ++++++++++++------------------
 cldr/nls/el/gregorian.js      | 12 +++---------
 cldr/nls/en/gregorian.js      | 12 +++---------
 cldr/nls/es/gregorian.js      | 12 +++---------
 cldr/nls/fi/gregorian.js      | 26 ++++++++++----------------
 cldr/nls/fr/gregorian.js      | 26 ++++++++++----------------
 cldr/nls/hu/gregorian.js      | 26 ++++++++++----------------
 cldr/nls/ja/gregorian.js      |  1 -
 cldr/nls/nb/gregorian.js      |  8 ++------
 cldr/nls/nl/gregorian.js      |  4 +---
 cldr/nls/pt-pt/gregorian.js   | 12 +++---------
 cldr/nls/ru/gregorian.js      | 21 +++++++++------------
 cldr/nls/sv/gregorian.js      |  4 +---
 cldr/nls/th/gregorian.js      |  4 +---
 cldr/nls/tr/gregorian.js      | 12 +++---------
 cldr/nls/zh-hant/gregorian.js |  4 +---
 cldr/nls/zh-hk/gregorian.js   | 12 +++---------
 cldr/nls/zh-tw/gregorian.js   | 12 +++---------
 tests/date/locale.js          |  2 ++
 21 files changed, 90 insertions(+), 176 deletions(-)

diff --git a/cldr/nls/ca/gregorian.js b/cldr/nls/ca/gregorian.js
index 15fee40..4724bfc 100644
--- a/cldr/nls/ca/gregorian.js
+++ b/cldr/nls/ca/gregorian.js
@@ -36,14 +36,12 @@ define(
 	"dateFormatItem-yQQQ": "QQQ y",
 	"dateFormatItem-yMEd": "E, d/M/y",
 	"field-wed-relative+0": "aquest dimecres",
-	"field-wed-relative+1": "dimecres que ve",
 	"dateFormatItem-GyMMMEd": "E, d MMM, y G",
 	"dateFormatItem-MMMEd": "E d MMM",
+	"field-wed-relative+1": "dimecres que ve",
 	"eraNarrow": [
 		"aC",
-		"dC",
-		"dC",
-		"de la n.e."
+		"dC"
 	],
 	"field-tue-relative+-1": "dimarts passat",
 	"days-format-short": [
@@ -79,8 +77,8 @@ define(
 	"dateFormatItem-Md": "d/M",
 	"dateFormatItem-GyMMMM": "LLLL 'de' y G",
 	"dateFormatItem-yMd": "d/M/y",
-	"field-era": "era",
 	"dateFormatItem-yM": "M/y",
+	"field-era": "era",
 	"months-standAlone-wide": [
 		"gener",
 		"febrer",
@@ -102,10 +100,10 @@ define(
 		"3r trimestre",
 		"4t trimestre"
 	],
-	"dateFormatItem-yQQQQ": "QQQQ y",
 	"timeFormat-long": "H:mm:ss z",
-	"field-year": "any",
 	"dateFormatItem-yMMM": "LLL y",
+	"dateFormatItem-yQQQQ": "QQQQ y",
+	"field-year": "any",
 	"field-hour": "hora",
 	"months-format-abbr": [
 		"gen.",
@@ -125,11 +123,11 @@ define(
 	"field-sat-relative+1": "dissabte que ve",
 	"timeFormat-full": "H:mm:ss zzzz",
 	"field-day-relative+0": "avui",
-	"field-thu-relative+0": "aquest dijous",
 	"field-day-relative+1": "demà",
-	"field-thu-relative+1": "dijous que ve",
+	"field-thu-relative+0": "aquest dijous",
 	"dateFormatItem-GyMMMd": "d MMM y G",
 	"field-day-relative+2": "demà passat",
+	"field-thu-relative+1": "dijous que ve",
 	"dateFormatItem-H": "H",
 	"months-standAlone-abbr": [
 		"gen.",
@@ -172,18 +170,16 @@ define(
 	"timeFormat-medium": "H:mm:ss",
 	"field-sun-relative+0": "aquest diumenge",
 	"dateFormatItem-Hm": "HH:mm",
-	"field-sun-relative+1": "diumenge que ve",
 	"quarters-standAlone-abbr": [
 		"1T",
 		"2T",
 		"3T",
 		"4T"
 	],
+	"field-sun-relative+1": "diumenge que ve",
 	"eraAbbr": [
 		"aC",
-		"a. de la n. e.",
-		"dC",
-		"de la n.e."
+		"dC"
 	],
 	"field-minute": "minut",
 	"field-dayperiod": "a. m./p. m.",
diff --git a/cldr/nls/da/gregorian.js b/cldr/nls/da/gregorian.js
index ba7017a..31e1be9 100644
--- a/cldr/nls/da/gregorian.js
+++ b/cldr/nls/da/gregorian.js
@@ -183,9 +183,7 @@ define(
 	"field-sun-relative+1": "næste søndag",
 	"eraAbbr": [
 		"f.Kr.",
-		"f.v.t.",
-		"e.Kr.",
-		"v.t."
+		"e.Kr."
 	],
 	"field-minute": "Minut",
 	"field-dayperiod": "AM/PM",
diff --git a/cldr/nls/de/gregorian.js b/cldr/nls/de/gregorian.js
index 7567035..4ac9c47 100644
--- a/cldr/nls/de/gregorian.js
+++ b/cldr/nls/de/gregorian.js
@@ -36,18 +36,16 @@ define(
 	"dateFormatItem-yQQQ": "QQQ y",
 	"dateFormatItem-yMEd": "E, d.M.y",
 	"field-wed-relative+0": "Diesen Mittwoch",
-	"field-wed-relative+1": "Nächsten Mittwoch",
 	"dateFormatItem-GyMMMEd": "E, d. MMM y G",
 	"dateFormatItem-MMMEd": "E, d. MMM",
+	"field-wed-relative+1": "Nächsten Mittwoch",
 	"eraNarrow": [
 		"v. Chr.",
-		"n. Chr.",
-		"n. Chr.",
-		"u. Z."
+		"n. Chr."
 	],
 	"dateFormatItem-yMM": "MM.y",
-	"field-tue-relative+-1": "Letzten Dienstag",
 	"dayPeriods-format-wide-earlyMorning": "morgens",
+	"field-tue-relative+-1": "Letzten Dienstag",
 	"dayPeriods-format-wide-morning": "vormittags",
 	"days-format-short": [
 		"So.",
@@ -83,8 +81,8 @@ define(
 	"dateFormatItem-Md": "d.M.",
 	"dayPeriods-format-wide-noon": "Mittag",
 	"dateFormatItem-yMd": "d.M.y",
-	"field-era": "Epoche",
 	"dateFormatItem-yM": "M.y",
+	"field-era": "Epoche",
 	"months-standAlone-wide": [
 		"Januar",
 		"Februar",
@@ -106,12 +104,12 @@ define(
 		"3. Quartal",
 		"4. Quartal"
 	],
-	"dateFormatItem-yQQQQ": "QQQQ y",
 	"timeFormat-long": "HH:mm:ss z",
-	"field-year": "Jahr",
 	"dateFormatItem-yMMM": "MMM y",
-	"field-hour": "Stunde",
+	"dateFormatItem-yQQQQ": "QQQQ y",
+	"field-year": "Jahr",
 	"dateFormatItem-MMdd": "dd.MM.",
+	"field-hour": "Stunde",
 	"months-format-abbr": [
 		"Jan.",
 		"Feb.",
@@ -130,11 +128,11 @@ define(
 	"field-sat-relative+1": "Nächsten Samstag",
 	"timeFormat-full": "HH:mm:ss zzzz",
 	"field-day-relative+0": "Heute",
-	"field-thu-relative+0": "Diesen Donnerstag",
 	"field-day-relative+1": "Morgen",
-	"field-thu-relative+1": "Nächsten Donnerstag",
+	"field-thu-relative+0": "Diesen Donnerstag",
 	"dateFormatItem-GyMMMd": "d. MMM y G",
 	"field-day-relative+2": "Übermorgen",
+	"field-thu-relative+1": "Nächsten Donnerstag",
 	"dateFormatItem-H": "HH 'Uhr'",
 	"months-standAlone-abbr": [
 		"Jan",
@@ -177,18 +175,16 @@ define(
 	"dateFormatItem-yMMdd": "dd.MM.y",
 	"field-sun-relative+0": "Diesen Sonntag",
 	"dateFormatItem-Hm": "HH:mm",
-	"field-sun-relative+1": "Nächsten Sonntag",
 	"quarters-standAlone-abbr": [
 		"Q1",
 		"Q2",
 		"Q3",
 		"Q4"
 	],
+	"field-sun-relative+1": "Nächsten Sonntag",
 	"eraAbbr": [
 		"v. Chr.",
-		"v. u. Z.",
-		"n. Chr.",
-		"u. Z."
+		"n. Chr."
 	],
 	"field-minute": "Minute",
 	"field-dayperiod": "Tageshälfte",
@@ -260,9 +256,7 @@ define(
 	],
 	"eraNames": [
 		"v. Chr.",
-		"n. Chr.",
-		"n. Chr.",
-		"u. Z."
+		"n. Chr."
 	],
 	"dateFormatItem-yMMMd": "d. MMM y",
 	"days-format-narrow": [
diff --git a/cldr/nls/el/gregorian.js b/cldr/nls/el/gregorian.js
index e313135..cb9653d 100644
--- a/cldr/nls/el/gregorian.js
+++ b/cldr/nls/el/gregorian.js
@@ -41,9 +41,7 @@ define(
 	"dateFormatItem-MMMEd": "E, d MMM",
 	"eraNarrow": [
 		"π.Χ.",
-		"π.Κ.Χ.",
-		"μ.Χ.",
-		"ΚΧ"
+		"μ.Χ."
 	],
 	"field-tue-relative+-1": "προηγούμενη Τρίτη",
 	"days-format-short": [
@@ -181,9 +179,7 @@ define(
 	],
 	"eraAbbr": [
 		"π.Χ.",
-		"π.Κ.Χ.",
-		"μ.Χ.",
-		"ΚΧ"
+		"μ.Χ."
 	],
 	"field-minute": "Λεπτό",
 	"field-dayperiod": "π.μ./μ.μ.",
@@ -255,9 +251,7 @@ define(
 	"dateFormatItem-yMMMd": "d MMM y",
 	"eraNames": [
 		"π.Χ.",
-		"π.Κ.Χ.",
-		"μ.Χ.",
-		"ΚΧ"
+		"μ.Χ."
 	],
 	"days-format-narrow": [
 		"Κ",
diff --git a/cldr/nls/en/gregorian.js b/cldr/nls/en/gregorian.js
index 9b921e7..038e940 100644
--- a/cldr/nls/en/gregorian.js
+++ b/cldr/nls/en/gregorian.js
@@ -41,9 +41,7 @@ define(
 	"dateFormatItem-MMMEd": "E, MMM d",
 	"eraNarrow": [
 		"B",
-		"A",
-		"AD",
-		"CE"
+		"A"
 	],
 	"field-tue-relative+-1": "last Tuesday",
 	"days-format-short": [
@@ -177,9 +175,7 @@ define(
 	"field-sun-relative+1": "next Sunday",
 	"eraAbbr": [
 		"BC",
-		"BCE",
-		"AD",
-		"CE"
+		"AD"
 	],
 	"field-minute": "Minute",
 	"field-dayperiod": "AM/PM",
@@ -238,9 +234,7 @@ define(
 	"dateFormatItem-yMMMd": "MMM d, y",
 	"eraNames": [
 		"Before Christ",
-		"Before Common Era",
-		"Anno Domini",
-		"Common Era"
+		"Anno Domini"
 	],
 	"days-standAlone-narrow": [
 		"S",
diff --git a/cldr/nls/es/gregorian.js b/cldr/nls/es/gregorian.js
index dfee933..7fecdd6 100644
--- a/cldr/nls/es/gregorian.js
+++ b/cldr/nls/es/gregorian.js
@@ -41,9 +41,7 @@ define(
 	"dateFormatItem-MMMEd": "E d 'de' MMM",
 	"eraNarrow": [
 		"a. C.",
-		"a. e. c.",
-		"d. C.",
-		"e. c."
+		"d. C."
 	],
 	"dateFormatItem-yMM": "M/y",
 	"field-tue-relative+-1": "el martes pasado",
@@ -183,9 +181,7 @@ define(
 	],
 	"eraAbbr": [
 		"a. C.",
-		"a. e. c.",
-		"d. C.",
-		"e. c."
+		"d. C."
 	],
 	"field-minute": "minuto",
 	"field-dayperiod": "periodo del día",
@@ -257,9 +253,7 @@ define(
 	],
 	"eraNames": [
 		"antes de Cristo",
-		"anno Dómini",
-		"d. C.",
-		"e. c."
+		"anno Dómini"
 	],
 	"dateFormatItem-yMMMd": "d 'de' MMM 'de' y",
 	"days-format-narrow": [
diff --git a/cldr/nls/fi/gregorian.js b/cldr/nls/fi/gregorian.js
index e548b17..203d606 100644
--- a/cldr/nls/fi/gregorian.js
+++ b/cldr/nls/fi/gregorian.js
@@ -36,14 +36,12 @@ define(
 	"dateFormatItem-yQQQ": "QQQ y",
 	"dateFormatItem-yMEd": "E d.M.y",
 	"field-wed-relative+0": "tänä keskiviikkona",
-	"field-wed-relative+1": "ensi keskiviikkona",
 	"dateFormatItem-GyMMMEd": "E d. MMM y G",
 	"dateFormatItem-MMMEd": "ccc d. MMM",
+	"field-wed-relative+1": "ensi keskiviikkona",
 	"eraNarrow": [
 		"eK",
-		"jK",
-		"jKr.",
-		"jaa."
+		"jK"
 	],
 	"dateFormatItem-yMM": "M.y",
 	"field-tue-relative+-1": "viime tiistaina",
@@ -81,8 +79,8 @@ define(
 	"dayPeriods-standAlone-wide-pm": "ip.",
 	"dayPeriods-format-abbr-am": "ap.",
 	"dateFormatItem-yMd": "d.M.y",
-	"field-era": "aikakausi",
 	"dateFormatItem-yM": "L.y",
+	"field-era": "aikakausi",
 	"months-standAlone-wide": [
 		"tammikuu",
 		"helmikuu",
@@ -104,10 +102,10 @@ define(
 		"3. neljännes",
 		"4. neljännes"
 	],
-	"dateFormatItem-yQQQQ": "QQQQ y",
 	"timeFormat-long": "H.mm.ss z",
-	"field-year": "vuosi",
 	"dateFormatItem-yMMM": "LLL y",
+	"dateFormatItem-yQQQQ": "QQQQ y",
+	"field-year": "vuosi",
 	"field-hour": "tunti",
 	"months-format-abbr": [
 		"tammikuuta",
@@ -127,11 +125,11 @@ define(
 	"field-sat-relative+1": "ensi lauantaina",
 	"timeFormat-full": "H.mm.ss zzzz",
 	"field-day-relative+0": "tänään",
-	"field-thu-relative+0": "tänä torstaina",
 	"field-day-relative+1": "huomenna",
-	"field-thu-relative+1": "ensi torstaina",
+	"field-thu-relative+0": "tänä torstaina",
 	"dateFormatItem-GyMMMd": "d. MMM y G",
 	"field-day-relative+2": "ylihuomenna",
+	"field-thu-relative+1": "ensi torstaina",
 	"dateFormatItem-H": "H",
 	"months-standAlone-abbr": [
 		"tammi",
@@ -173,18 +171,16 @@ define(
 	"timeFormat-medium": "H.mm.ss",
 	"field-sun-relative+0": "tänä sunnuntaina",
 	"dateFormatItem-Hm": "H.mm",
-	"field-sun-relative+1": "ensi sunnuntaina",
 	"quarters-standAlone-abbr": [
 		"1. nelj.",
 		"2. nelj.",
 		"3. nelj.",
 		"4. nelj."
 	],
+	"field-sun-relative+1": "ensi sunnuntaina",
 	"eraAbbr": [
 		"eKr.",
-		"eaa.",
-		"jKr.",
-		"jaa."
+		"jKr."
 	],
 	"field-minute": "minuutti",
 	"field-dayperiod": "vuorokaudenaika",
@@ -258,9 +254,7 @@ define(
 	],
 	"eraNames": [
 		"ennen Kristuksen syntymää",
-		"ennen ajanlaskun alkua",
-		"jälkeen Kristuksen syntymän",
-		"jälkeen ajanlaskun alun"
+		"jälkeen Kristuksen syntymän"
 	],
 	"dateFormatItem-yMMMd": "d. MMM y",
 	"days-format-narrow": [
diff --git a/cldr/nls/fr/gregorian.js b/cldr/nls/fr/gregorian.js
index acba23e..c20f25a 100644
--- a/cldr/nls/fr/gregorian.js
+++ b/cldr/nls/fr/gregorian.js
@@ -36,14 +36,12 @@ define(
 	"dateFormatItem-yQQQ": "QQQ y",
 	"dateFormatItem-yMEd": "E d/M/y",
 	"field-wed-relative+0": "ce mercredi",
-	"field-wed-relative+1": "mercredi prochain",
 	"dateFormatItem-GyMMMEd": "E d MMM y G",
 	"dateFormatItem-MMMEd": "E d MMM",
+	"field-wed-relative+1": "mercredi prochain",
 	"eraNarrow": [
 		"av. J.-C.",
-		"ap. J.-C.",
-		"ap. J.-C.",
-		"EC"
+		"ap. J.-C."
 	],
 	"field-tue-relative+-1": "mardi dernier",
 	"dayPeriods-format-wide-morning": "matin",
@@ -81,8 +79,8 @@ define(
 	"dayPeriods-format-abbr-am": "AM",
 	"dayPeriods-format-wide-noon": "midi",
 	"dateFormatItem-yMd": "d/M/y",
-	"field-era": "ère",
 	"dateFormatItem-yM": "M/y",
+	"field-era": "ère",
 	"months-standAlone-wide": [
 		"janvier",
 		"février",
@@ -104,10 +102,10 @@ define(
 		"3e trimestre",
 		"4e trimestre"
 	],
-	"dateFormatItem-yQQQQ": "QQQQ y",
 	"timeFormat-long": "HH:mm:ss z",
-	"field-year": "année",
 	"dateFormatItem-yMMM": "MMM y",
+	"dateFormatItem-yQQQQ": "QQQQ y",
+	"field-year": "année",
 	"field-hour": "heure",
 	"months-format-abbr": [
 		"janv.",
@@ -128,11 +126,11 @@ define(
 	"timeFormat-full": "HH:mm:ss zzzz",
 	"dayPeriods-format-narrow-morning": "matin",
 	"field-day-relative+0": "aujourd’hui",
-	"field-thu-relative+0": "ce jeudi",
 	"field-day-relative+1": "demain",
-	"field-thu-relative+1": "jeudi prochain",
+	"field-thu-relative+0": "ce jeudi",
 	"dateFormatItem-GyMMMd": "d MMM y G",
 	"field-day-relative+2": "après-demain",
+	"field-thu-relative+1": "jeudi prochain",
 	"dateFormatItem-H": "HH 'h'",
 	"months-standAlone-abbr": [
 		"janv.",
@@ -174,18 +172,16 @@ define(
 	"timeFormat-medium": "HH:mm:ss",
 	"field-sun-relative+0": "ce dimanche",
 	"dateFormatItem-Hm": "HH:mm",
-	"field-sun-relative+1": "dimanche prochain",
 	"quarters-standAlone-abbr": [
 		"T1",
 		"T2",
 		"T3",
 		"T4"
 	],
+	"field-sun-relative+1": "dimanche prochain",
 	"eraAbbr": [
 		"av. J.-C.",
-		"AEC",
-		"ap. J.-C.",
-		"EC"
+		"ap. J.-C."
 	],
 	"field-minute": "minute",
 	"field-dayperiod": "cadran",
@@ -259,9 +255,7 @@ define(
 	],
 	"eraNames": [
 		"avant Jésus-Christ",
-		"après Jésus-Christ",
-		"ap. J.-C.",
-		"EC"
+		"après Jésus-Christ"
 	],
 	"dateFormatItem-yMMMd": "d MMM y",
 	"days-format-narrow": [
diff --git a/cldr/nls/hu/gregorian.js b/cldr/nls/hu/gregorian.js
index 567e07c..887837f 100644
--- a/cldr/nls/hu/gregorian.js
+++ b/cldr/nls/hu/gregorian.js
@@ -36,14 +36,12 @@ define(
 	"dateFormatItem-yQQQ": "y. QQQ",
 	"dateFormatItem-yMEd": "y. MM. dd., E",
 	"field-wed-relative+0": "ez a szerda",
-	"field-wed-relative+1": "következő szerda",
 	"dateFormatItem-GyMMMEd": "G y. MMM d., E",
 	"dateFormatItem-MMMEd": "MMM d., E",
+	"field-wed-relative+1": "következő szerda",
 	"eraNarrow": [
 		"ie.",
-		"isz.",
-		"i. sz.",
-		"Kr. u."
+		"isz."
 	],
 	"field-tue-relative+-1": "előző kedd",
 	"days-format-short": [
@@ -78,8 +76,8 @@ define(
 	"field-thu-relative+-1": "előző csütörtök",
 	"dateFormatItem-Md": "M. d.",
 	"dateFormatItem-yMd": "y. MM. dd.",
-	"field-era": "éra",
 	"dateFormatItem-yM": "y. M.",
+	"field-era": "éra",
 	"months-standAlone-wide": [
 		"január",
 		"február",
@@ -101,10 +99,10 @@ define(
 		"III. negyedév",
 		"IV. negyedév"
 	],
-	"dateFormatItem-yQQQQ": "y. QQQQ",
 	"timeFormat-long": "H:mm:ss z",
-	"field-year": "év",
 	"dateFormatItem-yMMM": "y. MMM",
+	"dateFormatItem-yQQQQ": "y. QQQQ",
+	"field-year": "év",
 	"field-hour": "óra",
 	"months-format-abbr": [
 		"jan.",
@@ -124,11 +122,11 @@ define(
 	"field-sat-relative+1": "következő szombat",
 	"timeFormat-full": "H:mm:ss zzzz",
 	"field-day-relative+0": "ma",
-	"field-thu-relative+0": "ez a csütörtök",
 	"field-day-relative+1": "holnap",
-	"field-thu-relative+1": "következő csütörtök",
+	"field-thu-relative+0": "ez a csütörtök",
 	"dateFormatItem-GyMMMd": "G y. MMM d.",
 	"field-day-relative+2": "holnapután",
+	"field-thu-relative+1": "következő csütörtök",
 	"dateFormatItem-H": "H",
 	"months-standAlone-abbr": [
 		"jan.",
@@ -171,18 +169,16 @@ define(
 	"timeFormat-medium": "H:mm:ss",
 	"field-sun-relative+0": "ez a vasárnap",
 	"dateFormatItem-Hm": "H:mm",
-	"field-sun-relative+1": "következő vasárnap",
 	"quarters-standAlone-abbr": [
 		"N1",
 		"N2",
 		"N3",
 		"N4"
 	],
+	"field-sun-relative+1": "következő vasárnap",
 	"eraAbbr": [
 		"i. e.",
-		"Kr. e.",
-		"i. sz.",
-		"Kr. u."
+		"i. sz."
 	],
 	"field-minute": "perc",
 	"field-dayperiod": "napszak",
@@ -255,9 +251,7 @@ define(
 	"dateFormatItem-yMMMd": "y. MMM d.",
 	"eraNames": [
 		"időszámításunk előtt",
-		"időszámításunk szerint",
-		"i. sz.",
-		"Kr. u."
+		"időszámításunk szerint"
 	],
 	"days-format-narrow": [
 		"V",
diff --git a/cldr/nls/ja/gregorian.js b/cldr/nls/ja/gregorian.js
index 165464c..f0e9ca3 100644
--- a/cldr/nls/ja/gregorian.js
+++ b/cldr/nls/ja/gregorian.js
@@ -184,7 +184,6 @@ define(
 	"field-sun-relative+1": "来週の日曜日",
 	"eraAbbr": [
 		"紀元前",
-		"西暦紀元前",
 		"西暦"
 	],
 	"field-minute": "分",
diff --git a/cldr/nls/nb/gregorian.js b/cldr/nls/nb/gregorian.js
index f68c935..51060a8 100644
--- a/cldr/nls/nb/gregorian.js
+++ b/cldr/nls/nb/gregorian.js
@@ -182,9 +182,7 @@ define(
 	"field-sun-relative+1": "søndag neste uke",
 	"eraAbbr": [
 		"f.Kr.",
-		"fvt.",
-		"e.Kr.",
-		"vt."
+		"e.Kr."
 	],
 	"field-minute": "Minutt",
 	"field-dayperiod": "AM/PM",
@@ -257,9 +255,7 @@ define(
 	],
 	"eraNames": [
 		"f.Kr.",
-		"før vår tidsregning",
-		"e.Kr.",
-		"vår tidsregning"
+		"e.Kr."
 	],
 	"dateFormatItem-yMMMd": "d. MMM y",
 	"days-format-narrow": [
diff --git a/cldr/nls/nl/gregorian.js b/cldr/nls/nl/gregorian.js
index 3992e55..8b88492 100644
--- a/cldr/nls/nl/gregorian.js
+++ b/cldr/nls/nl/gregorian.js
@@ -182,9 +182,7 @@ define(
 	"field-sun-relative+1": "volgende week zondag",
 	"eraAbbr": [
 		"v.Chr.",
-		"v.g.j.",
-		"n.Chr.",
-		"g.j."
+		"n.Chr."
 	],
 	"field-minute": "Minuut",
 	"field-dayperiod": "AM/PM",
diff --git a/cldr/nls/pt-pt/gregorian.js b/cldr/nls/pt-pt/gregorian.js
index 513d428..e5f7814 100644
--- a/cldr/nls/pt-pt/gregorian.js
+++ b/cldr/nls/pt-pt/gregorian.js
@@ -40,9 +40,7 @@ define(
 	"dateFormatItem-MMMEd": "E, d/MM",
 	"eraNarrow": [
 		"a.C.",
-		"a.E.C.",
-		"d.C.",
-		"E.C."
+		"d.C."
 	],
 	"dateFormatItem-yMM": "MM/y",
 	"field-tue-relative+-1": "terça-feira passada",
@@ -187,9 +185,7 @@ define(
 	],
 	"eraAbbr": [
 		"a.C.",
-		"a.E.C.",
-		"d.C.",
-		"E.C."
+		"d.C."
 	],
 	"field-minute": "Minuto",
 	"field-dayperiod": "Da manhã/da tarde",
@@ -264,9 +260,7 @@ define(
 	"dateFormatItem-yMMMd": "d/MM/y",
 	"eraNames": [
 		"a.C.",
-		"a.E.C.",
-		"d.C.",
-		"E.C."
+		"d.C."
 	],
 	"days-format-narrow": [
 		"D",
diff --git a/cldr/nls/ru/gregorian.js b/cldr/nls/ru/gregorian.js
index b2516c8..ac31ed2 100644
--- a/cldr/nls/ru/gregorian.js
+++ b/cldr/nls/ru/gregorian.js
@@ -36,12 +36,11 @@ define(
 	"dateFormatItem-yQQQ": "QQQ y 'г'.",
 	"dateFormatItem-yMEd": "ccc, d.MM.y 'г'.",
 	"field-wed-relative+0": "в эту среду",
-	"field-wed-relative+1": "в следующую среду",
 	"dateFormatItem-GyMMMEd": "E, d MMM y G",
 	"dateFormatItem-MMMEd": "ccc, d MMM",
+	"field-wed-relative+1": "в следующую среду",
 	"eraNarrow": [
 		"до н.э.",
-		"н.э.",
 		"н.э."
 	],
 	"dateFormatItem-yMM": "MM.y",
@@ -79,8 +78,8 @@ define(
 	"dateFormatItem-Md": "dd.MM",
 	"dayPeriods-format-abbr-am": "AM",
 	"dateFormatItem-yMd": "dd.MM.y",
-	"field-era": "Эра",
 	"dateFormatItem-yM": "MM.y",
+	"field-era": "Эра",
 	"months-standAlone-wide": [
 		"Январь",
 		"Февраль",
@@ -102,12 +101,12 @@ define(
 		"3-й квартал",
 		"4-й квартал"
 	],
-	"dateFormatItem-yQQQQ": "QQQQ y 'г'.",
 	"timeFormat-long": "H:mm:ss z",
-	"field-year": "Год",
 	"dateFormatItem-yMMM": "LLL y",
-	"field-hour": "Час",
+	"dateFormatItem-yQQQQ": "QQQQ y 'г'.",
+	"field-year": "Год",
 	"dateFormatItem-MMdd": "dd.MM",
+	"field-hour": "Час",
 	"months-format-abbr": [
 		"янв.",
 		"февр.",
@@ -127,11 +126,11 @@ define(
 	"timeFormat-full": "H:mm:ss zzzz",
 	"dateFormatItem-E": "ccc",
 	"field-day-relative+0": "сегодня",
-	"field-thu-relative+0": "в этот четверг",
 	"field-day-relative+1": "завтра",
-	"field-thu-relative+1": "в следующий четверг",
+	"field-thu-relative+0": "в этот четверг",
 	"dateFormatItem-GyMMMd": "d MMM y 'г'. G",
 	"field-day-relative+2": "послезавтра",
+	"field-thu-relative+1": "в следующий четверг",
 	"dateFormatItem-H": "H",
 	"months-standAlone-abbr": [
 		"Янв.",
@@ -174,17 +173,16 @@ define(
 	"timeFormat-medium": "H:mm:ss",
 	"field-sun-relative+0": "в это воскресенье",
 	"dateFormatItem-Hm": "H:mm",
-	"field-sun-relative+1": "в следующее воскресенье",
 	"quarters-standAlone-abbr": [
 		"1-й кв.",
 		"2-й кв.",
 		"3-й кв.",
 		"4-й кв."
 	],
+	"field-sun-relative+1": "в следующее воскресенье",
 	"eraAbbr": [
 		"до н. э.",
-		"н. э.",
-		"н.э."
+		"н. э."
 	],
 	"field-minute": "Минута",
 	"field-dayperiod": "ДП/ПП",
@@ -257,7 +255,6 @@ define(
 	],
 	"eraNames": [
 		"до н.э.",
-		"н.э.",
 		"н.э."
 	],
 	"dateFormatItem-yMMMd": "d MMM y 'г'.",
diff --git a/cldr/nls/sv/gregorian.js b/cldr/nls/sv/gregorian.js
index 5384303..e6ec911 100644
--- a/cldr/nls/sv/gregorian.js
+++ b/cldr/nls/sv/gregorian.js
@@ -183,9 +183,7 @@ define(
 	"field-sun-relative+1": "söndag nästa vecka",
 	"eraAbbr": [
 		"f.Kr.",
-		"f.v.t.",
-		"e.Kr.",
-		"v.t."
+		"e.Kr."
 	],
 	"field-minute": "Minut",
 	"field-dayperiod": "fm/em",
diff --git a/cldr/nls/th/gregorian.js b/cldr/nls/th/gregorian.js
index fb0c6c4..171f8a4 100644
--- a/cldr/nls/th/gregorian.js
+++ b/cldr/nls/th/gregorian.js
@@ -180,9 +180,7 @@ define(
 	],
 	"eraAbbr": [
 		"ปีก่อน ค.ศ.",
-		"ก.ส.ศ.",
-		"ค.ศ.",
-		"ส.ศ."
+		"ค.ศ."
 	],
 	"field-minute": "นาที",
 	"field-dayperiod": "ช่วงวัน",
diff --git a/cldr/nls/tr/gregorian.js b/cldr/nls/tr/gregorian.js
index d3d4986..11f1234 100644
--- a/cldr/nls/tr/gregorian.js
+++ b/cldr/nls/tr/gregorian.js
@@ -41,9 +41,7 @@ define(
 	"dateFormatItem-MMMEd": "d MMMM E",
 	"eraNarrow": [
 		"MÖ",
-		"İÖ",
-		"MS",
-		"İS"
+		"MS"
 	],
 	"dateFormatItem-yMM": "MM.y",
 	"field-tue-relative+-1": "geçen salı",
@@ -181,9 +179,7 @@ define(
 	],
 	"eraAbbr": [
 		"MÖ",
-		"İÖ",
-		"MS",
-		"İS"
+		"MS"
 	],
 	"field-minute": "Dakika",
 	"field-dayperiod": "ÖÖ/ÖS",
@@ -255,9 +251,7 @@ define(
 	"dateFormatItem-yMMMd": "dd MMM y",
 	"eraNames": [
 		"Milattan Önce",
-		"Milattan Sonra",
-		"MS",
-		"İS"
+		"Milattan Sonra"
 	],
 	"days-format-narrow": [
 		"P",
diff --git a/cldr/nls/zh-hant/gregorian.js b/cldr/nls/zh-hant/gregorian.js
index 94469b7..c8d494e 100644
--- a/cldr/nls/zh-hant/gregorian.js
+++ b/cldr/nls/zh-hant/gregorian.js
@@ -186,9 +186,7 @@ define(
 	"field-sun-relative+1": "下週日",
 	"eraAbbr": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"field-minute": "分鐘",
 	"field-dayperiod": "上午/下午",
diff --git a/cldr/nls/zh-hk/gregorian.js b/cldr/nls/zh-hk/gregorian.js
index b911efd..8cc936b 100644
--- a/cldr/nls/zh-hk/gregorian.js
+++ b/cldr/nls/zh-hk/gregorian.js
@@ -8,9 +8,7 @@ define(
 	"field-minute": "分鐘",
 	"eraNames": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"dateTimeFormat-full": "{1}{0}",
 	"field-weekday": "週天",
@@ -33,9 +31,7 @@ define(
 	"dateFormatItem-Ed": "d日(E)",
 	"eraAbbr": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"field-day-relative+2": "後天",
 	"dateFormatItem-GyMMMd": "G y 年 M 月 d 日",
@@ -122,9 +118,7 @@ define(
 	],
 	"eraNarrow": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"dateFormatItem-h": "ah時",
 	"field-thu-relative+-1": "上週四"
diff --git a/cldr/nls/zh-tw/gregorian.js b/cldr/nls/zh-tw/gregorian.js
index b856f0e..e67f337 100644
--- a/cldr/nls/zh-tw/gregorian.js
+++ b/cldr/nls/zh-tw/gregorian.js
@@ -8,9 +8,7 @@ define(
 	"field-minute": "分鐘",
 	"eraNames": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"dateTimeFormat-full": "{1}{0}",
 	"field-weekday": "週天",
@@ -33,9 +31,7 @@ define(
 	"dateFormatItem-Ed": "d日(E)",
 	"eraAbbr": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"field-day-relative+2": "後天",
 	"dateFormatItem-GyMMMd": "G y 年 M 月 d 日",
@@ -122,9 +118,7 @@ define(
 	],
 	"eraNarrow": [
 		"西元前",
-		"公元前",
-		"西元",
-		"公元"
+		"西元"
 	],
 	"dateFormatItem-h": "ah時",
 	"field-thu-relative+-1": "上週四"
diff --git a/tests/date/locale.js b/tests/date/locale.js
index aae4023..c865e4b 100644
--- a/tests/date/locale.js
+++ b/tests/date/locale.js
@@ -68,6 +68,8 @@ define(["doh", "dojo/_base/array", "dojo/i18n", "dojo/_base/kernel", "dojo/date"
 
 	t.is("6", locale.format(date, {datePattern:'E', selector:'date'}));
 
+	t.is("Fri, Aug 11, 2006 AD", locale.format(date, {selector: 'date', datePattern: 'EEE, MMM d, yyyy G', locale:'en-us' }));				
+
 	t.is("12:55 AM", locale.format(date, {formatLength:'short',selector:'time', locale:'en-us'}));
 	t.is("12:55:12", locale.format(date, {timePattern:'h:m:s',selector:'time'}));
 	t.is("12:55:12.35", locale.format(date, {timePattern:'h:m:s.SS',selector:'time'}));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git



More information about the Pkg-javascript-commits mailing list