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

Merge pull request #32438 from woocommerce/fix/woocommerce-admin-i18n-textdomain 

Replace i18n textdomain 'woocommerce-admin' with 'woocommerce'
This commit is contained in:
RJ 2022-04-01 23:46:35 +08:00 committed by GitHub
parent d062f2e5fa ce874e6a75
commit feba6a8dcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
400 changed files with 3064 additions and 3471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/js/components/src/advanced-filters/README.md
View File

@ -12,24 +12,24 @@ const config = {
// A sentence describing filters for Orders
// See screen shot for context: https://cloudup.com/cSsUY9VeCVJ
'Orders Match {{select /}} Filters',
'woocommerce-admin'
'woocommerce'
),
filters: {
status: {
labels: {
add: __( 'Order Status', 'woocommerce-admin' ),
remove: __( 'Remove order status filter', 'woocommerce-admin' ),
add: __( 'Order Status', 'woocommerce' ),
remove: __( 'Remove order status filter', 'woocommerce' ),
rule: __(
'Select an order status filter match',
'woocommerce-admin'
'woocommerce'
),
// A sentence describing an Order Status filter
// See screen shot for context: https://cloudup.com/cSsUY9VeCVJ
title: __(
'Order Status {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select an order status', 'woocommerce-admin' ),
filter: __( 'Select an order status', 'woocommerce' ),
},
rules: [
{
@ -37,14 +37,14 @@ const config = {
// Sentence fragment, logical, "Is"
// Refers to searching for orders matching a chosen order status
// Screenshot for context: https://cloudup.com/cSsUY9VeCVJ
label: _x( 'Is', 'order status', 'woocommerce-admin' ),
label: _x( 'Is', 'order status', 'woocommerce' ),
},
{
value: 'is_not',
// Sentence fragment, logical, "Is Not"
// Refers to searching for orders that don't match a chosen order status
// Screenshot for context: https://cloudup.com/cSsUY9VeCVJ
label: _x( 'Is Not', 'order status', 'woocommerce-admin' ),
label: _x( 'Is Not', 'order status', 'woocommerce' ),
},
],
input: {
@ -139,15 +139,15 @@ const config = {
rules: [
{
value: 'before',
label: __( 'Before', 'woocommerce-admin' ),
label: __( 'Before', 'woocommerce' ),
},
{
value: 'after',
label: __( 'After', 'woocommerce-admin' ),
label: __( 'After', 'woocommerce' ),
},
{
value: 'between',
label: __( 'Between', 'woocommerce-admin' ),
label: __( 'Between', 'woocommerce' ),
},
],
input: {
@ -172,15 +172,15 @@ const config = {
rules: [
{
value: 'lessthan',
label: __( 'Less Than', 'woocommerce-admin' ),
label: __( 'Less Than', 'woocommerce' ),
},
{
value: 'morethan',
label: __( 'More Than', 'woocommerce-admin' ),
label: __( 'More Than', 'woocommerce' ),
},
{
value: 'between',
label: __( 'Between', 'woocommerce-admin' ),
label: __( 'Between', 'woocommerce' ),
},
],
input: {

8
packages/js/components/src/advanced-filters/attribute-filter.js
View File

@ -59,7 +59,7 @@ const getScreenReaderText = ( {
/* translators: Sentence fragment describing a product attribute match. Example: "Color Is Not Blue" - attribute = Color, equals = Is Not, value = Blue */
mixedString: __(
'{{attribute /}} {{equals /}} {{value /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
attribute: <Fragment>{ attributeName }</Fragment>,
@ -202,14 +202,14 @@ const AttributeFilter = ( props ) => {
type="attributes"
placeholder={ __(
'Attribute name',
'woocommerce-admin'
'woocommerce'
) }
multiple={ false }
selected={ selectedAttribute }
inlineTags
aria-label={ __(
'Attribute name',
'woocommerce-admin'
'woocommerce'
) }
/>
) : (
@ -225,7 +225,7 @@ const AttributeFilter = ( props ) => {
className="woocommerce-filters-advanced__input woocommerce-search"
placeholder={ __(
'Attribute value',
'woocommerce-admin'
'woocommerce'
) }
inlineTags
isSearchable

6
packages/js/components/src/advanced-filters/date-filter.js
View File

@ -16,8 +16,8 @@ import moment from 'moment';
import DatePicker from '../calendar/date-picker';
import { textContent } from './utils';
const dateStringFormat = __( 'MMM D, YYYY', 'woocommerce-admin' );
const dateFormat = __( 'MM/DD/YYYY', 'woocommerce-admin' );
const dateStringFormat = __( 'MMM D, YYYY', 'woocommerce' );
const dateFormat = __( 'MM/DD/YYYY', 'woocommerce' );
class DateFilter extends Component {
constructor( { filter } ) {
@ -48,7 +48,7 @@ class DateFilter extends Component {
return _x(
'{{after /}}{{span}} and {{/span}}{{before /}}',
'Date range inputs arranged on a single line',
'woocommerce-admin'
'woocommerce'
);
}

20
packages/js/components/src/advanced-filters/index.js
View File

@ -32,8 +32,8 @@ import AdvancedFilterItem from './item';
import { Text } from '../experimental';
const matches = [
{ value: 'all', label: __( 'All', 'woocommerce-admin' ) },
{ value: 'any', label: __( 'Any', 'woocommerce-admin' ) },
{ value: 'all', label: __( 'All', 'woocommerce' ) },
{ value: 'any', label: __( 'Any', 'woocommerce' ) },
];
/**
@ -154,7 +154,7 @@ class AdvancedFilters extends Component {
onChange={ this.onMatchChange }
aria-label={ __(
'Choose to apply any or all filters',
'woocommerce-admin'
'woocommerce'
) }
/>
),
@ -330,10 +330,7 @@ class AdvancedFilters extends Component {
aria-expanded={ isOpen }
>
<AddOutlineIcon />
{ __(
'Add a Filter',
'woocommerce-admin'
) }
{ __( 'Add a Filter', 'woocommerce' ) }
</Button>
) }
renderContent={ ( { onClose } ) => (
@ -364,7 +361,7 @@ class AdvancedFilters extends Component {
<div className="woocommerce-filters-advanced__controls">
{ updateDisabled && (
<Button isPrimary disabled>
{ __( 'Filter', 'woocommerce-admin' ) }
{ __( 'Filter', 'woocommerce' ) }
</Button>
) }
{ ! updateDisabled && (
@ -374,7 +371,7 @@ class AdvancedFilters extends Component {
href={ updateHref }
onClick={ this.onFilter }
>
{ __( 'Filter', 'woocommerce-admin' ) }
{ __( 'Filter', 'woocommerce' ) }
</Link>
) }
{ activeFilters.length > 0 && (
@ -383,10 +380,7 @@ class AdvancedFilters extends Component {
href={ this.getUpdateHref( [] ) }
onClick={ this.clearFilters }
>
{ __(
'Clear all filters',
'woocommerce-admin'
) }
{ __( 'Clear all filters', 'woocommerce' ) }
</Link>
) }
</div>

10
packages/js/components/src/advanced-filters/number-filter.js
View File

@ -21,7 +21,7 @@ class NumberFilter extends Component {
return _x(
'{{rangeStart /}}{{span}} and {{/span}}{{rangeEnd /}}',
'Numerical range inputs arranged on a single line',
'woocommerce-admin'
'woocommerce'
);
}
@ -151,7 +151,7 @@ class NumberFilter extends Component {
labelFormat = _x(
'%(field)s maximum amount',
'maximum value input',
'woocommerce-admin'
'woocommerce'
);
} else {
/* eslint-disable-next-line max-len */
@ -159,7 +159,7 @@ class NumberFilter extends Component {
labelFormat = _x(
'%(field)s minimum amount',
'minimum value input',
'woocommerce-admin'
'woocommerce'
);
}
@ -207,7 +207,7 @@ class NumberFilter extends Component {
label: sprintf(
/* eslint-disable-next-line max-len */
/* translators: Sentence fragment, "range start" refers to the first of two numeric values the field must be between. Screenshot for context: https://cloudup.com/cmv5CLyMPNQ */
__( '%(field)s range start', 'woocommerce-admin' ),
__( '%(field)s range start', 'woocommerce' ),
{ field: get( config, [ 'labels', 'add' ] ) }
),
onChange: rangeStartOnChange,
@ -220,7 +220,7 @@ class NumberFilter extends Component {
label: sprintf(
/* eslint-disable-next-line max-len */
/* translators: Sentence fragment, "range end" refers to the second of two numeric values the field must be between. Screenshot for context: https://cloudup.com/cmv5CLyMPNQ */
__( '%(field)s range end', 'woocommerce-admin' ),
__( '%(field)s range end', 'woocommerce' ),
{ field: get( config, [ 'labels', 'add' ] ) }
),
onChange: rangeEndOnChange,

6
packages/js/components/src/calendar/date-picker.js
View File

@ -96,12 +96,12 @@ class DatePicker extends Component {
onChange={ this.onInputChange }
onBlur={ partial( this.handleBlur, isOpen, onToggle ) }
dateFormat={ dateFormat }
label={ __( 'Choose a date', 'woocommerce-admin' ) }
label={ __( 'Choose a date', 'woocommerce' ) }
error={ error }
describedBy={ sprintf(
__(
'Date input describing a selected date in format %s',
'woocommerce-admin'
'woocommerce'
),
dateFormat
) }
@ -118,7 +118,7 @@ class DatePicker extends Component {
renderContent={ ( { onToggle } ) => (
<Section component={ false }>
<H className="woocommerce-calendar__date-picker-title">
{ __( 'select a date', 'woocommerce-admin' ) }
{ __( 'select a date', 'woocommerce' ) }
</H>
<div className="woocommerce-calendar__react-dates is-core-datepicker">
<WpDatePicker

10
packages/js/components/src/calendar/date-range.js
View File

@ -191,30 +191,30 @@ class DateRange extends Component {
value={ afterText }
onChange={ partial( this.onInputChange, 'after' ) }
dateFormat={ shortDateFormat }
label={ __( 'Start Date', 'woocommerce-admin' ) }
label={ __( 'Start Date', 'woocommerce' ) }
error={ afterError }
describedBy={ sprintf(
__(
"Date input describing a selected date range's start date in format %s",
'woocommerce-admin'
'woocommerce'
),
shortDateFormat
) }
onFocus={ () => this.onFocusChange( 'startDate' ) }
/>
<div className="woocommerce-calendar__inputs-to">
{ __( 'to', 'woocommerce-admin' ) }
{ __( 'to', 'woocommerce' ) }
</div>
<DateInput
value={ beforeText }
onChange={ partial( this.onInputChange, 'before' ) }
dateFormat={ shortDateFormat }
label={ __( 'End Date', 'woocommerce-admin' ) }
label={ __( 'End Date', 'woocommerce' ) }
error={ beforeError }
describedBy={ sprintf(
__(
"Date input describing a selected date range's end date in format %s",
'woocommerce-admin'
'woocommerce'
),
shortDateFormat
) }

56
packages/js/components/src/calendar/phrases.js
View File

@ -4,61 +4,55 @@
import { __, sprintf } from '@wordpress/i18n';
export default {
calendarLabel: __( 'Calendar', 'woocommerce-admin' ),
closeDatePicker: __( 'Close', 'woocommerce-admin' ),
calendarLabel: __( 'Calendar', 'woocommerce' ),
closeDatePicker: __( 'Close', 'woocommerce' ),
focusStartDate: __(
'Interact with the calendar and select start and end dates.',
'woocommerce-admin'
'woocommerce'
),
clearDate: __( 'Clear Date', 'woocommerce-admin' ),
clearDates: __( 'Clear Dates', 'woocommerce-admin' ),
clearDate: __( 'Clear Date', 'woocommerce' ),
clearDates: __( 'Clear Dates', 'woocommerce' ),
jumpToPrevMonth: __(
'Move backward to switch to the previous month.',
'woocommerce-admin'
'woocommerce'
),
jumpToNextMonth: __(
'Move forward to switch to the next month.',
'woocommerce-admin'
'woocommerce'
),
enterKey: __( 'Enter key', 'woocommerce-admin' ),
leftArrowRightArrow: __( 'Right and left arrow keys', 'woocommerce-admin' ),
upArrowDownArrow: __( 'up and down arrow keys', 'woocommerce-admin' ),
pageUpPageDown: __( 'page up and page down keys', 'woocommerce-admin' ),
homeEnd: __( 'Home and end keys', 'woocommerce-admin' ),
escape: __( 'Escape key', 'woocommerce-admin' ),
questionMark: __( 'Question mark', 'woocommerce-admin' ),
selectFocusedDate: __( 'Select the date in focus.', 'woocommerce-admin' ),
enterKey: __( 'Enter key', 'woocommerce' ),
leftArrowRightArrow: __( 'Right and left arrow keys', 'woocommerce' ),
upArrowDownArrow: __( 'up and down arrow keys', 'woocommerce' ),
pageUpPageDown: __( 'page up and page down keys', 'woocommerce' ),
homeEnd: __( 'Home and end keys', 'woocommerce' ),
escape: __( 'Escape key', 'woocommerce' ),
questionMark: __( 'Question mark', 'woocommerce' ),
selectFocusedDate: __( 'Select the date in focus.', 'woocommerce' ),
moveFocusByOneDay: __(
'Move backward (left) and forward (right) by one day.',
'woocommerce-admin'
'woocommerce'
),
moveFocusByOneWeek: __(
'Move backward (up) and forward (down) by one week.',
'woocommerce-admin'
'woocommerce'
),
moveFocusByOneMonth: __( 'Switch months.', 'woocommerce-admin' ),
moveFocusByOneMonth: __( 'Switch months.', 'woocommerce' ),
moveFocustoStartAndEndOfWeek: __(
'Go to the first or last day of a week.',
'woocommerce-admin'
),
returnFocusToInput: __(
'Return to the date input field.',
'woocommerce-admin'
'woocommerce'
),
returnFocusToInput: __( 'Return to the date input field.', 'woocommerce' ),
keyboardNavigationInstructions: __(
'Press the down arrow key to interact with the calendar and select a date.',
'woocommerce-admin'
'woocommerce'
),
chooseAvailableStartDate: ( { date } ) =>
sprintf(
__( 'Select %s as a start date.', 'woocommerce-admin' ),
date
),
sprintf( __( 'Select %s as a start date.', 'woocommerce' ), date ),
chooseAvailableEndDate: ( { date } ) =>
sprintf( __( 'Select %s as an end date.', 'woocommerce-admin' ), date ),
sprintf( __( 'Select %s as an end date.', 'woocommerce' ), date ),
chooseAvailableDate: ( { date } ) => date,
dateIsUnavailable: ( { date } ) =>
sprintf( __( '%s is not selectable.', 'woocommerce-admin' ), date ),
sprintf( __( '%s is not selectable.', 'woocommerce' ), date ),
dateIsSelected: ( { date } ) =>
sprintf( __( 'Selected. %s', 'woocommerce-admin' ), date ),
sprintf( __( 'Selected. %s', 'woocommerce' ), date ),
};

2
packages/js/components/src/chart/d3chart/legend.js vendored
View File

@ -122,7 +122,7 @@ class D3Legend extends Component {
? sprintf(
__(
'You may select up to %d items.',
'woocommerce-admin'
'woocommerce'
),
selectionLimit
)

21
packages/js/components/src/chart/index.js
View File

@ -238,12 +238,12 @@ class Chart extends Component {
}
const intervalLabels = {
hour: __( 'By hour', 'woocommerce-admin' ),
day: __( 'By day', 'woocommerce-admin' ),
week: __( 'By week', 'woocommerce-admin' ),
month: __( 'By month', 'woocommerce-admin' ),
quarter: __( 'By quarter', 'woocommerce-admin' ),
year: __( 'By year', 'woocommerce-admin' ),
hour: __( 'By hour', 'woocommerce' ),
day: __( 'By day', 'woocommerce' ),
week: __( 'By week', 'woocommerce' ),
month: __( 'By month', 'woocommerce' ),
quarter: __( 'By quarter', 'woocommerce' ),
year: __( 'By year', 'woocommerce' ),
};
return (
@ -390,10 +390,7 @@ class Chart extends Component {
chartType === 'line',
}
) }
title={ __(
'Line chart',
'woocommerce-admin'
) }
title={ __( 'Line chart', 'woocommerce' ) }
aria-checked={ chartType === 'line' }
role="menuitemradio"
tabIndex={ chartType === 'line' ? 0 : -1 }
@ -412,7 +409,7 @@ class Chart extends Component {
chartType === 'bar',
}
) }
title={ __( 'Bar chart', 'woocommerce-admin' ) }
title={ __( 'Bar chart', 'woocommerce' ) }
aria-checked={ chartType === 'bar' }
role="menuitemradio"
tabIndex={ chartType === 'bar' ? 0 : -1 }
@ -440,7 +437,7 @@ class Chart extends Component {
<span className="screen-reader-text">
{ __(
'Your requested data is loading',
'woocommerce-admin'
'woocommerce'
) }
</span>
<ChartPlaceholder height={ chartHeight } />

2
packages/js/components/src/compare-filter/index.js
View File

@ -126,7 +126,7 @@ export class CompareFilter extends Component {
</CompareButton>
{ selected.length > 0 && (
<Button isLink={ true } onClick={ this.clearQuery }>
{ __( 'Clear all', 'woocommerce-admin' ) }
{ __( 'Clear all', 'woocommerce' ) }
</Button>
) }
</CardFooter>

2
packages/js/components/src/date-range-filter-picker/compare-periods.js
View File

@ -21,7 +21,7 @@ class ComparePeriods extends Component {
selected={ compare }
onSelect={ onSelect }
name="compare"
legend={ __( 'compare to', 'woocommerce-admin' ) }
legend={ __( 'compare to', 'woocommerce' ) }
/>
);
}

25
packages/js/components/src/date-range-filter-picker/content.js
View File

@ -65,25 +65,22 @@ class DatePickerContent extends Component {
return (
<div>
<H className="screen-reader-text" tabIndex="0">
{ __(
'Select date range and comparison',
'woocommerce-admin'
) }
{ __( 'Select date range and comparison', 'woocommerce' ) }
</H>
<Section component={ false }>
<H className="woocommerce-filters-date__text">
{ __( 'select a date range', 'woocommerce-admin' ) }
{ __( 'select a date range', 'woocommerce' ) }
</H>
<TabPanel
tabs={ [
{
name: 'period',
title: __( 'Presets', 'woocommerce-admin' ),
title: __( 'Presets', 'woocommerce' ),
className: 'woocommerce-filters-date__tab',
},
{
name: 'custom',
title: __( 'Custom', 'woocommerce-admin' ),
title: __( 'Custom', 'woocommerce' ),
className: 'woocommerce-filters-date__tab',
},
] }
@ -130,10 +127,7 @@ class DatePickerContent extends Component {
ref={ this.controlsRef }
>
<H className="woocommerce-filters-date__text">
{ __(
'compare to',
'woocommerce-admin'
) }
{ __( 'compare to', 'woocommerce' ) }
</H>
<ComparePeriods
onSelect={ onUpdate }
@ -149,10 +143,7 @@ class DatePickerContent extends Component {
! ( after || before )
}
>
{ __(
'Reset',
'woocommerce-admin'
) }
{ __( 'Reset', 'woocommerce' ) }
</Button>
) }
{ isValidSelection( selected.name ) ? (
@ -166,7 +157,7 @@ class DatePickerContent extends Component {
>
{ __(
'Update',
'woocommerce-admin'
'woocommerce'
) }
</Button>
) : (
@ -177,7 +168,7 @@ class DatePickerContent extends Component {
>
{ __(
'Update',
'woocommerce-admin'
'woocommerce'
) }
</Button>
) }

6
packages/js/components/src/date-range-filter-picker/index.js
View File

@ -14,7 +14,7 @@ import classnames from 'classnames';
import DatePickerContent from './content';
import DropdownButton from '../dropdown-button';
const shortDateFormat = __( 'MM/DD/YYYY', 'woocommerce-admin' );
const shortDateFormat = __( 'MM/DD/YYYY', 'woocommerce' );
/**
* Select a range of dates or single dates.
@ -86,7 +86,7 @@ class DateRangeFilterPicker extends Component {
const { primaryDate, secondaryDate } = this.props.dateQuery;
return [
`${ primaryDate.label } (${ primaryDate.range })`,
`${ __( 'vs.', 'woocommerce-admin' ) } ${ secondaryDate.label } (${
`${ __( 'vs.', 'woocommerce' ) } ${ secondaryDate.label } (${
secondaryDate.range
})`,
];
@ -135,7 +135,7 @@ class DateRangeFilterPicker extends Component {
return (
<div className="woocommerce-filters-filter">
<span className="woocommerce-filters-label">
{ __( 'Date range', 'woocommerce-admin' ) }:
{ __( 'Date range', 'woocommerce' ) }:
</span>
<Dropdown
contentClassName={ contentClasses }

2
packages/js/components/src/date-range-filter-picker/preset-periods.js
View File

@ -25,7 +25,7 @@ class PresetPeriods extends Component {
selected={ period }
onSelect={ onSelect }
name="period"
legend={ __( 'select a preset period', 'woocommerce-admin' ) }
legend={ __( 'select a preset period', 'woocommerce' ) }
/>
);
}

2
packages/js/components/src/dynamic-form/dynamic-form.tsx
View File

@ -55,7 +55,7 @@ export const DynamicForm: React.FC< DynamicFormProps > = ( {
onSubmit = () => {},
onChange = () => {},
validate = () => ( {} ),
submitLabel = __( 'Proceed', 'woocommerce-admin' ),
submitLabel = __( 'Proceed', 'woocommerce' ),
} ) => {
// Support accepting fields in the format provided by the API (object), but transform to Array
const fields =

2
packages/js/components/src/filter-picker/index.js
View File

@ -305,7 +305,7 @@ class FilterPicker extends Component {
expandOnMobile
headerTitle={ __(
'filter report to show:',
'woocommerce-admin'
'woocommerce'
) }
renderToggle={ ( { isOpen, onToggle } ) => (
<DropdownButton

2
packages/js/components/src/filters/index.js
View File

@ -121,7 +121,7 @@ class ReportFilters extends Component {
return (
<Fragment>
<H className="screen-reader-text">
{ __( 'Filters', 'woocommerce-admin' ) }
{ __( 'Filters', 'woocommerce' ) }
</H>
<Section component="div" className="woocommerce-filters">
<div className="woocommerce-filters__basic-filters">

4
packages/js/components/src/image-upload/index.js
View File

@ -76,7 +76,7 @@ class ImageUpload extends Component {
className="woocommerce-image-upload__remove-image"
onClick={ this.removeImage }
>
{ __( 'Remove image', 'woocommerce-admin' ) }
{ __( 'Remove image', 'woocommerce' ) }
</Button>
</div>
) }
@ -94,7 +94,7 @@ class ImageUpload extends Component {
isSecondary
>
<Icon icon={ upload } />
{ __( 'Add an image', 'woocommerce-admin' ) }
{ __( 'Add an image', 'woocommerce' ) }
</Button>
</div>
) }

10
packages/js/components/src/pagination/index.js
View File

@ -108,7 +108,7 @@ class Pagination extends Component {
aria-live="polite"
>
{ sprintf(
__( 'Page %d of %d', 'woocommerce-admin' ),
__( 'Page %d of %d', 'woocommerce' ),
page,
this.pageCount
) }
@ -119,7 +119,7 @@ class Pagination extends Component {
className={ previousLinkClass }
disabled={ ! ( page > 1 ) }
onClick={ this.previousPage }
label={ __( 'Previous Page', 'woocommerce-admin' ) }
label={ __( 'Previous Page', 'woocommerce' ) }
>
<Icon icon={ chevronLeft } />
</Button>
@ -127,7 +127,7 @@ class Pagination extends Component {
className={ nextLinkClass }
disabled={ ! ( page < this.pageCount ) }
onClick={ this.nextPage }
label={ __( 'Next Page', 'woocommerce-admin' ) }
label={ __( 'Next Page', 'woocommerce' ) }
>
<Icon icon={ chevronRight } />
</Button>
@ -154,7 +154,7 @@ class Pagination extends Component {
htmlFor={ instanceId }
className="woocommerce-pagination__page-picker-label"
>
{ __( 'Go to page', 'woocommerce-admin' ) }
{ __( 'Go to page', 'woocommerce' ) }
<input
id={ instanceId }
className={ inputClass }
@ -181,7 +181,7 @@ class Pagination extends Component {
return (
<div className="woocommerce-pagination__per-page-picker">
<SelectControl
label={ __( 'Rows per page', 'woocommerce-admin' ) }
label={ __( 'Rows per page', 'woocommerce' ) }
labelPosition="side"
value={ this.props.perPage }
onChange={ this.perPageChange }

15
packages/js/components/src/plugins/index.js
View File

@ -91,13 +91,10 @@ export class Plugins extends Component {
isBusy={ isRequesting }
onClick={ this.installAndActivate }
>
{ __( 'Retry', 'woocommerce-admin' ) }
{ __( 'Retry', 'woocommerce' ) }
</Button>
<Button onClick={ this.skipInstaller }>
{ __(
'Continue without installing',
'woocommerce-admin'
) }
{ __( 'Continue without installing', 'woocommerce' ) }
</Button>
</Fragment>
);
@ -115,7 +112,7 @@ export class Plugins extends Component {
isBusy={ isRequesting }
onClick={ this.skipInstaller }
>
{ __( 'Continue', 'woocommerce-admin' ) }
{ __( 'Continue', 'woocommerce' ) }
</Button>
</Fragment>
);
@ -128,14 +125,14 @@ export class Plugins extends Component {
isPrimary
onClick={ this.installAndActivate }
>
{ __( 'Install & enable', 'woocommerce-admin' ) }
{ __( 'Install & enable', 'woocommerce' ) }
</Button>
<Button isTertiary onClick={ this.skipInstaller }>
{ skipText || __( 'No thanks', 'woocommerce-admin' ) }
{ skipText || __( 'No thanks', 'woocommerce' ) }
</Button>
{ onAbort && (
<Button isTertiary onClick={ onAbort }>
{ abortText || __( 'Abort', 'woocommerce-admin' ) }
{ abortText || __( 'Abort', 'woocommerce' ) }
</Button>
) }
</Fragment>

2
packages/js/components/src/rating/index.js
View File

@ -38,7 +38,7 @@ class Rating extends Component {
};
const label = sprintf(
__( '%1$s out of %2$s stars.', 'woocommerce-admin' ),
__( '%1$s out of %2$s stars.', 'woocommerce' ),
rating,
totalStars
);

19
packages/js/components/src/search-list-control/index.js
View File

@ -28,22 +28,17 @@ import SearchListItem from './item';
import Tag from '../tag';
const defaultMessages = {
clear: __( 'Clear all selected items', 'woocommerce-admin' ),
noItems: __( 'No items found.', 'woocommerce-admin' ),
noResults: __( 'No results for %s', 'woocommerce-admin' ),
search: __( 'Search for items', 'woocommerce-admin' ),
clear: __( 'Clear all selected items', 'woocommerce' ),
noItems: __( 'No items found.', 'woocommerce' ),
noResults: __( 'No results for %s', 'woocommerce' ),
search: __( 'Search for items', 'woocommerce' ),
selected: ( n ) =>
sprintf(
/* translators: Number of items selected from list. */
_n(
'%d item selected',
'%d items selected',
n,
'woocommerce-admin'
),
_n( '%d item selected', '%d items selected', n, 'woocommerce' ),
n
),
updated: __( 'Search results updated.', 'woocommerce-admin' ),
updated: __( 'Search results updated.', 'woocommerce' ),
};
/**
@ -201,7 +196,7 @@ export const SearchListControl = ( props ) => {
onClick={ onChange( [] ) }
aria-label={ messages.clear }
>
{ __( 'Clear all', 'woocommerce-admin' ) }
{ __( 'Clear all', 'woocommerce' ) }
</Button>
) : null }
</div>

2
packages/js/components/src/search/autocompleters/attributes.js
View File

@ -122,7 +122,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All attributes with names that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/categories.js
View File

@ -122,7 +122,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All categories with titles that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/coupons.js
View File

@ -121,7 +121,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All coupons with codes that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/customers.js
View File

@ -122,7 +122,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All customers with names that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/product.js
View File

@ -122,7 +122,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All products with titles that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/taxes.js
View File

@ -121,7 +121,7 @@ export default {
{ interpolateComponents( {
mixedString: __(
'All taxes with codes that include {{query /}}',
'woocommerce-admin'
'woocommerce'
),
components: {
query: (

2
packages/js/components/src/search/autocompleters/utils.js
View File

@ -37,7 +37,7 @@ export function getTaxCode( tax ) {
return [
tax.country,
tax.state,
tax.name || __( 'TAX', 'woocommerce-admin' ),
tax.name || __( 'TAX', 'woocommerce' ),
tax.priority,
]
.filter( Boolean )

2
packages/js/components/src/select-control/control.js
View File

@ -252,7 +252,7 @@ class Control extends Component {
>
{ __(
'Move backward for selected items',
'woocommerce-admin'
'woocommerce'
) }
</span>
) }

7
packages/js/components/src/select-control/index.js
View File

@ -173,17 +173,14 @@ export class SelectControl extends Component {
'%d result found, use up and down arrow keys to navigate.',
'%d results found, use up and down arrow keys to navigate.',
searchOptions.length,
'woocommerce-admin'
'woocommerce'
),
searchOptions.length
),
'assertive'
);
} else {
debouncedSpeak(
__( 'No results.', 'woocommerce-admin' ),
'assertive'
);
debouncedSpeak( __( 'No results.', 'woocommerce' ), 'assertive' );
}
}

4
packages/js/components/src/select-control/tags.js
View File

@ -53,7 +53,7 @@ class Tags extends Component {
return null;
}
const screenReaderLabel = sprintf(
__( '%1$s (%2$s of %3$s)', 'woocommerce-admin' ),
__( '%1$s (%2$s of %3$s)', 'woocommerce' ),
item.label,
i + 1,
selected.length
@ -80,7 +80,7 @@ class Tags extends Component {
className="clear-icon"
/>
<span className="screen-reader-text">
{ __( 'Clear all', 'woocommerce-admin' ) }
{ __( 'Clear all', 'woocommerce' ) }
</span>
</Button>
) }

4
packages/js/components/src/summary/README.md
View File

@ -36,7 +36,7 @@ A container element for a list of SummaryNumbers. This component handles detecti
Name | Type | Default | Description
--- | --- | --- | ---
`children` | Function | `null` | (required) A function returning a list of `<SummaryNumber />`s
`label` | String | `__( 'Performance Indicators', 'woocommerce-admin' )` | An optional label of this group, read to screen reader users
`label` | String | `__( 'Performance Indicators', 'woocommerce' )` | An optional label of this group, read to screen reader users
SummaryNumber
@ -57,7 +57,7 @@ Name | Type | Default | Description
`isOpen` | Boolean | `false` | Boolean describing whether the menu list is open. Only applies in mobile view, and only applies to the toggle-able item (first in the list)
`label` | String | `null` | (required) A string description of this value, ex "Revenue", or "New Customers"
`onToggle` | Function | `null` | A function used to switch the given SummaryNumber to a button, and called on click
`prevLabel` | String | `__( 'Previous period:', 'woocommerce-admin' )` | A string description of the previous value's timeframe, ex "Previous year:"
`prevLabel` | String | `__( 'Previous period:', 'woocommerce' )` | A string description of the previous value's timeframe, ex "Previous year:"
`prevValue` | One of type: number, string | `null` | A string or number value to display - a string is allowed so we can accept currency formatting. If omitted, this section won't display
`reverseTrend` | Boolean | `false` | A boolean used to indicate that a negative delta is "good", and should be styled like a positive (and vice-versa)
`selected` | Boolean | `false` | A boolean used to show a highlight style on this number

2
packages/js/components/src/summary/index.js
View File

@ -78,7 +78,7 @@ SummaryList.propTypes = {
};
SummaryList.defaultProps = {
label: __( 'Performance Indicators', 'woocommerce-admin' ),
label: __( 'Performance Indicators', 'woocommerce' ),
};
export default withViewportMatch( {

2
packages/js/components/src/summary/menu.js
View File

@ -31,7 +31,7 @@ const Menu = ( { label, orientation, itemCount, items } ) => {
{ __(
'List of data points available for filtering. Use arrow keys to cycle through ' +
'the list. Click a data point for a detailed report.',
'woocommerce-admin'
'woocommerce'
) }
</p>
<ul className={ classes }>{ items }</ul>

16
packages/js/components/src/summary/number.js
View File

@ -65,18 +65,18 @@ const SummaryNumber = ( {
let screenReaderLabel =
delta > 0
? sprintf(
__( 'Up %f%% from %s', 'woocommerce-admin' ),
__( 'Up %f%% from %s', 'woocommerce' ),
delta,
prevLabel
)
: sprintf(
__( 'Down %f%% from %s', 'woocommerce-admin' ),
__( 'Down %f%% from %s', 'woocommerce' ),
Math.abs( delta ),
prevLabel
);
if ( ! delta ) {
screenReaderLabel = sprintf(
__( 'No change from %s', 'woocommerce-admin' ),
__( 'No change from %s', 'woocommerce' ),
prevLabel
);
}
@ -131,7 +131,7 @@ const SummaryNumber = ( {
<Text variant="title.small" size="20" lineHeight="28px">
{ ! isNil( value )
? value
: __( 'N/A', 'woocommerce-admin' ) }
: __( 'N/A', 'woocommerce' ) }
</Text>
</div>
@ -139,7 +139,7 @@ const SummaryNumber = ( {
text={
! isNil( prevValue )
? `${ prevLabel } ${ prevValue }`
: __( 'N/A', 'woocommerce-admin' )
: __( 'N/A', 'woocommerce' )
}
position="top center"
>
@ -151,10 +151,10 @@ const SummaryNumber = ( {
<Text variant="caption" size="12" lineHeight="16px">
{ ! isNil( delta )
? sprintf(
__( '%f%%', 'woocommerce-admin' ),
__( '%f%%', 'woocommerce' ),
delta
)
: __( 'N/A', 'woocommerce-admin' ) }
: __( 'N/A', 'woocommerce' ) }
</Text>
</div>
</Tooltip>
@ -235,7 +235,7 @@ SummaryNumber.defaultProps = {
href: '',
hrefType: 'wc-admin',
isOpen: false,
prevLabel: __( 'Previous period:', 'woocommerce-admin' ),
prevLabel: __( 'Previous period:', 'woocommerce' ),
reverseTrend: false,
selected: false,
onLinkClickCallback: noop,

9
packages/js/components/src/table/index.js
View File

@ -177,15 +177,12 @@ class TableCard extends Component {
<EllipsisMenu
label={ __(
'Choose which values to display',
'woocommerce-admin'
'woocommerce'
) }
renderContent={ () => (
<Fragment>
<MenuTitle>
{ __(
'Columns:',
'woocommerce-admin'
) }
{ __( 'Columns:', 'woocommerce' ) }
</MenuTitle>
{ allHeaders.map(
( { key, label, required } ) => {
@ -220,7 +217,7 @@ class TableCard extends Component {
<span className="screen-reader-text">
{ __(
'Your requested data is loading',
'woocommerce-admin'
'woocommerce'
) }
</span>
<TablePlaceholder

11
packages/js/components/src/table/table.js
View File

@ -178,10 +178,7 @@ class Table extends Component {
{ caption }
{ tabIndex === '0' && (
<small>
{ __(
'(scroll to see more)',
'woocommerce-admin'
) }
{ __( '(scroll to see more)', 'woocommerce' ) }
</small>
) }
</caption>
@ -226,14 +223,14 @@ class Table extends Component {
? sprintf(
__(
'Sort by %s in ascending order',
'woocommerce-admin'
'woocommerce'
),
screenReaderLabel || label
)
: sprintf(
__(
'Sort by %s in descending order',
'woocommerce-admin'
'woocommerce'
),
screenReaderLabel || label
);
@ -349,7 +346,7 @@ class Table extends Component {
>
{ __(
'No data to display',
'woocommerce-admin'
'woocommerce'
) }
</td>
</tr>

5
packages/js/components/src/tag/index.js
View File

@ -77,10 +77,7 @@ const Tag = ( {
<Button
className="woocommerce-tag__remove"
onClick={ remove( id ) }
label={ sprintf(
__( 'Remove %s', 'woocommerce-admin' ),
label
) }
label={ sprintf( __( 'Remove %s', 'woocommerce' ), label ) }
aria-describedby={ labelId }
>
<Icon

6
packages/js/components/src/timeline/index.js
View File

@ -29,7 +29,7 @@ const Timeline = ( props ) => {
return (
<div className={ timelineClassName }>
<p className={ 'timeline_no_events' }>
{ __( 'No data to display', 'woocommerce-admin' ) }
{ __( 'No data to display', 'woocommerce' ) }
</p>
</div>
);
@ -123,9 +123,9 @@ Timeline.defaultProps = {
groupBy: 'day',
orderBy: 'desc',
/* translators: PHP date format string used to display dates, see php.net/date. */
dateFormat: __( 'F j, Y', 'woocommerce-admin' ),
dateFormat: __( 'F j, Y', 'woocommerce' ),
/* translators: PHP clock format string used to display times, see php.net/date. */
clockFormat: __( 'g:ia', 'woocommerce-admin' ),
clockFormat: __( 'g:ia', 'woocommerce' ),
};
export { orderByOptions, groupByOptions } from './util';

2
packages/js/components/src/view-more-list/index.js
View File

@ -22,7 +22,7 @@ const ViewMoreList = ( { items } ) => {
<Tag
className="woocommerce-view-more-list"
label={ sprintf(
__( '+%d more', 'woocommerce-admin' ),
__( '+%d more', 'woocommerce' ),
items.length - 1
) }
popoverContents={

25
packages/js/customer-effort-score/src/customer-feedback-modal/index.tsx
View File

@ -36,23 +36,23 @@ function CustomerFeedbackModal( {
} ): JSX.Element | null {
const options = [
{
label: __( 'Very difficult', 'woocommerce-admin' ),
label: __( 'Very difficult', 'woocommerce' ),
value: '1',
},
{
label: __( 'Somewhat difficult', 'woocommerce-admin' ),
label: __( 'Somewhat difficult', 'woocommerce' ),
value: '2',
},
{
label: __( 'Neutral', 'woocommerce-admin' ),
label: __( 'Neutral', 'woocommerce' ),
value: '3',
},
{
label: __( 'Somewhat easy', 'woocommerce-admin' ),
label: __( 'Somewhat easy', 'woocommerce' ),
value: '4',
},
{
label: __( 'Very easy', 'woocommerce-admin' ),
label: __( 'Very easy', 'woocommerce' ),
value: '5',
},
];
@ -86,7 +86,7 @@ function CustomerFeedbackModal( {
return (
<Modal
className="woocommerce-customer-effort-score"
title={ __( 'Please share your feedback', 'woocommerce-admin' ) }
title={ __( 'Please share your feedback', 'woocommerce' ) }
onRequestClose={ closeModal }
shouldCloseOnClickOutside={ false }
>
@ -111,13 +111,10 @@ function CustomerFeedbackModal( {
{ ( score === 1 || score === 2 ) && (
<div className="woocommerce-customer-effort-score__comments">
<TextareaControl
label={ __(
'Comments (Optional)',
'woocommerce-admin'
) }
label={ __( 'Comments (Optional)', 'woocommerce' ) }
help={ __(
'Your feedback will go to the WooCommerce development team',
'woocommerce-admin'
'woocommerce'
) }
value={ comments }
onChange={ ( value: string ) => setComments( value ) }
@ -134,7 +131,7 @@ function CustomerFeedbackModal( {
<Text variant="body" as="p">
{ __(
'Please provide feedback by selecting an option above.',
'woocommerce-admin'
'woocommerce'
) }
</Text>
</div>
@ -142,10 +139,10 @@ function CustomerFeedbackModal( {
<div className="woocommerce-customer-effort-score__buttons">
<Button isTertiary onClick={ closeModal } name="cancel">
{ __( 'Cancel', 'woocommerce-admin' ) }
{ __( 'Cancel', 'woocommerce' ) }
</Button>
<Button isPrimary onClick={ sendScore } name="send">
{ __( 'Send', 'woocommerce-admin' ) }
{ __( 'Send', 'woocommerce' ) }
</Button>
</div>
</Modal>

2
packages/js/customer-effort-score/src/index.js
View File

@ -49,7 +49,7 @@ export function CustomerEffortScore( {
createNotice( 'success', label, {
actions: [
{
label: __( 'Give feedback', 'woocommerce-admin' ),
label: __( 'Give feedback', 'woocommerce' ),
onClick: () => {
setVisible( true );
onModalShownCallback();

2
packages/js/data/src/import/reducer.js
View File

@ -17,7 +17,7 @@ const reducer = (
errors: {},
lastImportStartTimestamp: 0,
period: {
date: moment().format( __( 'MM/DD/YYYY', 'woocommerce-admin' ) ),
date: moment().format( __( 'MM/DD/YYYY', 'woocommerce' ) ),
label: 'all',
},
skipPrevious: true,

2
packages/js/data/src/notes/resolvers.js
View File

@ -40,7 +40,7 @@ export function* getNotes( query = {} ) {
/* translators: %s = link to developer blog */
__(
'WooCommerce Admin will soon limit inbox note contents to 320 characters. For more information, please visit %s. The following notes currently exceeds that limit:',
'woocommerce-admin'
'woocommerce'
),
'https://developer.woocommerce.com/?p=10749'
) +

2
packages/js/data/src/plugins/actions.ts
View File

@ -96,7 +96,7 @@ const formatErrorMessage = (
'Could not %(actionType)s %(pluginName)s plugin, %(error)s',
'Could not %(actionType)s the following plugins: %(pluginName)s with these Errors: %(error)s',
Object.keys( pluginErrors ).length || 1,
'woocommerce-admin'
'woocommerce'
),
{
actionType,

51
packages/js/data/src/plugins/constants.ts
View File

@ -10,64 +10,49 @@ export const PAYPAL_NAMESPACE = '/wc-paypal/v1';
* Plugin slugs and names as key/value pairs.
*/
export const pluginNames = {
'facebook-for-woocommerce': __(
'Facebook for WooCommerce',
'woocommerce-admin'
),
jetpack: __( 'Jetpack', 'woocommerce-admin' ),
'facebook-for-woocommerce': __( 'Facebook for WooCommerce', 'woocommerce' ),
jetpack: __( 'Jetpack', 'woocommerce' ),
'klarna-checkout-for-woocommerce': __(
'Klarna Checkout for WooCommerce',
'woocommerce-admin'
'woocommerce'
),
'klarna-payments-for-woocommerce': __(
'Klarna Payments for WooCommerce',
'woocommerce-admin'
'woocommerce'
),
'mailchimp-for-woocommerce': __(
'Mailchimp for WooCommerce',
'woocommerce-admin'
'woocommerce'
),
'creative-mail-by-constant-contact': __(
'Creative Mail for WooCommerce',
'woocommerce-admin'
'woocommerce'
),
'woocommerce-gateway-paypal-express-checkout': __(
'WooCommerce PayPal',
'woocommerce-admin'
),
'woocommerce-gateway-stripe': __(
'WooCommerce Stripe',
'woocommerce-admin'
),
'woocommerce-payfast-gateway': __(
'WooCommerce PayFast',
'woocommerce-admin'
),
'woocommerce-payments': __( 'WooCommerce Payments', 'woocommerce-admin' ),
'woocommerce-services': __(
'WooCommerce Shipping & Tax',
'woocommerce-admin'
'woocommerce'
),
'woocommerce-gateway-stripe': __( 'WooCommerce Stripe', 'woocommerce' ),
'woocommerce-payfast-gateway': __( 'WooCommerce PayFast', 'woocommerce' ),
'woocommerce-payments': __( 'WooCommerce Payments', 'woocommerce' ),
'woocommerce-services': __( 'WooCommerce Shipping & Tax', 'woocommerce' ),
'woocommerce-services:shipping': __(
'WooCommerce Shipping & Tax',
'woocommerce-admin'
'woocommerce'
),
'woocommerce-services:tax': __(
'WooCommerce Shipping & Tax',
'woocommerce-admin'
'woocommerce'
),
'woocommerce-shipstation-integration': __(
'WooCommerce ShipStation Gateway',
'woocommerce-admin'
'woocommerce'
),
'woocommerce-mercadopago': __(
'Mercado Pago payments for WooCommerce',
'woocommerce-admin'
'woocommerce'
),
'google-listings-and-ads': __(
'Google Listings and Ads',
'woocommerce-admin'
),
'woo-razorpay': __( 'Razorpay', 'woocommerce-admin' ),
mailpoet: __( 'MailPoet', 'woocommerce-admin' ),
'google-listings-and-ads': __( 'Google Listings and Ads', 'woocommerce' ),
'woo-razorpay': __( 'Razorpay', 'woocommerce' ),
mailpoet: __( 'MailPoet', 'woocommerce' ),
};

2
packages/js/data/src/settings/actions.js
View File

@ -98,7 +98,7 @@ export function* persistSettingsForGroup( group ) {
throw new Error(
__(
'There was a problem updating your settings.',
'woocommerce-admin'
'woocommerce'
)
);
}

72
packages/js/date/src/index.js
View File

@ -31,27 +31,27 @@ export const defaultDateTimeFormat = 'YYYY-MM-DDTHH:mm:ss';
*/
export const presetValues = [
{ value: 'today', label: __( 'Today', 'woocommerce-admin' ) },
{ value: 'yesterday', label: __( 'Yesterday', 'woocommerce-admin' ) },
{ value: 'week', label: __( 'Week to date', 'woocommerce-admin' ) },
{ value: 'last_week', label: __( 'Last week', 'woocommerce-admin' ) },
{ value: 'month', label: __( 'Month to date', 'woocommerce-admin' ) },
{ value: 'last_month', label: __( 'Last month', 'woocommerce-admin' ) },
{ value: 'quarter', label: __( 'Quarter to date', 'woocommerce-admin' ) },
{ value: 'last_quarter', label: __( 'Last quarter', 'woocommerce-admin' ) },
{ value: 'year', label: __( 'Year to date', 'woocommerce-admin' ) },
{ value: 'last_year', label: __( 'Last year', 'woocommerce-admin' ) },
{ value: 'custom', label: __( 'Custom', 'woocommerce-admin' ) },
{ value: 'today', label: __( 'Today', 'woocommerce' ) },
{ value: 'yesterday', label: __( 'Yesterday', 'woocommerce' ) },
{ value: 'week', label: __( 'Week to date', 'woocommerce' ) },
{ value: 'last_week', label: __( 'Last week', 'woocommerce' ) },
{ value: 'month', label: __( 'Month to date', 'woocommerce' ) },
{ value: 'last_month', label: __( 'Last month', 'woocommerce' ) },
{ value: 'quarter', label: __( 'Quarter to date', 'woocommerce' ) },
{ value: 'last_quarter', label: __( 'Last quarter', 'woocommerce' ) },
{ value: 'year', label: __( 'Year to date', 'woocommerce' ) },
{ value: 'last_year', label: __( 'Last year', 'woocommerce' ) },
{ value: 'custom', label: __( 'Custom', 'woocommerce' ) },
];
export const periods = [
{
value: 'previous_period',
label: __( 'Previous period', 'woocommerce-admin' ),
label: __( 'Previous period', 'woocommerce' ),
},
{
value: 'previous_year',
label: __( 'Previous year', 'woocommerce-admin' ),
label: __( 'Previous year', 'woocommerce' ),
},
];
@ -109,7 +109,7 @@ export function getRangeLabel( after, before ) {
const isSameMonth = isSameYear && after.month() === before.month();
const isSameDay =
isSameYear && isSameMonth && after.isSame( before, 'day' );
const fullDateFormat = __( 'MMM D, YYYY', 'woocommerce-admin' );
const fullDateFormat = __( 'MMM D, YYYY', 'woocommerce' );
if ( isSameDay ) {
return after.format( fullDateFormat );
@ -119,7 +119,7 @@ export function getRangeLabel( after, before ) {
.format( fullDateFormat )
.replace( afterDate, `${ afterDate } - ${ before.date() }` );
} else if ( isSameYear ) {
const monthDayFormat = __( 'MMM D', 'woocommerce-admin' );
const monthDayFormat = __( 'MMM D', 'woocommerce' );
return `${ after.format( monthDayFormat ) } - ${ before.format(
fullDateFormat
) }`;
@ -646,15 +646,9 @@ export function getDateFormatsForIntervalD3( interval, ticks = 0 ) {
x2Format = '%Y';
}
// eslint-disable-next-line @wordpress/i18n-translator-comments
screenReaderFormat = __(
'Week of %B %-d, %Y',
'woocommerce-admin'
);
screenReaderFormat = __( 'Week of %B %-d, %Y', 'woocommerce' );
// eslint-disable-next-line @wordpress/i18n-translator-comments
tooltipLabelFormat = __(
'Week of %B %-d, %Y',
'woocommerce-admin'
);
tooltipLabelFormat = __( 'Week of %B %-d, %Y', 'woocommerce' );
break;
case 'quarter':
case 'month':
@ -720,10 +714,10 @@ export function getDateFormatsForIntervalPhp( interval, ticks = 0 ) {
}
// Since some alphabet letters have php associated formats, we need to escape them first.
const escapedWeekOfStr = __(
'Week of',
'woocommerce-admin'
).replace( /(\w)/g, '\\$1' );
const escapedWeekOfStr = __( 'Week of', 'woocommerce' ).replace(
/(\w)/g,
'\\$1'
);
screenReaderFormat = `${ escapedWeekOfStr } F j, Y`;
tooltipLabelFormat = `${ escapedWeekOfStr } F j, Y`;
@ -765,11 +759,11 @@ export function loadLocaleData( { userLocale, weekdaysShort } ) {
if ( moment.locale() !== 'en' ) {
moment.updateLocale( userLocale, {
longDateFormat: {
L: __( 'MM/DD/YYYY', 'woocommerce-admin' ),
LL: __( 'MMMM D, YYYY', 'woocommerce-admin' ),
LLL: __( 'D MMMM YYYY LT', 'woocommerce-admin' ),
LLLL: __( 'dddd, D MMMM YYYY LT', 'woocommerce-admin' ),
LT: __( 'HH:mm', 'woocommerce-admin' ),
L: __( 'MM/DD/YYYY', 'woocommerce' ),
LL: __( 'MMMM D, YYYY', 'woocommerce' ),
LLL: __( 'D MMMM YYYY LT', 'woocommerce' ),
LLLL: __( 'dddd, D MMMM YYYY LT', 'woocommerce' ),
LT: __( 'HH:mm', 'woocommerce' ),
},
weekdaysMin: weekdaysShort,
} );
@ -777,16 +771,10 @@ export function loadLocaleData( { userLocale, weekdaysShort } ) {
}
export const dateValidationMessages = {
invalid: __( 'Invalid date', 'woocommerce-admin' ),
future: __( 'Select a date in the past', 'woocommerce-admin' ),
startAfterEnd: __(
'Start date must be before end date',
'woocommerce-admin'
),
endBeforeStart: __(
'Start date must be before end date',
'woocommerce-admin'
),
invalid: __( 'Invalid date', 'woocommerce' ),
future: __( 'Select a date in the past', 'woocommerce' ),
startAfterEnd: __( 'Start date must be before end date', 'woocommerce' ),
endBeforeStart: __( 'Start date must be before end date', 'woocommerce' ),
};
/**

2
packages/js/e2e-environment/bin/get-latest-docker-tag.js
View File

@ -68,7 +68,7 @@ async function fetchLatestTagFromPage( image, nameSearch, page ) {
});
req.end();
}
)
);
}
/**

15
packages/js/experimental/src/experimental-list/task-item/index.tsx
View File

@ -69,12 +69,12 @@ const OptionalTaskTooltip: React.FC< {
if ( level === 1 && ! completed ) {
tooltip = __(
'This task is required to keep your store running',
'woocommerce-admin'
'woocommerce'
);
} else if ( level === 2 && ! completed ) {
tooltip = __(
'This task is required to set up your extension',
'woocommerce-admin'
'woocommerce'
);
}
if ( tooltip === '' ) {
@ -236,7 +236,7 @@ export const TaskItem: React.FC< TaskItemProps > = ( {
</div>
{ showEllipsisMenu && (
<EllipsisMenu
label={ __( 'Task Options', 'woocommerce-admin' ) }
label={ __( 'Task Options', 'woocommerce' ) }
className="woocommerce-task-list__item-after"
onToggle={ ( e: React.MouseEvent | React.KeyboardEvent ) =>
e.stopPropagation()
@ -254,7 +254,7 @@ export const TaskItem: React.FC< TaskItemProps > = ( {
onDismiss();
} }
>
{ __( 'Dismiss', 'woocommerce-admin' ) }
{ __( 'Dismiss', 'woocommerce' ) }
</Button>
) }
{ onSnooze && ! completed && (
@ -264,10 +264,7 @@ export const TaskItem: React.FC< TaskItemProps > = ( {
onSnooze();
} }
>
{ __(
'Remind me later',
'woocommerce-admin'
) }
{ __( 'Remind me later', 'woocommerce' ) }
</Button>
) }
{ onDelete && completed && (
@ -281,7 +278,7 @@ export const TaskItem: React.FC< TaskItemProps > = ( {
onDelete();
} }
>
{ __( 'Delete', 'woocommerce-admin' ) }
{ __( 'Delete', 'woocommerce' ) }
</Button>
) }
</div>

8
packages/js/experimental/src/inbox-note/inbox-dismiss-confirmation-modal.tsx
View File

@ -14,13 +14,13 @@ type ConfirmationModalProps = {
export const InboxDismissConfirmationModal: React.FC< ConfirmationModalProps > = ( {
onClose,
onDismiss,
buttonLabel = __( "Yes, I'm sure", 'woocommerce-admin' ),
buttonLabel = __( "Yes, I'm sure", 'woocommerce' ),
} ) => {
const [ inAction, setInAction ] = useState( false );
return (
<Modal
title={ __( 'Are you sure?', 'woocommerce-admin' ) }
title={ __( 'Are you sure?', 'woocommerce' ) }
onRequestClose={ () => onClose() }
className="woocommerce-inbox-dismiss-confirmation_modal"
>
@ -28,12 +28,12 @@ export const InboxDismissConfirmationModal: React.FC< ConfirmationModalProps > =
<p>
{ __(
'Dismissed messages cannot be viewed again',
'woocommerce-admin'
'woocommerce'
) }
</p>
<div className="woocommerce-inbox-dismiss-confirmation_buttons">
<Button isSecondary onClick={ () => onClose() }>
{ __( 'Cancel', 'woocommerce-admin' ) }
{ __( 'Cancel', 'woocommerce' ) }
</Button>
<Button
isSecondary

2
packages/js/experimental/src/inbox-note/inbox-note.tsx
View File

@ -95,7 +95,7 @@ const InboxNoteCard: React.FC< InboxNoteProps > = ( {
className="woocommerce-admin-dismiss-notification"
onClick={ () => onDismiss && onDismiss( note ) }
>
{ __( 'Dismiss', 'woocommerce-admin' ) }
{ __( 'Dismiss', 'woocommerce' ) }
</Button>
);
};

4
packages/js/js-tests/src/setup-globals.js
View File

@ -115,8 +115,8 @@ if ( global.window ) {
}
setLocaleData(
{ '': { domain: 'woocommerce-admin', lang: 'en_US' } },
'woocommerce-admin'
{ '': { domain: 'woocommerce', lang: 'en_US' } },
'woocommerce'
);
// Mock core/notices store for components dispatching core notices

4
packages/js/onboarding/src/components/RecommendedRibbon/RecommendedRibbon.js
View File

@ -6,8 +6,8 @@ import { createElement } from '@wordpress/element';
export const RecommendedRibbon = ( { isLocalPartner = false } ) => {
const text = isLocalPartner
? __( 'Local Partner', 'woocommerce-admin' )
: __( 'Recommended', 'woocommerce-admin' );
? __( 'Local Partner', 'woocommerce' )
: __( 'Recommended', 'woocommerce' );
return (
<div className={ 'woocommerce-task-payment__recommended-ribbon' }>

2
packages/js/onboarding/src/components/SetupRequired.js
View File

@ -11,7 +11,7 @@ export const SetupRequired = () => {
<span className="woocommerce-task-payment__setup_required">
<NoticeOutlineIcon />
<Text variant="small" size="14" lineHeight="20px">
{ __( 'Setup required', 'woocommerce-admin' ) }
{ __( 'Setup required', 'woocommerce' ) }
</Text>
</span>
);

2
packages/js/onboarding/src/components/WCPayAcceptedMethods.js
View File

@ -22,7 +22,7 @@ import UnionPay from '../images/cards/unionpay.js';
export const WCPayAcceptedMethods = () => (
<>
<Text as="h3" variant="label" weight="600" size="12" lineHeight="16px">
{ __( 'Accepted payment methods', 'woocommerce-admin' ) }
{ __( 'Accepted payment methods', 'woocommerce' ) }
</Text>
<div className="woocommerce-task-payment-wcpay__accepted">

2
packages/js/onboarding/src/components/WCPayCard/WCPayCard.js
View File

@ -46,7 +46,7 @@ export const WCPayCardBody = ( {
href="https://woocommerce.com/payments/?utm_medium=product"
onClick={ onLinkClick }
>
{ __( 'Learn more', 'woocommerce-admin' ) }
{ __( 'Learn more', 'woocommerce' ) }
</Link>
</Text>

30
phpcs.xml
View File

@ -98,4 +98,34 @@
<rule ref="Squiz.Commenting.FileComment.Missing">
<exclude-pattern>tests/php/</exclude-pattern>
</rule>
<!-- Temporary -->
<rule ref="Generic.Arrays.DisallowShortArraySyntax.Found">
<exclude-pattern>src/Internal/Admin/</exclude-pattern>
<exclude-pattern>src/Admin/</exclude-pattern>
</rule>
<!-- Temporary -->
<rule ref="WooCommerce.Functions.InternalInjectionMethod.MissingFinal">
<exclude-pattern>src/Internal/Admin/</exclude-pattern>
<exclude-pattern>src/Admin/</exclude-pattern>
</rule>
<!-- Temporary -->
<rule ref="WooCommerce.Functions.InternalInjectionMethod.MissingInternalTag">
<exclude-pattern>src/Internal/Admin/</exclude-pattern>
<exclude-pattern>src/Admin/</exclude-pattern>
</rule>
<!-- Temporary -->
<rule ref="WooCommerce.Commenting.CommentHooks.MissingHooksComment">
<exclude-pattern>plugins/woocommerce/src/Internal/Admin/</exclude-pattern>
<exclude-pattern>src/Admin/</exclude-pattern>
</rule>
<!-- Temporary -->
<rule ref="WordPress.Security.NonceVerification.Recommended">
<exclude-pattern>src/Internal/Admin/</exclude-pattern>
<exclude-pattern>src/Admin/</exclude-pattern>
</rule>
</ruleset>

2
plugins/woocommerce-admin/Gruntfile.js
View File

@ -23,7 +23,7 @@ module.exports = function( grunt ) {
checktextdomain: {
options: {
text_domain: 'woocommerce-admin',
text_domain: 'woocommerce',
keywords: [
'__:1,2d',
'_e:1,2d',

31
plugins/woocommerce-admin/bin/package-update-textdomain.js Executable file
View File

@ -0,0 +1,31 @@
const wpTextdomain = require( 'wp-textdomain' );
const dirs = process.argv.slice( 2 );
for ( dir of dirs ) {
let path = dir + '/**/*.php';
console.log("Processing: " + dir);
wpTextdomain( path, {
domain: 'woocommerce',
fix: true,
missingDomain: true,
variableDomain: true,
keywords: [
'__:1,2d',
'_e:1,2d',
'_x:1,2c,3d',
'esc_html__:1,2d',
'esc_html_e:1,2d',
'esc_html_x:1,2c,3d',
'esc_attr__:1,2d',
'esc_attr_e:1,2d',
'esc_attr_x:1,2c,3d',
'_ex:1,2c,3d',
'_n:1,2,4d',
'_nx:1,2,4c,5d',
'_n_noop:1,2,3d',
'_nx_noop:1,2,3c,4d',
'wp_set_script_translations:1,2d,3',
],
} );
}

16
plugins/woocommerce-admin/client/activity-panel/activity-panel.js
View File

@ -224,7 +224,7 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
const getTabs = () => {
const activity = {
name: 'activity',
title: __( 'Activity', 'woocommerce-admin' ),
title: __( 'Activity', 'woocommerce' ),
icon: <IconFlag />,
unread: hasUnreadNotes || hasAbbreviatedNotifications,
visible:
@ -233,7 +233,7 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
const setup = {
name: 'setup',
title: __( 'Finish setup', 'woocommerce-admin' ),
title: __( 'Finish setup', 'woocommerce' ),
icon: <SetupProgress />,
onClick: () => {
const currentLocation = window.location.href;
@ -265,7 +265,7 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
const help = {
name: 'help',
title: __( 'Help', 'woocommerce-admin' ),
title: __( 'Help', 'woocommerce' ),
icon: <Icon icon={ helpIcon } />,
visible:
currentUserCan( 'manage_woocommerce' ) &&
@ -284,7 +284,7 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
const previewSite = {
name: 'previewSite',
title: __( 'Preview site', 'woocommerce-admin' ),
title: __( 'Preview site', 'woocommerce' ),
icon: <Icon icon={ external } />,
visible: query.page === 'wc-admin' && query.task === 'appearance',
onClick: () => {
@ -355,7 +355,7 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
return (
<div>
<H id={ headerId } className="screen-reader-text">
{ __( 'Store Activity', 'woocommerce-admin' ) }
{ __( 'Store Activity', 'woocommerce' ) }
</H>
<Section
component="aside"
@ -390,12 +390,12 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
<HighlightTooltip
delay={ 1000 }
useAnchor={ true }
title={ __( "We're here for help", 'woocommerce-admin' ) }
title={ __( "We're here for help", 'woocommerce' ) }
content={ __(
'If you have any questions, feel free to explore the WooCommerce docs listed here.',
'woocommerce-admin'
'woocommerce'
) }
closeButtonText={ __( 'Got it', 'woocommerce-admin' ) }
closeButtonText={ __( 'Got it', 'woocommerce' ) }
id="activity-panel-tab-help"
onClose={ () => closedHelpPanelHighlight() }
onShow={ () => recordEvent( 'help_tooltip_view' ) }

2
plugins/woocommerce-admin/client/activity-panel/display-options/icons/display.js
View File

@ -38,6 +38,6 @@ export const DisplayIcon = () => (
strokeLinejoin="round"
/>
</svg>
{ __( 'Display', 'woocommerce-admin' ) }
{ __( 'Display', 'woocommerce' ) }
</>
);

11
plugins/woocommerce-admin/client/activity-panel/display-options/index.js
View File

@ -35,7 +35,7 @@ const LAYOUTS = [
label: (
<>
<SingleColumnIcon />
{ __( 'Single column', 'woocommerce-admin' ) }
{ __( 'Single column', 'woocommerce' ) }
</>
),
},
@ -44,7 +44,7 @@ const LAYOUTS = [
label: (
<>
<TwoColumnsIcon />
{ __( 'Two columns', 'woocommerce-admin' ) }
{ __( 'Two columns', 'woocommerce' ) }
</>
),
},
@ -88,7 +88,7 @@ export const DisplayOptions = () => {
<DropdownMenu
icon={ <DisplayIcon /> }
/* translators: button label text should, if possible, be under 16 characters. */
label={ __( 'Display options', 'woocommerce-admin' ) }
label={ __( 'Display options', 'woocommerce' ) }
toggleProps={ {
className:
'woocommerce-layout__activity-panel-tab display-options',
@ -106,10 +106,7 @@ export const DisplayOptions = () => {
{ hasTwoColumnContent ? (
<MenuGroup
className="woocommerce-layout__homescreen-display-options"
label={ __(
'Layout',
'woocommerce-admin'
) }
label={ __( 'Layout', 'woocommerce' ) }
>
<MenuItemsChoice
choices={ LAYOUTS }

2
plugins/woocommerce-admin/client/activity-panel/highlight-tooltip/index.js
View File

@ -169,7 +169,7 @@ function HighlightTooltip( {
onClick={ triggerClose }
>
{ closeButtonText ||
__( 'Close', 'woocommerce-admin' ) }
__( 'Close', 'woocommerce' ) }
</Button>
</CardFooter>
</Card>

99
plugins/woocommerce-admin/client/activity-panel/panels/help.js
View File

@ -29,32 +29,32 @@ export const SETUP_TASK_HELP_ITEMS_FILTER =
function getHomeItems() {
return [
{
title: __( 'Get Support', 'woocommerce-admin' ),
title: __( 'Get Support', 'woocommerce' ),
link:
'https://woocommerce.com/my-account/create-a-ticket/?utm_medium=product',
},
{
title: __( 'Home Screen', 'woocommerce-admin' ),
title: __( 'Home Screen', 'woocommerce' ),
link:
'https://woocommerce.com/document/home-screen/?utm_medium=product',
},
{
title: __( 'Inbox', 'woocommerce-admin' ),
title: __( 'Inbox', 'woocommerce' ),
link:
'https://woocommerce.com/document/home-screen/?utm_medium=product#section-2',
},
{
title: __( 'Stats Overview', 'woocommerce-admin' ),
title: __( 'Stats Overview', 'woocommerce' ),
link:
'https://woocommerce.com/document/home-screen/?utm_medium=product#section-4',
},
{
title: __( 'Store Management', 'woocommerce-admin' ),
title: __( 'Store Management', 'woocommerce' ),
link:
'https://woocommerce.com/document/home-screen/?utm_medium=product#section-5',
},
{
title: __( 'Store Setup Checklist', 'woocommerce-admin' ),
title: __( 'Store Setup Checklist', 'woocommerce' ),
link:
'https://woocommerce.com/document/woocommerce-setup-wizard?utm_medium=product#store-setup-checklist',
},
@ -66,7 +66,7 @@ function getAppearanceItems() {
{
title: __(
'Showcase your products and tailor your shopping experience using Blocks',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/woocommerce-blocks/?utm_source=help_panel&utm_medium=product',
@ -74,16 +74,13 @@ function getAppearanceItems() {
{
title: __(
'Manage Store Notice, Catalog View and Product Images',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/woocommerce-customizer/?utm_source=help_panel&utm_medium=product',
},
{
title: __(
'How to choose and change a theme',
'woocommerce-admin'
),
title: __( 'How to choose and change a theme', 'woocommerce' ),
link:
'https://woocommerce.com/document/choose-change-theme/?utm_source=help_panel&utm_medium=product',
},
@ -95,27 +92,21 @@ function getMarketingItems( props ) {
return [
activePlugins.includes( 'mailpoet' ) && {
title: __( 'Get started with Mailpoet', 'woocommerce-admin' ),
title: __( 'Get started with Mailpoet', 'woocommerce' ),
link: 'https://kb.mailpoet.com/category/114-getting-started',
},
activePlugins.includes( 'google-listings-and-ads' ) && {
title: __( 'Set up Google Listing & Ads', 'woocommerce-admin' ),
title: __( 'Set up Google Listing & Ads', 'woocommerce' ),
link:
'https://woocommerce.com/document/google-listings-and-ads/?utm_medium=product#get-started',
},
activePlugins.includes( 'mailchimp-for-woocommerce' ) && {
title: __(
'Connect Mailchimp for WooCommerce',
'woocommerce-admin'
),
title: __( 'Connect Mailchimp for WooCommerce', 'woocommerce' ),
link:
'https://mailchimp.com/help/connect-or-disconnect-mailchimp-for-woocommerce/',
},
activePlugins.includes( 'creative-mail-by-constant-contact' ) && {
title: __(
'Set up Creative Mail for WooCommerce',
'woocommerce-admin'
),
title: __( 'Set up Creative Mail for WooCommerce', 'woocommerce' ),
link: 'https://app.creativemail.com/kb/help/WooCommerce',
},
].filter( Boolean );
@ -126,71 +117,65 @@ function getPaymentGatewaySuggestions( props ) {
return [
{
title: __(
'Which Payment Option is Right for Me?',
'woocommerce-admin'
),
title: __( 'Which Payment Option is Right for Me?', 'woocommerce' ),
link:
'https://woocommerce.com/document/premium-payment-gateway-extensions/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.woocommerce_payments && {
title: __(
'WooCommerce Payments Start Up Guide',
'woocommerce-admin'
),
title: __( 'WooCommerce Payments Start Up Guide', 'woocommerce' ),
link:
'https://woocommerce.com/document/payments/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.woocommerce_payments && {
title: __( 'WooCommerce Payments FAQs', 'woocommerce-admin' ),
title: __( 'WooCommerce Payments FAQs', 'woocommerce' ),
link:
'https://woocommerce.com/documentation/woocommerce-payments/woocommerce-payments-faqs/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.stripe && {
title: __( 'Stripe Setup and Configuration', 'woocommerce-admin' ),
title: __( 'Stripe Setup and Configuration', 'woocommerce' ),
link:
'https://woocommerce.com/document/stripe/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions[ 'ppcp-gateway' ] && {
title: __(
'PayPal Checkout Setup and Configuration',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/2-0/woocommerce-paypal-payments/?utm_medium=product#section-3',
},
paymentGatewaySuggestions.square_credit_card && {
title: __( 'Square - Get started', 'woocommerce-admin' ),
title: __( 'Square - Get started', 'woocommerce' ),
link:
'https://woocommerce.com/document/woocommerce-square/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.kco && {
title: __( 'Klarna - Introduction', 'woocommerce-admin' ),
title: __( 'Klarna - Introduction', 'woocommerce' ),
link:
'https://woocommerce.com/document/klarna-checkout/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.klarna_payments && {
title: __( 'Klarna - Introduction', 'woocommerce-admin' ),
title: __( 'Klarna - Introduction', 'woocommerce' ),
link:
'https://woocommerce.com/document/klarna-payments/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.payfast && {
title: __( 'PayFast Setup and Configuration', 'woocommerce-admin' ),
title: __( 'PayFast Setup and Configuration', 'woocommerce' ),
link:
'https://woocommerce.com/document/payfast-payment-gateway/?utm_source=help_panel&utm_medium=product',
},
paymentGatewaySuggestions.eway && {
title: __( 'Eway Setup and Configuration', 'woocommerce-admin' ),
title: __( 'Eway Setup and Configuration', 'woocommerce' ),
link:
'https://woocommerce.com/document/eway/?utm_source=help_panel&utm_medium=product',
},
{
title: __( 'Direct Bank Transfer (BACS)', 'woocommerce-admin' ),
title: __( 'Direct Bank Transfer (BACS)', 'woocommerce' ),
link:
'https://woocommerce.com/document/bacs/?utm_source=help_panel&utm_medium=product',
},
{
title: __( 'Cash on Delivery', 'woocommerce-admin' ),
title: __( 'Cash on Delivery', 'woocommerce' ),
link:
'https://woocommerce.com/document/cash-on-delivery/?utm_source=help_panel&utm_medium=product',
},
@ -200,31 +185,25 @@ function getPaymentGatewaySuggestions( props ) {
function getProductsItems() {
return [
{
title: __( 'Adding and Managing Products', 'woocommerce-admin' ),
title: __( 'Adding and Managing Products', 'woocommerce' ),
link:
'https://woocommerce.com/document/managing-products/?utm_source=help_panel&utm_medium=product',
},
{
title: __(
'Import products using the CSV Importer and Exporter',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/product-csv-importer-exporter/?utm_source=help_panel&utm_medium=product',
},
{
title: __(
'Migrate products using Cart2Cart',
'woocommerce-admin'
),
title: __( 'Migrate products using Cart2Cart', 'woocommerce' ),
link:
'https://woocommerce.com/products/cart2cart/?utm_source=help_panel&utm_medium=product',
},
{
title: __(
'Learn more about setting up products',
'woocommerce-admin'
),
title: __( 'Learn more about setting up products', 'woocommerce' ),
link:
'https://woocommerce.com/documentation/plugins/woocommerce/getting-started/setup-products/?utm_source=help_panel&utm_medium=product',
},
@ -237,24 +216,24 @@ function getShippingItems( { activePlugins, countryCode } ) {
! activePlugins.includes( 'woocommerce-services' );
return [
{
title: __( 'Setting up Shipping Zones', 'woocommerce-admin' ),
title: __( 'Setting up Shipping Zones', 'woocommerce' ),
link:
'https://woocommerce.com/document/setting-up-shipping-zones/?utm_source=help_panel&utm_medium=product',
},
{
title: __( 'Core Shipping Options', 'woocommerce-admin' ),
title: __( 'Core Shipping Options', 'woocommerce' ),
link:
'https://woocommerce.com/documentation/plugins/woocommerce/getting-started/shipping/core-shipping-options/?utm_source=help_panel&utm_medium=product',
},
{
title: __( 'Product Shipping Classes', 'woocommerce-admin' ),
title: __( 'Product Shipping Classes', 'woocommerce' ),
link:
'https://woocommerce.com/document/product-shipping-classes/?utm_source=help_panel&utm_medium=product',
},
showWCS && {
title: __(
'WooCommerce Shipping setup and configuration',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/woocommerce-shipping-and-tax/?utm_source=help_panel&utm_medium=product#section-3',
@ -262,7 +241,7 @@ function getShippingItems( { activePlugins, countryCode } ) {
{
title: __(
'Learn more about configuring your shipping settings',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/plugins/woocommerce/getting-started/shipping/?utm_source=help_panel&utm_medium=product',
@ -292,14 +271,14 @@ function getTaxItems( props ) {
return [
{
title: __( 'Setting up Taxes in WooCommerce', 'woocommerce-admin' ),
title: __( 'Setting up Taxes in WooCommerce', 'woocommerce' ),
link:
'https://woocommerce.com/document/setting-up-taxes-in-woocommerce/?utm_source=help_panel&utm_medium=product',
},
showWCS && {
title: __(
'Automated Tax calculation using WooCommerce Tax',
'woocommerce-admin'
'woocommerce'
),
link:
'https://woocommerce.com/document/woocommerce-services/?utm_source=help_panel&utm_medium=product#section-10',
@ -345,7 +324,7 @@ function handleOnItemClick( props, event ) {
function getListItems( props ) {
const itemsByType = getItems( props );
const genericDocsLink = {
title: __( 'WooCommerce Docs', 'woocommerce-admin' ),
title: __( 'WooCommerce Docs', 'woocommerce' ),
link:
'https://woocommerce.com/documentation/?utm_source=help_panel&utm_medium=product',
};
@ -413,9 +392,7 @@ export const HelpPanel = ( props ) => {
return (
<Fragment>
<ActivityHeader
title={ __( 'Documentation', 'woocommerce-admin' ) }
/>
<ActivityHeader title={ __( 'Documentation', 'woocommerce' ) } />
<Section>
<List
items={ listItems }

16
plugins/woocommerce-admin/client/activity-panel/panels/inbox/abbreviated-notifications-panel.js
View File

@ -71,7 +71,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
type={ isWCAdminPage ? 'wc-admin' : 'wp-admin' }
>
<Text as="h3">
{ __( 'Things to do next', 'woocommerce-admin' ) }
{ __( 'Things to do next', 'woocommerce' ) }
</Text>
<Text as="p">
{ sprintf(
@ -80,7 +80,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
'You have %d new thing to do',
'You have %d new things to do',
thingsToDoNextCount,
'woocommerce-admin'
'woocommerce'
),
thingsToDoNextCount
) }
@ -98,7 +98,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
type={ isWCAdminPage ? 'wc-admin' : 'wp-admin' }
>
<Text as="h3">
{ __( 'Orders to fulfill', 'woocommerce-admin' ) }
{ __( 'Orders to fulfill', 'woocommerce' ) }
</Text>
<Text>
{ sprintf(
@ -107,7 +107,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
'You have %d order to fulfill',
'You have %d orders to fulfill',
ordersToProcessCount,
'woocommerce-admin'
'woocommerce'
),
ordersToProcessCount
) }
@ -125,7 +125,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
type={ isWCAdminPage ? 'wc-admin' : 'wp-admin' }
>
<Text as="h3">
{ __( 'Reviews to moderate', 'woocommerce-admin' ) }
{ __( 'Reviews to moderate', 'woocommerce' ) }
</Text>
<Text>
{ sprintf(
@ -134,7 +134,7 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
'You have %d review to moderate',
'You have %d reviews to moderate',
reviewsToModerateCount,
'woocommerce-admin'
'woocommerce'
),
reviewsToModerateCount
) }
@ -152,12 +152,12 @@ export const AbbreviatedNotificationsPanel = ( { thingsToDoNextCount } ) => {
type={ isWCAdminPage ? 'wc-admin' : 'wp-admin' }
>
<Text as="h3">
{ __( 'Inventory to review', 'woocommerce-admin' ) }
{ __( 'Inventory to review', 'woocommerce' ) }
</Text>
<Text>
{ __(
'You have inventory to review and update',
'woocommerce-admin'
'woocommerce'
) }
</Text>
</AbbreviatedCard>

2
plugins/woocommerce-admin/client/activity-panel/tab/index.js
View File

@ -37,7 +37,7 @@ export const Tab = ( {
{ title }{ ' ' }
{ unread && (
<span className="screen-reader-text">
{ __( 'unread activity', 'woocommerce-admin' ) }
{ __( 'unread activity', 'woocommerce' ) }
</span>
) }
</Button>

2
plugins/woocommerce-admin/client/analytics/components/leaderboard/index.js
View File

@ -80,7 +80,7 @@ export class Leaderboard extends Component {
<EmptyTable>
{ __(
'No data recorded for the selected time period.',
'woocommerce-admin'
'woocommerce'
) }
</EmptyTable>
</CardBody>

4
plugins/woocommerce-admin/client/analytics/components/report-chart/index.js
View File

@ -169,8 +169,8 @@ export class ReportChart extends Component {
{ type: 'php' }
);
const emptyMessage = emptySearchResults
? __( 'No data for the current search', 'woocommerce-admin' )
: __( 'No data for the selected date range', 'woocommerce-admin' );
? __( 'No data for the current search', 'woocommerce' )
: __( 'No data for the selected date range', 'woocommerce' );
const { formatAmount, getCurrencyConfig } = this.context;
return (
<Chart

4
plugins/woocommerce-admin/client/analytics/components/report-error/index.js
View File

@ -15,9 +15,9 @@ import { EmptyContent } from '@woocommerce/components';
function ReportError( { className } ) {
const title = __(
'There was an error getting your stats. Please try again.',
'woocommerce-admin'
'woocommerce'
);
const actionLabel = __( 'Reload', 'woocommerce-admin' );
const actionLabel = __( 'Reload', 'woocommerce' );
const actionCallback = () => {
// @todo Add tracking for how often an error is displayed, and the reload action is clicked.
window.location.reload();

4
plugins/woocommerce-admin/client/analytics/components/report-summary/index.js
View File

@ -104,8 +104,8 @@ export class ReportSummary extends Component {
reverseTrend={ isReverseTrend }
prevLabel={
compare === 'previous_period'
? __( 'Previous period:', 'woocommerce-admin' )
: __( 'Previous year:', 'woocommerce-admin' )
? __( 'Previous period:', 'woocommerce' )
: __( 'Previous year:', 'woocommerce' )
}
prevValue={ prevValue }
selected={ isSelected }

12
plugins/woocommerce-admin/client/analytics/components/report-table/index.js
View File

@ -209,7 +209,7 @@ const ReportTable = ( props ) => {
/* translators: %s = type of report */
__(
'Your %s Report will be emailed to you.',
'woocommerce-admin'
'woocommerce'
),
title
)
@ -223,7 +223,7 @@ const ReportTable = ( props ) => {
/* translators: %s = type of report */
__(
'There was a problem exporting your %s Report. Please try again.',
'woocommerce-admin'
'woocommerce'
),
title
)
@ -401,14 +401,14 @@ const ReportTable = ( props ) => {
labels.helpText ||
__(
'Check at least two items below to compare',
'woocommerce-admin'
'woocommerce'
)
}
onClick={ onCompare }
disabled={ ! downloadable }
>
{ labels.compareButton ||
__( 'Compare', 'woocommerce-admin' ) }
__( 'Compare', 'woocommerce' ) }
</CompareButton>
),
searchBy && (
@ -419,7 +419,7 @@ const ReportTable = ( props ) => {
onChange={ onSearchChange }
placeholder={
labels.placeholder ||
__( 'Search by item name', 'woocommerce-admin' )
__( 'Search by item name', 'woocommerce' )
}
selected={ searchedLabels }
showClearButton={ true }
@ -437,7 +437,7 @@ const ReportTable = ( props ) => {
<DownloadIcon />
<span className="woocommerce-table__download-button__label">
{ labels.downloadButton ||
__( 'Download', 'woocommerce-admin' ) }
__( 'Download', 'woocommerce' ) }
</span>
</Button>
),

30
plugins/woocommerce-admin/client/analytics/report/categories/config.js
View File

@ -33,21 +33,21 @@ const { addCesSurveyForAnalytics } = dispatch( CES_STORE_KEY );
export const charts = applyFilters( CATEGORY_REPORT_CHARTS_FILTER, [
{
key: 'items_sold',
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
order: 'desc',
orderby: 'items_sold',
type: 'number',
},
{
key: 'net_revenue',
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
order: 'desc',
orderby: 'net_revenue',
type: 'currency',
},
{
key: 'orders_count',
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
order: 'desc',
orderby: 'orders_count',
type: 'number',
@ -69,18 +69,18 @@ export const advancedFilters = applyFilters(
title: _x(
'Categories match {{select /}} filters',
'A sentence describing filters for Categories. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
const filterValues = [
{
label: __( 'All categories', 'woocommerce-admin' ),
label: __( 'All categories', 'woocommerce' ),
value: 'all',
},
{
label: __( 'Single category', 'woocommerce-admin' ),
label: __( 'Single category', 'woocommerce' ),
value: 'select_category',
chartMode: 'item-comparison',
subFilters: [
@ -96,16 +96,16 @@ const filterValues = [
labels: {
placeholder: __(
'Type to search for a category',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single Category', 'woocommerce-admin' ),
button: __( 'Single Category', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
value: 'compare-categories',
chartMode: 'item-comparison',
settings: {
@ -115,14 +115,14 @@ const filterValues = [
labels: {
helpText: __(
'Check at least two categories below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __(
'Search for categories to compare',
'woocommerce-admin'
'woocommerce'
),
title: __( 'Compare Categories', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Categories', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
},
onClick: addCesSurveyForAnalytics,
},
@ -131,7 +131,7 @@ const filterValues = [
if ( Object.keys( advancedFilters.filters ).length ) {
filterValues.push( {
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
} );
}
@ -148,7 +148,7 @@ if ( Object.keys( advancedFilters.filters ).length ) {
*/
export const filters = applyFilters( CATEGORY_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,

4
plugins/woocommerce-admin/client/analytics/report/categories/index.js
View File

@ -31,8 +31,8 @@ class CategoriesReport extends Component {
? 'item-comparison'
: 'time-comparison';
const itemsLabel = isSingleCategoryView
? __( '%d products', 'woocommerce-admin' )
: __( '%d categories', 'woocommerce-admin' );
? __( '%d products', 'woocommerce' )
: __( '%d categories', 'woocommerce' );
return {
isSingleCategoryView,

29
plugins/woocommerce-admin/client/analytics/report/categories/table.js
View File

@ -29,14 +29,14 @@ class CategoriesReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Category', 'woocommerce-admin' ),
label: __( 'Category', 'woocommerce' ),
key: 'category',
required: true,
isSortable: true,
isLeftAligned: true,
},
{
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
key: 'items_sold',
required: true,
defaultSort: true,
@ -44,19 +44,19 @@ class CategoriesReportTable extends Component {
isNumeric: true,
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
key: 'net_revenue',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Products', 'woocommerce-admin' ),
label: __( 'Products', 'woocommerce' ),
key: 'products_count',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
isSortable: true,
isNumeric: true,
@ -146,7 +146,7 @@ class CategoriesReportTable extends Component {
'Category',
'Categories',
totalResults,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', totalResults ),
},
@ -155,21 +155,16 @@ class CategoriesReportTable extends Component {
'Item sold',
'Items sold',
itemsSold,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', itemsSold ),
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
value: formatAmount( netRevenue ),
},
{
label: _n(
'Order',
'Orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'Order', 'Orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
];
@ -181,9 +176,9 @@ class CategoriesReportTable extends Component {
const labels = {
helpText: __(
'Check at least two categories below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __( 'Search by category name', 'woocommerce-admin' ),
placeholder: __( 'Search by category name', 'woocommerce' ),
};
return (
@ -208,7 +203,7 @@ class CategoriesReportTable extends Component {
order: query.order || 'desc',
extended_info: true,
} }
title={ __( 'Categories', 'woocommerce-admin' ) }
title={ __( 'Categories', 'woocommerce' ) }
columnPrefsKey="categories_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

26
plugins/woocommerce-admin/client/analytics/report/coupons/config.js
View File

@ -31,14 +31,14 @@ const { addCesSurveyForAnalytics } = dispatch( CES_STORE_KEY );
export const charts = applyFilters( COUPON_REPORT_CHARTS_FILTER, [
{
key: 'orders_count',
label: __( 'Discounted orders', 'woocommerce-admin' ),
label: __( 'Discounted orders', 'woocommerce' ),
order: 'desc',
orderby: 'orders_count',
type: 'number',
},
{
key: 'amount',
label: __( 'Amount', 'woocommerce-admin' ),
label: __( 'Amount', 'woocommerce' ),
order: 'desc',
orderby: 'amount',
type: 'currency',
@ -60,15 +60,15 @@ export const advancedFilters = applyFilters(
title: _x(
'Coupons match {{select /}} filters',
'A sentence describing filters for Coupons. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
const filterValues = [
{ label: __( 'All coupons', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All coupons', 'woocommerce' ), value: 'all' },
{
label: __( 'Single coupon', 'woocommerce-admin' ),
label: __( 'Single coupon', 'woocommerce' ),
value: 'select_coupon',
chartMode: 'item-comparison',
subFilters: [
@ -84,27 +84,27 @@ const filterValues = [
labels: {
placeholder: __(
'Type to search for a coupon',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single Coupon', 'woocommerce-admin' ),
button: __( 'Single Coupon', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
value: 'compare-coupons',
settings: {
type: 'coupons',
param: 'coupons',
getLabels: getCouponLabels,
labels: {
title: __( 'Compare Coupon Codes', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Coupon Codes', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
helpText: __(
'Check at least two coupon codes below to compare',
'woocommerce-admin'
'woocommerce'
),
},
onClick: addCesSurveyForAnalytics,
@ -114,7 +114,7 @@ const filterValues = [
if ( Object.keys( advancedFilters.filters ).length ) {
filterValues.push( {
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
} );
}
@ -131,7 +131,7 @@ if ( Object.keys( advancedFilters.filters ).length ) {
*/
export const filters = applyFilters( COUPON_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,

2
plugins/woocommerce-admin/client/analytics/report/coupons/index.js
View File

@ -24,7 +24,7 @@ class CouponsReport extends Component {
query.coupons.split( ',' ).length > 1;
const mode = isCompareView ? 'item-comparison' : 'time-comparison';
const itemsLabel = __( '%d coupons', 'woocommerce-admin' );
const itemsLabel = __( '%d coupons', 'woocommerce' );
return {
itemsLabel,

42
plugins/woocommerce-admin/client/analytics/report/coupons/table.js
View File

@ -28,14 +28,14 @@ class CouponsReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Coupon code', 'woocommerce-admin' ),
label: __( 'Coupon code', 'woocommerce' ),
key: 'code',
required: true,
isLeftAligned: true,
isSortable: true,
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
required: true,
defaultSort: true,
@ -43,21 +43,21 @@ class CouponsReportTable extends Component {
isNumeric: true,
},
{
label: __( 'Amount discounted', 'woocommerce-admin' ),
label: __( 'Amount discounted', 'woocommerce' ),
key: 'amount',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Created', 'woocommerce-admin' ),
label: __( 'Created', 'woocommerce' ),
key: 'created',
},
{
label: __( 'Expires', 'woocommerce-admin' ),
label: __( 'Expires', 'woocommerce' ),
key: 'expires',
},
{
label: __( 'Type', 'woocommerce-admin' ),
label: __( 'Type', 'woocommerce' ),
key: 'type',
},
];
@ -147,7 +147,7 @@ class CouponsReportTable extends Component {
visibleFormat={ dateFormat }
/>
) : (
__( 'N/A', 'woocommerce-admin' )
__( 'N/A', 'woocommerce' )
),
value: dateCreated,
},
@ -158,7 +158,7 @@ class CouponsReportTable extends Component {
visibleFormat={ dateFormat }
/>
) : (
__( 'N/A', 'woocommerce-admin' )
__( 'N/A', 'woocommerce' )
),
value: dateExpires,
},
@ -180,25 +180,15 @@ class CouponsReportTable extends Component {
const currency = getCurrencyConfig();
return [
{
label: _n(
'Coupon',
'Coupons',
couponsCount,
'woocommerce-admin'
),
label: _n( 'Coupon', 'Coupons', couponsCount, 'woocommerce' ),
value: formatValue( currency, 'number', couponsCount ),
},
{
label: _n(
'Order',
'Orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'Order', 'Orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
{
label: __( 'Amount discounted', 'woocommerce-admin' ),
label: __( 'Amount discounted', 'woocommerce' ),
value: formatAmount( amount ),
},
];
@ -206,11 +196,11 @@ class CouponsReportTable extends Component {
getCouponType( discountType ) {
const couponTypes = {
percent: __( 'Percentage', 'woocommerce-admin' ),
fixed_cart: __( 'Fixed cart', 'woocommerce-admin' ),
fixed_product: __( 'Fixed product', 'woocommerce-admin' ),
percent: __( 'Percentage', 'woocommerce' ),
fixed_cart: __( 'Fixed cart', 'woocommerce' ),
fixed_product: __( 'Fixed product', 'woocommerce' ),
};
return couponTypes[ discountType ] || __( 'N/A', 'woocommerce-admin' );
return couponTypes[ discountType ] || __( 'N/A', 'woocommerce' );
}
render() {
@ -233,7 +223,7 @@ class CouponsReportTable extends Component {
order: query.order || 'desc',
extended_info: true,
} }
title={ __( 'Coupons', 'woocommerce-admin' ) }
title={ __( 'Coupons', 'woocommerce' ) }
columnPrefsKey="coupons_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

187
plugins/woocommerce-admin/client/analytics/report/customers/config.js
View File

@ -32,14 +32,14 @@ const CUSTOMERS_REPORT_ADVANCED_FILTERS_FILTER =
*/
export const filters = applyFilters( CUSTOMERS_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,
filters: [
{ label: __( 'All Customers', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All Customers', 'woocommerce' ), value: 'all' },
{
label: __( 'Single Customer', 'woocommerce-admin' ),
label: __( 'Single Customer', 'woocommerce' ),
value: 'select_customer',
chartMode: 'item-comparison',
subFilters: [
@ -55,19 +55,16 @@ export const filters = applyFilters( CUSTOMERS_REPORT_FILTERS_FILTER, [
labels: {
placeholder: __(
'Type to search for a customer',
'woocommerce-admin'
),
button: __(
'Single Customer',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single Customer', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
},
],
@ -89,27 +86,24 @@ export const advancedFilters = applyFilters(
title: _x(
'Customers match {{select /}} filters',
'A sentence describing filters for Customers. See screen shot for context: https://cloudup.com/cCsm3GeXJbE',
'woocommerce-admin'
'woocommerce'
),
filters: {
name: {
labels: {
add: __( 'Name', 'woocommerce-admin' ),
placeholder: __( 'Search', 'woocommerce-admin' ),
remove: __(
'Remove customer name filter',
'woocommerce-admin'
),
add: __( 'Name', 'woocommerce' ),
placeholder: __( 'Search', 'woocommerce' ),
remove: __( 'Remove customer name filter', 'woocommerce' ),
rule: __(
'Select a customer name filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Name{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select customer name', 'woocommerce-admin' ),
filter: __( 'Select customer name', 'woocommerce' ),
},
rules: [
{
@ -118,7 +112,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Includes',
'customer names',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -127,7 +121,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Excludes',
'customer names',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -145,44 +139,33 @@ export const advancedFilters = applyFilters(
},
country: {
labels: {
add: __( 'Country / Region', 'woocommerce-admin' ),
placeholder: __( 'Search', 'woocommerce-admin' ),
add: __( 'Country / Region', 'woocommerce' ),
placeholder: __( 'Search', 'woocommerce' ),
remove: __(
'Remove country / region filter',
'woocommerce-admin'
'woocommerce'
),
rule: __(
'Select a country / region filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Country / Region{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
),
filter: __(
'Select country / region',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select country / region', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to countries including a given country or countries. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x(
'Includes',
'countries',
'woocommerce-admin'
),
label: _x( 'Includes', 'countries', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to countries excluding a given country or countries. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x(
'Excludes',
'countries',
'woocommerce-admin'
),
label: _x( 'Excludes', 'countries', 'woocommerce' ),
},
],
input: {
@ -207,28 +190,25 @@ export const advancedFilters = applyFilters(
},
username: {
labels: {
add: __( 'Username', 'woocommerce-admin' ),
add: __( 'Username', 'woocommerce' ),
placeholder: __(
'Search customer username',
'woocommerce-admin'
'woocommerce'
),
remove: __(
'Remove customer username filter',
'woocommerce-admin'
'woocommerce'
),
rule: __(
'Select a customer username filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a customer username filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Username{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
),
filter: __(
'Select customer username',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select customer username', 'woocommerce' ),
},
rules: [
{
@ -237,7 +217,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Includes',
'customer usernames',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -246,7 +226,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Excludes',
'customer usernames',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -258,25 +238,19 @@ export const advancedFilters = applyFilters(
},
email: {
labels: {
add: __( 'Email', 'woocommerce-admin' ),
placeholder: __(
'Search customer email',
'woocommerce-admin'
),
remove: __(
'Remove customer email filter',
'woocommerce-admin'
),
add: __( 'Email', 'woocommerce' ),
placeholder: __( 'Search customer email', 'woocommerce' ),
remove: __( 'Remove customer email filter', 'woocommerce' ),
rule: __(
'Select a customer email filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a customer email filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Email{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select customer email', 'woocommerce-admin' ),
filter: __( 'Select customer email', 'woocommerce' ),
},
rules: [
{
@ -285,7 +259,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Includes',
'customer emails',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -294,7 +268,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Excludes',
'customer emails',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -312,15 +286,15 @@ export const advancedFilters = applyFilters(
},
orders_count: {
labels: {
add: __( 'No. of Orders', 'woocommerce-admin' ),
remove: __( 'Remove order filter', 'woocommerce-admin' ),
add: __( 'No. of Orders', 'woocommerce' ),
remove: __( 'Remove order filter', 'woocommerce' ),
rule: __(
'Select an order count filter match',
'woocommerce-admin'
'woocommerce'
),
title: __(
'{{title}}No. of Orders{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
},
rules: [
@ -330,7 +304,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Less Than',
'number of orders',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -339,7 +313,7 @@ export const advancedFilters = applyFilters(
label: _x(
'More Than',
'number of orders',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -348,7 +322,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Between',
'number of orders',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -358,18 +332,15 @@ export const advancedFilters = applyFilters(
},
total_spend: {
labels: {
add: __( 'Total Spend', 'woocommerce-admin' ),
remove: __(
'Remove total spend filter',
'woocommerce-admin'
),
add: __( 'Total Spend', 'woocommerce' ),
remove: __( 'Remove total spend filter', 'woocommerce' ),
rule: __(
'Select a total spend filter match',
'woocommerce-admin'
'woocommerce'
),
title: __(
'{{title}}Total Spend{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
},
rules: [
@ -379,7 +350,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Less Than',
'total spend by customer',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -388,7 +359,7 @@ export const advancedFilters = applyFilters(
label: _x(
'More Than',
'total spend by customer',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -397,7 +368,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Between',
'total spend by customer',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -407,18 +378,18 @@ export const advancedFilters = applyFilters(
},
avg_order_value: {
labels: {
add: __( 'AOV', 'woocommerce-admin' ),
add: __( 'AOV', 'woocommerce' ),
remove: __(
'Remove average order value filter',
'woocommerce-admin'
'woocommerce'
),
rule: __(
'Select an average order value filter match',
'woocommerce-admin'
'woocommerce'
),
title: __(
'{{title}}AOV{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
},
rules: [
@ -428,7 +399,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Less Than',
'average order value of customer',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -438,7 +409,7 @@ export const advancedFilters = applyFilters(
label: _x(
'More Than',
'average order value of customer',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -447,7 +418,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Between',
'average order value of customer',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -457,37 +428,34 @@ export const advancedFilters = applyFilters(
},
registered: {
labels: {
add: __( 'Registered', 'woocommerce-admin' ),
remove: __(
'Remove registered filter',
'woocommerce-admin'
),
add: __( 'Registered', 'woocommerce' ),
remove: __( 'Remove registered filter', 'woocommerce' ),
rule: __(
'Select a registered filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Registered{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select registered date', 'woocommerce-admin' ),
filter: __( 'Select registered date', 'woocommerce' ),
},
rules: [
{
value: 'before',
/* translators: Sentence fragment, logical, "Before" refers to customers registered before a given date. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'Before', 'date', 'woocommerce-admin' ),
label: _x( 'Before', 'date', 'woocommerce' ),
},
{
value: 'after',
/* translators: Sentence fragment, logical, "after" refers to customers registered after a given date. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'After', 'date', 'woocommerce-admin' ),
label: _x( 'After', 'date', 'woocommerce' ),
},
{
value: 'between',
/* translators: Sentence fragment, logical, "Between" refers to average order value of a customer, between two given amounts. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'Between', 'date', 'woocommerce-admin' ),
label: _x( 'Between', 'date', 'woocommerce' ),
},
],
input: {
@ -496,37 +464,34 @@ export const advancedFilters = applyFilters(
},
last_active: {
labels: {
add: __( 'Last active', 'woocommerce-admin' ),
remove: __(
'Remove last active filter',
'woocommerce-admin'
),
add: __( 'Last active', 'woocommerce' ),
remove: __( 'Remove last active filter', 'woocommerce' ),
rule: __(
'Select a last active filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cCsm3GeXJbE */
title: __(
'{{title}}Last active{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select registered date', 'woocommerce-admin' ),
filter: __( 'Select registered date', 'woocommerce' ),
},
rules: [
{
value: 'before',
/* translators: Sentence fragment, logical, "Before" refers to customers registered before a given date. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'Before', 'date', 'woocommerce-admin' ),
label: _x( 'Before', 'date', 'woocommerce' ),
},
{
value: 'after',
/* translators: Sentence fragment, logical, "after" refers to customers registered after a given date. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'After', 'date', 'woocommerce-admin' ),
label: _x( 'After', 'date', 'woocommerce' ),
},
{
value: 'between',
/* translators: Sentence fragment, logical, "Between" refers to average order value of a customer, between two given amounts. Screenshot for context: https://cloudup.com/cCsm3GeXJbE */
label: _x( 'Between', 'date', 'woocommerce-admin' ),
label: _x( 'Between', 'date', 'woocommerce' ),
},
],
input: {

44
plugins/woocommerce-admin/client/analytics/report/customers/table.js
View File

@ -38,72 +38,69 @@ function CustomersReportTable( {
const getHeadersContent = () => {
return [
{
label: __( 'Name', 'woocommerce-admin' ),
label: __( 'Name', 'woocommerce' ),
key: 'name',
required: true,
isLeftAligned: true,
isSortable: true,
},
{
label: __( 'Username', 'woocommerce-admin' ),
label: __( 'Username', 'woocommerce' ),
key: 'username',
hiddenByDefault: true,
},
{
label: __( 'Last active', 'woocommerce-admin' ),
label: __( 'Last active', 'woocommerce' ),
key: 'date_last_active',
defaultSort: true,
isSortable: true,
},
{
label: __( 'Date registered', 'woocommerce-admin' ),
label: __( 'Date registered', 'woocommerce' ),
key: 'date_registered',
isSortable: true,
},
{
label: __( 'Email', 'woocommerce-admin' ),
label: __( 'Email', 'woocommerce' ),
key: 'email',
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Total spend', 'woocommerce-admin' ),
label: __( 'Total spend', 'woocommerce' ),
key: 'total_spend',
isSortable: true,
isNumeric: true,
},
{
label: __( 'AOV', 'woocommerce-admin' ),
screenReaderLabel: __(
'Average order value',
'woocommerce-admin'
),
label: __( 'AOV', 'woocommerce' ),
screenReaderLabel: __( 'Average order value', 'woocommerce' ),
key: 'avg_order_value',
isNumeric: true,
},
{
label: __( 'Country / Region', 'woocommerce-admin' ),
label: __( 'Country / Region', 'woocommerce' ),
key: 'country',
isSortable: true,
},
{
label: __( 'City', 'woocommerce-admin' ),
label: __( 'City', 'woocommerce' ),
key: 'city',
hiddenByDefault: true,
isSortable: true,
},
{
label: __( 'Region', 'woocommerce-admin' ),
label: __( 'Region', 'woocommerce' ),
key: 'state',
hiddenByDefault: true,
isSortable: true,
},
{
label: __( 'Postal code', 'woocommerce-admin' ),
label: __( 'Postal code', 'woocommerce' ),
key: 'postcode',
hiddenByDefault: true,
isSortable: true,
@ -250,7 +247,7 @@ function CustomersReportTable( {
'customer',
'customers',
customersCount,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', customersCount ),
},
@ -259,16 +256,16 @@ function CustomersReportTable( {
'Average order',
'Average orders',
avgOrdersCount,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', avgOrdersCount ),
},
{
label: __( 'Average lifetime spend', 'woocommerce-admin' ),
label: __( 'Average lifetime spend', 'woocommerce' ),
value: formatAmount( avgTotalSpend ),
},
{
label: __( 'Average order value', 'woocommerce-admin' ),
label: __( 'Average order value', 'woocommerce' ),
value: formatAmount( avgAvgOrderValue ),
},
];
@ -290,13 +287,10 @@ function CustomersReportTable( {
itemIdField="id"
query={ query }
labels={ {
placeholder: __(
'Search by customer name',
'woocommerce-admin'
),
placeholder: __( 'Search by customer name', 'woocommerce' ),
} }
searchBy="customers"
title={ __( 'Customers', 'woocommerce-admin' ) }
title={ __( 'Customers', 'woocommerce' ) }
columnPrefsKey="customers_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

113
plugins/woocommerce-admin/client/analytics/report/downloads/config.js
View File

@ -32,7 +32,7 @@ const DOWLOADS_REPORT_ADVANCED_FILTERS_FILTER =
export const charts = applyFilters( DOWLOADS_REPORT_CHARTS_FILTER, [
{
key: 'download_count',
label: __( 'Downloads', 'woocommerce-admin' ),
label: __( 'Downloads', 'woocommerce' ),
type: 'number',
},
] );
@ -49,14 +49,14 @@ export const charts = applyFilters( DOWLOADS_REPORT_CHARTS_FILTER, [
*/
export const filters = applyFilters( DOWLOADS_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,
filters: [
{ label: __( 'All downloads', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All downloads', 'woocommerce' ), value: 'all' },
{
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
},
],
@ -79,43 +79,32 @@ export const advancedFilters = applyFilters(
title: _x(
'Downloads match {{select /}} filters',
'A sentence describing filters for Downloads. See screen shot for context: https://cloudup.com/ccxhyH2mEDg',
'woocommerce-admin'
'woocommerce'
),
filters: {
product: {
labels: {
add: __( 'Product', 'woocommerce-admin' ),
placeholder: __( 'Search', 'woocommerce-admin' ),
remove: __( 'Remove product filter', 'woocommerce-admin' ),
rule: __(
'Select a product filter match',
'woocommerce-admin'
),
add: __( 'Product', 'woocommerce' ),
placeholder: __( 'Search', 'woocommerce' ),
remove: __( 'Remove product filter', 'woocommerce' ),
rule: __( 'Select a product filter match', 'woocommerce' ),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/ccxhyH2mEDg */
title: __(
'{{title}}Product{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select product', 'woocommerce-admin' ),
filter: __( 'Select product', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to products including a given product(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Includes',
'products',
'woocommerce-admin'
),
label: _x( 'Includes', 'products', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to products excluding a products(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Excludes',
'products',
'woocommerce-admin'
),
label: _x( 'Excludes', 'products', 'woocommerce' ),
},
],
input: {
@ -126,28 +115,25 @@ export const advancedFilters = applyFilters(
},
customer: {
labels: {
add: __( 'Username', 'woocommerce-admin' ),
add: __( 'Username', 'woocommerce' ),
placeholder: __(
'Search customer username',
'woocommerce-admin'
'woocommerce'
),
remove: __(
'Remove customer username filter',
'woocommerce-admin'
'woocommerce'
),
rule: __(
'Select a customer username filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a customer username filter. See screen shot for context: https://cloudup.com/ccxhyH2mEDg */
title: __(
'{{title}}Username{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
),
filter: __(
'Select customer username',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select customer username', 'woocommerce' ),
},
rules: [
{
@ -156,7 +142,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Includes',
'customer usernames',
'woocommerce-admin'
'woocommerce'
),
},
{
@ -165,7 +151,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Excludes',
'customer usernames',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -177,44 +163,30 @@ export const advancedFilters = applyFilters(
},
order: {
labels: {
add: __( 'Order #', 'woocommerce-admin' ),
placeholder: __(
'Search order number',
'woocommerce-admin'
),
remove: __(
'Remove order number filter',
'woocommerce-admin'
),
add: __( 'Order #', 'woocommerce' ),
placeholder: __( 'Search order number', 'woocommerce' ),
remove: __( 'Remove order number filter', 'woocommerce' ),
rule: __(
'Select a order number filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a order number filter. See screen shot for context: https://cloudup.com/ccxhyH2mEDg */
title: __(
'{{title}}Order #{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select order number', 'woocommerce-admin' ),
filter: __( 'Select order number', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to order numbers including a given order(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Includes',
'order numbers',
'woocommerce-admin'
),
label: _x( 'Includes', 'order numbers', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to order numbers excluding a given order(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Excludes',
'order numbers',
'woocommerce-admin'
),
label: _x( 'Excludes', 'order numbers', 'woocommerce' ),
},
],
input: {
@ -231,41 +203,30 @@ export const advancedFilters = applyFilters(
},
ip_address: {
labels: {
add: __( 'IP Address', 'woocommerce-admin' ),
placeholder: __( 'Search IP address', 'woocommerce-admin' ),
remove: __(
'Remove IP address filter',
'woocommerce-admin'
),
add: __( 'IP Address', 'woocommerce' ),
placeholder: __( 'Search IP address', 'woocommerce' ),
remove: __( 'Remove IP address filter', 'woocommerce' ),
rule: __(
'Select an IP address filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a order number filter. See screen shot for context: https://cloudup.com/ccxhyH2mEDg */
title: __(
'{{title}}IP Address{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select IP address', 'woocommerce-admin' ),
filter: __( 'Select IP address', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to IP addresses including a given address(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Includes',
'IP addresses',
'woocommerce-admin'
),
label: _x( 'Includes', 'IP addresses', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to IP addresses excluding a given address(s). Screenshot for context: https://cloudup.com/ccxhyH2mEDg */
label: _x(
'Excludes',
'IP addresses',
'woocommerce-admin'
),
label: _x( 'Excludes', 'IP addresses', 'woocommerce' ),
},
],
input: {

24
plugins/woocommerce-admin/client/analytics/report/downloads/table.js
View File

@ -32,7 +32,7 @@ class DownloadsReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Date', 'woocommerce-admin' ),
label: __( 'Date', 'woocommerce' ),
key: 'date',
defaultSort: true,
required: true,
@ -40,26 +40,26 @@ class DownloadsReportTable extends Component {
isSortable: true,
},
{
label: __( 'Product title', 'woocommerce-admin' ),
label: __( 'Product title', 'woocommerce' ),
key: 'product',
isSortable: true,
required: true,
},
{
label: __( 'File name', 'woocommerce-admin' ),
label: __( 'File name', 'woocommerce' ),
key: 'file_name',
},
{
label: __( 'Order #', 'woocommerce-admin' ),
screenReaderLabel: __( 'Order Number', 'woocommerce-admin' ),
label: __( 'Order #', 'woocommerce' ),
screenReaderLabel: __( 'Order Number', 'woocommerce' ),
key: 'order_number',
},
{
label: __( 'Username', 'woocommerce-admin' ),
label: __( 'Username', 'woocommerce' ),
key: 'user_id',
},
{
label: __( 'IP', 'woocommerce-admin' ),
label: __( 'IP', 'woocommerce' ),
key: 'ip_address',
},
];
@ -94,8 +94,8 @@ class DownloadsReportTable extends Component {
// Handle deleted products.
if ( errorCode === 'woocommerce_rest_product_invalid_id' ) {
productDisplay = __( '(Deleted)', 'woocommerce-admin' );
productValue = __( '(Deleted)', 'woocommerce-admin' );
productDisplay = __( '(Deleted)', 'woocommerce' );
productValue = __( '(Deleted)', 'woocommerce' );
} else {
const productURL = getNewPath(
persistedQuery,
@ -169,7 +169,7 @@ class DownloadsReportTable extends Component {
return [
{
label: _n( 'day', 'days', days, 'woocommerce-admin' ),
label: _n( 'day', 'days', days, 'woocommerce' ),
value: formatValue( currency, 'number', days ),
},
{
@ -177,7 +177,7 @@ class DownloadsReportTable extends Component {
'Download',
'Downloads',
downloadCount,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', downloadCount ),
},
@ -198,7 +198,7 @@ class DownloadsReportTable extends Component {
tableQuery={ {
_embed: true,
} }
title={ __( 'Downloads', 'woocommerce-admin' ) }
title={ __( 'Downloads', 'woocommerce' ) }
columnPrefsKey="downloads_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

20
plugins/woocommerce-admin/client/analytics/report/get-reports.js
View File

@ -51,7 +51,7 @@ export default () => {
const reports = [
{
report: 'revenue',
title: __( 'Revenue', 'woocommerce-admin' ),
title: __( 'Revenue', 'woocommerce' ),
component: RevenueReport,
navArgs: {
id: 'woocommerce-analytics-revenue',
@ -59,7 +59,7 @@ export default () => {
},
{
report: 'products',
title: __( 'Products', 'woocommerce-admin' ),
title: __( 'Products', 'woocommerce' ),
component: ProductsReport,
navArgs: {
id: 'woocommerce-analytics-products',
@ -67,7 +67,7 @@ export default () => {
},
{
report: 'variations',
title: __( 'Variations', 'woocommerce-admin' ),
title: __( 'Variations', 'woocommerce' ),
component: VariationsReport,
navArgs: {
id: 'woocommerce-analytics-variations',
@ -75,7 +75,7 @@ export default () => {
},
{
report: 'orders',
title: __( 'Orders', 'woocommerce-admin' ),
title: __( 'Orders', 'woocommerce' ),
component: OrdersReport,
navArgs: {
id: 'woocommerce-analytics-orders',
@ -83,7 +83,7 @@ export default () => {
},
{
report: 'categories',
title: __( 'Categories', 'woocommerce-admin' ),
title: __( 'Categories', 'woocommerce' ),
component: CategoriesReport,
navArgs: {
id: 'woocommerce-analytics-categories',
@ -91,7 +91,7 @@ export default () => {
},
{
report: 'coupons',
title: __( 'Coupons', 'woocommerce-admin' ),
title: __( 'Coupons', 'woocommerce' ),
component: CouponsReport,
navArgs: {
id: 'woocommerce-analytics-coupons',
@ -99,7 +99,7 @@ export default () => {
},
{
report: 'taxes',
title: __( 'Taxes', 'woocommerce-admin' ),
title: __( 'Taxes', 'woocommerce' ),
component: TaxesReport,
navArgs: {
id: 'woocommerce-analytics-taxes',
@ -108,7 +108,7 @@ export default () => {
manageStock === 'yes'
? {
report: 'stock',
title: __( 'Stock', 'woocommerce-admin' ),
title: __( 'Stock', 'woocommerce' ),
component: StockReport,
navArgs: {
id: 'woocommerce-analytics-stock',
@ -117,12 +117,12 @@ export default () => {
: null,
{
report: 'customers',
title: __( 'Customers', 'woocommerce-admin' ),
title: __( 'Customers', 'woocommerce' ),
component: CustomersReport,
},
{
report: 'downloads',
title: __( 'Downloads', 'woocommerce-admin' ),
title: __( 'Downloads', 'woocommerce' ),
component: DownloadsReport,
navArgs: {
id: 'woocommerce-analytics-downloads',

209
plugins/woocommerce-admin/client/analytics/report/orders/config.js
View File

@ -33,24 +33,24 @@ const ORDERS_REPORT_ADVANCED_FILTERS_FILTER =
export const charts = applyFilters( ORDERS_REPORT_CHARTS_FILTER, [
{
key: 'orders_count',
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
type: 'number',
},
{
key: 'net_revenue',
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
order: 'desc',
orderby: 'net_total',
type: 'currency',
},
{
key: 'avg_order_value',
label: __( 'Average order value', 'woocommerce-admin' ),
label: __( 'Average order value', 'woocommerce' ),
type: 'currency',
},
{
key: 'avg_items_per_order',
label: __( 'Average items per order', 'woocommerce-admin' ),
label: __( 'Average items per order', 'woocommerce' ),
order: 'desc',
orderby: 'num_items_sold',
type: 'average',
@ -69,14 +69,14 @@ export const charts = applyFilters( ORDERS_REPORT_CHARTS_FILTER, [
*/
export const filters = applyFilters( ORDERS_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,
filters: [
{ label: __( 'All orders', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All orders', 'woocommerce' ), value: 'all' },
{
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
},
],
@ -99,41 +99,34 @@ export const advancedFilters = applyFilters(
title: _x(
'Orders match {{select /}} filters',
'A sentence describing filters for Orders. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
filters: {
status: {
labels: {
add: __( 'Order Status', 'woocommerce-admin' ),
remove: __(
'Remove order status filter',
'woocommerce-admin'
),
add: __( 'Order Status', 'woocommerce' ),
remove: __( 'Remove order status filter', 'woocommerce' ),
rule: __(
'Select an order status filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing an Order Status filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Order Status{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select an order status', 'woocommerce-admin' ),
filter: __( 'Select an order status', 'woocommerce' ),
},
rules: [
{
value: 'is',
/* translators: Sentence fragment, logical, "Is" refers to searching for orders matching a chosen order status. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x( 'Is', 'order status', 'woocommerce-admin' ),
label: _x( 'Is', 'order status', 'woocommerce' ),
},
{
value: 'is_not',
/* translators: Sentence fragment, logical, "Is Not" refers to searching for orders that don\'t match a chosen order status. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Is Not',
'order status',
'woocommerce-admin'
),
label: _x( 'Is Not', 'order status', 'woocommerce' ),
},
],
input: {
@ -146,38 +139,27 @@ export const advancedFilters = applyFilters(
},
product: {
labels: {
add: __( 'Products', 'woocommerce-admin' ),
placeholder: __( 'Search products', 'woocommerce-admin' ),
remove: __( 'Remove products filter', 'woocommerce-admin' ),
rule: __(
'Select a product filter match',
'woocommerce-admin'
),
add: __( 'Products', 'woocommerce' ),
placeholder: __( 'Search products', 'woocommerce' ),
remove: __( 'Remove products filter', 'woocommerce' ),
rule: __( 'Select a product filter match', 'woocommerce' ),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Product{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select products', 'woocommerce-admin' ),
filter: __( 'Select products', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to orders including a given product(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'products',
'woocommerce-admin'
),
label: _x( 'Includes', 'products', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to orders excluding a given product(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'products',
'woocommerce-admin'
),
label: _x( 'Excludes', 'products', 'woocommerce' ),
},
],
input: {
@ -188,41 +170,30 @@ export const advancedFilters = applyFilters(
},
variation: {
labels: {
add: __( 'Variations', 'woocommerce-admin' ),
placeholder: __( 'Search variations', 'woocommerce-admin' ),
remove: __(
'Remove variations filter',
'woocommerce-admin'
),
add: __( 'Variations', 'woocommerce' ),
placeholder: __( 'Search variations', 'woocommerce' ),
remove: __( 'Remove variations filter', 'woocommerce' ),
rule: __(
'Select a variation filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Variation filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Variation{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select variation', 'woocommerce-admin' ),
filter: __( 'Select variation', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to orders including a given variation(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'variations',
'woocommerce-admin'
),
label: _x( 'Includes', 'variations', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to orders excluding a given variation(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'variations',
'woocommerce-admin'
),
label: _x( 'Excludes', 'variations', 'woocommerce' ),
},
],
input: {
@ -233,38 +204,27 @@ export const advancedFilters = applyFilters(
},
coupon: {
labels: {
add: __( 'Coupon Codes', 'woocommerce-admin' ),
placeholder: __( 'Search coupons', 'woocommerce-admin' ),
remove: __( 'Remove coupon filter', 'woocommerce-admin' ),
rule: __(
'Select a coupon filter match',
'woocommerce-admin'
),
add: __( 'Coupon Codes', 'woocommerce' ),
placeholder: __( 'Search coupons', 'woocommerce' ),
remove: __( 'Remove coupon filter', 'woocommerce' ),
rule: __( 'Select a coupon filter match', 'woocommerce' ),
/* translators: A sentence describing a Coupon filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Coupon code{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select coupon codes', 'woocommerce-admin' ),
filter: __( 'Select coupon codes', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to orders including a given coupon code(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'coupon code',
'woocommerce-admin'
),
label: _x( 'Includes', 'coupon code', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to orders excluding a given coupon code(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'coupon code',
'woocommerce-admin'
),
label: _x( 'Excludes', 'coupon code', 'woocommerce' ),
},
],
input: {
@ -275,29 +235,26 @@ export const advancedFilters = applyFilters(
},
customer_type: {
labels: {
add: __( 'Customer type', 'woocommerce-admin' ),
remove: __( 'Remove customer filter', 'woocommerce-admin' ),
rule: __(
'Select a customer filter match',
'woocommerce-admin'
),
add: __( 'Customer type', 'woocommerce' ),
remove: __( 'Remove customer filter', 'woocommerce' ),
rule: __( 'Select a customer filter match', 'woocommerce' ),
/* translators: A sentence describing a Customer filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Customer is{{/title}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select a customer type', 'woocommerce-admin' ),
filter: __( 'Select a customer type', 'woocommerce' ),
},
input: {
component: 'SelectControl',
options: [
{
value: 'new',
label: __( 'New', 'woocommerce-admin' ),
label: __( 'New', 'woocommerce' ),
},
{
value: 'returning',
label: __( 'Returning', 'woocommerce-admin' ),
label: __( 'Returning', 'woocommerce' ),
},
],
defaultOption: 'new',
@ -305,39 +262,33 @@ export const advancedFilters = applyFilters(
},
refunds: {
labels: {
add: __( 'Refunds', 'woocommerce-admin' ),
remove: __( 'Remove refunds filter', 'woocommerce-admin' ),
rule: __(
'Select a refund filter match',
'woocommerce-admin'
),
add: __( 'Refunds', 'woocommerce' ),
remove: __( 'Remove refunds filter', 'woocommerce' ),
rule: __( 'Select a refund filter match', 'woocommerce' ),
title: __(
'{{title}}Refunds{{/title}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select a refund type', 'woocommerce-admin' ),
filter: __( 'Select a refund type', 'woocommerce' ),
},
input: {
component: 'SelectControl',
options: [
{
value: 'all',
label: __( 'All', 'woocommerce-admin' ),
label: __( 'All', 'woocommerce' ),
},
{
value: 'partial',
label: __(
'Partially refunded',
'woocommerce-admin'
),
label: __( 'Partially refunded', 'woocommerce' ),
},
{
value: 'full',
label: __( 'Fully refunded', 'woocommerce-admin' ),
label: __( 'Fully refunded', 'woocommerce' ),
},
{
value: 'none',
label: __( 'None', 'woocommerce-admin' ),
label: __( 'None', 'woocommerce' ),
},
],
defaultOption: 'all',
@ -345,38 +296,27 @@ export const advancedFilters = applyFilters(
},
tax_rate: {
labels: {
add: __( 'Tax Rates', 'woocommerce-admin' ),
placeholder: __( 'Search tax rates', 'woocommerce-admin' ),
remove: __( 'Remove tax rate filter', 'woocommerce-admin' ),
rule: __(
'Select a tax rate filter match',
'woocommerce-admin'
),
add: __( 'Tax Rates', 'woocommerce' ),
placeholder: __( 'Search tax rates', 'woocommerce' ),
remove: __( 'Remove tax rate filter', 'woocommerce' ),
rule: __( 'Select a tax rate filter match', 'woocommerce' ),
/* translators: A sentence describing a tax rate filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Tax Rate{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select tax rates', 'woocommerce-admin' ),
filter: __( 'Select tax rates', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to orders including a given tax rate(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'tax rate',
'woocommerce-admin'
),
label: _x( 'Includes', 'tax rate', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to orders excluding a given tax rate(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'tax rate',
'woocommerce-admin'
),
label: _x( 'Excludes', 'tax rate', 'woocommerce' ),
},
],
input: {
@ -388,32 +328,25 @@ export const advancedFilters = applyFilters(
attribute: {
allowMultiple: true,
labels: {
add: __( 'Attribute', 'woocommerce-admin' ),
placeholder: __( 'Search attributes', 'woocommerce-admin' ),
remove: __(
'Remove attribute filter',
'woocommerce-admin'
),
add: __( 'Attribute', 'woocommerce' ),
placeholder: __( 'Search attributes', 'woocommerce' ),
remove: __( 'Remove attribute filter', 'woocommerce' ),
rule: __(
'Select a product attribute filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Attribute{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select attributes', 'woocommerce-admin' ),
filter: __( 'Select attributes', 'woocommerce' ),
},
rules: [
{
value: 'is',
/* translators: Sentence fragment, logical, "Is" refers to searching for products matching a chosen attribute. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Is',
'product attribute',
'woocommerce-admin'
),
label: _x( 'Is', 'product attribute', 'woocommerce' ),
},
{
value: 'is_not',
@ -421,7 +354,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Is Not',
'product attribute',
'woocommerce-admin'
'woocommerce'
),
},
],

59
plugins/woocommerce-admin/client/analytics/report/orders/table.js
View File

@ -31,7 +31,7 @@ class OrdersReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Date', 'woocommerce-admin' ),
label: __( 'Date', 'woocommerce' ),
key: 'date',
required: true,
defaultSort: true,
@ -39,53 +39,53 @@ class OrdersReportTable extends Component {
isSortable: true,
},
{
label: __( 'Order #', 'woocommerce-admin' ),
screenReaderLabel: __( 'Order Number', 'woocommerce-admin' ),
label: __( 'Order #', 'woocommerce' ),
screenReaderLabel: __( 'Order Number', 'woocommerce' ),
key: 'order_number',
required: true,
},
{
label: __( 'Status', 'woocommerce-admin' ),
label: __( 'Status', 'woocommerce' ),
key: 'status',
required: false,
isSortable: false,
},
{
label: __( 'Customer', 'woocommerce-admin' ),
label: __( 'Customer', 'woocommerce' ),
key: 'customer_id',
required: false,
isSortable: false,
},
{
label: __( 'Customer type', 'woocommerce-admin' ),
label: __( 'Customer type', 'woocommerce' ),
key: 'customer_type',
required: false,
isSortable: false,
},
{
label: __( 'Product(s)', 'woocommerce-admin' ),
screenReaderLabel: __( 'Products', 'woocommerce-admin' ),
label: __( 'Product(s)', 'woocommerce' ),
screenReaderLabel: __( 'Products', 'woocommerce' ),
key: 'products',
required: false,
isSortable: false,
},
{
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
key: 'num_items_sold',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Coupon(s)', 'woocommerce-admin' ),
screenReaderLabel: __( 'Coupons', 'woocommerce-admin' ),
label: __( 'Coupon(s)', 'woocommerce' ),
screenReaderLabel: __( 'Coupons', 'woocommerce' ),
key: 'coupons',
required: false,
isSortable: false,
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
screenReaderLabel: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
screenReaderLabel: __( 'Net sales', 'woocommerce' ),
key: 'net_total',
required: true,
isSortable: true,
@ -202,7 +202,7 @@ class OrdersReportTable extends Component {
: [],
formattedProducts.map( ( product ) => ( {
label: sprintf(
__( '%s× %s', 'woocommerce-admin' ),
__( '%s× %s', 'woocommerce' ),
product.quantity,
product.label
),
@ -212,7 +212,7 @@ class OrdersReportTable extends Component {
value: formattedProducts
.map( ( { quantity, label } ) =>
sprintf(
__( '%s× %s', 'woocommerce-admin' ),
__( '%s× %s', 'woocommerce' ),
quantity,
label
)
@ -259,12 +259,7 @@ class OrdersReportTable extends Component {
const currency = getCurrencyConfig();
return [
{
label: _n(
'Order',
'Orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'Order', 'Orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
{
@ -272,17 +267,12 @@ class OrdersReportTable extends Component {
' Customer',
' Customers',
totalCustomers,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', totalCustomers ),
},
{
label: _n(
'Product',
'Products',
products,
'woocommerce-admin'
),
label: _n( 'Product', 'Products', products, 'woocommerce' ),
value: formatValue( currency, 'number', products ),
},
{
@ -290,21 +280,16 @@ class OrdersReportTable extends Component {
'Item sold',
'Items sold',
numItemsSold,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', numItemsSold ),
},
{
label: _n(
'Coupon',
'Coupons',
couponsCount,
'woocommerce-admin'
),
label: _n( 'Coupon', 'Coupons', couponsCount, 'woocommerce' ),
value: formatValue( currency, 'number', couponsCount ),
},
{
label: __( 'net sales', 'woocommerce-admin' ),
label: __( 'net sales', 'woocommerce' ),
value: formatAmount( netRevenue ),
},
];
@ -350,7 +335,7 @@ class OrdersReportTable extends Component {
tableQuery={ {
extended_info: true,
} }
title={ __( 'Orders', 'woocommerce-admin' ) }
title={ __( 'Orders', 'woocommerce' ) }
columnPrefsKey="orders_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

53
plugins/woocommerce-admin/client/analytics/report/products/config.js
View File

@ -36,21 +36,21 @@ const { addCesSurveyForAnalytics } = dispatch( CES_STORE_KEY );
export const charts = applyFilters( PRODUCTS_REPORT_CHARTS_FILTER, [
{
key: 'items_sold',
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
order: 'desc',
orderby: 'items_sold',
type: 'number',
},
{
key: 'net_revenue',
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
order: 'desc',
orderby: 'net_revenue',
type: 'currency',
},
{
key: 'orders_count',
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
order: 'desc',
orderby: 'orders_count',
type: 'number',
@ -58,14 +58,14 @@ export const charts = applyFilters( PRODUCTS_REPORT_CHARTS_FILTER, [
] );
const filterConfig = {
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,
filters: [
{ label: __( 'All products', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All products', 'woocommerce' ), value: 'all' },
{
label: __( 'Single product', 'woocommerce-admin' ),
label: __( 'Single product', 'woocommerce' ),
value: 'select_product',
chartMode: 'item-comparison',
subFilters: [
@ -81,16 +81,16 @@ const filterConfig = {
labels: {
placeholder: __(
'Type to search for a product',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single product', 'woocommerce-admin' ),
button: __( 'Single product', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
value: 'compare-products',
chartMode: 'item-comparison',
settings: {
@ -100,14 +100,14 @@ const filterConfig = {
labels: {
helpText: __(
'Check at least two products below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __(
'Search for products to compare',
'woocommerce-admin'
'woocommerce'
),
title: __( 'Compare Products', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Products', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
},
onClick: addCesSurveyForAnalytics,
},
@ -124,12 +124,12 @@ const variationsConfig = {
param: 'filter-variations',
filters: [
{
label: __( 'All variations', 'woocommerce-admin' ),
label: __( 'All variations', 'woocommerce' ),
chartMode: 'item-comparison',
value: 'all',
},
{
label: __( 'Single variation', 'woocommerce-admin' ),
label: __( 'Single variation', 'woocommerce' ),
value: 'select_variation',
subFilters: [
{
@ -143,19 +143,16 @@ const variationsConfig = {
labels: {
placeholder: __(
'Type to search for a variation',
'woocommerce-admin'
),
button: __(
'Single variation',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single variation', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
chartMode: 'item-comparison',
value: 'compare-variations',
settings: {
@ -165,14 +162,14 @@ const variationsConfig = {
labels: {
helpText: __(
'Check at least two variations below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __(
'Search for variations to compare',
'woocommerce-admin'
'woocommerce'
),
title: __( 'Compare Variations', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Variations', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
},
},
},
@ -194,18 +191,18 @@ export const advancedFilters = applyFilters(
title: _x(
'Products Match {{select /}} Filters',
'A sentence describing filters for Products. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
if ( Object.keys( advancedFilters.filters ).length ) {
filterConfig.filters.push( {
label: __( 'Advanced Filters', 'woocommerce-admin' ),
label: __( 'Advanced Filters', 'woocommerce' ),
value: 'advanced',
} );
variationsConfig.filters.push( {
label: __( 'Advanced Filters', 'woocommerce-admin' ),
label: __( 'Advanced Filters', 'woocommerce' ),
value: 'advanced',
} );
}

4
plugins/woocommerce-admin/client/analytics/report/products/index.js
View File

@ -42,8 +42,8 @@ class ProductsReport extends Component {
: 'products';
const label =
isSingleProductView && isSingleProductVariable
? __( '%d variations', 'woocommerce-admin' )
: __( '%d products', 'woocommerce-admin' );
? __( '%d variations', 'woocommerce' )
: __( '%d products', 'woocommerce' );
return {
compareObject,

50
plugins/woocommerce-admin/client/analytics/report/products/table.js
View File

@ -39,20 +39,20 @@ class ProductsReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Product title', 'woocommerce-admin' ),
label: __( 'Product title', 'woocommerce' ),
key: 'product_name',
required: true,
isLeftAligned: true,
isSortable: true,
},
{
label: __( 'SKU', 'woocommerce-admin' ),
label: __( 'SKU', 'woocommerce' ),
key: 'sku',
hiddenByDefault: true,
isSortable: true,
},
{
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
key: 'items_sold',
required: true,
defaultSort: true,
@ -60,37 +60,37 @@ class ProductsReportTable extends Component {
isNumeric: true,
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
screenReaderLabel: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
screenReaderLabel: __( 'Net sales', 'woocommerce' ),
key: 'net_revenue',
required: true,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Category', 'woocommerce-admin' ),
label: __( 'Category', 'woocommerce' ),
key: 'product_cat',
},
{
label: __( 'Variations', 'woocommerce-admin' ),
label: __( 'Variations', 'woocommerce' ),
key: 'variations',
isSortable: true,
},
manageStock === 'yes'
? {
label: __( 'Status', 'woocommerce-admin' ),
label: __( 'Status', 'woocommerce' ),
key: 'stock_status',
}
: null,
manageStock === 'yes'
? {
label: __( 'Stock', 'woocommerce-admin' ),
label: __( 'Stock', 'woocommerce' ),
key: 'stock',
isNumeric: true,
}
@ -167,7 +167,7 @@ class ProductsReportTable extends Component {
{ _x(
'Low',
'Indication of a low quantity',
'woocommerce-admin'
'woocommerce'
) }
</Link>
) : (
@ -218,7 +218,7 @@ class ProductsReportTable extends Component {
_x(
'+%d more',
'categories',
'woocommerce-admin'
'woocommerce'
),
productCategories.length - 1
) }
@ -252,7 +252,7 @@ class ProductsReportTable extends Component {
? {
display: extendedInfoManageStock
? stockStatus
: __( 'N/A', 'woocommerce-admin' ),
: __( 'N/A', 'woocommerce' ),
value: extendedInfoManageStock
? stockStatuses[ extendedInfoStockStatus ]
: null,
@ -266,7 +266,7 @@ class ProductsReportTable extends Component {
'number',
stockQuantity
)
: __( 'N/A', 'woocommerce-admin' ),
: __( 'N/A', 'woocommerce' ),
value: stockQuantity,
}
: null,
@ -289,7 +289,7 @@ class ProductsReportTable extends Component {
'Product',
'Products',
productsCount,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', productsCount ),
},
@ -298,21 +298,16 @@ class ProductsReportTable extends Component {
'Item sold',
'Items sold',
itemsSold,
'woocommerce-admin'
'woocommerce'
),
value: formatValue( currency, 'number', itemsSold ),
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
value: formatAmount( netRevenue ),
},
{
label: _n(
'Orders',
'Orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'Orders', 'Orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
];
@ -331,12 +326,9 @@ class ProductsReportTable extends Component {
const labels = {
helpText: __(
'Check at least two products below to compare',
'woocommerce-admin'
),
placeholder: __(
'Search by product name or SKU',
'woocommerce-admin'
'woocommerce'
),
placeholder: __( 'Search by product name or SKU', 'woocommerce' ),
};
return (
@ -364,7 +356,7 @@ class ProductsReportTable extends Component {
extended_info: true,
segmentby: query.segmentby,
} }
title={ __( 'Products', 'woocommerce-admin' ) }
title={ __( 'Products', 'woocommerce' ) }
columnPrefsKey="products_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

26
plugins/woocommerce-admin/client/analytics/report/revenue/config.js
View File

@ -23,7 +23,7 @@ const REVENUE_REPORT_ADVANCED_FILTERS_FILTER =
export const charts = applyFilters( REVENUE_REPORT_CHARTS_FILTER, [
{
key: 'gross_sales',
label: __( 'Gross sales', 'woocommerce-admin' ),
label: __( 'Gross sales', 'woocommerce' ),
order: 'desc',
orderby: 'gross_sales',
type: 'currency',
@ -31,7 +31,7 @@ export const charts = applyFilters( REVENUE_REPORT_CHARTS_FILTER, [
},
{
key: 'refunds',
label: __( 'Returns', 'woocommerce-admin' ),
label: __( 'Returns', 'woocommerce' ),
order: 'desc',
orderby: 'refunds',
type: 'currency',
@ -39,7 +39,7 @@ export const charts = applyFilters( REVENUE_REPORT_CHARTS_FILTER, [
},
{
key: 'coupons',
label: __( 'Coupons', 'woocommerce-admin' ),
label: __( 'Coupons', 'woocommerce' ),
order: 'desc',
orderby: 'coupons',
type: 'currency',
@ -47,37 +47,37 @@ export const charts = applyFilters( REVENUE_REPORT_CHARTS_FILTER, [
},
{
key: 'net_revenue',
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
orderby: 'net_revenue',
type: 'currency',
isReverseTrend: false,
labelTooltipText: __(
'Full refunds are not deducted from tax or net sales totals',
'woocommerce-admin'
'woocommerce'
),
},
{
key: 'taxes',
label: __( 'Taxes', 'woocommerce-admin' ),
label: __( 'Taxes', 'woocommerce' ),
order: 'desc',
orderby: 'taxes',
type: 'currency',
isReverseTrend: false,
labelTooltipText: __(
'Full refunds are not deducted from tax or net sales totals',
'woocommerce-admin'
'woocommerce'
),
},
{
key: 'shipping',
label: __( 'Shipping', 'woocommerce-admin' ),
label: __( 'Shipping', 'woocommerce' ),
orderby: 'shipping',
type: 'currency',
isReverseTrend: false,
},
{
key: 'total_sales',
label: __( 'Total sales', 'woocommerce-admin' ),
label: __( 'Total sales', 'woocommerce' ),
order: 'desc',
orderby: 'total_sales',
type: 'currency',
@ -100,7 +100,7 @@ export const advancedFilters = applyFilters(
title: _x(
'Revenue Matches {{select /}} Filters',
'A sentence describing filters for Revenue. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
@ -109,11 +109,11 @@ const filterValues = [];
if ( Object.keys( advancedFilters.filters ).length ) {
filterValues.push( {
label: __( 'All Revenue', 'woocommerce-admin' ),
label: __( 'All Revenue', 'woocommerce' ),
value: 'all',
} );
filterValues.push( {
label: __( 'Advanced Filters', 'woocommerce-admin' ),
label: __( 'Advanced Filters', 'woocommerce' ),
value: 'advanced',
} );
}
@ -130,7 +130,7 @@ if ( Object.keys( advancedFilters.filters ).length ) {
*/
export const filters = applyFilters( REVENUE_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => filterValues.length > 0,

43
plugins/woocommerce-admin/client/analytics/report/revenue/table.js
View File

@ -54,7 +54,7 @@ class RevenueReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Date', 'woocommerce-admin' ),
label: __( 'Date', 'woocommerce' ),
key: 'date',
required: true,
defaultSort: true,
@ -62,56 +62,56 @@ class RevenueReportTable extends Component {
isSortable: true,
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Gross sales', 'woocommerce-admin' ),
label: __( 'Gross sales', 'woocommerce' ),
key: 'gross_sales',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Returns', 'woocommerce-admin' ),
label: __( 'Returns', 'woocommerce' ),
key: 'refunds',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Coupons', 'woocommerce-admin' ),
label: __( 'Coupons', 'woocommerce' ),
key: 'coupons',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
key: 'net_revenue',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Taxes', 'woocommerce-admin' ),
label: __( 'Taxes', 'woocommerce' ),
key: 'taxes',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Shipping', 'woocommerce-admin' ),
label: __( 'Shipping', 'woocommerce' ),
key: 'shipping',
required: false,
isSortable: true,
isNumeric: true,
},
{
label: __( 'Total sales', 'woocommerce-admin' ),
label: __( 'Total sales', 'woocommerce' ),
key: 'total_sales',
required: false,
isSortable: true,
@ -222,44 +222,39 @@ class RevenueReportTable extends Component {
const currency = getCurrencyConfig();
return [
{
label: _n( 'day', 'days', totalResults, 'woocommerce-admin' ),
label: _n( 'day', 'days', totalResults, 'woocommerce' ),
value: formatValue( currency, 'number', totalResults ),
},
{
label: _n(
'order',
'orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'order', 'orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
{
label: __( 'Gross sales', 'woocommerce-admin' ),
label: __( 'Gross sales', 'woocommerce' ),
value: formatAmount( grossSales ),
},
{
label: __( 'Returns', 'woocommerce-admin' ),
label: __( 'Returns', 'woocommerce' ),
value: formatAmount( refunds ),
},
{
label: __( 'Coupons', 'woocommerce-admin' ),
label: __( 'Coupons', 'woocommerce' ),
value: formatAmount( coupons ),
},
{
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
value: formatAmount( netRevenue ),
},
{
label: __( 'Taxes', 'woocommerce-admin' ),
label: __( 'Taxes', 'woocommerce' ),
value: formatAmount( taxes ),
},
{
label: __( 'Shipping', 'woocommerce-admin' ),
label: __( 'Shipping', 'woocommerce' ),
value: formatAmount( shipping ),
},
{
label: __( 'Total sales', 'woocommerce-admin' ),
label: __( 'Total sales', 'woocommerce' ),
value: formatAmount( totalSales ),
},
];
@ -277,7 +272,7 @@ class RevenueReportTable extends Component {
summaryFields={ summaryFields }
query={ query }
tableData={ tableData }
title={ __( 'Revenue', 'woocommerce-admin' ) }
title={ __( 'Revenue', 'woocommerce' ) }
columnPrefsKey="revenue_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

20
plugins/woocommerce-admin/client/analytics/report/stock/config.js
View File

@ -25,7 +25,7 @@ export const advancedFilters = applyFilters(
title: _x(
'Products Match {{select /}} Filters',
'A sentence describing filters for Products. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
@ -42,36 +42,36 @@ export const advancedFilters = applyFilters(
*/
export const filters = applyFilters( STOCK_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'paged', 'per_page' ],
param: 'type',
showFilters: () => true,
filters: [
{ label: __( 'All products', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All products', 'woocommerce' ), value: 'all' },
{
label: __( 'Out of stock', 'woocommerce-admin' ),
label: __( 'Out of stock', 'woocommerce' ),
value: 'outofstock',
},
{
label: __( 'Low stock', 'woocommerce-admin' ),
label: __( 'Low stock', 'woocommerce' ),
value: 'lowstock',
},
{ label: __( 'In stock', 'woocommerce-admin' ), value: 'instock' },
{ label: __( 'In stock', 'woocommerce' ), value: 'instock' },
{
label: __( 'On backorder', 'woocommerce-admin' ),
label: __( 'On backorder', 'woocommerce' ),
value: 'onbackorder',
},
],
},
{
label: __( 'Filter by', 'woocommerce-admin' ),
label: __( 'Filter by', 'woocommerce' ),
staticParams: [ 'paged', 'per_page' ],
param: 'filter',
showFilters: () => Object.keys( advancedFilters.filters ).length,
filters: [
{ label: __( 'All Products', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All Products', 'woocommerce' ), value: 'all' },
{
label: __( 'Advanced Filters', 'woocommerce-admin' ),
label: __( 'Advanced Filters', 'woocommerce' ),
value: 'advanced',
},
],

29
plugins/woocommerce-admin/client/analytics/report/stock/table.js
View File

@ -31,25 +31,25 @@ class StockReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Product / Variation', 'woocommerce-admin' ),
label: __( 'Product / Variation', 'woocommerce' ),
key: 'title',
required: true,
isLeftAligned: true,
isSortable: true,
},
{
label: __( 'SKU', 'woocommerce-admin' ),
label: __( 'SKU', 'woocommerce' ),
key: 'sku',
isSortable: true,
},
{
label: __( 'Status', 'woocommerce-admin' ),
label: __( 'Status', 'woocommerce' ),
key: 'stock_status',
isSortable: true,
defaultSort: true,
},
{
label: __( 'Stock', 'woocommerce-admin' ),
label: __( 'Stock', 'woocommerce' ),
key: 'stock_quantity',
isSortable: true,
},
@ -100,7 +100,7 @@ class StockReportTable extends Component {
{ _x(
'Low',
'Indication of a low quantity',
'woocommerce-admin'
'woocommerce'
) }
</Link>
) : (
@ -129,7 +129,7 @@ class StockReportTable extends Component {
'number',
stockQuantity
)
: __( 'N/A', 'woocommerce-admin' ),
: __( 'N/A', 'woocommerce' ),
value: stockQuantity,
},
];
@ -147,28 +147,23 @@ class StockReportTable extends Component {
const currency = this.context.getCurrencyConfig();
return [
{
label: _n(
'Product',
'Products',
products,
'woocommerce-admin'
),
label: _n( 'Product', 'Products', products, 'woocommerce' ),
value: formatValue( currency, 'number', products ),
},
{
label: __( 'Out of stock', 'woocommerce-admin' ),
label: __( 'Out of stock', 'woocommerce' ),
value: formatValue( currency, 'number', outofstock ),
},
{
label: __( 'Low stock', 'woocommerce-admin' ),
label: __( 'Low stock', 'woocommerce' ),
value: formatValue( currency, 'number', lowstock ),
},
{
label: __( 'On backorder', 'woocommerce-admin' ),
label: __( 'On backorder', 'woocommerce' ),
value: formatValue( currency, 'number', onbackorder ),
},
{
label: __( 'In stock', 'woocommerce-admin' ),
label: __( 'In stock', 'woocommerce' ),
value: formatValue( currency, 'number', instock ),
},
];
@ -196,7 +191,7 @@ class StockReportTable extends Component {
order: query.order || 'asc',
type: query.type || 'all',
} }
title={ __( 'Stock', 'woocommerce-admin' ) }
title={ __( 'Stock', 'woocommerce' ) }
filters={ filters }
advancedFilters={ advancedFilters }
/>

26
plugins/woocommerce-admin/client/analytics/report/taxes/config.js
View File

@ -33,28 +33,28 @@ const { addCesSurveyForAnalytics } = dispatch( CES_STORE_KEY );
export const charts = applyFilters( TAXES_REPORT_CHARTS_FILTER, [
{
key: 'total_tax',
label: __( 'Total tax', 'woocommerce-admin' ),
label: __( 'Total tax', 'woocommerce' ),
order: 'desc',
orderby: 'total_tax',
type: 'currency',
},
{
key: 'order_tax',
label: __( 'Order tax', 'woocommerce-admin' ),
label: __( 'Order tax', 'woocommerce' ),
order: 'desc',
orderby: 'order_tax',
type: 'currency',
},
{
key: 'shipping_tax',
label: __( 'Shipping tax', 'woocommerce-admin' ),
label: __( 'Shipping tax', 'woocommerce' ),
order: 'desc',
orderby: 'shipping_tax',
type: 'currency',
},
{
key: 'orders_count',
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
order: 'desc',
orderby: 'orders_count',
type: 'number',
@ -76,15 +76,15 @@ export const advancedFilters = applyFilters(
title: _x(
'Taxes match {{select /}} filters',
'A sentence describing filters for Taxes. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
}
);
const filterValues = [
{ label: __( 'All taxes', 'woocommerce-admin' ), value: 'all' },
{ label: __( 'All taxes', 'woocommerce' ), value: 'all' },
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
value: 'compare-taxes',
chartMode: 'item-comparison',
settings: {
@ -101,14 +101,14 @@ const filterValues = [
labels: {
helpText: __(
'Check at least two tax codes below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __(
'Search for tax codes to compare',
'woocommerce-admin'
'woocommerce'
),
title: __( 'Compare Tax Codes', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Tax Codes', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
},
onClick: addCesSurveyForAnalytics,
},
@ -117,7 +117,7 @@ const filterValues = [
if ( Object.keys( advancedFilters.filters ).length ) {
filterValues.push( {
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
} );
}
@ -134,7 +134,7 @@ if ( Object.keys( advancedFilters.filters ).length ) {
*/
export const filters = applyFilters( TAXES_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter',
showFilters: () => true,

2
plugins/woocommerce-admin/client/analytics/report/taxes/index.js
View File

@ -20,7 +20,7 @@ class TaxesReport extends Component {
const { query } = this.props;
const isCompareTaxView = query.filter === 'compare-taxes';
const mode = isCompareTaxView ? 'item-comparison' : 'time-comparison';
const itemsLabel = __( '%d taxes', 'woocommerce-admin' );
const itemsLabel = __( '%d taxes', 'woocommerce' );
return {
itemsLabel,

34
plugins/woocommerce-admin/client/analytics/report/taxes/table.js
View File

@ -27,35 +27,35 @@ class TaxesReportTable extends Component {
getHeadersContent() {
return [
{
label: __( 'Tax code', 'woocommerce-admin' ),
label: __( 'Tax code', 'woocommerce' ),
key: 'tax_code',
required: true,
isLeftAligned: true,
isSortable: true,
},
{
label: __( 'Rate', 'woocommerce-admin' ),
label: __( 'Rate', 'woocommerce' ),
key: 'rate',
isSortable: true,
isNumeric: true,
},
{
label: __( 'Total tax', 'woocommerce-admin' ),
label: __( 'Total tax', 'woocommerce' ),
key: 'total_tax',
isSortable: true,
},
{
label: __( 'Order tax', 'woocommerce-admin' ),
label: __( 'Order tax', 'woocommerce' ),
key: 'order_tax',
isSortable: true,
},
{
label: __( 'Shipping tax', 'woocommerce-admin' ),
label: __( 'Shipping tax', 'woocommerce' ),
key: 'shipping_tax',
isSortable: true,
},
{
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
key: 'orders_count',
required: true,
defaultSort: true,
@ -144,33 +144,23 @@ class TaxesReportTable extends Component {
const currency = getCurrencyConfig();
return [
{
label: _n(
'tax code',
'tax codes',
taxesCodes,
'woocommerce-admin'
),
label: _n( 'tax code', 'tax codes', taxesCodes, 'woocommerce' ),
value: formatValue( currency, 'number', taxesCodes ),
},
{
label: __( 'total tax', 'woocommerce-admin' ),
label: __( 'total tax', 'woocommerce' ),
value: formatAmount( totalTax ),
},
{
label: __( 'order tax', 'woocommerce-admin' ),
label: __( 'order tax', 'woocommerce' ),
value: formatAmount( orderTax ),
},
{
label: __( 'shipping tax', 'woocommerce-admin' ),
label: __( 'shipping tax', 'woocommerce' ),
value: formatAmount( shippingTax ),
},
{
label: _n(
'order',
'orders',
ordersCount,
'woocommerce-admin'
),
label: _n( 'order', 'orders', ordersCount, 'woocommerce' ),
value: formatValue( currency, 'number', ordersCount ),
},
];
@ -200,7 +190,7 @@ class TaxesReportTable extends Component {
tableQuery={ {
orderby: query.orderby || 'tax_rate_id',
} }
title={ __( 'Taxes', 'woocommerce-admin' ) }
title={ __( 'Taxes', 'woocommerce' ) }
columnPrefsKey="taxes_report_columns"
filters={ filters }
advancedFilters={ advancedFilters }

2
plugins/woocommerce-admin/client/analytics/report/taxes/utils.js
View File

@ -7,7 +7,7 @@ export function getTaxCode( tax ) {
return [
tax.country,
tax.state,
tax.name || __( 'TAX', 'woocommerce-admin' ),
tax.name || __( 'TAX', 'woocommerce' ),
tax.priority,
]
.map( ( item ) => item.toString().toUpperCase().trim() )

113
plugins/woocommerce-admin/client/analytics/report/variations/config.js
View File

@ -37,21 +37,21 @@ const { addCesSurveyForAnalytics } = dispatch( CES_STORE_KEY );
export const charts = applyFilters( VARIATIONS_REPORT_CHARTS_FILTER, [
{
key: 'items_sold',
label: __( 'Items sold', 'woocommerce-admin' ),
label: __( 'Items sold', 'woocommerce' ),
order: 'desc',
orderby: 'items_sold',
type: 'number',
},
{
key: 'net_revenue',
label: __( 'Net sales', 'woocommerce-admin' ),
label: __( 'Net sales', 'woocommerce' ),
order: 'desc',
orderby: 'net_revenue',
type: 'currency',
},
{
key: 'orders_count',
label: __( 'Orders', 'woocommerce-admin' ),
label: __( 'Orders', 'woocommerce' ),
order: 'desc',
orderby: 'orders_count',
type: 'number',
@ -70,18 +70,18 @@ export const charts = applyFilters( VARIATIONS_REPORT_CHARTS_FILTER, [
*/
export const filters = applyFilters( VARIATIONS_REPORT_FILTERS_FILTER, [
{
label: __( 'Show', 'woocommerce-admin' ),
label: __( 'Show', 'woocommerce' ),
staticParams: [ 'chartType', 'paged', 'per_page' ],
param: 'filter-variations',
showFilters: () => true,
filters: [
{
label: __( 'All variations', 'woocommerce-admin' ),
label: __( 'All variations', 'woocommerce' ),
chartMode: 'item-comparison',
value: 'all',
},
{
label: __( 'Single variation', 'woocommerce-admin' ),
label: __( 'Single variation', 'woocommerce' ),
value: 'select_variation',
subFilters: [
{
@ -95,19 +95,16 @@ export const filters = applyFilters( VARIATIONS_REPORT_FILTERS_FILTER, [
labels: {
placeholder: __(
'Type to search for a variation',
'woocommerce-admin'
),
button: __(
'Single variation',
'woocommerce-admin'
'woocommerce'
),
button: __( 'Single variation', 'woocommerce' ),
},
},
},
],
},
{
label: __( 'Comparison', 'woocommerce-admin' ),
label: __( 'Comparison', 'woocommerce' ),
chartMode: 'item-comparison',
value: 'compare-variations',
settings: {
@ -117,20 +114,20 @@ export const filters = applyFilters( VARIATIONS_REPORT_FILTERS_FILTER, [
labels: {
helpText: __(
'Check at least two variations below to compare',
'woocommerce-admin'
'woocommerce'
),
placeholder: __(
'Search for variations to compare',
'woocommerce-admin'
'woocommerce'
),
title: __( 'Compare Variations', 'woocommerce-admin' ),
update: __( 'Compare', 'woocommerce-admin' ),
title: __( 'Compare Variations', 'woocommerce' ),
update: __( 'Compare', 'woocommerce' ),
},
onClick: addCesSurveyForAnalytics,
},
},
{
label: __( 'Advanced filters', 'woocommerce-admin' ),
label: __( 'Advanced filters', 'woocommerce' ),
value: 'advanced',
},
],
@ -151,38 +148,31 @@ export const advancedFilters = applyFilters(
title: _x(
'Variations match {{select /}} filters',
'A sentence describing filters for Variations. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ',
'woocommerce-admin'
'woocommerce'
),
filters: {
attribute: {
allowMultiple: true,
labels: {
add: __( 'Attribute', 'woocommerce-admin' ),
placeholder: __( 'Search attributes', 'woocommerce-admin' ),
remove: __(
'Remove attribute filter',
'woocommerce-admin'
),
add: __( 'Attribute', 'woocommerce' ),
placeholder: __( 'Search attributes', 'woocommerce' ),
remove: __( 'Remove attribute filter', 'woocommerce' ),
rule: __(
'Select a product attribute filter match',
'woocommerce-admin'
'woocommerce'
),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Attribute{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select attributes', 'woocommerce-admin' ),
filter: __( 'Select attributes', 'woocommerce' ),
},
rules: [
{
value: 'is',
/* translators: Sentence fragment, logical, "Is" refers to searching for product variations matching a chosen attribute. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Is',
'product attribute',
'woocommerce-admin'
),
label: _x( 'Is', 'product attribute', 'woocommerce' ),
},
{
value: 'is_not',
@ -190,7 +180,7 @@ export const advancedFilters = applyFilters(
label: _x(
'Is Not',
'product attribute',
'woocommerce-admin'
'woocommerce'
),
},
],
@ -200,41 +190,27 @@ export const advancedFilters = applyFilters(
},
category: {
labels: {
add: __( 'Categories', 'woocommerce-admin' ),
placeholder: __( 'Search categories', 'woocommerce-admin' ),
remove: __(
'Remove categories filter',
'woocommerce-admin'
),
rule: __(
'Select a category filter match',
'woocommerce-admin'
),
add: __( 'Categories', 'woocommerce' ),
placeholder: __( 'Search categories', 'woocommerce' ),
remove: __( 'Remove categories filter', 'woocommerce' ),
rule: __( 'Select a category filter match', 'woocommerce' ),
/* translators: A sentence describing a Category filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Category{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select categories', 'woocommerce-admin' ),
filter: __( 'Select categories', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to variations including a given category. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'categories',
'woocommerce-admin'
),
label: _x( 'Includes', 'categories', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to variations excluding a given category. Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'categories',
'woocommerce-admin'
),
label: _x( 'Excludes', 'categories', 'woocommerce' ),
},
],
input: {
@ -245,38 +221,27 @@ export const advancedFilters = applyFilters(
},
product: {
labels: {
add: __( 'Products', 'woocommerce-admin' ),
placeholder: __( 'Search products', 'woocommerce-admin' ),
remove: __( 'Remove products filter', 'woocommerce-admin' ),
rule: __(
'Select a product filter match',
'woocommerce-admin'
),
add: __( 'Products', 'woocommerce' ),
placeholder: __( 'Search products', 'woocommerce' ),
remove: __( 'Remove products filter', 'woocommerce' ),
rule: __( 'Select a product filter match', 'woocommerce' ),
/* translators: A sentence describing a Product filter. See screen shot for context: https://cloudup.com/cSsUY9VeCVJ */
title: __(
'{{title}}Product{{/title}} {{rule /}} {{filter /}}',
'woocommerce-admin'
'woocommerce'
),
filter: __( 'Select products', 'woocommerce-admin' ),
filter: __( 'Select products', 'woocommerce' ),
},
rules: [
{
value: 'includes',
/* translators: Sentence fragment, logical, "Includes" refers to orders including a given product(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Includes',
'products',
'woocommerce-admin'
),
label: _x( 'Includes', 'products', 'woocommerce' ),
},
{
value: 'excludes',
/* translators: Sentence fragment, logical, "Excludes" refers to orders excluding a given product(s). Screenshot for context: https://cloudup.com/cSsUY9VeCVJ */
label: _x(
'Excludes',
'products',
'woocommerce-admin'
),
label: _x( 'Excludes', 'products', 'woocommerce' ),
},
],
input: {

2
plugins/woocommerce-admin/client/analytics/report/variations/index.js
View File

@ -24,7 +24,7 @@ const getChartMeta = ( { query } ) => {
return {
compareObject: 'variations',
itemsLabel: __( '%d variations', 'woocommerce-admin' ),
itemsLabel: __( '%d variations', 'woocommerce' ),
mode: isCompareView ? 'item-comparison' : 'time-comparison',
};
};

Some files were not shown because too many files have changed in this diff Show More