From 25d820941092ff412b81610ceaeb3cd3b9fa75ab Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Thu, 17 Nov 2022 16:32:25 +0100 Subject: [PATCH] use English release-notes for github-ae if have to (#32700) --- middleware/contextualizers/ghae-release-notes.js | 5 ++++- middleware/contextualizers/ghes-release-notes.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/middleware/contextualizers/ghae-release-notes.js b/middleware/contextualizers/ghae-release-notes.js index e832000796..708f372970 100644 --- a/middleware/contextualizers/ghae-release-notes.js +++ b/middleware/contextualizers/ghae-release-notes.js @@ -10,7 +10,10 @@ export default async function ghaeReleaseNotesContext(req, res, next) { ) return next() - const ghaeReleaseNotes = getDeepDataByLanguage('release-notes.github-ae', req.language) + let ghaeReleaseNotes = getDeepDataByLanguage('release-notes.github-ae', req.language) + if ((!ghaeReleaseNotes || Object.keys(ghaeReleaseNotes).length === 0) && req.language !== 'en') { + ghaeReleaseNotes = getDeepDataByLanguage('release-notes.github-ae', 'en') + } // internalLatestRelease is set in lib/all-versions, e.g., '3.5' but UI still displays '@latest'. let requestedRelease = req.context.currentVersionObj.internalLatestRelease diff --git a/middleware/contextualizers/ghes-release-notes.js b/middleware/contextualizers/ghes-release-notes.js index 3432f4f740..6da18ec6b2 100644 --- a/middleware/contextualizers/ghes-release-notes.js +++ b/middleware/contextualizers/ghes-release-notes.js @@ -7,7 +7,10 @@ export default async function ghesReleaseNotesContext(req, res, next) { const [requestedPlan, requestedRelease] = req.context.currentVersion.split('@') if (requestedPlan !== 'enterprise-server') return next() - const ghesReleaseNotes = getDeepDataByLanguage('release-notes.enterprise-server', req.language) + let ghesReleaseNotes = getDeepDataByLanguage('release-notes.enterprise-server', req.language) + if ((!ghesReleaseNotes || Object.keys(ghesReleaseNotes).length === 0) && req.language !== 'en') { + ghesReleaseNotes = getDeepDataByLanguage('release-notes.enterprise-server', 'en') + } // If the requested GHES release isn't found in data/release-notes/enterprise-server/*, // and it IS a valid GHES release, try being helpful and redirecting to the old location.