From 68a9a8a83a268d8647f112b0ad32ca2d25a31850 Mon Sep 17 00:00:00 2001 From: kurudrive Date: Wed, 3 Nov 2021 21:17:14 +0900 Subject: [PATCH 1/7] =?UTF-8?q?readme=20=E8=BF=BD=E8=A8=98=E3=81=AE?= =?UTF-8?q?=E3=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 881f795..5e5f8b7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # VK Color Palette Manager ``` -composer require vektor-inc/vk-color-palette-manager +composer require --no-dev vektor-inc/vk-color-palette-manager ``` \ No newline at end of file From 5a1391b0432bbcfbb4f6d4618b50140d8c16cb78 Mon Sep 17 00:00:00 2001 From: kurudrive Date: Thu, 18 Nov 2021 10:44:28 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E3=83=91?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=88=E3=81=8C=E7=99=BB=E9=8C=B2=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/VkColorPaletteManager.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index 80432d0..f1ba925 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -5,7 +5,7 @@ * @package vektor-inc/vk-color-palette-manager * @license GPL-2.0+ * - * @version 0.0.11 + * @version 0.0.12 */ namespace VektorInc\VK_Color_Palette_Manager; @@ -114,14 +114,16 @@ public static function add_color_array() { */ public static function additional_color_palette( $editor_settings, $block_editor_context ) { $add_color = self::add_color_array(); - $editor_settings['__experimentalFeatures']['color']['palette']['core'] = array_merge( - $editor_settings['__experimentalFeatures']['color']['palette']['core'], - $add_color - ); - $editor_settings['colors'] = array_merge( - $editor_settings['colors'], - $add_color - ); + if ( ! empty( $add_color ) ) { + $editor_settings['__experimentalFeatures']['color']['palette']['core'] = array_merge( + $editor_settings['__experimentalFeatures']['color']['palette']['core'], + $add_color + ); + $editor_settings['colors'] = array_merge( + $editor_settings['colors'], + $add_color + ); + } return $editor_settings; } From 86482a786c2f6f8b325c46e78525e9ee06aef4c5 Mon Sep 17 00:00:00 2001 From: kurudrive Date: Thu, 18 Nov 2021 16:11:36 +0900 Subject: [PATCH 3/7] [ Change version ] 0.0.13 --- src/VkColorPaletteManager.php | 3 ++- src/languages/VkColorPaletteManager-ja.mo | Bin 0 -> 756 bytes src/languages/VkColorPaletteManager-ja.po | 29 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/languages/VkColorPaletteManager-ja.mo create mode 100644 src/languages/VkColorPaletteManager-ja.po diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index f1ba925..0d789b3 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -5,7 +5,7 @@ * @package vektor-inc/vk-color-palette-manager * @license GPL-2.0+ * - * @version 0.0.12 + * @version 0.0.13 */ namespace VektorInc\VK_Color_Palette_Manager; @@ -27,6 +27,7 @@ public function __construct() { add_action( 'wp_enqueue_scripts', array( __CLASS__, 'add_color_palette_css' ), 11 ); // 11 指定が無いと先に読み込んでしまって効かない add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'add_color_palette_css_to_editor' ), 11 ); + $load = load_textdomain( 'vcpm_textdomain', dirname( __FILE__ ) . '/languages/VkColorPaletteManager-ja.mo' ); } /** diff --git a/src/languages/VkColorPaletteManager-ja.mo b/src/languages/VkColorPaletteManager-ja.mo new file mode 100644 index 0000000000000000000000000000000000000000..2207e88f116e8b16ce3575482bd4025e5616c2a2 GIT binary patch literal 756 zcmY+B&2G~`5XToN7mE`TCphel1FUgcRSFKd5Ly(q5f%wm4@lA0nI>+WU3a}H^oH$2 zK>{H@DgmcTa0n_Ci5pS{&%g_CSrzp$7{?`nm4Dv(_!KAX>tb1Yv%_;gw$jx74>)sS_5t3 zI}lw`8^&4=sGlcEs~5zDNzqWS9)ho-Ljyr|59nGb{XT_GpryL}R~QuqZQ?1pfpS*w zuoX~oAcaf+@7dsjcR^X+9d;MCf?UFGaSbk=b!JPfgio24=H2T6NR z15u%VkE9K_nC?RKRN(_~W)l@GOI zR+kpTPMS7>E5GMqTjt Date: Thu, 18 Nov 2021 17:35:24 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/VkColorPaletteManager.php | 10 +++++----- ...ger-ja.mo => vk-color-palette-manager-ja.mo} | Bin 756 -> 756 bytes ...ger-ja.po => vk-color-palette-manager-ja.po} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/languages/{VkColorPaletteManager-ja.mo => vk-color-palette-manager-ja.mo} (86%) rename src/languages/{VkColorPaletteManager-ja.po => vk-color-palette-manager-ja.po} (95%) diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index 0d789b3..72814c2 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -27,7 +27,7 @@ public function __construct() { add_action( 'wp_enqueue_scripts', array( __CLASS__, 'add_color_palette_css' ), 11 ); // 11 指定が無いと先に読み込んでしまって効かない add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'add_color_palette_css_to_editor' ), 11 ); - $load = load_textdomain( 'vcpm_textdomain', dirname( __FILE__ ) . '/languages/VkColorPaletteManager-ja.mo' ); + load_textdomain( 'vk-color-palette-manager', dirname( __FILE__ ) . '/languages/vk-color-palette-manager-'.get_locale().'.mo' ); } /** @@ -52,8 +52,8 @@ public static function customize_register( $wp_customize ) { 'label' => '', 'section' => 'colors', 'type' => 'text', - 'custom_title_sub' => __( 'Color Palette Setting', 'vcpm_textdomain' ), - 'custom_html' => __( 'This color is reflected in the block editor\'s color palette.', 'vcpm_textdomain' ), + 'custom_title_sub' => __( 'Color Palette Setting', 'vk-color-palette-manager' ), + 'custom_html' => __( 'This color is reflected in the block editor\'s color palette.', 'vk-color-palette-manager' ), 'priority' => 1000, ) ) @@ -70,7 +70,7 @@ public static function customize_register( $wp_customize ) { 'sanitize_callback' => 'sanitize_hex_color', ) ); - $label = __( 'Custom color', 'vcpm_textdomain' ) . ' ' . $i; + $label = __( 'Custom color', 'vk-color-palette-manager' ) . ' ' . $i; $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, @@ -96,7 +96,7 @@ public static function add_color_array() { for ( $i = 1; $i <= 5; $i++ ) { if ( ! empty( $options_color[ 'color_custom_' . $i ] ) ) { $vcm_add_color_array[] = array( - 'name' => __( 'Custom color', 'vcpm_textdomain' ) . ' ' . $i, + 'name' => __( 'Custom color', 'vk-color-palette-manager' ) . ' ' . $i, 'slug' => 'vk-color-custom-' . $i, 'color' => $options_color[ 'color_custom_' . $i ], ); diff --git a/src/languages/VkColorPaletteManager-ja.mo b/src/languages/vk-color-palette-manager-ja.mo similarity index 86% rename from src/languages/VkColorPaletteManager-ja.mo rename to src/languages/vk-color-palette-manager-ja.mo index 2207e88f116e8b16ce3575482bd4025e5616c2a2..7132f021539a53007fc8104c0dc9a2760dea4232 100644 GIT binary patch delta 17 Ycmeyu`h|6aBqNKtm4V4-S;p&(05xI-KL7v# delta 17 Ycmeyu`h|6aBqNKdm8tP&S;p&(05xp|K>z>% diff --git a/src/languages/VkColorPaletteManager-ja.po b/src/languages/vk-color-palette-manager-ja.po similarity index 95% rename from src/languages/VkColorPaletteManager-ja.po rename to src/languages/vk-color-palette-manager-ja.po index 50e26a2..8834e39 100644 --- a/src/languages/VkColorPaletteManager-ja.po +++ b/src/languages/vk-color-palette-manager-ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Color Palette Manager\n" "POT-Creation-Date: 2021-11-18 15:43+0900\n" -"PO-Revision-Date: 2021-11-18 15:53+0900\n" +"PO-Revision-Date: 2021-11-18 17:04+0900\n" "Last-Translator: \n" "Language-Team: Vektor,Inc.\n" "Language: ja\n" From 79b6c10737d4602befe89d7b1cfb57f877d371b5 Mon Sep 17 00:00:00 2001 From: kurudrive Date: Thu, 18 Nov 2021 17:44:09 +0900 Subject: [PATCH 5/7] change version --- src/VkColorPaletteManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index 72814c2..75e62df 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -5,7 +5,7 @@ * @package vektor-inc/vk-color-palette-manager * @license GPL-2.0+ * - * @version 0.0.13 + * @version 0.0.14 */ namespace VektorInc\VK_Color_Palette_Manager; @@ -27,7 +27,7 @@ public function __construct() { add_action( 'wp_enqueue_scripts', array( __CLASS__, 'add_color_palette_css' ), 11 ); // 11 指定が無いと先に読み込んでしまって効かない add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'add_color_palette_css_to_editor' ), 11 ); - load_textdomain( 'vk-color-palette-manager', dirname( __FILE__ ) . '/languages/vk-color-palette-manager-'.get_locale().'.mo' ); + load_textdomain( 'vk-color-palette-manager', dirname( __FILE__ ) . '/languages/vk-color-palette-manager-' . get_locale() . '.mo' ); } /** From 699b1d6f99272631bb9978e1cd5bad04ac99e520 Mon Sep 17 00:00:00 2001 From: kurudrive Date: Fri, 3 Dec 2021 02:00:03 +0900 Subject: [PATCH 6/7] =?UTF-8?q?php=E3=82=A8=E3=83=A9=E3=83=BC=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/VkColorPaletteManager.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index 75e62df..c187cdc 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -5,7 +5,7 @@ * @package vektor-inc/vk-color-palette-manager * @license GPL-2.0+ * - * @version 0.0.14 + * @version 0.0.15 */ namespace VektorInc\VK_Color_Palette_Manager; @@ -116,10 +116,14 @@ public static function add_color_array() { public static function additional_color_palette( $editor_settings, $block_editor_context ) { $add_color = self::add_color_array(); if ( ! empty( $add_color ) ) { - $editor_settings['__experimentalFeatures']['color']['palette']['core'] = array_merge( - $editor_settings['__experimentalFeatures']['color']['palette']['core'], - $add_color - ); + if ( ! empty( $editor_settings['__experimentalFeatures']['color']['palette']['core'] ) ) { + $editor_settings['__experimentalFeatures']['color']['palette']['core'] = array_merge( + $editor_settings['__experimentalFeatures']['color']['palette']['core'], + $add_color + ); + } else { + $editor_settings['__experimentalFeatures']['color']['palette']['core'] = $add_color; + } $editor_settings['colors'] = array_merge( $editor_settings['colors'], $add_color From 55e53c3fdae8c5cea63d2bf073ff3944bff7a516 Mon Sep 17 00:00:00 2001 From: shimotmk Date: Tue, 11 Jan 2022 13:25:05 +0900 Subject: [PATCH 7/7] fix: Rename core to default. --- src/VkColorPaletteManager.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/VkColorPaletteManager.php b/src/VkColorPaletteManager.php index c187cdc..cdcf1ac 100644 --- a/src/VkColorPaletteManager.php +++ b/src/VkColorPaletteManager.php @@ -116,13 +116,19 @@ public static function add_color_array() { public static function additional_color_palette( $editor_settings, $block_editor_context ) { $add_color = self::add_color_array(); if ( ! empty( $add_color ) ) { - if ( ! empty( $editor_settings['__experimentalFeatures']['color']['palette']['core'] ) ) { + if ( ! empty( $editor_settings['__experimentalFeatures']['color']['palette']['default'] ) ) { + $editor_settings['__experimentalFeatures']['color']['palette']['default'] = array_merge( + $editor_settings['__experimentalFeatures']['color']['palette']['default'], + $add_color + ); + } elseif ( ! empty( $editor_settings['__experimentalFeatures']['color']['palette']['core'] ) ) { $editor_settings['__experimentalFeatures']['color']['palette']['core'] = array_merge( $editor_settings['__experimentalFeatures']['color']['palette']['core'], $add_color ); } else { - $editor_settings['__experimentalFeatures']['color']['palette']['core'] = $add_color; + $editor_settings['__experimentalFeatures']['color']['palette']['default'] = $add_color; + $editor_settings['__experimentalFeatures']['color']['palette']['core'] = $add_color; } $editor_settings['colors'] = array_merge( $editor_settings['colors'],