colour -> color

#12627
This commit is contained in:
Mike Jolley 2016-12-19 11:28:09 +00:00
parent 81f4cadf12
commit 2e77e38d33
13 changed files with 87 additions and 87 deletions

View File

@ -8,14 +8,14 @@ $red: #a00;
$orange: #ffba00;
$blue: #2ea2cc;
$primary: #a46497; // Primary colour for buttons (alt)
$primarytext: desaturate(lighten($primary, 50%), 18%); // Text on primary colour bg
$primary: #a46497; // Primary color for buttons (alt)
$primarytext: desaturate(lighten($primary, 50%), 18%); // Text on primary color bg
$secondary: desaturate(lighten($primary, 40%), 21%); // Secondary buttons
$secondarytext: desaturate(darken($secondary, 60%), 21%); // Text on secondary colour bg
$secondarytext: desaturate(darken($secondary, 60%), 21%); // Text on secondary color bg
$highlight: adjust-hue($primary, 150deg); // Prices, In stock labels, sales flash
$highlightext: desaturate(lighten($highlight, 50%), 18%); // Text on highlight colour bg
$highlightext: desaturate(lighten($highlight, 50%), 18%); // Text on highlight color bg
$contentbg: #fff; // Content BG - Tabs (active state)
$subtext: #777; // small, breadcrumbs etc

View File

