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

Merge branch 'master' into tests/reports

This commit is contained in:
Steve Grunwell 2018-01-15 15:57:40 +00:00
parent d4ca2d87e8 0006d575a6
commit 02f4ed19f4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18n/states/JP.php
View File

@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
$states['JP'] = array( $states['JP'] = array(
'JP01' => __( 'Hokkaido', 'woocommerce' ), 'JP01' => __( 'Hokkai-do', 'woocommerce' ),
'JP02' => __( 'Aomori-ken', 'woocommerce' ), 'JP02' => __( 'Aomori-ken', 'woocommerce' ),
'JP03' => __( 'Iwate-ken', 'woocommerce' ), 'JP03' => __( 'Iwate-ken', 'woocommerce' ),
'JP04' => __( 'Miyagi-ken', 'woocommerce' ), 'JP04' => __( 'Miyagi-ken', 'woocommerce' ),

23
includes/class-wc-cli.php
View File

@ -1,14 +1,17 @@
<?php <?php
/**
* Enables WooCommerce, via the the command line.
*
* @package WooCommerce\CLI
* @version 3.0.0
*/
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; exit;
} }
/** /**
* Enables WooCommerce, via the the command line. * CLI class.
*
* @version 3.0.0
* @package WooCommerce
* @author WooCommerce
*/ */
class WC_CLI { class WC_CLI {
/** /**
@ -23,10 +26,10 @@ class WC_CLI {
* Load command files. * Load command files.
*/ */
private function includes() { private function includes() {
require_once __DIR__ . '/cli/class-wc-cli-runner.php'; require_once dirname( __FILE__ ) . '/cli/class-wc-cli-runner.php';
require_once __DIR__ . '/cli/class-wc-cli-rest-command.php'; require_once dirname( __FILE__ ) . '/cli/class-wc-cli-rest-command.php';
require_once __DIR__ . '/cli/class-wc-cli-tool-command.php'; require_once dirname( __FILE__ ) . '/cli/class-wc-cli-tool-command.php';
require_once __DIR__ . '/cli/class-wc-cli-update-command.php'; require_once dirname( __FILE__ ) . '/cli/class-wc-cli-update-command.php';
} }
/** /**
@ -39,4 +42,4 @@ class WC_CLI {
} }
} }
new WC_CLI; new WC_CLI();

3
woocommerce.php
View File

@ -6,13 +6,10 @@
* Version: 3.3.0-rc.1 * Version: 3.3.0-rc.1
* Author: Automattic * Author: Automattic
* Author URI: https://woocommerce.com * Author URI: https://woocommerce.com
*
* Text Domain: woocommerce * Text Domain: woocommerce
* Domain Path: /i18n/languages/ * Domain Path: /i18n/languages/
* *
* @package WooCommerce * @package WooCommerce
* @category Core
* @author Automattic
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {