Fix i18next merge

This commit is contained in:
Nathan Shively-Sanders
2016-08-10 07:13:51 -07:00
parent 15c9fdbdf1
commit a4af2e4e31

6
i18next/index.d.ts vendored
View File

@@ -87,8 +87,8 @@ declare namespace i18n {
type TranslationFunction = (key: string, options?: TranslationOptions) => string;
class I18n {
constructor(options?: Options, callback?: (err: any, t: TranslationFunction) => void);
interface I18n {
//constructor(options?: Options, callback?: (err: any, t: TranslationFunction) => void);
init(options?: Options, callback?: (err: any, t: TranslationFunction) => void): I18n;
@@ -121,7 +121,7 @@ declare namespace i18n {
cloneInstance(options?: Options, callback?: (err: any, t: TranslationFunction) => void): I18n;
on(event: string, listener: () => void): void;
on(initialized: 'initialized', listener: (options: I18next.Options) => void): void;
on(initialized: 'initialized', listener: (options: i18n.Options) => void): void;
on(loaded: 'loaded', listener: (loaded: any) => void): void;
on(failedLoading: 'failedLoading', listener: (lng: string, ns: string, msg: string) => void): void;
on(missingKey: 'missingKey', listener: (lngs: any, namespace: string, key: string, res: any) => void): void;