chore: replace easygettext with scripts from vue3 gettext

owncloud · Jan 23, 2024 · 17c1cba · 17c1cba
1 parent 10a2e25
commit 17c1cba
Show file tree

Hide file tree

Showing 20 changed files with 143 additions and 149 deletions.
diff --git a/gettext.config.cjs b/gettext.config.cjs
@@ -0,0 +1,13 @@
+module.exports = {
+  input: {
+    path: './src',
+    include: ['**/*.js', '**/*.ts', '**/*.vue']
+  },
+  output: {
+    locales: ['bg', 'cs', 'de', 'en', 'es', 'fr', 'it', 'nl', 'ko', 'sq', 'sv', 'tr', 'zh'],
+    path: './l10n/locale',
+    potPath: '../template.pot',
+    flat: false,
+    linguas: false
+  }
+}
diff --git a/packages/design-system/docs/i18n.md b/packages/design-system/docs/i18n.md
@@ -1,6 +1,6 @@
 ## Writing translations
 
-For translations we are using combination of [vue-gettext](https://github.com/Polyconseil/vue-gettext) and [easygettext](https://github.com/polyconseil/easygettext).
+For translations we are using [Vue 3 Gettext](https://jshmrtn.github.io/vue3-gettext/).
 
 ### Escaping
 

diff --git a/packages/design-system/l10n/.tx/config b/packages/design-system/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:design-system]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-admin-settings/l10n/.tx/config b/packages/web-app-admin-settings/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:admin-settings]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-draw-io/l10n/.tx/config b/packages/web-app-draw-io/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:draw-io]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-external/l10n/.tx/config b/packages/web-app-external/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:external]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-files/l10n/.tx/config b/packages/web-app-files/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:files]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-importer/l10n/.tx/config b/packages/web-app-importer/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:importer]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-ocm/l10n/.tx/config b/packages/web-app-ocm/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:ocm]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-pdf-viewer/l10n/.tx/config b/packages/web-app-pdf-viewer/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:pdf-viewer]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-preview/l10n/.tx/config b/packages/web-app-preview/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:preview]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-search/l10n/.tx/config b/packages/web-app-search/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:search]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-text-editor/l10n/.tx/config b/packages/web-app-text-editor/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:text-editor]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-app-webfinger/l10n/.tx/config b/packages/web-app-webfinger/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:webfinger]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-client/l10n/.tx/config b/packages/web-client/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:client]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-pkg/l10n/.tx/config b/packages/web-pkg/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:pkg]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-runtime/l10n/.tx/config b/packages/web-runtime/l10n/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [o:owncloud-org:p:owncloud-web:r:core]
-file_filter = locale/<lang>/LC_MESSAGES/app.po
+file_filter = locale/<lang>/app.po
 minimum_perc = 0
 source_file = template.pot
 source_lang = en

diff --git a/packages/web-runtime/l10n/Makefile b/packages/web-runtime/l10n/Makefile
@@ -48,8 +48,7 @@ $(TEMPLATE_FILE):
 			export OUT_DIR=$$app/l10n; \
 		fi; \
 		mkdir -p $$OUT_DIR; \
-		export GETTEXT_APP_SOURCES=`find $$app/src -name '*.vue' -o -name '*.js' -o -name '*.ts'`; \
-		node $(NODE_MODULES)/easygettext/src/extract-cli.js --attribute v-translate --output $$OUT_DIR/template.pot $$GETTEXT_APP_SOURCES; \
+		(cd $$app && pnpm exec vue-gettext-extract --config ../../gettext.config.cjs); \
 	done;
 
 .PHONY: translations
@@ -66,7 +65,7 @@ $(OUTPUT_DIR)/translations.json:
 			export OUT_DIR=$$app/l10n; \
 		fi; \
 		mkdir -p $$OUT_DIR; \
-		gettext-compile --output $$OUT_DIR/translations.json $(patsubst %,$$OUT_DIR/locale/%/LC_MESSAGES/app.po,$(LOCALES)); \
+		(cd $$app && pnpm exec vue-gettext-compile && mv ./l10n/locale/translations.json ./l10n/translations.json); \
 	done; \
 
 .PHONY: push

diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
@@ -17,7 +17,6 @@
     "@vueuse/head": "2.0.0",
     "axios": "1.6.5",
     "design-system": "workspace:@ownclouders/design-system@*",
-    "easygettext": "https://github.com/owncloud/easygettext/archive/refs/tags/v2.18.2-oc.tar.gz",
     "filesize": "^9.0.11",
     "focus-trap": "7.2.0",
     "focus-trap-vue": "^4.0.1",