From f941f805be218cbb992c9bad25f2495c6000064d Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Wed, 11 Nov 2015 15:27:55 -0800
Subject: [PATCH] Checkpoint.

---
 src/locale.js       | 22 ++++++++++++++++++++--
 src/locale/en-US.js |  5 ++++-
 src/locale/en.js    |  5 +++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/locale/en.js

diff --git a/src/locale.js b/src/locale.js
index 6af7a20..704dbd2 100644
--- a/src/locale.js
+++ b/src/locale.js
@@ -22,6 +22,10 @@ function newYear(y) {
   return {y: y, m: 0, d: 1, H: 0, M: 0, S: 0, L: 0};
 }
 
+function empty() {
+  return "";
+}
+
 export default function(locale) {
   var locale_dateTime = locale.dateTime,
       locale_date = locale.date,
@@ -30,7 +34,8 @@ export default function(locale) {
       locale_weekdays = locale.days,
       locale_shortWeekdays = locale.shortDays,
       locale_months = locale.months,
-      locale_shortMonths = locale.shortMonths;
+      locale_shortMonths = locale.shortMonths,
+      locale_ordinal = locale.ordinal || empty;
 
   var periodRe = formatRe(locale_periods),
       periodLookup = formatLookup(locale_periods),
@@ -56,6 +61,7 @@ export default function(locale) {
     "j": formatDayOfYear,
     "L": formatMilliseconds,
     "m": formatMonthNumber,
+    "o": formatDayOfMonthOrdinal,
     "M": formatMinutes,
     "p": formatPeriod,
     "S": formatSeconds,
@@ -83,6 +89,7 @@ export default function(locale) {
     "j": formatUTCDayOfYear,
     "L": formatUTCMilliseconds,
     "m": formatUTCMonthNumber,
+    "o": formatUTCDayOfMonthOrdinal,
     "M": formatUTCMinutes,
     "p": formatUTCPeriod,
     "S": formatUTCSeconds,
@@ -110,6 +117,7 @@ export default function(locale) {
     "j": parseDayOfYear,
     "L": parseMilliseconds,
     "m": parseMonthNumber,
+    "o": null, // TODO
     "M": parseMinutes,
     "p": parsePeriod,
     "S": parseSeconds,
@@ -146,7 +154,7 @@ export default function(locale) {
         if (specifier.charCodeAt(i) === 37) {
           string.push(specifier.slice(j, i));
           if ((pad = pads[c = specifier.charAt(++i)]) != null) c = specifier.charAt(++i);
-          else pad = c === "e" ? " " : "0";
+          else pad = c === "e" ? " " : c === "o" ? "" : "0";
           if (format = formats[c]) c = format(date, pad);
           string.push(c);
           j = i + 1;
@@ -247,6 +255,11 @@ export default function(locale) {
     return parseSpecifier(d, locale_time, string, i);
   }
 
+  function formatDayOfMonthOrdinal(d, p) {
+    var v = d.getDate();
+    return pad(v, p, 2) + locale_ordinal(v);
+  }
+
   function formatShortWeekday(d) {
     return locale_shortWeekdays[d.getDay()];
   }
@@ -267,6 +280,11 @@ export default function(locale) {
     return locale_periods[+(d.getHours() >= 12)];
   }
 
+  function formatUTCDayOfMonthOrdinal(d, p) {
+    var v = d.getUTCDate();
+    return pad(v, p, 2) + locale_ordinal(v);
+  }
+
   function formatUTCShortWeekday(d) {
     return locale_shortWeekdays[d.getUTCDay()];
   }
diff --git a/src/locale/en-US.js b/src/locale/en-US.js
index d3e0cf9..edd55d3 100644
--- a/src/locale/en-US.js
+++ b/src/locale/en-US.js
@@ -1,3 +1,5 @@
+import {ordinal} from "./en";
+
 export default {
   dateTime: "%a %b %e %X %Y",
   date: "%m/%d/%Y",
@@ -6,5 +8,6 @@ export default {
   days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
   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"]
+  shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+  ordinal: ordinal
 };
diff --git a/src/locale/en.js b/src/locale/en.js
new file mode 100644
index 0000000..7b0fe24
--- /dev/null
+++ b/src/locale/en.js
@@ -0,0 +1,5 @@
+var ordinals = ["th", "st", "nd", "rd"];
+
+export function ordinal(x) {
+  return ordinals[(3 < x && x < 21) || (x %= 10) > 3 ? 0 : x];
+};