From ba650a6f4e5cf96f1c36d9ade000a2f35dde85a7 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 20 Nov 2013 15:51:57 +0000 Subject: [PATCH 1/2] Globalize:add missing overloads/now TS0.9.5 compt --- globalize/globalize.d.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/globalize/globalize.d.ts b/globalize/globalize.d.ts index da17957f1..d6792115b 100644 --- a/globalize/globalize.d.ts +++ b/globalize/globalize.d.ts @@ -100,18 +100,20 @@ interface GlobalizeCultures { interface GlobalizeStatic { cultures: GlobalizeCultures; - init(cultureSelector: string); + init(cultureSelector: string): void; cultureSelector: string; culture(): GlobalizeCulture; culture(cultureSelector: string): GlobalizeCulture; culture(cultureSelector: string[]): GlobalizeCulture; - addCultureInfo(cultureName: string, baseCultureName, info?); - findClosestCulture(cultureSelector: string); + addCultureInfo(cultureName: string, baseCultureName: string, info: Object): void; + addCultureInfo(cultureName: string, info: Object): void; + addCultureInfo(info: Object): void; + findClosestCulture(cultureSelector: string): void; format(value: number, format: string, cultureSelector?: string); format(value: Date, format: string, cultureSelector?: string); - localize(key: string, cultureSelector?: string); + localize(key: string, cultureSelector?: string): void; parseDate(value: string, format?: string, cultureSelector?: string): Date; parseDate(value: string, formats?: string[], cultureSelector?: string): Date; From db49859709bd898979beb8c3ac266dee46f4b54e Mon Sep 17 00:00:00 2001 From: John Reilly Date: Thu, 21 Nov 2013 09:59:58 +0000 Subject: [PATCH 2/2] Globalize: Corrected return types / amended tests --- globalize/globalize-tests.ts | 2 ++ globalize/globalize.d.ts | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/globalize/globalize-tests.ts b/globalize/globalize-tests.ts index 5174f90f9..3d599a611 100644 --- a/globalize/globalize-tests.ts +++ b/globalize/globalize-tests.ts @@ -33,7 +33,9 @@ Globalize.parseDate("15 Jun 2012", ["dd MMM yyyy"]); Globalize.culture("fr"); Globalize.parseDate("1/2/2003"); +Globalize.addCultureInfo({ numberFormat: { billionZeroes: 12 } }); Globalize.addCultureInfo("fr", { numberFormat: { billionZeroes: 12 } }); +Globalize.addCultureInfo("de-DE", "de", { numberFormat: { billionZeroes: 12 } }); //Globalize.culture().calendar = Globalize.culture().calendars.SomeOtherCalendar; //Globalize.culture().calendar = Globalize.culture().calendars.standard; diff --git a/globalize/globalize.d.ts b/globalize/globalize.d.ts index d6792115b..91f991833 100644 --- a/globalize/globalize.d.ts +++ b/globalize/globalize.d.ts @@ -100,7 +100,7 @@ interface GlobalizeCultures { interface GlobalizeStatic { cultures: GlobalizeCultures; - init(cultureSelector: string): void; + init(cultureSelector: string): GlobalizeStatic; cultureSelector: string; culture(): GlobalizeCulture; @@ -110,10 +110,10 @@ interface GlobalizeStatic { addCultureInfo(cultureName: string, baseCultureName: string, info: Object): void; addCultureInfo(cultureName: string, info: Object): void; addCultureInfo(info: Object): void; - findClosestCulture(cultureSelector: string): void; + findClosestCulture(cultureSelector: string): GlobalizeStatic; format(value: number, format: string, cultureSelector?: string); format(value: Date, format: string, cultureSelector?: string); - localize(key: string, cultureSelector?: string): void; + localize(key: string, cultureSelector?: string): string; parseDate(value: string, format?: string, cultureSelector?: string): Date; parseDate(value: string, formats?: string[], cultureSelector?: string): Date;