krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 05:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 6d74f87db332fd28c7522cabc0f96a390d36e64f
Author: SabreCat <sabe@habitica.com>
Date:   Fri Aug 18 20:04:52 2023 -0500

    fix(i18n): default to EN for empties
This commit is contained in:
SabreCat
2023-08-22 12:23:02 -05:00
parent e8f5958f77
commit c71f0b3fda
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/server/libs/i18n.js
View File

@@ -50,7 +50,8 @@ approvedLanguages.forEach(file => {
if (file === 'en' || fs.statSync(path.join(localePath, file)).isDirectory() === false) return; if (file === 'en' || fs.statSync(path.join(localePath, file)).isDirectory() === false) return;
_loadTranslations(file); _loadTranslations(file);
// Merge missing strings from english // Strip empty strings, then merge missing strings from english
translations[file] = _.pickBy(translations[file], string => string !== '');
_.defaults(translations[file], translations.en); _.defaults(translations[file], translations.en);
}); });