Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo sync #28617

Merged
merged 2 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/reusables/git/clear-stored-gcm-credentials.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- If the output is `manager-core`, you're using Git Credential Manager. To clear the credentials, run the following command.
- If the output is `manager` (or `manager-core` in previous versions), you're using Git Credential Manager. To clear the credentials, run the following command.
21 changes: 21 additions & 0 deletions lib/correct-translation-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,27 @@ export function correctTranslatedContentStrings(content, englishContent, context
content = content.replaceAll('{{ 용어집.description }}', '{{ glossary.description }}')
}

// We have seen a lot of Markdown tables, that may have Liquid tags
// (like `{% ifversion ... %}`) within them lose the linebreak between
// the heading and the first row marker.
// For example:
//
// | **Sprache** | **Ökosystem** | **Manifestdatei** | **Unterstützter Abhängigkeitsbereich** | |:---|:---:|:---:|:---|{% ifversion dep
//
// The equivalent English for that is:
//
// | **Language** | **Ecosystem** | **Manifest file** | **Dependency scope supported** |
// |:---|:---:|:---:|:---|
// {%- ifversion dependency-graph-dart-support %}
//
// Let's inject these newline characters if found in the English content.
if (content.includes('| |:---|:') && englishContent.includes('|\n|:---|')) {
content = content.replaceAll('| |:---|:', '|\n|:---|:')
}
if (content.includes('|:---|{% ifversion') && englishContent.includes('|:---|\n{%- ifversion')) {
content = content.replaceAll('|:---|{% ifversion', '|:---|\n{%- ifversion')
}

// A lot of Liquid tags lose their linebreak after the `}` which can
// result in formatting problems, especially around Markdown tables.
// This code here, compares each Liquid statement, in the translation,
Expand Down
Loading