Chapril/xmpp.chapril.org-conversejs
Chapril
/
xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Postrelease and fix issue with Uyghur translations not loading

This commit is contained in:
JC Brand 2023-01-07 21:50:13 +01:00
parent 078936fb8a
commit 451ed18261
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,5 +1,9 @@
# Changelog
## 10.1.1 (Unreleased)
- Bugfix. Uyghur translations weren't loading
## 10.1.0 (2023-01-07)
- #326: Add the ability to reset your password

12
RELEASE.md
View File

@ -2,16 +2,16 @@
1. Check that weblate translations are all merged in
2. Run `make check` to check that all tests pass.
3. Run `make release VERSION=10.1.0`
3. Run `make release VERSION=10.1.1`
4. Do a `git diff` to check if things look sane.
5. Do a quick manual test with the `dist` files (via `index.html`)
6. `git commit -am "Release 10.1.0"`
7. `git tag -s v10.1.0 -m "Release 10.1.0"`
8. Run `git push && git push origin v10.1.0`
6. `git commit -am "Release 10.1.1"`
7. `git tag -s v10.1.1 -m "Release 10.1.1"`
8. Run `git push && git push origin v10.1.1`
9. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v10.1.0 git@github.com:conversejs/converse.js.git 10.1.0`
* `cd 10.1.0 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.1.0/dist/ make dist && make doc`
* `git clone --branch v10.1.1 git@github.com:conversejs/converse.js.git 10.1.1`
* `cd 10.1.1 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.1.1/dist/ make dist && make doc`
* `cd .. && git pull && nvm install && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist && make doc`
10. Update release page on Github
11. Run `npm publish && cd src/headless/ && npm publish`

1
dev.html
View File

@ -28,6 +28,7 @@
});
converse.initialize({
i18n: 'ug',
theme: 'dracula',
auto_away: 300,
enable_smacks: true,

7
src/i18n/index.js
View File

@ -66,6 +66,11 @@ function isLocaleAvailable (locale, available) {
}
}
function getDayJSLocale (locale) {
const dayjs_locale = locale.toLowerCase().replace('_', '-');
return dayjs_locale === 'ug' ? 'ug-cn' : dayjs_locale;
}
/* Fetch the translations for the given local at the given URL.
* @private
@ -74,7 +79,7 @@ function isLocaleAvailable (locale, available) {
*/
async function fetchTranslations (_converse) {
const { api, locale } = _converse;
const dayjs_locale = locale.toLowerCase().replace('_', '-');
const dayjs_locale = getDayJSLocale(locale);
if (!isConverseLocale(locale, api.settings.get("locales")) || locale === 'en') {
return;