Include built-in locales by default.

Related d3/d3-format#8.

README.md

@@ -47,11 +47,11 @@ If you use NPM, `npm install d3-time-format`. Otherwise, download the [latest re
 
 <a name="format" href="#format">#</a> <b>format</b>(<i>specifier</i>)
 
-An alias for [*locale*.format](#locale_format) on the default locale. While this method generates output for [U.S. English](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js)-speaking humans by default, humans in other locales may be served using [localeFormat](#localeFormat) or by editing [index.js](https://github.com/d3/d3-time-format/tree/master/index.js) and rebuilding.
+An alias for [*locale*.format](#locale_format) on the default [U.S. English](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js) locale. Use [localeFormat](#localeFormat) for a different built-in locale or to define a new locale.
 
 <a name="utcFormat" href="#utcFormat">#</a> <b>utcFormat</b>(<i>specifier</i>)
 
-An alias for [*locale*.utcFormat](#locale_utcFormat) on the default locale. While this method generates output for [U.S. English](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js)-speaking humans by default, humans in other locales may be served using [localeFormat](#localeFormat) or by editing [index.js](https://github.com/d3/d3-time-format/tree/master/index.js) and rebuilding.
+An alias for [*locale*.utcFormat](#locale_utcFormat) on the default [U.S. English](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js) locale. Use [localeFormat](#localeFormat) for a different built-in locale or to define a new locale.
 
 <a name="isoFormat" href="#isoFormat">#</a> <b>isoFormat</b>
 
@@ -131,7 +131,27 @@ Returns this format’s specifier.
 
 <a name="localeFormat" href="#localeFormat">#</a> <b>localeFormat</b>(<i>definition</i>)
 
-Returns a *locale* object for the specified *definition*, with [*locale*.format](#locale_format) and [*locale*.utcFormat](#locale_utcFormat) methods. The locale *definition* must include the following properties:
+Returns a *locale* object for the specified *definition* with [*locale*.format](#locale_format) and [*locale*.utcFormat](#locale_utcFormat) methods. If *definition* is a string, it is the name of a built-in locale:
+
+* `"ca-ES"` - [Catalan (Spain)](https://github.com/d3/d3-time-format/tree/master/src/locale/ca-ES.js)
+* `"de-DE"` - [German (Germany)](https://github.com/d3/d3-time-format/tree/master/src/locale/de-DE.js)
+* `"en-CA"` - [English (Canada)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-CA.js)
+* `"en-GB"` - [English (United Kingdom)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-GB.js)
+* `"en-US"` - [English (United States)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js)
+* `"es-ES"` - [Spanish (Spain)](https://github.com/d3/d3-time-format/tree/master/src/locale/es-ES.js)
+* `"fi-FI"` - [Finnish (Finland)](https://github.com/d3/d3-time-format/tree/master/src/locale/fi-FI.js)
+* `"fr-CA"` - [French (Canada)](https://github.com/d3/d3-time-format/tree/master/src/locale/fr-CA.js)
+* `"fr-FR"` - [French (France)](https://github.com/d3/d3-time-format/tree/master/src/locale/fr-FR.js)
+* `"he-IL"` - [Hebrew (Israel)](https://github.com/d3/d3-time-format/tree/master/src/locale/he-IL.js)
+* `"it-IT"` - [Italian (Italy)](https://github.com/d3/d3-time-format/tree/master/src/locale/it-IT.js)
+* `"mk-MK"` - [Macedonian (Macedonia)](https://github.com/d3/d3-time-format/tree/master/src/locale/mk-MK.js)
+* `"nl-NL"` - [Dutch (Netherlands)](https://github.com/d3/d3-time-format/tree/master/src/locale/nl-NL.js)
+* `"pl-PL"` - [Polish (Poland)](https://github.com/d3/d3-time-format/tree/master/src/locale/pl-PL.js)
+* `"pt-BR"` - [Portuguese (Brazil)](https://github.com/d3/d3-time-format/tree/master/src/locale/pt-BR.js)
+* `"ru-RU"` - [Russian (Russia)](https://github.com/d3/d3-time-format/tree/master/src/locale/ru-RU.js)
+* `"zh-CN"` - [Chinese (China)](https://github.com/d3/d3-time-format/tree/master/src/locale/zh-CN.js)
+
+Otherwise, the locale *definition* must include the following properties:
 
 * `dateTime` - the date and time (`%c`) format specifier (<i>e.g.</i>, `"%a %b %e %X %Y"`).
 * `date` - the date (`%x`) format specifier (<i>e.g.</i>, `"%m/%d/%Y"`).
@@ -142,30 +162,10 @@ Returns a *locale* object for the specified *definition*, with [*locale*.format]
 * `months` - the full names of the months (starting with January).
 * `shortMonths` - the abbreviated names of the months (starting with January).
 
-The following locale definitions are available in the source:
-
-* [Catalan (Spain)](https://github.com/d3/d3-time-format/tree/master/src/locale/ca-ES.js)
-* [German (Germany)](https://github.com/d3/d3-time-format/tree/master/src/locale/de-DE.js)
-* [English (Canada)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-CA.js)
-* [English (United Kingdom)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-GB.js)
-* [English (United States)](https://github.com/d3/d3-time-format/tree/master/src/locale/en-US.js)
-* [Spanish (Spain)](https://github.com/d3/d3-time-format/tree/master/src/locale/es-ES.js)
-* [Finnish (Finland)](https://github.com/d3/d3-time-format/tree/master/src/locale/fi-FI.js)
-* [French (Canada)](https://github.com/d3/d3-time-format/tree/master/src/locale/fr-CA.js)
-* [French (France)](https://github.com/d3/d3-time-format/tree/master/src/locale/fr-FR.js)
-* [Hebrew (Israel)](https://github.com/d3/d3-time-format/tree/master/src/locale/he-IL.js)
-* [Italian (Italy)](https://github.com/d3/d3-time-format/tree/master/src/locale/it-IT.js)
-* [Macedonian (Macedonia)](https://github.com/d3/d3-time-format/tree/master/src/locale/mk-MK.js)
-* [Dutch (Netherlands)](https://github.com/d3/d3-time-format/tree/master/src/locale/nl-NL.js)
-* [Polish (Poland)](https://github.com/d3/d3-time-format/tree/master/src/locale/pl-PL.js)
-* [Portuguese (Brazil)](https://github.com/d3/d3-time-format/tree/master/src/locale/pt-BR.js)
-* [Russian (Russia)](https://github.com/d3/d3-time-format/tree/master/src/locale/ru-RU.js)
-* [Chinese (China)](https://github.com/d3/d3-time-format/tree/master/src/locale/zh-CN.js)
-
-To change the default locale, edit [index.js](https://github.com/d3/d3-time-format/tree/master/index.js) and run `npm run prepublish`.
-
 ## Changes from D3 3.x:
 
+* Exposed built-in locales.
+
 * Removed format.multi.
 
 * Renamed format.utc to utcFormat and format.iso to isoFormat.

index.js

@@ -1,11 +1,55 @@
 import isoFormat from "./src/isoFormat";
-import locale from "./src/locale/en-US";
-import localeFormat from "./src/localeFormat";
+import locale from "./src/locale";
 
-export var format = locale.format;
-export var utcFormat = locale.utcFormat;
+import caEs from "./src/locale/ca-ES.js";
+import deDe from "./src/locale/de-DE.js";
+import enCa from "./src/locale/en-CA.js";
+import enGb from "./src/locale/en-GB.js";
+import enUs from "./src/locale/en-US.js";
+import esEs from "./src/locale/es-ES.js";
+import fiFi from "./src/locale/fi-FI.js";
+import frCa from "./src/locale/fr-CA.js";
+import frFr from "./src/locale/fr-FR.js";
+import heIl from "./src/locale/he-IL.js";
+import itIt from "./src/locale/it-IT.js";
+import mkMk from "./src/locale/mk-MK.js";
+import nlNl from "./src/locale/nl-NL.js";
+import plPl from "./src/locale/pl-PL.js";
+import ptBr from "./src/locale/pt-BR.js";
+import ruRu from "./src/locale/ru-RU.js";
+import zhCn from "./src/locale/zh-CN.js";
+
+var localeDefinitions = (new Map)
+    .set("ca-ES", caEs)
+    .set("de-DE", deDe)
+    .set("en-CA", enCa)
+    .set("en-GB", enGb)
+    .set("en-US", enUs)
+    .set("es-ES", esEs)
+    .set("fi-FI", fiFi)
+    .set("fr-CA", frCa)
+    .set("fr-FR", frFr)
+    .set("he-IL", heIl)
+    .set("it-IT", itIt)
+    .set("mk-MK", mkMk)
+    .set("nl-NL", nlNl)
+    .set("pl-PL", plPl)
+    .set("pt-BR", ptBr)
+    .set("ru-RU", ruRu)
+    .set("zh-CN", zhCn);
+
+var defaultLocale = locale(enUs);
+export var format = defaultLocale.format;
+export var utcFormat = defaultLocale.utcFormat;
+
+export function localeFormat(definition) {
+  if (typeof definition === "string") {
+    definition = localeDefinitions.get(definition);
+    if (!definition) return null;
+  }
+  return locale(definition);
+};
 
 export {
-  isoFormat,
-  localeFormat
+  isoFormat
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3-time-format",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "A JavaScript time formatter and parser inspired by strftime and strptime.",
   "keywords": [
     "d3",

src/locale/ca-ES.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e de %B de %Y, %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["dg.", "dl.", "dt.", "dc.", "dj.", "dv.", "ds."],
   months: ["gener", "febrer", "març", "abril", "maig", "juny", "juliol", "agost", "setembre", "octubre", "novembre", "desembre"],
   shortMonths: ["gen.", "febr.", "març", "abr.", "maig", "juny", "jul.", "ag.", "set.", "oct.", "nov.", "des."]
-});
+};

src/locale/de-DE.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, der %e. %B %Y, %X",
   date: "%d.%m.%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"],
   months: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
   shortMonths: ["Jan", "Feb", "Mrz", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
-});
+};

src/locale/en-CA.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %b %e %X %Y",
   date: "%Y-%m-%d",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
   months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
   shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
+};

src/locale/en-GB.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %e %b %X %Y",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
   months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
   shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
+};

src/locale/en-US.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %b %e %X %Y",
   date: "%m/%d/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
   months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
   shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
+};

src/locale/es-ES.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e de %B de %Y, %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["dom", "lun", "mar", "mié", "jue", "vie", "sáb"],
   months: ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"],
   shortMonths: ["ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"]
-});
+};

src/locale/fi-FI.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %-d. %Bta %Y klo %X",
   date: "%-d.%-m.%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Su", "Ma", "Ti", "Ke", "To", "Pe", "La"],
   months: ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"],
   shortMonths: ["Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä", "Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu"]
-});
+};

src/locale/fr-CA.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %e %b %Y %X",
   date: "%Y-%m-%d",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"],
   months: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"],
   shortMonths: ["jan", "fév", "mar", "avr", "mai", "jui", "jul", "aoû", "sep", "oct", "nov", "déc"]
-});
+};

src/locale/fr-FR.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, le %e %B %Y, %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam."],
   months: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"],
   shortMonths: ["janv.", "févr.", "mars", "avr.", "mai", "juin", "juil.", "août", "sept.", "oct.", "nov.", "déc."]
-});
+};

src/locale/he-IL.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e ב%B %Y %X",
   date: "%d.%m.%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["א׳", "ב׳", "ג׳", "ד׳", "ה׳", "ו׳", "ש׳"],
   months: ["ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני", "יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר"],
   shortMonths: ["ינו׳", "פבר׳", "מרץ", "אפר׳", "מאי", "יוני", "יולי", "אוג׳", "ספט׳", "אוק׳", "נוב׳", "דצמ׳"]
-});
+};

src/locale/it-IT.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A %e %B %Y, %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"],
   months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
   shortMonths: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"]
-});
+};

src/locale/mk-MK.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e %B %Y г. %X",
   date: "%d.%m.%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["нед", "пон", "вто", "сре", "чет", "пет", "саб"],
   months: ["јануари", "февруари", "март", "април", "мај", "јуни", "јули", "август", "септември", "октомври", "ноември", "декември"],
   shortMonths: ["јан", "фев", "мар", "апр", "мај", "јун", "јул", "авг", "сеп", "окт", "ное", "дек"]
-});
+};

src/locale/nl-NL.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %e %B %Y %T",
   date: "%d-%m-%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["zo", "ma", "di", "wo", "do", "vr", "za"],
   months: ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"],
   shortMonths: ["jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"]
-});
+};

src/locale/pl-PL.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e %B %Y, %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Niedz.", "Pon.", "Wt.", "Śr.", "Czw.", "Pt.", "Sob."],
   months: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"],
   shortMonths: ["Stycz.", "Luty", "Marz.", "Kwie.", "Maj", "Czerw.", "Lipc.", "Sierp.", "Wrz.", "Paźdz.", "Listop.", "Grudz."]/* In Polish language abbraviated months are not commonly used so there is a dispute about the proper abbraviations. */
-});
+};

src/locale/pt-BR.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e de %B de %Y. %X",
   date: "%d/%m/%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb"],
   months: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"],
   shortMonths: ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"]
-});
+};

src/locale/ru-RU.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%A, %e %B %Y г. %X",
   date: "%d.%m.%Y",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["вс", "пн", "вт", "ср", "чт", "пт", "сб"],
   months: ["января", "февраля", "марта", "апреля", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря"],
   shortMonths: ["янв", "фев", "мар", "апр", "май", "июн", "июл", "авг", "сен", "окт", "ноя", "дек"]
-});
+};

src/locale/zh-CN.js

@@ -1,6 +1,4 @@
-import localeFormat from "../localeFormat";
-
-export default localeFormat({
+export default {
   dateTime: "%a %b %e %X %Y",
   date: "%Y/%-m/%-d",
   time: "%H:%M:%S",
@@ -9,4 +7,4 @@ export default localeFormat({
   shortDays: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
   months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
   shortMonths: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
-});
+};