diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/content/dependencies/generateGroupGalleryPage.js | 5 | ||||
| -rw-r--r-- | src/data/things/language.js | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/content/dependencies/generateGroupGalleryPage.js b/src/content/dependencies/generateGroupGalleryPage.js index ab8a06ae..1ec53a0a 100644 --- a/src/content/dependencies/generateGroupGalleryPage.js +++ b/src/content/dependencies/generateGroupGalleryPage.js @@ -153,11 +153,10 @@ export default { }), ], - ...( + ... relations.sidebar ?.slot('currentExtra', 'gallery') - ?.content - ?? {}), + ?.content, navLinkStyle: 'hierarchical', navLinks: diff --git a/src/data/things/language.js b/src/data/things/language.js index 98ab9bc7..ec62de40 100644 --- a/src/data/things/language.js +++ b/src/data/things/language.js @@ -101,7 +101,7 @@ export class Language extends Thing { dependencies: ['strings', 'inheritedStrings', 'escapeHTML'], compute({strings, inheritedStrings, escapeHTML}) { if (!(strings || inheritedStrings) || !escapeHTML) return null; - const allStrings = {...(inheritedStrings ?? {}), ...(strings ?? {})}; + const allStrings = {...inheritedStrings, ...strings}; return Object.fromEntries( Object.entries(allStrings).map(([k, v]) => [k, escapeHTML(v)]) ); |