Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into b20230902-117
Browse files Browse the repository at this point in the history
  • Loading branch information
yyss committed Sep 30, 2023
2 parents ae33ff5 + 3c2fe75 commit ee4bf31
Show file tree
Hide file tree
Showing 1,672 changed files with 58,228 additions and 18,300 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,6 @@
/.github/ @mdn/core-dev
/* @mdn/core-dev
/*.md @mdn/core-dev @mdn/core-yari-content
/CONTRIBUTING.md @mdn/core-yari-content
/PEERS_GUIDELINES.md @mdn/core-yari-content
/.prettierignore
40 changes: 20 additions & 20 deletions .github/ISSUE_TEMPLATE/page-report-fr.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
name: "[via des pages MDN uniquement // fr]"
description: Issue filed via le lien "Report a problem with this content on GitHub" sur des pages MDN.
description: Tickets rapportés via le lien "Report a problem with this content on GitHub" sur des pages MDN.
labels: ["l10n-fr", "needs triage"]
body:
- type: markdown
attributes:
value: |
### Before you start
### Avant toute chose
**Want to change this page yourself?** This content is open source!
Go back and use the _Edit on GitHub_ link on the page.
**Vous souhaitez éditer cette page vous-même ?** Le contenu est open source !
Revenez sur la page et cliquez sur le lien _Edit on GitHub_ en bas de la page.
**Is your issue about the browser compatibility table?**
Go back and use the _Report problems with this compatibility data on GitHub_ link on the page.
**Est-ce que le problème porte sur le tableau de compatibilité des navigateurs ?**
Revenez sur la page et cliquez sur le lien _Report problems with this compatibility data on GitHub_ en bas de la page.
**Need help with a browser?**
🙋 To get help with [Firefox](https://support.mozilla.org/en-US/kb/file-bug-report-or-feature-request-mozilla), [Chrome](https://support.google.com/chrome/answer/95315?hl=en-GB&ref_topic=7439544), [Safari](https://www.apple.com/feedback/safari.html), or another browser, check the browser's support site.
**Vous avez besoin d'aide avec votre navigateur ?**
Consultez le site d'aide du navigateur (https://support.mozilla.org/fr/products/firefox pour Firefox, https://support.apple.com/fr-fr/safari pour Safari, https://support.google.com/chrome/?hl=fr#topic=7439538 pour Chrome, https://support.microsoft.com/fr-fr/microsoft-edge pour Edge).
---
- type: input
id: mdn-url
attributes:
label: MDN URL
description: Set automatically. Do not modify.
label: URL MDN
description: Cette information est ajoutée automatiquement. Veuillez ne pas la modifier.
validations:
required: true
- type: input
id: section
attributes:
label: What specific section or headline is this issue about?
label: Sur quelle section/titre porte ce problème ?
- type: textarea
id: problem
attributes:
label: What information was incorrect, unhelpful, or incomplete?
label: Quelle information était incorrecte, inutile ou incomplète ?
validations:
required: true
- type: textarea
id: expected
attributes:
label: What did you expect to see?
label: Que vous attendiez-vous à voir ?
validations:
required: true
- type: textarea
id: references
attributes:
label: Do you have any supporting links, references, or citations?
description: Link to information that helps us confirm your issue.
label: Avez-vous des liens, références ou citations sur ce sujet ?
description: Des liens vers des informations qui pourront nous aider à confirmer le problème.
- type: textarea
id: more-info
attributes:
label: Do you have anything more you want to share?
description: For example, steps to reproduce a bug, screenshots, screen recordings, or sample code
label: Souhaitez-vous ajouter autre chose ?
description: Cela peut être des étapes de reproduction du bogue, des captures ou enregistrements d'écran, un fragment de code.
- type: markdown
attributes:
value: |
---
You're finished! The following fields are prefilled. Please click **Submit new issue**.
Et voilà, c'est terminé ! Les champs suivants sont remplis automatiquement. Vous pouvez cliquer sur **Submit new issue**.
- type: textarea
id: metadata
attributes:
label: MDN metadata
description: Set automatically. Do not modify.
label: Métadonnées MDN
description: Remplies automatiquement. Ne pas modifier.
2 changes: 1 addition & 1 deletion .github/workflows/autocorrect-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Get changed files
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdown-lint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- zh-cn
- zh-tw
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand All @@ -38,7 +38,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HUSKY: 0

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/pr-check-lint_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout BASE
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get changed files
env:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Checkout HEAD
if: ${{ env.DIFF_DOCUMENTS }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
path: pr_head
Expand All @@ -61,7 +61,7 @@ jobs:
git add .
git commit -m "Code from PR head"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ env.DIFF_DOCUMENTS }}
with:
repository: mdn/content
Expand Down Expand Up @@ -106,7 +106,9 @@ jobs:
echo "Linting front-matter"
FM_LINT_FAILED=false
FM_LINT_LOG=$(cd ${{ github.workspace }}/mdn/content && yarn fix:fm --config-file ${{ github.workspace }}/front-matter-config.json --fix true ${files_to_lint} 2>&1) || FM_LINT_FAILED=true
# absolute_paths is needed because front-matter linter is run from mdn/content directory
absolute_paths=$(echo "${files_to_lint}" | xargs realpath -e | xargs)
FM_LINT_LOG=$(cd ${{ github.workspace }}/mdn/content && yarn fix:fm --config-file ${{ github.workspace }}/front-matter-config.json ${absolute_paths} 2>&1) || FM_LINT_FAILED=true
echo "FM_LINT_LOG<<${EOF}" >> $GITHUB_ENV
echo "${FM_LINT_LOG}" >> $GITHUB_ENV
echo "${EOF}" >> $GITHUB_ENV
Expand All @@ -121,6 +123,7 @@ jobs:
# info for troubleshooting
echo MD_LINT_FAILED=${MD_LINT_FAILED}
echo FM_LINT_FAILED=${FM_LINT_FAILED}
git diff
- name: Setup reviewdog
Expand Down Expand Up @@ -157,9 +160,11 @@ jobs:
-reporter="github-pr-review"
- name: Fail if any issues pending
if: env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true'
if: env.FILES_MODIFIED == 'true' || env.MD_LINT_FAILED == 'true' || env.FM_LINT_FAILED == 'true'
run: |
echo -e "\nLogs from markdownlint:"
echo "${{ env.MD_LINT_LOG }}"
echo -e "\nLogs from front-matter linter:"
echo "${{ env.FM_LINT_LOG }}"
echo -e "\nPlease fix all the linting issues mentioned in above logs and in the review comments."
exit 1
2 changes: 1 addition & 1 deletion .github/workflows/pr-check_json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-check_redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-check_yml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-companion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: |
7z x build.zip -obuild -bb1
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/yari
path: yari
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
BUILD_OUT_ROOT: /tmp/build

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Needed otherswise it will check out a merge commit which means
# you can't get a `git diff` for this PR compared to its base.
# with:
# ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-translated-content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
- zh-tw

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: mdn/content
path: mdn/content
Expand Down
4 changes: 0 additions & 4 deletions docs/ko/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ PR 생성시에 한국 리뷰어들은 라운드 로빈 방식으로 배정이

- [ko-locale 현황판](https://github.com/mdn/translated-content/projects/2)

### 파일 확장자

현재 translated-content 저장소는 `.html``.md` 두 개의 확장자로 문서 편집을 할 수 있습니다. **(자세한 내용은 [자주 묻는 질문](./faq.md) 5번을 참고해주세요.)**

첫 기여자분들을 위해 다음 [issue 827](https://github.com/mdn/translated-content/issues/827)에 기여 방법을 작성했습니다. 참고해주세요.

## yari 빠른 사용법
Expand Down
Loading

0 comments on commit ee4bf31

Please sign in to comment.