Merge lib/humanize into lib/formatting

resources/frontend_client/app/lib/formatting.js

 "use strict";
 
 import d3 from "d3";
+import inflection from "inflection";
 
 var precisionNumberFormatter = d3.format(".2r");
 var fixedNumberFormatter = d3.format(",.f");
@@ -22,3 +23,16 @@ export function formatScalar(scalar) {
         return String(scalar);
     }
 }
+
+export function singularize(...args) {
+    return inflection.singularize(...args);
+}
+
+export function capitalize(...args) {
+    return inflection.capitalize(...args);
+}
+
+// Removes trailing "id" from field names
+export function stripId(name) {
+    return name && name.replace(/ id$/i, "");
+}

resources/frontend_client/app/lib/humanize.js

-
-import inflection from "inflection";
-
-export function stripId(name) {
-    return name && name.replace(/ id$/i, "");
-}
-
-export function singularize(...args) {
-    return inflection.singularize(...args);
-}

resources/frontend_client/app/query_builder/FieldList.react.js

@@ -9,7 +9,7 @@ import TimeGroupingPopover from "./TimeGroupingPopover.react";
 
 import { isDate, getUmbrellaType, TIME, NUMBER, STRING, LOCATION } from 'metabase/lib/schema_metadata';
 import { parseFieldBucketing, parseFieldTarget } from "metabase/lib/query_time";
-import { stripId, singularize } from "metabase/lib/humanize";
+import { stripId, singularize } from "metabase/lib/formatting";
 
 import _ from "underscore";
 

resources/frontend_client/app/query_builder/FieldName.react.js

@@ -8,7 +8,7 @@ import Query from "metabase/lib/query";
 import { parseFieldTarget, parseFieldBucketing, formatBucketing } from "metabase/lib/query_time";
 import { isDate } from "metabase/lib/schema_metadata";
 
-import { stripId } from "metabase/lib/humanize";
+import { stripId } from "metabase/lib/formatting";
 
 import cx from "classnames";
 

resources/frontend_client/app/query_builder/filters/FilterPopover.react.js

@@ -4,16 +4,17 @@ import React, { Component, PropTypes } from "react";
 
 import FieldList from "../FieldList.react";
 import OperatorSelector from "./OperatorSelector.react";
+
+import DatePicker from "./pickers/DatePicker.react";
+import NumberPicker from "./pickers/NumberPicker.react";
 import SelectPicker from "./pickers/SelectPicker.react";
 import TextPicker from "./pickers/TextPicker.react";
-import NumberPicker from "./pickers/NumberPicker.react";
-import DatePicker from "./pickers/DatePicker.react";
 
 import Icon from "metabase/components/Icon.react";
 
 import Query from "metabase/lib/query";
 import { isDate } from "metabase/lib/schema_metadata";
-import { singularize } from "metabase/lib/humanize";
+import { singularize } from "metabase/lib/formatting";
 
 import cx from "classnames";
 import _ from "underscore";