diff --git a/.gitignore b/.gitignore index 3edfb9059..52bfcd5ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Distribution directory dist +# conversejs/media repo checkout +media + # Editor fluff *~ .sw? diff --git a/CHANGES.md b/CHANGES.md index 6f3c94b14..47321504c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,11 +8,11 @@ - Remove call to `api.confirm` in `@converse/headless` - Generate TypeScript declaration files into `dist/types` - Removed documentation about the no longer implemented `fullname` option. +- Updated translations - #3156: Add function to prevent drag stutter effect over iframes when resize is called in overlay mode - #3165: Use configured nickname in profile view in the control box - New config option [stanza_timeout](https://conversejs.org/docs/html/configuration.html#stanza-timeout) -- Small fixes in pt_BR translation ## 10.1.2 (2023-02-17) diff --git a/Makefile b/Makefile index fce9c935e..3fa1be5a7 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ serve_bg: node_modules dist/converse-no-dependencies.js: src webpack/webpack.common.js webpack/webpack.nodeps.js @converse/headless node_modules npm run nodeps -GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=10.1.2 dist/converse-no-dependencies.js -c +GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=10.1.3 dist/converse-no-dependencies.js -c src/i18n/converse.pot: dist/converse-no-dependencies.js $(GETTEXT) 2>&1 > /dev/null; exit $$?; @@ -84,7 +84,9 @@ po: .PHONY: release release: - find ./src -name "*~" -exec rm {} \; + rm -rf release && mkdir release + git clone git@github.com:conversejs/converse.js.git --depth 1 release/ + cd release $(SED) -i '/^export const VERSION_NAME =/s/=.*/= "v$(VERSION)";/' src/headless/shared/constants.js $(SED) -i '/Version:/s/:.*/: $(VERSION)/' COPYRIGHT $(SED) -i '/Project-Id-Version:/s/:.*/: Converse.js $(VERSION)\n"/' src/i18n/converse.pot