Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use store currency settings to initialize D3 format.

This commit is contained in:
Jeff Stieler 2019-01-17 10:08:15 -07:00
parent 25e81de952
commit 7a0243e6d7
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/woocommerce-admin/packages/components/src/chart/index.js
View File

@ -5,7 +5,6 @@
import { __, sprintf } from '@wordpress/i18n';
import classNames from 'classnames';
import { Component, createRef, Fragment } from '@wordpress/element';
import { decodeEntities } from '@wordpress/html-entities';
import { formatDefaultLocale as d3FormatDefaultLocale } from 'd3-format';
import { get, isEqual, partial } from 'lodash';
import Gridicon from 'gridicons';
@ -26,11 +25,28 @@ import ChartPlaceholder from './placeholder';
import { H, Section } from '../section';
import { D3Chart, D3Legend } from './d3chart';
function getD3CurrencyFormat( symbol, position ) {
switch ( position ) {
case 'left_space':
return [ symbol + ' ', '' ];
case 'right':
return [ '', symbol ];
case 'right_space':
return [ '', ' ' + symbol ];
case 'left':
default:
return [ symbol, '' ];
}
}
const currencySymbol = get( wcSettings, [ 'currency', 'symbol' ], '' );
const symbolPosition = get( wcSettings, [ 'currency', 'position' ], 'left' );
d3FormatDefaultLocale( {
decimal: '.',
thousands: ',',
decimal: get( wcSettings, [ 'currency', 'decimal_separator' ], '.' ),
thousands: get( wcSettings, [ 'currency', 'thousand_separator' ], ',' ),
grouping: [ 3 ],
currency: [ decodeEntities( get( wcSettings, 'currency.symbol', '' ) ), '' ],
currency: getD3CurrencyFormat( currencySymbol, symbolPosition ),
} );
function getOrderedKeys( props, previousOrderedKeys = [] ) {