Skip to content

Commit

Permalink
Merge branch 'develop' into fix/zoomout-toggle/block-api-v3
Browse files Browse the repository at this point in the history
* develop: (53 commits)
  [ Change version ] 1.95.0.4
  [ Change version ] 1.95.0.3 / 翻訳調整 & update readme
  [ Change version ] 1.95.0.2 / 翻訳修正
  [ Change version ] 1.95.0.1
  翻訳調整
  テキストドメイン置換不良対応
  build
  lint
  [ Change version ] 1.95.0 / 翻訳調整
  lint
  fix: パスワード保護ページも非表示化
  プラグインを無効化した時に オプション値 vk_blocks_checked_flags を削除する処理を追加
  $flags が配列でない場合は空の配列をセット
  phpcs
  fix: 静的クラス化&vk_blocks_optionsを使わない
  VK_Blocks_Check_Using_VK_Page_Content_Block::delete_checked_flag(); でも使えるように static 化
  fix yoda
  lint
  既にチェック済みの場合にはチェックしないフラグ追加
  コメント調整のみ
  ...

# Conflicts:
#	readme.txt
  • Loading branch information
sysbird committed Feb 3, 2025
2 parents f64b73a + 67fd3e4 commit 3c9735f
Show file tree
Hide file tree
Showing 17 changed files with 1,285 additions and 864 deletions.
10 changes: 5 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ gulp.task('text-domain-free', (done) => {
.pipe(replace("wp_set_script_translations( 'vk-blocks-build-js', 'vk-blocks-pro', VK_BLOCKS_DIR_PATH . 'languages' );", "wp_set_script_translations( 'vk-blocks-build-js', 'vk-blocks' );"))
.pipe(gulp.dest('./inc/'));
gulp.src(['./src/**'])
.pipe(replace(/__\(\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gm, "__( $1, 'vk-blocks' )"))
.pipe(replace(/_e\(\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gm, "_e( $1, 'vk-blocks' )"))
.pipe(replace(/_n_noop\(\s*?(['"`].*?['"`]),\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gm, "_n_noop( $1, $2, 'vk-blocks' )"))
.pipe(replace(/_x\(\s*?(['"`].*?['"`]),\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gm, "_x( $1, $2, 'vk-blocks' )"))
.pipe(replace('"textdomain": "vk-blocks-pro"', '"textdomain": "vk-blocks"'))
.pipe(replace(/__\(\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gsm, "__( $1, 'vk-blocks' )"))
.pipe(replace(/_e\(\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gsm, "_e( $1, 'vk-blocks' )"))
.pipe(replace(/_n_noop\(\s*?(['"`].*?['"`]),\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gsm, "_n_noop( $1, $2, 'vk-blocks' )"))
.pipe(replace(/_x\(\s*?(['"`].*?['"`]),\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gsm, "_x( $1, $2, 'vk-blocks' )"))
.pipe(replace(/"textdomain":\s*?["']vk-blocks-pro["']/gsm, '"textdomain": "vk-blocks"'))
.pipe(gulp.dest('./src/'));
gulp.src(['./test/**'])
.pipe(replace(/__\(\s*?(['"`].*?['"`]),\s*?['"`]vk-blocks-pro['"`]\s*?\)/gm, "__( $1, 'vk-blocks' )"))
Expand Down
2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-admin-js.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-build-js.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja.l10n.php

Large diffs are not rendered by default.

Binary file modified languages/vk-blocks-pro-ja.mo
Binary file not shown.
Loading

0 comments on commit 3c9735f

Please sign in to comment.