Merge remote-tracking branch 'upstream/master'

2026-09-09 11:13:57 +08:00 · 2014-05-14 21:50:51 +02:00
parent a55232a29a 9371c65e5a
commit a4bd01026c
222 changed files with 306085 additions and 30156 deletions
@@ -22,7 +22,7 @@ declare module ng.translate {
    }

    interface ITranslateService {
-        (key: string, ...params: string[]): string;
+        (key: string, ...params: string[]): ng.IPromise<string>;
        fallbackLanguage(): string;
        preferredLanguage(): string;
        proposedLanguage(): string;