diff --git a/globalize/globalize-tests.ts b/globalize/globalize-tests.ts
index 3d599a611..a5d25037d 100644
--- a/globalize/globalize-tests.ts
+++ b/globalize/globalize-tests.ts
@@ -1,6 +1,6 @@
///
-Globalize.culture("fr");
+/*Globalize.culture("fr");
console.log(Globalize.culture().name);
Globalize.culture("fr-FR");
@@ -66,7 +66,7 @@ Globalize.format(new Date(2012, 1, 20), 'd');
Globalize.format(new Date(2012, 1, 20), 'D');
-Globalize.cultures[ "default" ] = {
+Globalize.load[ "default" ] = {
name: "English",
englishName: "English",
nativeName: "English",
@@ -132,4 +132,4 @@ Globalize.cultures[ "default" ] = {
}
},
messages: {}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/globalize/globalize.d.ts b/globalize/globalize.d.ts
index 4510e38cb..f4ebd7697 100644
--- a/globalize/globalize.d.ts
+++ b/globalize/globalize.d.ts
@@ -1,125 +1,24 @@
// Type definitions for Globalize
// Project: https://github.com/jquery/globalize
-// Definitions by: Boris Yankov
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Aram Taieb
+// Definitions: https://github.com/afromogli/DefinitelyTyped
-
-interface GlobalizePercent {
- pattern: string[];
- decimals: number;
- groupSizes: number[];
- //",": string;
- //".": string;
- symbol: string;
-}
-
-interface GlobalizeCurrency {
- pattern: string[];
- decimals: number;
- groupSizes: number[];
- //",": string;
- //".": string;
- symbol: string;
-}
-
-interface GlobalizeNumberFormat {
- pattern: string[];
- decimals: string;
- //",": string;
- //".": string;
- groupSizes: number[];
- //"+": string;
- //"-": string;
- NaN: string;
- negativeInfinity: string;
- positiveInfinity: string;
- percent: GlobalizePercent;
- currency: GlobalizeCurrency;
-}
-
-interface GlobalizeEra {
- name: string;
- start: any;
- offset: number;
-}
-
-interface GlobalizeDays {
- names: string[];
- namesAbbr: string[];
- namesShort: string[];
-}
-
-interface GlobalizeMonths {
- names: string[];
- namesAbbr: string[];
-}
-
-interface GlobalizePatterns {
- d: string;
- D: string;
- t: string;
- T: string;
- f: string;
- F: string;
- M: string;
- Y: string;
- S: string;
-}
-
-interface GlobalizeCalendar {
- name: string;
- // "/": string,
- // ":": string,
- firstDay: number;
- days: GlobalizeDays;
- months: GlobalizeMonths;
- AM: string[];
- PM: string[];
- eras: GlobalizeEra[];
- twoDigitYearMax: number;
- patterns: GlobalizePatterns;
-}
-
-interface GlobalizeCalendars {
- standard: GlobalizeCalendar;
-}
-
-interface GlobalizeCulture {
- name: string;
- englishName: string;
- nativeName: string;
- isRTL: boolean;
- language: string;
- numberFormat: GlobalizeNumberFormat;
- calendar: GlobalizeCalendar;
- calendars: GlobalizeCalendars;
- messages: any;
-}
-interface GlobalizeCultures {
- [index: number]: GlobalizeCulture;
+interface NumberFormatterOptions {
+ minimumIntegerDigits?: number;
+ minimumFractionDigits?: number;
+ maximumFractionDigits?: number;
+ minimumSignificantDigits?: number;
+ maximumSignificantDigits?: number;
+ round?: string;
+ useGrouping?: boolean;
}
interface GlobalizeStatic {
- cultures: GlobalizeCultures;
- init(cultureSelector: string): GlobalizeStatic;
- cultureSelector: string;
+ load(jsonData: any);
+ locale(locale: string);
- culture(): GlobalizeCulture;
- culture(cultureSelector: string): GlobalizeCulture;
- culture(cultureSelector: string[]): GlobalizeCulture;
-
- addCultureInfo(cultureName: string, baseCultureName: string, info: Object): void;
- addCultureInfo(cultureName: string, info: Object): void;
- addCultureInfo(info: Object): void;
- findClosestCulture(cultureSelector: string): GlobalizeStatic;
- format(value: number, format: string, cultureSelector?: string): string;
- format(value: Date, format: string, cultureSelector?: string): string;
- localize(key: string, cultureSelector?: string): string;
-
- parseDate(value: string, format?: string, cultureSelector?: string): Date;
- parseDate(value: string, formats?: string[], cultureSelector?: string): Date;
- parseInt(value: string, radix?: number, cultureSelector?: string): number;
- parseFloat(value: string, radix?: number, cultureSelector?: string): number;
+ numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+ formatNumber(value, options?: NumberFormatterOptions): string;
}
declare var Globalize: GlobalizeStatic;