From 8dfda54fbb423d4ac58a6f72296d2196142b28d4 Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Sun, 29 May 2022 14:20:35 -0400 Subject: [PATCH 1/3] New translation batch for es (#28084) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/fix-translation-errors.js * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=es * run script/i18n/reset-known-broken-translation-files.js From 5102f4cbaa977600c4f02751d5248c5276bc301c Mon Sep 17 00:00:00 2001 From: docubot <67483024+docubot@users.noreply.github.com> Date: Sun, 29 May 2022 19:49:16 -0400 Subject: [PATCH 2/3] New translation batch for cn (#28086) * Add crowdin translations * Run script/i18n/homogenize-frontmatter.js * Run script/i18n/lint-translation-files.js --check rendering * run script/i18n/reset-files-with-broken-liquid-tags.js --language=cn * run script/i18n/reset-known-broken-translation-files.js * Check in cn CSV report --- translations/log/cn-resets.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/log/cn-resets.csv b/translations/log/cn-resets.csv index 28d7c2d883..40c2fff4f7 100644 --- a/translations/log/cn-resets.csv +++ b/translations/log/cn-resets.csv @@ -344,14 +344,14 @@ translations/zh-CN/data/reusables/dependabot/dependabot-alerts-dependency-graph- translations/zh-CN/data/reusables/dependabot/enterprise-enable-dependabot.md,broken liquid tags translations/zh-CN/data/reusables/dotcom_billing/downgrade-org-to-free.md,broken liquid tags translations/zh-CN/data/reusables/enterprise-accounts/emu-password-reset-session.md,broken liquid tags -translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,broken liquid tags +translations/zh-CN/data/reusables/enterprise-accounts/emu-short-summary.md,rendering error translations/zh-CN/data/reusables/enterprise-licensing/about-license-sync.md,broken liquid tags translations/zh-CN/data/reusables/enterprise-licensing/you-can-sync-for-a-combined-view.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_installation/hardware-considerations-all-platforms.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_installation/hardware-rec-table.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_installation/upgrade-hardware-requirements.md,broken liquid tags translations/zh-CN/data/reusables/enterprise_management_console/badge_indicator.md,broken liquid tags -translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,broken liquid tags +translations/zh-CN/data/reusables/gated-features/enterprise-accounts.md,rendering error translations/zh-CN/data/reusables/gated-features/packages.md,broken liquid tags translations/zh-CN/data/reusables/gated-features/secret-scanning.md,broken liquid tags translations/zh-CN/data/reusables/getting-started/actions.md,broken liquid tags @@ -372,9 +372,9 @@ translations/zh-CN/data/reusables/repositories/deleted_forks_from_private_reposi translations/zh-CN/data/reusables/repositories/enable-security-alerts.md,broken liquid tags translations/zh-CN/data/reusables/repositories/github-reviews-security-advisories.md,broken liquid tags translations/zh-CN/data/reusables/repositories/select-marketplace-apps.md,broken liquid tags -translations/zh-CN/data/reusables/saml/saml-session-oauth.md,broken liquid tags +translations/zh-CN/data/reusables/saml/saml-session-oauth.md,rendering error translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,Listed in localization-support#489 -translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,broken liquid tags +translations/zh-CN/data/reusables/saml/you-must-periodically-authenticate.md,rendering error translations/zh-CN/data/reusables/scim/after-you-configure-saml.md,broken liquid tags translations/zh-CN/data/reusables/secret-scanning/enterprise-enable-secret-scanning.md,broken liquid tags translations/zh-CN/data/reusables/security-advisory/link-browsing-advisory-db.md,broken liquid tags From 6b26400c49ed02e3b0c600b08a166d12e36227d3 Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Sun, 29 May 2022 19:54:05 -0400 Subject: [PATCH 3/3] only include props we need (#28067) --- pages/[versionId]/admin/release-notes.tsx | 86 +++++++++++------------ 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/pages/[versionId]/admin/release-notes.tsx b/pages/[versionId]/admin/release-notes.tsx index 6ca7c4cee1..e40ce3bc3c 100644 --- a/pages/[versionId]/admin/release-notes.tsx +++ b/pages/[versionId]/admin/release-notes.tsx @@ -4,31 +4,21 @@ import { MainContextT, MainContext, getMainContext } from 'components/context/Ma import { DefaultLayout } from 'components/DefaultLayout' import { GHAEReleaseNotes } from 'components/release-notes/GHAEReleaseNotes' import { GHESReleaseNotes } from 'components/release-notes/GHESReleaseNotes' -import { - CurrentVersion, - GHAEReleaseNotesContextT, - GHESReleaseNotesContextT, -} from 'components/release-notes/types' +import { GHAEReleaseNotesContextT, GHESReleaseNotesContextT } from 'components/release-notes/types' const liquid = new Liquid() type Props = { mainContext: MainContextT - ghaeContext: GHAEReleaseNotesContextT - ghesContext: GHESReleaseNotesContextT - currentVersion: CurrentVersion + ghaeContext?: GHAEReleaseNotesContextT + ghesContext?: GHESReleaseNotesContextT } -export default function ReleaseNotes({ - mainContext, - ghesContext, - ghaeContext, - currentVersion, -}: Props) { +export default function ReleaseNotes({ mainContext, ghesContext, ghaeContext }: Props) { return ( - {currentVersion.plan === 'enterprise-server' && } + {ghesContext && } - {currentVersion.plan === 'github-ae' && } + {ghaeContext && } ) @@ -42,35 +32,41 @@ export const getServerSideProps: GetServerSideProps = async (context) => return { props: { mainContext: getMainContext(req, res), - currentVersion, - ghesContext: { - currentVersion, - latestPatch, - latestRelease, - prevRelease: req.context.prevRelease || '', - nextRelease: req.context.nextRelease || '', - releaseNotes: req.context.releaseNotes, - releases: req.context.releases, - message: { - ghes_release_notes_upgrade_patch_only: liquid.parseAndRenderSync( - req.context.site.data.ui.header.notices.ghes_release_notes_upgrade_patch_only, - { latestPatch, latestRelease } - ), - ghes_release_notes_upgrade_release_only: liquid.parseAndRenderSync( - req.context.site.data.ui.header.notices.ghes_release_notes_upgrade_release_only, - { latestPatch, latestRelease } - ), - ghes_release_notes_upgrade_patch_and_release: liquid.parseAndRenderSync( - req.context.site.data.ui.header.notices.ghes_release_notes_upgrade_patch_and_release, - { latestPatch, latestRelease } - ), - }, - }, - ghaeContext: { - currentVersion, - releaseNotes: req.context.releaseNotes, - releases: req.context.releases, - }, + ghesContext: + currentVersion.plan === 'enterprise-server' + ? { + currentVersion, + latestPatch, + latestRelease, + prevRelease: req.context.prevRelease || '', + nextRelease: req.context.nextRelease || '', + releaseNotes: req.context.releaseNotes, + releases: req.context.releases, + message: { + ghes_release_notes_upgrade_patch_only: liquid.parseAndRenderSync( + req.context.site.data.ui.header.notices.ghes_release_notes_upgrade_patch_only, + { latestPatch, latestRelease } + ), + ghes_release_notes_upgrade_release_only: liquid.parseAndRenderSync( + req.context.site.data.ui.header.notices.ghes_release_notes_upgrade_release_only, + { latestPatch, latestRelease } + ), + ghes_release_notes_upgrade_patch_and_release: liquid.parseAndRenderSync( + req.context.site.data.ui.header.notices + .ghes_release_notes_upgrade_patch_and_release, + { latestPatch, latestRelease } + ), + }, + } + : undefined, + ghaeContext: + currentVersion.plan === 'github-ae' + ? { + currentVersion, + releaseNotes: req.context.releaseNotes, + releases: req.context.releases, + } + : undefined, }, } }