@ -3672,7 +3672,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
<wp:comment_author_IP>86.19.152.140</wp:comment_author_IP>
<wp:comment_date>2013-06-07 11:54:51</wp:comment_date>
<wp:comment_date_gmt>2013-06-07 11:54:51</wp:comment_date_gmt>
<wp:comment_content><![CDATA[I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
<wp:comment_content><![CDATA[I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat]]></wp:comment_content>
<wp:comment_approved>1</wp:comment_approved>
<wp:comment_type></wp:comment_type>
<wp:comment_parent>0</wp:comment_parent>
@ -3687,7 +3687,7 @@ If only it came in red as well!";s:7:"POST__n";s:10:"2145d644a3";s:21:"POST__wp_
</wp:commentmeta>
<wp:commentmeta>
<wp:meta_key>akismet_as_submitted</wp:meta_key>
<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green colour, apparently it GREY! I'm colour blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
<wp:meta_value><![CDATA[a:64:{s:15:"comment_post_ID";i:53;s:14:"comment_author";s:6:"Andrew";s:20:"comment_author_email";s:25:"andrew@chromeorange.co.uk";s:18:"comment_author_url";N;s:15:"comment_content";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:12:"comment_type";s:0:"";s:14:"comment_parent";i:0;s:7:"user_ID";i:0;s:7:"user_ip";s:13:"86.19.152.140";s:10:"user_agent";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:8:"referrer";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:4:"blog";s:36:"http://demo.woothemes.com/woocommerce";s:9:"blog_lang";s:5:"en_US";s:12:"blog_charset";s:5:"UTF-8";s:9:"permalink";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:21:"akismet_comment_nonce";s:6:"passed";s:11:"POST_author";s:6:"Andrew";s:10:"POST_email";s:25:"andrew@chromeorange.co.uk";s:11:"POST_rating";s:1:"1";s:12:"POST_comment";s:149:"I bought this thinking it was a nice green color, apparently it GREY! I'm color blind so I don't care but my girlfriend says grey makes me look fat";s:7:"POST__n";s:10:"a80bd2f042";s:21:"POST__wp_http_referer";s:35:"/woocommerce/product/happy-ninja-2/";s:11:"POST_submit";s:13:"Submit Review";s:20:"POST_comment_post_ID";s:2:"53";s:19:"POST_comment_parent";s:1:"0";s:26:"POST_akismet_comment_nonce";s:10:"d96b507062";s:15:"SERVER_SOFTWARE";s:6:"Apache";s:11:"REQUEST_URI";s:33:"/woocommerce/wp-comments-post.php";s:15:"REDIRECT_IS_WPE";s:1:"1";s:27:"REDIRECT_WPE_CAN_WRITE_DISK";s:1:"0";s:15:"REDIRECT_STATUS";s:3:"200";s:6:"IS_WPE";s:1:"1";s:18:"WPE_CAN_WRITE_DISK";s:1:"0";s:9:"HTTP_HOST";s:19:"demo2.woothemes.com";s:13:"HTTP_X_LB_KEY";s:8:"woodemo2";s:13:"HTTP_X_IS_BOT";s:1:"0";s:15:"HTTP_USER_AGENT";s:81:"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0";s:15:"HTTP_CONNECTION";s:5:"close";s:11:"HTTP_ACCEPT";s:63:"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";s:20:"HTTP_ACCEPT_LANGUAGE";s:14:"en-US,en;q=0.5";s:20:"HTTP_ACCEPT_ENCODING";s:13:"gzip, deflate";s:12:"HTTP_REFERER";s:61:"http://demo.woothemes.com/woocommerce/product/happy-ninja-2/";s:11:"HTTP_COOKIE";s:0:"";s:12:"CONTENT_TYPE";s:33:"application/x-www-form-urlencoded";s:14:"CONTENT_LENGTH";s:3:"387";s:4:"PATH";s:28:"/usr/local/bin:/usr/bin:/bin";s:16:"SERVER_SIGNATURE";s:0:"";s:11:"SERVER_NAME";s:19:"demo2.woothemes.com";s:11:"SERVER_ADDR";s:9:"127.0.0.1";s:11:"SERVER_PORT";s:2:"80";s:11:"REMOTE_ADDR";s:13:"86.19.152.140";s:13:"DOCUMENT_ROOT";s:26:"/nas/wp/www/sites/woodemo2";s:12:"SERVER_ADMIN";s:18:"[no address given]";s:15:"SCRIPT_FILENAME";s:47:"/nas/wp/www/sites/woodemo2/wp-comments-post.php";s:11:"REMOTE_PORT";s:5:"55431";s:12:"REDIRECT_URL";s:33:"/woocommerce/wp-comments-post.php";s:17:"GATEWAY_INTERFACE";s:7:"CGI/1.1";s:15:"SERVER_PROTOCOL";s:8:"HTTP/1.0";s:14:"REQUEST_METHOD";s:4:"POST";s:12:"QUERY_STRING";s:0:"";s:11:"SCRIPT_NAME";s:21:"/wp-comments-post.php";s:8:"PHP_SELF";s:21:"/wp-comments-post.php";s:12:"REQUEST_TIME";s:10:"1370606091";s:25:"comment_post_modified_gmt";s:19:"2013-06-07 11:17:38";}]]></wp:meta_value>
</wp:commentmeta>
<wp:commentmeta>
<wp:meta_key>rating</wp:meta_key>

View File

@ -6145,7 +6145,7 @@ msgstr ""
#: includes/admin/class-wc-admin-attributes.php:449
msgid ""
"Attributes let you define extra product data, such as size or colour. You "
"Attributes let you define extra product data, such as size or color. You "
"can use these attributes in the shop sidebar using the \"layered nav\" "
"widgets. Please note: you cannot rename an attribute later on."
msgstr ""
@ -10561,39 +10561,39 @@ msgid "%s - Powered by WooCommerce"
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:121
msgid "Base colour"
msgid "Base color"
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:123
#. translators: %s: default color
msgid "The base colour for WooCommerce email templates. Default %s."
msgid "The base color for WooCommerce email templates. Default %s."
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:133
msgid "Background colour"
msgid "Background color"
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:135
#. translators: %s: default color
msgid "The background colour for WooCommerce email templates. Default %s."
msgid "The background color for WooCommerce email templates. Default %s."
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:145
msgid "Body background colour"
msgid "Body background color"
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:147
#. translators: %s: default color
msgid "The main body background colour. Default %s."
msgid "The main body background color. Default %s."
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:157
msgid "Body text colour"
msgid "Body text color"
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:159
#. translators: %s: default color
msgid "The main body text colour. Default %s."
msgid "The main body text color. Default %s."
msgstr ""
#: includes/admin/settings/class-wc-settings-emails.php:239

View File

@ -446,7 +446,7 @@ class WC_Admin_Attributes {
<div class="col-wrap">
<div class="form-wrap">
<h2><?php _e( 'Add new attribute', 'woocommerce' ); ?></h2>
<p><?php _e( 'Attributes let you define extra product data, such as size or colour. You can use these attributes in the shop sidebar using the "layered nav" widgets. Please note: you cannot rename an attribute later on.', 'woocommerce' ); ?></p>
<p><?php _e( 'Attributes let you define extra product data, such as size or color. You can use these attributes in the shop sidebar using the "layered nav" widgets. Please note: you cannot rename an attribute later on.', 'woocommerce' ); ?></p>
<form action="edit.php?post_type=product&amp;page=product_attributes" method="post">
<?php do_action( 'woocommerce_before_add_attribute_fields' ) ?>

View File

@ -15,11 +15,11 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Report_Coupon_Usage extends WC_Admin_Report {
/**
* Chart colours.
* Chart colors.
*
* @var array
*/
public $chart_colours = array();
public $chart_colors = array();
/**
* Coupon codes.
@ -107,14 +107,14 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
$legend[] = array(
/* translators: %s: discount ammount */
'title' => sprintf( __( '%s discounts in total', 'woocommerce' ), '<strong>' . wc_price( $total_discount ) . '</strong>' ),
'color' => $this->chart_colours['discount_amount'],
'color' => $this->chart_colors['discount_amount'],
'highlight_series' => 1,
);
$legend[] = array(
/* translators: %s: coupons ammount */
'title' => sprintf( __( '%s coupons used in total', 'woocommerce' ), '<strong>' . $total_coupons . '</strong>' ),
'color' => $this->chart_colours['coupon_count'],
'color' => $this->chart_colors['coupon_count'],
'highlight_series' => 0,
);
@ -133,7 +133,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);
$this->chart_colours = array(
$this->chart_colors = array(
'discount_amount' => '#3498db',
'coupon_count' => '#d4d9dc',
);
@ -460,8 +460,8 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Number of coupons used', 'woocommerce' ) ) ?>",
data: order_data.order_coupon_counts,
color: '<?php echo $this->chart_colours['coupon_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['coupon_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['coupon_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
hoverable: false
},
@ -469,7 +469,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Discount amount', 'woocommerce' ) ) ?>",
data: order_data.order_discount_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['discount_amount']; ?>',
color: '<?php echo $this->chart_colors['discount_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 4, fill: false },
shadowSize: 0,

View File

@ -15,11 +15,11 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Report_Customers extends WC_Admin_Report {
/**
* Chart colours.
* Chart colors.
*
* @var array
*/
public $chart_colours = array();
public $chart_colors = array();
/**
* Customers.
@ -39,7 +39,7 @@ class WC_Report_Customers extends WC_Admin_Report {
$legend[] = array(
/* translators: %s: signups ammount */
'title' => sprintf( __( '%s signups in this period', 'woocommerce' ), '<strong>' . sizeof( $this->customers ) . '</strong>' ),
'color' => $this->chart_colours['signups'],
'color' => $this->chart_colors['signups'],
'highlight_series' => 2,
);
@ -106,8 +106,8 @@ class WC_Report_Customers extends WC_Admin_Report {
<div class="chart-container">
<div class="chart-placeholder customers_vs_guests pie-chart" style="height:200px"></div>
<ul class="pie-chart-legend">
<li style="border-color: <?php echo $this->chart_colours['customers']; ?>"><?php _e( 'Customer sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colours['guests']; ?>"><?php _e( 'Guest sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colors['customers']; ?>"><?php _e( 'Customer sales', 'woocommerce' ); ?></li>
<li style="border-color: <?php echo $this->chart_colors['guests']; ?>"><?php _e( 'Guest sales', 'woocommerce' ); ?></li>
</ul>
</div>
<script type="text/javascript">
@ -118,12 +118,12 @@ class WC_Report_Customers extends WC_Admin_Report {
{
label: '<?php _e( 'Customer orders', 'woocommerce' ); ?>',
data: "<?php echo $customer_order_totals->total_orders ?>",
color: '<?php echo $this->chart_colours['customers']; ?>'
color: '<?php echo $this->chart_colors['customers']; ?>'
},
{
label: '<?php _e( 'Guest orders', 'woocommerce' ); ?>',
data: "<?php echo $guest_order_totals->total_orders ?>",
color: '<?php echo $this->chart_colours['guests']; ?>'
color: '<?php echo $this->chart_colors['guests']; ?>'
}
],
{
@ -166,7 +166,7 @@ class WC_Report_Customers extends WC_Admin_Report {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);
$this->chart_colours = array(
$this->chart_colors = array(
'signups' => '#3498db',
'customers' => '#1abc9c',
'guests' => '#8fdece',
@ -315,8 +315,8 @@ class WC_Report_Customers extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Customer orders', 'woocommerce' ) ) ?>",
data: chart_data.customer_orders,
color: '<?php echo $this->chart_colours['customers']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['customers']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['customers']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['customers']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
enable_tooltip: true,
append_tooltip: "<?php echo ' ' . __( 'customer orders', 'woocommerce' ); ?>",
@ -325,8 +325,8 @@ class WC_Report_Customers extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Guest orders', 'woocommerce' ) ) ?>",
data: chart_data.guest_orders,
color: '<?php echo $this->chart_colours['guests']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['guests']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['guests']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['guests']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
enable_tooltip: true,
append_tooltip: "<?php echo ' ' . __( 'guest orders', 'woocommerce' ); ?>",
@ -335,7 +335,7 @@ class WC_Report_Customers extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Signups', 'woocommerce' ) ) ?>",
data: chart_data.signups,
color: '<?php echo $this->chart_colours['signups']; ?>',
color: '<?php echo $this->chart_colors['signups']; ?>',
points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 4, fill: false },
shadowSize: 0,

View File

@ -15,11 +15,11 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Report_Sales_By_Category extends WC_Admin_Report {
/**
* Chart colours.
* Chart colors.
*
* @var array
*/
public $chart_colours = array();
public $chart_colors = array();
/**
* Categories ids.
@ -95,7 +95,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
$legend[] = array(
/* translators: 1: total items sold 2: category name */
'title' => sprintf( __( '%1$s sales in %2$s', 'woocommerce' ), '<strong>' . wc_price( $total ) . '</strong>', $category->name ),
'color' => isset( $this->chart_colours[ $index ] ) ? $this->chart_colours[ $index ] : $this->chart_colours[0],
'color' => isset( $this->chart_colors[ $index ] ) ? $this->chart_colors[ $index ] : $this->chart_colors[0],
'highlight_series' => $index,
);
@ -117,7 +117,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);
$this->chart_colours = array( '#3498db', '#34495e', '#1abc9c', '#2ecc71', '#f1c40f', '#e67e22', '#e74c3c', '#2980b9', '#8e44ad', '#2c3e50', '#16a085', '#27ae60', '#f39c12', '#d35400', '#c0392b' );
$this->chart_colors = array( '#3498db', '#34495e', '#1abc9c', '#2ecc71', '#f1c40f', '#e67e22', '#e74c3c', '#2980b9', '#8e44ad', '#2c3e50', '#16a085', '#27ae60', '#f39c12', '#d35400', '#c0392b' );
$current_range = ! empty( $_GET['range'] ) ? sanitize_text_field( $_GET['range'] ) : '7day';
@ -335,7 +335,7 @@ class WC_Report_Sales_By_Category extends WC_Admin_Report {
<?php
$index = 0;
foreach ( $chart_data as $data ) {
$color = isset( $this->chart_colours[ $index ] ) ? $this->chart_colours[ $index ] : $this->chart_colours[0];
$color = isset( $this->chart_colors[ $index ] ) ? $this->chart_colors[ $index ] : $this->chart_colors[0];
$width = $this->barwidth / sizeof( $chart_data );
$offset = ( $width * $index );
$series = $data['data'];

View File

@ -15,11 +15,11 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Report_Sales_By_Date extends WC_Admin_Report {
/**
* Chart colours.
* Chart colors.
*
* @var array
*/
public $chart_colours = array();
public $chart_colors = array();
/**
* The report data.
@ -387,13 +387,13 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
'<strong>' . wc_price( $data->total_sales ) . '</strong>'
),
'placeholder' => __( 'This is the sum of the order totals after any refunds and including shipping and taxes.', 'woocommerce' ),
'color' => $this->chart_colours['sales_amount'],
'color' => $this->chart_colors['sales_amount'],
'highlight_series' => 6,
);
if ( $data->average_total_sales > 0 ) {
$legend[] = array(
'title' => $average_total_sales_title,
'color' => $this->chart_colours['average'],
'color' => $this->chart_colors['average'],
'highlight_series' => 2,
);
}
@ -405,13 +405,13 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
'<strong>' . wc_price( $data->net_sales ) . '</strong>'
),
'placeholder' => __( 'This is the sum of the order totals after any refunds and excluding shipping and taxes.', 'woocommerce' ),
'color' => $this->chart_colours['net_sales_amount'],
'color' => $this->chart_colors['net_sales_amount'],
'highlight_series' => 7,
);
if ( $data->average_sales > 0 ) {
$legend[] = array(
'title' => $average_sales_title,
'color' => $this->chart_colours['net_average'],
'color' => $this->chart_colors['net_average'],
'highlight_series' => 3,
);
}
@ -422,7 +422,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
__( '%s orders placed', 'woocommerce' ),
'<strong>' . $data->total_orders . '</strong>'
),
'color' => $this->chart_colours['order_count'],
'color' => $this->chart_colors['order_count'],
'highlight_series' => 1,
);
@ -432,7 +432,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
__( '%s items purchased', 'woocommerce' ),
'<strong>' . $data->total_items . '</strong>'
),
'color' => $this->chart_colours['item_count'],
'color' => $this->chart_colors['item_count'],
'highlight_series' => 0,
);
$legend[] = array(
@ -443,7 +443,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
$this->report_data->total_refunded_orders,
$this->report_data->refunded_order_items
),
'color' => $this->chart_colours['refund_amount'],
'color' => $this->chart_colors['refund_amount'],
'highlight_series' => 8,
);
$legend[] = array(
@ -452,7 +452,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
__( '%s charged for shipping', 'woocommerce' ),
'<strong>' . wc_price( $data->total_shipping ) . '</strong>'
),
'color' => $this->chart_colours['shipping_amount'],
'color' => $this->chart_colors['shipping_amount'],
'highlight_series' => 5,
);
$legend[] = array(
@ -461,7 +461,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
__( '%s worth of coupons used', 'woocommerce' ),
'<strong>' . wc_price( $data->total_coupons ) . '</strong>'
),
'color' => $this->chart_colours['coupon_amount'],
'color' => $this->chart_colors['coupon_amount'],
'highlight_series' => 4,
);
@ -479,7 +479,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);
$this->chart_colours = array(
$this->chart_colors = array(
'sales_amount' => '#b1d4ea',
'net_sales_amount' => '#3498db',
'average' => '#b1d4ea',
@ -599,16 +599,16 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Number of items sold', 'woocommerce' ) ) ?>",
data: order_data.order_item_counts,
color: '<?php echo $this->chart_colours['item_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['item_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['item_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['item_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
hoverable: false
},
{
label: "<?php echo esc_js( __( 'Number of orders', 'woocommerce' ) ) ?>",
data: order_data.order_counts,
color: '<?php echo $this->chart_colours['order_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['order_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['order_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['order_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
hoverable: false
},
@ -616,7 +616,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Average gross sales amount', 'woocommerce' ) ) ?>",
data: [ [ <?php echo min( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ], [ <?php echo max( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_total_sales; ?> ] ],
yaxis: 2,
color: '<?php echo $this->chart_colours['average']; ?>',
color: '<?php echo $this->chart_colors['average']; ?>',
points: { show: false },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,
@ -626,7 +626,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Average net sales amount', 'woocommerce' ) ) ?>",
data: [ [ <?php echo min( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_sales; ?> ], [ <?php echo max( array_keys( $data['order_amounts'] ) ); ?>, <?php echo $this->report_data->average_sales; ?> ] ],
yaxis: 2,
color: '<?php echo $this->chart_colours['net_average']; ?>',
color: '<?php echo $this->chart_colors['net_average']; ?>',
points: { show: false },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,
@ -636,7 +636,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Coupon amount', 'woocommerce' ) ) ?>",
data: order_data.coupon_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['coupon_amount']; ?>',
color: '<?php echo $this->chart_colors['coupon_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 2, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,
@ -646,7 +646,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Shipping amount', 'woocommerce' ) ) ?>",
data: order_data.shipping_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['shipping_amount']; ?>',
color: '<?php echo $this->chart_colors['shipping_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 2, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,
@ -656,7 +656,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Gross sales amount', 'woocommerce' ) ) ?>",
data: order_data.gross_order_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['sales_amount']; ?>',
color: '<?php echo $this->chart_colors['sales_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 2, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,
@ -666,7 +666,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Net sales amount', 'woocommerce' ) ) ?>",
data: order_data.net_order_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['net_sales_amount']; ?>',
color: '<?php echo $this->chart_colors['net_sales_amount']; ?>',
points: { show: true, radius: 6, lineWidth: 4, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 5, fill: false },
shadowSize: 0,
@ -676,7 +676,7 @@ class WC_Report_Sales_By_Date extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Refund amount', 'woocommerce' ) ) ?>",
data: order_data.refund_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['refund_amount']; ?>',
color: '<?php echo $this->chart_colors['refund_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 2, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 2, fill: false },
shadowSize: 0,

View File

@ -15,11 +15,11 @@ if ( ! defined( 'ABSPATH' ) ) {
class WC_Report_Sales_By_Product extends WC_Admin_Report {
/**
* Chart colours.
* Chart colors.
*
* @var array
*/
public $chart_colours = array();
public $chart_colors = array();
/**
* Product ids.
@ -105,14 +105,14 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
$legend[] = array(
/* translators: %s: total items sold */
'title' => sprintf( __( '%s sales for the selected items', 'woocommerce' ), '<strong>' . wc_price( $total_sales ) . '</strong>' ),
'color' => $this->chart_colours['sales_amount'],
'color' => $this->chart_colors['sales_amount'],
'highlight_series' => 1,
);
$legend[] = array(
/* translators: %s: total items purchased */
'title' => sprintf( __( '%s purchases for the selected items', 'woocommerce' ), '<strong>' . ( $total_items ) . '</strong>' ),
'color' => $this->chart_colours['item_count'],
'color' => $this->chart_colors['item_count'],
'highlight_series' => 0,
);
@ -131,7 +131,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
'7day' => __( 'Last 7 days', 'woocommerce' ),
);
$this->chart_colours = array(
$this->chart_colors = array(
'sales_amount' => '#3498db',
'item_count' => '#d4d9dc',
);
@ -493,8 +493,8 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
{
label: "<?php echo esc_js( __( 'Number of items sold', 'woocommerce' ) ) ?>",
data: order_data.order_item_counts,
color: '<?php echo $this->chart_colours['item_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colours['item_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
color: '<?php echo $this->chart_colors['item_count']; ?>',
bars: { fillColor: '<?php echo $this->chart_colors['item_count']; ?>', fill: true, show: true, lineWidth: 0, barWidth: <?php echo $this->barwidth; ?> * 0.5, align: 'center' },
shadowSize: 0,
hoverable: false
},
@ -502,7 +502,7 @@ class WC_Report_Sales_By_Product extends WC_Admin_Report {
label: "<?php echo esc_js( __( 'Sales amount', 'woocommerce' ) ) ?>",
data: order_data.order_item_amounts,
yaxis: 2,
color: '<?php echo $this->chart_colours['sales_amount']; ?>',
color: '<?php echo $this->chart_colors['sales_amount']; ?>',
points: { show: true, radius: 5, lineWidth: 3, fillColor: '#fff', fill: true },
lines: { show: true, lineWidth: 4, fill: false },
shadowSize: 0,

View File

@ -118,9 +118,9 @@ class WC_Settings_Emails extends WC_Settings_Page {
),
array(
'title' => __( 'Base colour', 'woocommerce' ),
'title' => __( 'Base color', 'woocommerce' ),
/* translators: %s: default color */
'desc' => sprintf( __( 'The base colour for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#96588a</code>' ),
'desc' => sprintf( __( 'The base color for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#96588a</code>' ),
'id' => 'woocommerce_email_base_color',
'type' => 'color',
'css' => 'width:6em;',
@ -130,9 +130,9 @@ class WC_Settings_Emails extends WC_Settings_Page {
),
array(
'title' => __( 'Background colour', 'woocommerce' ),
'title' => __( 'Background color', 'woocommerce' ),
/* translators: %s: default color */
'desc' => sprintf( __( 'The background colour for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#f7f7f7</code>' ),
'desc' => sprintf( __( 'The background color for WooCommerce email templates. Default %s.', 'woocommerce' ), '<code>#f7f7f7</code>' ),
'id' => 'woocommerce_email_background_color',
'type' => 'color',
'css' => 'width:6em;',
@ -142,9 +142,9 @@ class WC_Settings_Emails extends WC_Settings_Page {
),
array(
'title' => __( 'Body background colour', 'woocommerce' ),
'title' => __( 'Body background color', 'woocommerce' ),
/* translators: %s: default color */
'desc' => sprintf( __( 'The main body background colour. Default %s.', 'woocommerce' ), '<code>#ffffff</code>' ),
'desc' => sprintf( __( 'The main body background color. Default %s.', 'woocommerce' ), '<code>#ffffff</code>' ),
'id' => 'woocommerce_email_body_background_color',
'type' => 'color',
'css' => 'width:6em;',
@ -154,9 +154,9 @@ class WC_Settings_Emails extends WC_Settings_Page {
),
array(
'title' => __( 'Body text colour', 'woocommerce' ),
'title' => __( 'Body text color', 'woocommerce' ),
/* translators: %s: default color */
'desc' => sprintf( __( 'The main body text colour. Default %s.', 'woocommerce' ), '<code>#3c3c3c</code>' ),
'desc' => sprintf( __( 'The main body text color. Default %s.', 'woocommerce' ), '<code>#3c3c3c</code>' ),
'id' => 'woocommerce_email_text_color',
'type' => 'color',
'css' => 'width:6em;',

View File

@ -234,7 +234,7 @@ class WC_Settings_General extends WC_Settings_Page {
}
/**
* Output a colour picker input box.
* Output a color picker input box.
*
* @param mixed $name
* @param string $id

View File

@ -592,7 +592,7 @@ function wc_flatten_meta_callback( $value ) {
if ( ! function_exists( 'wc_rgb_from_hex' ) ) {
/**
* Hex darker/lighter/contrast functions for colours.
* Hex darker/lighter/contrast functions for colors.
*
* @param mixed $color
* @return string
@ -614,7 +614,7 @@ if ( ! function_exists( 'wc_rgb_from_hex' ) ) {
if ( ! function_exists( 'wc_hex_darker' ) ) {
/**
* Hex darker/lighter/contrast functions for colours.
* Hex darker/lighter/contrast functions for colors.
*
* @param mixed $color
* @param int $factor (default: 30)
@ -643,7 +643,7 @@ if ( ! function_exists( 'wc_hex_darker' ) ) {
if ( ! function_exists( 'wc_hex_lighter' ) ) {
/**
* Hex darker/lighter/contrast functions for colours.
* Hex darker/lighter/contrast functions for colors.
*
* @param mixed $color
* @param int $factor (default: 30)
@ -673,7 +673,7 @@ if ( ! function_exists( 'wc_hex_lighter' ) ) {
if ( ! function_exists( 'wc_light_or_dark' ) ) {
/**
* Detect if we should use a light or dark colour on a background colour.
* Detect if we should use a light or dark color on a background color.
*
* @param mixed $color
* @param string $dark (default: '#000000')

View File

@ -18,7 +18,7 @@
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
// Load colours
// Load colors
$bg = get_option( 'woocommerce_email_background_color' );
$body = get_option( 'woocommerce_email_body_background_color' );
$base = get_option( 'woocommerce_email_base_color' );