Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ff7c03a
Use i18n update script when generating JS bundle
fluiddot Dec 29, 2021
6e241e1
Remove makepot commands and no longer needed scripts
fluiddot Dec 29, 2021
3e66063
Remove translation files of jetpack and layout-grid
fluiddot Dec 29, 2021
6693dda
Use translation files from i18n-cache folder
fluiddot Dec 29, 2021
5405d5d
Update localization strings files
fluiddot Dec 29, 2021
109eb44
Merge branch 'add/i18n-update-script' into add/use-i18n-update-on-bundle
fluiddot Dec 30, 2021
b015a64
Update localization strings files
fluiddot Dec 30, 2021
7d5a272
Merge branch 'add/i18n-update-script' into add/use-i18n-update-on-bundle
fluiddot Jan 5, 2022
3fc857a
Update android-build-image docker image version
fluiddot Jan 5, 2022
5d65aff
Add skip if cache option to i18n update script
fluiddot Jan 5, 2022
3a68754
Update .gitignore
fluiddot Jan 5, 2022
3c3bb03
Attach i18n update to postinstall command
fluiddot Jan 5, 2022
b423c75
Extract update gutenberg i18n cache to a function
fluiddot Jan 5, 2022
f89eb16
Fix i18n update upon dependencies install
fluiddot Jan 5, 2022
fb9e3f5
Update i18n cache path in CircleCI jobs
fluiddot Jan 5, 2022
45422de
Update gb-mobile-image docker image version
fluiddot Jan 5, 2022
9af4de6
Add i18n check cache script
fluiddot Jan 7, 2022
535b7ee
Update script description
fluiddot Jan 7, 2022
0832eda
Update Gutenberg ref
fluiddot Jan 7, 2022
144a07d
Add WP_CLI_ALLOW_ROOT env variable to pipeline
fluiddot Jan 7, 2022
9c998ce
Update gb-mobile-image version for testing
fluiddot Jan 7, 2022
c68a1b3
Update Gutenberg ref
fluiddot Jan 7, 2022
40fa739
Use latest gb-mobile-image version
fluiddot Jan 10, 2022
b0c47c9
Update Gutenberg ref
fluiddot Jan 10, 2022
7350438
Merge branch 'develop' into add/use-i18n-update-on-bundle
fluiddot Jan 10, 2022
2f735a6
Remove wrong parameter validation
fluiddot Jan 11, 2022
c44a212
Remove unnecessary plugin_name parameter
fluiddot Jan 11, 2022
6e81af1
Update Gutenberg ref with merge commit
fluiddot Jan 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'add/i18n-update-script' into add/use-i18n-update-on-bundle
# Conflicts:
#	src/block-experiments-setup.js
#	src/jetpack-editor-setup.js
  • Loading branch information
fluiddot committed Jan 5, 2022
commit 7d5a272a8b8f9c234f1346786e0667b9ccef6c35
2 changes: 0 additions & 2 deletions src/block-experiments-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import { addAction } from '@wordpress/hooks';
*/
// This file is to set up the jetpack/layout-grid block that currently lives in block-experiments/blocks/layout-grid
import { registerBlock } from '../block-experiments/blocks/layout-grid/src';
import setupLocale from './setup-locale';
import { getTranslation as getLayoutGridTranslation } from './i18n-cache/layout-grid';

const setupHooks = () => {
// Hook triggered after the editor is rendered
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { registerGutenberg } from '@wordpress/react-native-editor';
/**
* Internal dependencies
*/
import { getTranslation as getJetpackTranslation } from './i18n-translations/jetpack';
import { getTranslation as getLayoutGridTranslation } from './i18n-translations/layout-grid';
import { getTranslation as getJetpackTranslation } from './i18n-cache/jetpack';
import { getTranslation as getLayoutGridTranslation } from './i18n-cache/layout-grid';

const pluginTranslations = [
{
Expand Down
8 changes: 0 additions & 8 deletions src/jetpack-editor-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ import {
registerLoomVariation,
registerSmartframeVariation,
} from '../jetpack/projects/plugins/jetpack/extensions/extended-blocks/core-embed';
import setupLocale from './setup-locale';
import { getTranslation as getJetpackTranslation } from './i18n-cache/jetpack';

/**
* WordPress dependencies
*/
import { dispatch } from '@wordpress/data';
import { store as editPostStore } from '@wordpress/edit-post';

// When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json
const supportedJetpackBlocks = {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.