3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-02 11:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(theme-classic): fix translation when footer has no links (#6144)

Browse source
This commit is contained in:
Joshua Chen 2021-12-21 20:12:19 +08:00 • committed by GitHub
parent 287292497d
commit 0384a7919e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/docusaurus-theme-classic/src/translations.ts
View file

@ -74,21 +74,21 @@ function translateNavbar(
function isMultiColumnFooterLinks( function isMultiColumnFooterLinks(
links: MultiColumnFooter['links'] | SimpleFooter['links'], links: MultiColumnFooter['links'] | SimpleFooter['links'],
): links is MultiColumnFooter['links'] { ): links is MultiColumnFooter['links'] {
return 'title' in links[0]; return links.length > 0 && 'title' in links[0];
} }
function getFooterTranslationFile(footer: Footer): TranslationFileContent { function getFooterTranslationFile(footer: Footer): TranslationFileContent {
const footerLinkTitles: TranslationFileContent = isMultiColumnFooterLinks( const footerLinkTitles: TranslationFileContent = chain(
footer.links, isMultiColumnFooterLinks(footer.links)
? footer.links.filter((link) => !!link.title)
: [],
) )
? chain(footer.links.filter((link) => !!link.title)) .keyBy((link) => `link.title.${link.title}`)
.keyBy((link) => `link.title.${link.title}`) .mapValues((link) => ({
.mapValues((link) => ({ message: link.title!,
message: link.title!, description: `The title of the footer links column with title=${link.title} in the footer`,
description: `The title of the footer links column with title=${link.title} in the footer`, }))
})) .value();
.value()
: {};
const footerLinkLabels: TranslationFileContent = chain( const footerLinkLabels: TranslationFileContent = chain(
isMultiColumnFooterLinks(footer.links) isMultiColumnFooterLinks(footer.links)

24
packages/docusaurus-theme-classic/src/validateThemeConfig.ts
View file

@ -312,18 +312,18 @@ const ThemeConfigSchema = Joi.object({
}), }),
copyright: Joi.string(), copyright: Joi.string(),
links: Joi.alternatives( links: Joi.alternatives(
Joi.array() Joi.array().items(
.items( Joi.object({
Joi.object({ title: Joi.string().allow(null).default(null),
title: Joi.string().allow(null).default(null), items: Joi.array().items(FooterLinkItemSchema).default([]),
items: Joi.array().items(FooterLinkItemSchema).default([]), }),
}), ),
) Joi.array().items(FooterLinkItemSchema),
.default([]), )
Joi.array().items(FooterLinkItemSchema).default([]), .messages({
).messages({ 'alternatives.match': `The footer must be either simple or multi-column, and not a mix of the two. See: https://docusaurus.io/docs/api/themes/configuration#footer-links`,
'alternatives.match': `The footer must be either simple or multi-column, and not a mix of the two. See: https://docusaurus.io/docs/api/themes/configuration#footer-links`, })
}), .default([]),
}).optional(), }).optional(),
prism: Joi.object({ prism: Joi.object({
theme: Joi.object({ theme: Joi.object({