Merge branch 'main' into fix_params_searchquery

plone · Aug 30, 2024 · 8883d25 · 8883d25
2 parents c7a8cc4 + e49fb93
commit 8883d25
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -147,6 +147,10 @@ packages/components/dist: $(shell find packages/components/src -type f)
 .PHONY: build-deps
 build-deps: packages/registry/dist ## Build dependencies
 
+.PHONY: i18n
+i18n: ## Converts your po files into json to translate volto frontend
+	$(MAKE) -C "./packages/volto/" i18n
+
 ## Storybook
 
 .PHONY: storybook-start

diff --git a/packages/volto/Makefile b/packages/volto/Makefile
@@ -81,6 +81,10 @@ cypress-install: ## Install Cypress for acceptance tests
 .PHONY: build-deps
 build-deps: ../registry/dist ## Build dependencies
 
+.PHONY: i18n
+i18n: ## Extract and compile translations
+	pnpm i18n
+
 ## Storybook
 
 .PHONY: storybook-start

diff --git a/packages/volto/news/6274.internal b/packages/volto/news/6274.internal
@@ -0,0 +1 @@
+Add `make i18n` command. @Faakhir30
diff --git a/packages/volto/news/6275.bugfix b/packages/volto/news/6275.bugfix
@@ -0,0 +1 @@
+Place actions storybook in correct path. @Tishasoumya-02
diff --git a/...onents/manage/Actions/Actions.stories.jsx → ...onents/manage/Actions/Actions.stories.jsx b/...onents/manage/Actions/Actions.stories.jsx → ...onents/manage/Actions/Actions.stories.jsx
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Place actions storybook in correct path. @Tishasoumya-02