From fa35d205efc89d776b3a6d93ef79af7fa36dace2 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <tobias.bengfort@liqd.de>
Date: Wed, 24 Sep 2014 12:20:27 +0200
Subject: [PATCH] fix locale/localeData definitions

I am not entirely sure about this. But this is how I understand the
docs.

See http://momentjs.com/docs/#/i18n/
---
 moment/moment-external-tests.ts | 39 +++++++++++++++++++--------------
 moment/moment-tests.ts          | 39 +++++++++++++++++++--------------
 moment/moment.d.ts              |  7 ++++--
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/moment/moment-external-tests.ts b/moment/moment-external-tests.ts
index 559ad7ce6..5f2e23e46 100644
--- a/moment/moment-external-tests.ts
+++ b/moment/moment-external-tests.ts
@@ -230,8 +230,13 @@ adur.subtract(bdur).days();
 adur.subtract(1).days();
 adur.subtract(1, 'd').days();
 
+// Selecting a language
+moment.locale();
+moment.locale('en');
+moment.locale(['en', 'fr']);
+
 // Defining a custom language: 
-moment.localeData('en', {
+moment.locale('en', {
     months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
     monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
     weekdays: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -289,14 +294,14 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     months : [
         "January", "February", "March", "April", "May", "June", "July",
         "August", "September", "October", "November", "December"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     months : function (momentToFormat: Moment, format: string) {
         // momentToFormat is the moment currently being formatted
         // format is the formatting string
@@ -308,14 +313,14 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     monthsShort : [
         "Jan", "Feb", "Mar", "Apr", "May", "Jun",
         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     monthsShort : function (momentToFormat: Moment, format: string) {
         if (/^MMMM/.test(format)) {
             return this.nominative[momentToFormat.month()];
@@ -325,39 +330,39 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdays : [
         "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdays : function (momentToFormat: Moment) {
         return this.weekdays[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysShort : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysShort : function (momentToFormat: Moment) {
         return this.weekdaysShort[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysMin : ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysMin : function (momentToFormat: Moment) {
         return this.weekdaysMin[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     longDateFormat : {
         LT: "h:mm A",
         L: "MM/DD/YYYY",
@@ -371,7 +376,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     longDateFormat : {
         LT: "h:mm A",
         L: "MM/DD/YYYY",
@@ -381,7 +386,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     relativeTime : {
         future: "in %s",
         past:   "%s ago",
@@ -399,7 +404,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     meridiem : function (hour, minute, isLowercase) {
         if (hour < 9) {
             return "早上";
@@ -415,7 +420,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     calendar : {
         lastDay : '[Yesterday at] LT',
         sameDay : '[Today at] LT',
@@ -428,7 +433,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     ordinal : function (number) {
         var b = number % 10;
         var output = (~~ (number % 100 / 10) === 1) ? 'th' :
diff --git a/moment/moment-tests.ts b/moment/moment-tests.ts
index 2a8941d8f..4f81b5020 100644
--- a/moment/moment-tests.ts
+++ b/moment/moment-tests.ts
@@ -228,8 +228,13 @@ adur.subtract(bdur).days();
 adur.subtract(1).days();
 adur.subtract(1, 'd').days();
 
+// Selecting a language
+moment.locale();
+moment.locale('en');
+moment.locale(['en', 'fr']);
+
 // Defining a custom language: 
-moment.localeData('en', {
+moment.locale('en', {
     months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
     monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
     weekdays: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -287,14 +292,14 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     months : [
         "January", "February", "March", "April", "May", "June", "July",
         "August", "September", "October", "November", "December"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     months : function (momentToFormat: Moment, format: string) {
         // momentToFormat is the moment currently being formatted
         // format is the formatting string
@@ -306,14 +311,14 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     monthsShort : [
         "Jan", "Feb", "Mar", "Apr", "May", "Jun",
         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     monthsShort : function (momentToFormat: Moment, format: string) {
         if (/^MMMM/.test(format)) {
             return this.nominative[momentToFormat.month()];
@@ -323,39 +328,39 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdays : [
         "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
     ]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdays : function (momentToFormat: Moment) {
         return this.weekdays[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysShort : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysShort : function (momentToFormat: Moment) {
         return this.weekdaysShort[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysMin : ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     weekdaysMin : function (momentToFormat: Moment) {
         return this.weekdaysMin[momentToFormat.day()];
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     longDateFormat : {
         LT: "h:mm A",
         L: "MM/DD/YYYY",
@@ -369,7 +374,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     longDateFormat : {
         LT: "h:mm A",
         L: "MM/DD/YYYY",
@@ -379,7 +384,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     relativeTime : {
         future: "in %s",
         past:   "%s ago",
@@ -397,7 +402,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     meridiem : function (hour, minute, isLowercase) {
         if (hour < 9) {
             return "早上";
@@ -413,7 +418,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     calendar : {
         lastDay : '[Yesterday at] LT',
         sameDay : '[Today at] LT',
@@ -426,7 +431,7 @@ moment.localeData('en', {
     }
 });
 
-moment.localeData('en', {
+moment.locale('en', {
     ordinal : function (number) {
         var b = number % 10;
         var output = (~~ (number % 100 / 10) === 1) ? 'th' :
diff --git a/moment/moment.d.ts b/moment/moment.d.ts
index 57d967f78..6037b0ef0 100644
--- a/moment/moment.d.ts
+++ b/moment/moment.d.ts
@@ -382,8 +382,11 @@ interface MomentStatic {
     lang(language?: string): string;
     lang(language?: string, definition?: MomentLanguage): string;
 
-    localeData(language?: string): string;
-    localeData(language?: string, definition?: MomentLanguage): string;
+    locale(language?: string): string;
+    locale(language?: string[]): string;
+    locale(language?: string, definition?: MomentLanguage): string;
+
+    localeData(language?: string): MomentLanguage;
 
     longDateFormat: any;
     relativeTime: any;