From 018adae4ec11a5a8d7914bdef845db91d7e3fe8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20M=C3=B8lgaard=20Tams?= Date: Wed, 18 Sep 2019 20:13:13 +0200 Subject: [PATCH] Fix Hindi parsing patterns --- src/locale/hi/_lib/match/index.js | 13 ++-- src/locale/hi/snapshot.md | 108 +++++++++++++++--------------- 2 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/locale/hi/_lib/match/index.js b/src/locale/hi/_lib/match/index.js index 9ccad9bb79..d23ad74b44 100644 --- a/src/locale/hi/_lib/match/index.js +++ b/src/locale/hi/_lib/match/index.js @@ -1,8 +1,9 @@ import buildMatchPatternFn from '../../../_lib/buildMatchPatternFn/index.js' import buildMatchFn from '../../../_lib/buildMatchFn/index.js' +import { localeToNumber } from '../localize' -var matchOrdinalNumberPattern = /^\d+\./i -var parseOrdinalNumberPattern = /\d+/i +var matchOrdinalNumberPattern = /^[०१२३४५६७८९]+/i +var parseOrdinalNumberPattern = /^[०१२३४५६७८९]+/i var matchEraPatterns = { narrow: /^(ईसा-पूर्व|ईस्वी)/i, @@ -24,7 +25,7 @@ var parseQuarterPatterns = { var matchMonthPatterns = { narrow: /^[जफ़माअप्मईजूनजुअगसिअक्तनदि]/i, - abbreviated: /^(जन|फ़|मा|अप्|मई|जून|जुल|अग|सित|अक्तू|नव|दिस)/i, + abbreviated: /^(जन|फ़र|मार्च|अप्|मई|जून|जुल|अग|सित|अक्तू|नव|दिस)/i, wide: /^(जनवरी|फ़रवरी|मार्च|अप्रैल|मई|जून|जुलाई|अगस्त|सितंबर|अक्तूबर|नवंबर|दिसंबर)/i } var parseMonthPatterns = { @@ -43,7 +44,7 @@ var parseMonthPatterns = { /^दि/i ], any: [ - /^ज/i, + /^जन/i, /^फ़/i, /^मा/i, /^अप्/i, @@ -90,9 +91,7 @@ var match = { ordinalNumber: buildMatchPatternFn({ matchPattern: matchOrdinalNumberPattern, parsePattern: parseOrdinalNumberPattern, - valueCallback: function(value) { - return parseInt(value, 10) - } + valueCallback: localeToNumber }), era: buildMatchFn({ diff --git a/src/locale/hi/snapshot.md b/src/locale/hi/snapshot.md index 2df41c9398..172a55f9c5 100644 --- a/src/locale/hi/snapshot.md +++ b/src/locale/hi/snapshot.md @@ -4,48 +4,48 @@ | Title | Token string | Date | `format` result | `parse` result | | ------------------------------- | ------------ | ------------------------ | ----------------------------------------------------- | ------------------------ | -| Calendar year | yo | 1987-02-11T12:13:14.015Z | १९८७ | Invalid Date | -| | | 0005-01-01T12:13:14.015Z | ५ | Invalid Date | -| Local week-numbering year | Yo | 1987-02-11T12:13:14.015Z | १९८७ | Invalid Date | -| | | 0005-01-01T12:13:14.015Z | ४ | Invalid Date | -| Quarter (formatting) | Qo | 2019-01-01T12:13:14.015Z | १ | Invalid Date | -| | | 2019-04-01T12:13:14.015Z | २ | Invalid Date | +| Calendar year | yo | 1987-02-11T12:13:14.015Z | १९८७ | 1987-01-01T00:00:00.000Z | +| | | 0005-01-01T12:13:14.015Z | ५ | 0005-01-01T00:00:00.000Z | +| Local week-numbering year | Yo | 1987-02-11T12:13:14.015Z | १९८७ | 1987-01-04T00:00:00.000Z | +| | | 0005-01-01T12:13:14.015Z | ४ | 0004-01-04T00:00:00.000Z | +| Quarter (formatting) | Qo | 2019-01-01T12:13:14.015Z | १ | 2019-01-01T00:00:00.000Z | +| | | 2019-04-01T12:13:14.015Z | २ | 2019-04-01T00:00:00.000Z | | | QQQ | 2019-01-01T12:13:14.015Z | ति1 | 2019-01-01T00:00:00.000Z | | | | 2019-04-01T12:13:14.015Z | ति2 | 2019-04-01T00:00:00.000Z | | | QQQQ | 2019-01-01T12:13:14.015Z | पहली तिमाही | Invalid Date | | | | 2019-04-01T12:13:14.015Z | दूसरी तिमाही | Invalid Date | | | QQQQQ | 2019-01-01T12:13:14.015Z | 1 | 2019-01-01T00:00:00.000Z | | | | 2019-04-01T12:13:14.015Z | 2 | 2019-04-01T00:00:00.000Z | -| Quarter (stand-alone) | qo | 2019-01-01T12:13:14.015Z | १ | Invalid Date | -| | | 2019-04-01T12:13:14.015Z | २ | Invalid Date | +| Quarter (stand-alone) | qo | 2019-01-01T12:13:14.015Z | १ | 2019-01-01T00:00:00.000Z | +| | | 2019-04-01T12:13:14.015Z | २ | 2019-04-01T00:00:00.000Z | | | qqq | 2019-01-01T12:13:14.015Z | ति1 | 2019-01-01T00:00:00.000Z | | | | 2019-04-01T12:13:14.015Z | ति2 | 2019-04-01T00:00:00.000Z | | | qqqq | 2019-01-01T12:13:14.015Z | पहली तिमाही | Invalid Date | | | | 2019-04-01T12:13:14.015Z | दूसरी तिमाही | Invalid Date | -| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | २ | Invalid Date | -| | | 2019-07-10T12:13:14.015Z | ७ | Invalid Date | -| | MMM | 2019-02-11T12:13:14.015Z | फ़र | Invalid Date | -| | | 2019-07-10T12:13:14.015Z | जुल | 2019-01-01T00:00:00.000Z | +| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | २ | 2019-02-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | ७ | 2019-07-01T00:00:00.000Z | +| | MMM | 2019-02-11T12:13:14.015Z | फ़र | 2019-02-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | जुल | 2019-07-01T00:00:00.000Z | | | MMMM | 2019-02-11T12:13:14.015Z | फ़रवरी | 2019-02-01T00:00:00.000Z | -| | | 2019-07-10T12:13:14.015Z | जुलाई | 2019-01-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | जुलाई | 2019-07-01T00:00:00.000Z | | | MMMMM | 2019-02-11T12:13:14.015Z | फ़ | Invalid Date | | | | 2019-07-10T12:13:14.015Z | जु | Invalid Date | -| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | २ | Invalid Date | -| | | 2019-07-10T12:13:14.015Z | ७ | Invalid Date | -| | LLL | 2019-02-11T12:13:14.015Z | फ़र | Invalid Date | -| | | 2019-07-10T12:13:14.015Z | जुल | 2019-01-01T00:00:00.000Z | +| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | २ | 2019-02-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | ७ | 2019-07-01T00:00:00.000Z | +| | LLL | 2019-02-11T12:13:14.015Z | फ़र | 2019-02-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | जुल | 2019-07-01T00:00:00.000Z | | | LLLL | 2019-02-11T12:13:14.015Z | फ़रवरी | 2019-02-01T00:00:00.000Z | -| | | 2019-07-10T12:13:14.015Z | जुलाई | 2019-01-01T00:00:00.000Z | +| | | 2019-07-10T12:13:14.015Z | जुलाई | 2019-07-01T00:00:00.000Z | | | LLLLL | 2019-02-11T12:13:14.015Z | फ़ | Invalid Date | | | | 2019-07-10T12:13:14.015Z | जु | Invalid Date | -| Local week of year | wo | 2019-01-01T12:13:14.015Z | १ | Invalid Date | -| | | 2019-12-01T12:13:14.015Z | ४९ | Invalid Date | -| ISO week of year | Io | 2019-01-01T12:13:14.015Z | १ | Invalid Date | -| | | 2019-12-01T12:13:14.015Z | ४८ | Invalid Date | -| Day of month | do | 2019-02-11T12:13:14.015Z | ११ | Invalid Date | -| | | 2019-02-28T12:13:14.015Z | २८ | Invalid Date | -| Day of year | Do | 2019-02-11T12:13:14.015Z | ४२ | Invalid Date | -| | | 2019-12-31T12:13:14.015Z | ३६५ | Invalid Date | +| Local week of year | wo | 2019-01-01T12:13:14.015Z | १ | 2018-12-30T00:00:00.000Z | +| | | 2019-12-01T12:13:14.015Z | ४९ | 2019-12-01T00:00:00.000Z | +| ISO week of year | Io | 2019-01-01T12:13:14.015Z | १ | 2018-12-31T00:00:00.000Z | +| | | 2019-12-01T12:13:14.015Z | ४८ | 2019-11-25T00:00:00.000Z | +| Day of month | do | 2019-02-11T12:13:14.015Z | ११ | 2019-02-11T00:00:00.000Z | +| | | 2019-02-28T12:13:14.015Z | २८ | 2019-02-28T00:00:00.000Z | +| Day of year | Do | 2019-02-11T12:13:14.015Z | ४२ | 2019-02-11T00:00:00.000Z | +| | | 2019-12-31T12:13:14.015Z | ३६५ | 2019-12-31T00:00:00.000Z | | Day of week (formatting) | E | 2019-02-11T12:13:14.015Z | सोम | 2019-02-11T00:00:00.000Z | | | | 2019-02-15T12:13:14.015Z | शुक्र | 2019-02-15T00:00:00.000Z | | | EE | 2019-02-11T12:13:14.015Z | सोम | 2019-02-11T00:00:00.000Z | @@ -58,8 +58,8 @@ | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | | | EEEEEE | 2019-02-11T12:13:14.015Z | सो | Invalid Date | | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | -| ISO day of week (formatting) | io | 2019-02-11T12:13:14.015Z | १ | Invalid Date | -| | | 2019-02-15T12:13:14.015Z | ५ | Invalid Date | +| ISO day of week (formatting) | io | 2019-02-11T12:13:14.015Z | १ | 2019-02-11T00:00:00.000Z | +| | | 2019-02-15T12:13:14.015Z | ५ | 2019-02-15T00:00:00.000Z | | | iii | 2019-02-11T12:13:14.015Z | सोम | 2019-02-11T00:00:00.000Z | | | | 2019-02-15T12:13:14.015Z | शुक्र | 2019-02-15T00:00:00.000Z | | | iiii | 2019-02-11T12:13:14.015Z | सोमवार | 2019-02-11T00:00:00.000Z | @@ -68,8 +68,8 @@ | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | | | iiiiii | 2019-02-11T12:13:14.015Z | सो | Invalid Date | | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | -| Local day of week (formatting) | eo | 2019-02-11T12:13:14.015Z | २ | Invalid Date | -| | | 2019-02-15T12:13:14.015Z | ६ | Invalid Date | +| Local day of week (formatting) | eo | 2019-02-11T12:13:14.015Z | २ | 2019-02-11T00:00:00.000Z | +| | | 2019-02-15T12:13:14.015Z | ६ | 2019-02-15T00:00:00.000Z | | | eee | 2019-02-11T12:13:14.015Z | सोम | 2019-02-11T00:00:00.000Z | | | | 2019-02-15T12:13:14.015Z | शुक्र | 2019-02-15T00:00:00.000Z | | | eeee | 2019-02-11T12:13:14.015Z | सोमवार | 2019-02-11T00:00:00.000Z | @@ -78,8 +78,8 @@ | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | | | eeeeee | 2019-02-11T12:13:14.015Z | सो | Invalid Date | | | | 2019-02-15T12:13:14.015Z | शु | Invalid Date | -| Local day of week (stand-alone) | co | 2019-02-11T12:13:14.015Z | २ | Invalid Date | -| | | 2019-02-15T12:13:14.015Z | ६ | Invalid Date | +| Local day of week (stand-alone) | co | 2019-02-11T12:13:14.015Z | २ | 2019-02-11T00:00:00.000Z | +| | | 2019-02-15T12:13:14.015Z | ६ | 2019-02-15T00:00:00.000Z | | | ccc | 2019-02-11T12:13:14.015Z | सोम | 2019-02-11T00:00:00.000Z | | | | 2019-02-15T12:13:14.015Z | शुक्र | 2019-02-15T00:00:00.000Z | | | cccc | 2019-02-11T12:13:14.015Z | सोमवार | 2019-02-11T00:00:00.000Z | @@ -148,26 +148,26 @@ | | | 2019-02-11T14:13:14.015Z | दोपहर | Invalid Date | | | | 2019-02-11T19:13:14.015Z | शाम | Invalid Date | | | | 2019-02-11T02:13:14.015Z | रात | Invalid Date | -| Hour [1-12] | ho | 2019-02-11T11:13:14.015Z | ११ | Invalid Date | -| | | 2019-02-11T23:13:14.015Z | ११ | Invalid Date | -| Hour [0-23] | Ho | 2019-02-11T11:13:14.015Z | ११ | Invalid Date | -| | | 2019-02-11T23:13:14.015Z | २३ | Invalid Date | -| Hour [0-11] | Ko | 2019-02-11T11:13:14.015Z | ११ | Invalid Date | -| | | 2019-02-11T23:13:14.015Z | ११ | Invalid Date | -| Hour [1-24] | ko | 2019-02-11T11:13:14.015Z | ११ | Invalid Date | -| | | 2019-02-11T23:13:14.015Z | २३ | Invalid Date | -| Minute | mo | 2019-01-01T12:01:14.015Z | १ | Invalid Date | -| | | 2019-04-01T12:55:14.015Z | ५५ | Invalid Date | -| Second | so | 2019-01-01T12:13:01.015Z | १ | Invalid Date | -| | | 2019-04-01T12:13:55.015Z | ५५ | Invalid Date | +| Hour [1-12] | ho | 2019-02-11T11:13:14.015Z | ११ | 2019-02-11T11:00:00.000Z | +| | | 2019-02-11T23:13:14.015Z | ११ | 2019-02-11T23:00:00.000Z | +| Hour [0-23] | Ho | 2019-02-11T11:13:14.015Z | ११ | 2019-02-11T11:00:00.000Z | +| | | 2019-02-11T23:13:14.015Z | २३ | 2019-02-11T23:00:00.000Z | +| Hour [0-11] | Ko | 2019-02-11T11:13:14.015Z | ११ | 2019-02-11T11:00:00.000Z | +| | | 2019-02-11T23:13:14.015Z | ११ | 2019-02-11T23:00:00.000Z | +| Hour [1-24] | ko | 2019-02-11T11:13:14.015Z | ११ | 2019-02-11T11:00:00.000Z | +| | | 2019-02-11T23:13:14.015Z | २३ | 2019-02-11T23:00:00.000Z | +| Minute | mo | 2019-01-01T12:01:14.015Z | १ | 2019-01-01T12:01:00.000Z | +| | | 2019-04-01T12:55:14.015Z | ५५ | 2019-04-01T12:55:00.000Z | +| Second | so | 2019-01-01T12:13:01.015Z | १ | 2019-01-01T12:13:01.000Z | +| | | 2019-04-01T12:13:55.015Z | ५५ | 2019-04-01T12:13:55.000Z | | Long localized date | P | 1987-02-11T12:13:14.015Z | 11/02/1987 | 1987-02-11T00:00:00.000Z | | | | 1453-05-29T23:59:59.999Z | 29/05/1453 | 1453-05-29T00:00:00.000Z | -| | PP | 1987-02-11T12:13:14.015Z | 11 फ़र, 1987 | Invalid Date | +| | PP | 1987-02-11T12:13:14.015Z | 11 फ़र, 1987 | 1987-02-11T00:00:00.000Z | | | | 1453-05-29T23:59:59.999Z | 29 मई, 1453 | 1453-05-29T00:00:00.000Z | -| | PPP | 1987-02-11T12:13:14.015Z | ११ फ़रवरी, 1987 | Invalid Date | -| | | 1453-05-29T23:59:59.999Z | २९ मई, 1453 | Invalid Date | -| | PPPP | 1987-02-11T12:13:14.015Z | बुधवार, ११ फ़रवरी, 1987 | Invalid Date | -| | | 1453-05-29T23:59:59.999Z | रविवार, २९ मई, 1453 | Invalid Date | +| | PPP | 1987-02-11T12:13:14.015Z | ११ फ़रवरी, 1987 | 1987-02-11T00:00:00.000Z | +| | | 1453-05-29T23:59:59.999Z | २९ मई, 1453 | 1453-05-29T00:00:00.000Z | +| | PPPP | 1987-02-11T12:13:14.015Z | बुधवार, ११ फ़रवरी, 1987 | 1987-02-11T00:00:00.000Z | +| | | 1453-05-29T23:59:59.999Z | रविवार, २९ मई, 1453 | 1453-05-29T00:00:00.000Z | | Long localized time | p | 1987-02-11T12:13:14.015Z | 12:13 अपराह्न | 1987-02-11T12:13:00.000Z | | | | 1453-05-29T23:59:59.999Z | 11:59 अपराह्न | 1453-05-29T23:59:00.000Z | | | pp | 1987-02-11T12:13:14.015Z | 12:13:14 अपराह्न | 1987-02-11T12:13:14.000Z | @@ -178,12 +178,12 @@ | | | 1453-05-29T23:59:59.999Z | 11:59:59 अपराह्न GMT+00:00 | Errored | | Combination of date and time | Pp | 1987-02-11T12:13:14.015Z | 11/02/1987, 12:13 अपराह्न | 1987-02-11T12:13:00.000Z | | | | 1453-05-29T23:59:59.999Z | 29/05/1453, 11:59 अपराह्न | 1453-05-29T23:59:00.000Z | -| | PPpp | 1987-02-11T12:13:14.015Z | 11 फ़र, 1987, 12:13:14 अपराह्न | Invalid Date | +| | PPpp | 1987-02-11T12:13:14.015Z | 11 फ़र, 1987, 12:13:14 अपराह्न | 1987-02-11T12:13:14.000Z | | | | 1453-05-29T23:59:59.999Z | 29 मई, 1453, 11:59:59 अपराह्न | 1453-05-29T23:59:59.000Z | -| | PPPppp | 1987-02-11T12:13:14.015Z | ११ फ़रवरी, 1987 को 12:13:14 अपराह्न GMT+0 | Invalid Date | -| | | 1453-05-29T23:59:59.999Z | २९ मई, 1453 को 11:59:59 अपराह्न GMT+0 | Invalid Date | -| | PPPPpppp | 1987-02-11T12:13:14.015Z | बुधवार, ११ फ़रवरी, 1987 को 12:13:14 अपराह्न GMT+00:00 | Invalid Date | -| | | 1453-05-29T23:59:59.999Z | रविवार, २९ मई, 1453 को 11:59:59 अपराह्न GMT+00:00 | Invalid Date | +| | PPPppp | 1987-02-11T12:13:14.015Z | ११ फ़रवरी, 1987 को 12:13:14 अपराह्न GMT+0 | Errored | +| | | 1453-05-29T23:59:59.999Z | २९ मई, 1453 को 11:59:59 अपराह्न GMT+0 | Errored | +| | PPPPpppp | 1987-02-11T12:13:14.015Z | बुधवार, ११ फ़रवरी, 1987 को 12:13:14 अपराह्न GMT+00:00 | Errored | +| | | 1453-05-29T23:59:59.999Z | रविवार, २९ मई, 1453 को 11:59:59 अपराह्न GMT+00:00 | Errored | ## `formatDistance`