feat: add uz lang fixes

standy · Jul 3, 2023 · ac60c5d · ac60c5d
1 parent 0efc911
commit ac60c5d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git a/locale/uz/latin/index.test.ts → locale/uz-Cyrl/index.test.ts b/locale/uz/latin/index.test.ts → locale/uz-Cyrl/index.test.ts
@@ -1,6 +1,6 @@
-import {Month} from '../../../src/utils/basic-types';
+import {Month} from '../../src/utils/basic-types';
 import * as assert from 'power-assert';
-import {newValidDate} from '../../../src/create/create-ts-date';
+import {newValidDate} from '../../src/create/create-ts-date';
 import {format, parse} from './index';
 
 describe('uz-lt locale', function () {
@@ -10,6 +10,7 @@ describe('uz-lt locale', function () {
 			['MMMM MMM ddd dddd A Do Wo Mo DDDo do Qo', 'avgust avg Ses seshanba TK 1 31 8 213 2 3'],
 			['D MMMM hh A', '1 avgust 12 TK'],
 			['Do MMMM, dddd', '1 avgust, seshanba'],
+			['D MMMM, hh A, dd', '1 avgust, 12 TK, Ses'],
 			['D MMMM, hh A, ddd', '1 avgust, 12 TK, Ses'],
 			['D MMMM, hh aa, ddd', '1 avgust, 12 t.k., Ses'],
 		];

diff --git a/locale/uz/latin/index.ts → locale/uz-Cyrl/index.ts b/locale/uz/latin/index.ts → locale/uz-Cyrl/index.ts
@@ -1,7 +1,7 @@
-import {createCustomFormatFn, createFormat} from '../../../src/format/create-format';
-import {createParse, parseOrThrowWrapper} from '../../../src/parse/create-parse';
-import {defaultFormatters} from '../../../src/format/default-formatters';
-import defaultParsers from '../../../src/parse/default-parsers';
+import {createCustomFormatFn, createFormat} from '../../src/format/create-format';
+import {createParse, parseOrThrowWrapper} from '../../src/parse/create-parse';
+import {defaultFormatters} from '../../src/format/default-formatters';
+import defaultParsers from '../../src/parse/default-parsers';
 import {
 	ParserObj,
 	FormatterObj,
@@ -10,9 +10,9 @@ import {
 	ParseByTemplateOrThrowFn,
 	ParserData,
 	Formatter,
-} from '../../../src/utils/basic-types';
-import {extend} from '../../../src/utils/utils';
-export * from '../../../src/default-exports';
+} from '../../src/utils/basic-types';
+import {extend} from '../../src/utils/utils';
+export * from '../../src/default-exports';
 
 const monthsShort = ['yan', 'fev', 'mar', 'apr', 'may', 'iyn', 'iyl', 'avg', 'sen', 'okt', 'noy', 'dek'];
 const monthsFull = [
@@ -43,23 +43,27 @@ const monthsGenitive = [
 	'noyabr',
 	'dekabr'
 ];
+const weekdays2char = ['Yak', 'Dus', 'Ses', 'Cho', 'Pay', 'Jum', 'Sha'];
 const weekdays3char = ['Yak', 'Dus', 'Ses', 'Cho', 'Pay', 'Jum', 'Sha'];
 const weekdaysFull = ['yakshanba', 'dushanba', 'seshanba', 'chorshanba', 'payshanba', 'juma', 'shanba'];
 const meridiemUppercase = ['TO', 'TK'];
 const meridiemLowercase = ['to', 'tk'];
 const meridiemFull = ['t.o.', 't.k.'];
 
 export const formatters: FormatterObj = {
-	// Month: янв, фев, ..., дек
+	// Month: yan, fev, ..., dek
 	MMM: (date) => monthsShort[date.getMonth()],
 
-	// Month: 'январ', 'феврал', ..., декабр
+	// Month: 'yanvar', 'fevral', ..., dekabr
 	MMMM: (date) => monthsFull[date.getMonth()],
 
-	// Day of week: якш, душ, ..., шан
+	// Day of week: Yak, Dus, ..., Sha
+	dd: (date) => weekdays2char[date.getDay()],
+
+	// Day of week: Yak, Dus, ..., Sha
 	ddd: (date) => weekdays3char[date.getDay()],
 
-	// Day of week: якшанба, душанба, ..., шанба
+	// Day of week: yakshanba, dushanba, ..., shanba
 	dddd: (date) => weekdaysFull[date.getDay()],
 
 	// TO, TK

diff --git a/locale/uz/cyrilic/index.test.ts → locale/uz/index.test.ts b/locale/uz/cyrilic/index.test.ts → locale/uz/index.test.ts
@@ -1,6 +1,6 @@
-import {Month} from '../../../src/utils/basic-types';
+import {Month} from '../../src/utils/basic-types';
 import * as assert from 'power-assert';
-import {newValidDate} from '../../../src/create/create-ts-date';
+import {newValidDate} from '../../src/create/create-ts-date';
 import {format, parse} from './index';
 
 describe('uz-cr locale', function () {
@@ -10,6 +10,7 @@ describe('uz-cr locale', function () {
 			['MMMM MMM ddd dddd A Do Wo Mo DDDo do Qo', 'август авг Сеш сешанба ТК 1 31 8 213 2 3'],
 			['D MMMM hh A', '1 август 12 ТК'],
 			['Do MMMM, dddd', '1 август, сешанба'],
+			['D MMMM, hh A, dd', '1 август, 12 ТК, Сеш'],
 			['D MMMM, hh A, ddd', '1 август, 12 ТК, Сеш'],
 			['D MMMM, hh aa, ddd', '1 август, 12 т.к., Сеш'],
 		];

diff --git a/locale/uz/cyrilic/index.ts → locale/uz/index.ts b/locale/uz/cyrilic/index.ts → locale/uz/index.ts
@@ -1,7 +1,7 @@
-import {createCustomFormatFn, createFormat} from '../../../src/format/create-format';
-import {createParse, parseOrThrowWrapper} from '../../../src/parse/create-parse';
-import {defaultFormatters} from '../../../src/format/default-formatters';
-import defaultParsers from '../../../src/parse/default-parsers';
+import {createCustomFormatFn, createFormat} from '../../src/format/create-format';
+import {createParse, parseOrThrowWrapper} from '../../src/parse/create-parse';
+import {defaultFormatters} from '../../src/format/default-formatters';
+import defaultParsers from '../../src/parse/default-parsers';
 import {
 	ParserObj,
 	FormatterObj,
@@ -10,9 +10,9 @@ import {
 	ParseByTemplateOrThrowFn,
 	ParserData,
 	Formatter,
-} from '../../../src/utils/basic-types';
-import {extend} from '../../../src/utils/utils';
-export * from '../../../src/default-exports';
+} from '../../src/utils/basic-types';
+import {extend} from '../../src/utils/utils';
+export * from '../../src/default-exports';
 
 const monthsShort = ['янв', 'фев', 'мар', 'апр', 'май', 'июн', 'июл', 'авг', 'сен', 'окт', 'ноя', 'дек'];
 const monthsFull = [
@@ -44,6 +44,7 @@ const monthsGenitive = [
 	'декабр'
 ];
 
+const weekdays2char = ['Якш', 'Душ', 'Сеш', 'Чор', 'Пай', 'Жум', 'Шан'];
 const weekdays3char = ['Якш', 'Душ', 'Сеш', 'Чор', 'Пай', 'Жум', 'Шан'];
 const weekdaysFull = ['якшанба', 'душанба', 'сешанба', 'чоршанба', 'пайшанба', 'жума', 'шанба'];
 const meridiemUppercase = ['ТО', 'ТК'];
@@ -57,7 +58,10 @@ export const formatters: FormatterObj = {
 	// Month: 'январ', 'феврал', ..., декабр
 	MMMM: (date) => monthsFull[date.getMonth()],
 
-	// Day of week: якш, душ, ..., шан
+	// Day of week: Якш, Душ, ..., Шан
+	dd: (date) => weekdays2char[date.getDay()],
+
+	// Day of week: Якш, Душ, ..., Шан
 	ddd: (date) => weekdays3char[date.getDay()],
 
 	// Day of week: якшанба, душанба, ..., шанба