From b8de26ecd6a55c86997b6f2a4eb24b30efeebaff Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 30 Sep 2015 14:39:12 -0700
Subject: [PATCH] Merge lib/humanize into lib/formatting
---
resources/frontend_client/app/lib/formatting.js | 14 ++++++++++++++
resources/frontend_client/app/lib/humanize.js | 10 ----------
.../app/query_builder/FieldList.react.js | 2 +-
.../app/query_builder/FieldName.react.js | 2 +-
.../query_builder/filters/FilterPopover.react.js | 7 ++++---
5 files changed, 20 insertions(+), 15 deletions(-)
delete mode 100644 resources/frontend_client/app/lib/humanize.js
diff --git a/resources/frontend_client/app/lib/formatting.js b/resources/frontend_client/app/lib/formatting.js
index 5e0f146bc07..fad0581112c 100644
--- a/resources/frontend_client/app/lib/formatting.js
+++ b/resources/frontend_client/app/lib/formatting.js
@@ -1,6 +1,7 @@
"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, "");
+}
diff --git a/resources/frontend_client/app/lib/humanize.js b/resources/frontend_client/app/lib/humanize.js
deleted file mode 100644
index 11f8366013e..00000000000
--- a/resources/frontend_client/app/lib/humanize.js
+++ /dev/null
@@ -1,10 +0,0 @@
-
-import inflection from "inflection";
-
-export function stripId(name) {
- return name && name.replace(/ id$/i, "");
-}
-
-export function singularize(...args) {
- return inflection.singularize(...args);
-}
diff --git a/resources/frontend_client/app/query_builder/FieldList.react.js b/resources/frontend_client/app/query_builder/FieldList.react.js
index 30c171a6fb1..d2999b19f14 100644
--- a/resources/frontend_client/app/query_builder/FieldList.react.js
+++ b/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";
diff --git a/resources/frontend_client/app/query_builder/FieldName.react.js b/resources/frontend_client/app/query_builder/FieldName.react.js
index 2690b698c83..0a8e7d15e06 100644
--- a/resources/frontend_client/app/query_builder/FieldName.react.js
+++ b/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";
diff --git a/resources/frontend_client/app/query_builder/filters/FilterPopover.react.js b/resources/frontend_client/app/query_builder/filters/FilterPopover.react.js
index aa89d63caca..4f61084bd9a 100644
--- a/resources/frontend_client/app/query_builder/filters/FilterPopover.react.js
+++ b/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";
--
GitLab