Skip to content

Commit

Permalink
Merge branch 'main' into ko-css-doublecolon-placeholder
Browse files Browse the repository at this point in the history
  • Loading branch information
givvemee authored Oct 4, 2024
2 parents d771151 + 8d42ed0 commit dbd85b5
Show file tree
Hide file tree
Showing 4,952 changed files with 59,684 additions and 26,381 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
auto-merge:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
if: github.event.pull_request.user.login == 'dependabot[bot]'
steps:
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
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 @@ -61,7 +61,7 @@ jobs:
- name: Create PR with only fixable issues
if: success()
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: "${{ matrix.lang }}: auto-fix Markdownlint issues"
branch: markdownlint-auto-cleanup-${{ matrix.lang }}
Expand All @@ -76,7 +76,7 @@ jobs:

- name: Create PR with notice on unfixed issues
if: failure()
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: "${{ matrix.lang }}: auto-fix Markdownlint issues"
branch: markdownlint-auto-cleanup-${{ matrix.lang }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-check-lint_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: |
# Use the GitHub API to get the list of changed files
# documentation: https://docs.github.com/rest/commits/commits#compare-two-commits
DIFF_DOCUMENTS=$(gh api repos/{owner}/{repo}/compare/${{ env.BASE_SHA }}...${{ env.HEAD_SHA }} \
DIFF_DOCUMENTS=$(gh api repos/{owner}/{repo}/compare/${BASE_SHA}...${HEAD_SHA} \
--jq '.files | .[] | select(.status|IN("added", "modified", "renamed", "copied", "changed")) | .filename')
# filter out files that are not markdown
DIFF_DOCUMENTS=$(echo "${DIFF_DOCUMENTS}" | egrep -i ".*\.md$" | xargs)
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
EOF="$(openssl rand -hex 8)"
files_to_lint="${{ env.DIFF_DOCUMENTS }}"
files_to_lint="${DIFF_DOCUMENTS}"
echo "Running markdownlint --fix"
MD_LINT_FAILED=false
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "${{ env.MD_LINT_LOG }}" | \
echo "${MD_LINT_LOG}" | \
reviewdog \
-efm="%f:%l:%c %m" \
-efm="%f:%l %m" \
Expand All @@ -172,8 +172,8 @@ jobs:
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 "${MD_LINT_LOG}"
echo -e "\nLogs from front-matter linter:"
echo "${{ env.FM_LINT_LOG }}"
echo "${FM_LINT_LOG}"
echo -e "\nPlease fix all the linting issues mentioned in above logs and in the review comments."
exit 1
20 changes: 10 additions & 10 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
# Use the GitHub API to get the list of changed files
# documentation: https://docs.github.com/rest/commits/commits#compare-two-commits
DIFF_DOCUMENTS=$(gh api repos/{owner}/{repo}/compare/${{ env.BASE_SHA }}...${{ env.HEAD_SHA }} \
DIFF_DOCUMENTS=$(gh api repos/{owner}/{repo}/compare/${BASE_SHA}...${HEAD_SHA} \
--jq '.files | .[] | select(.status|IN("added", "modified", "renamed", "copied", "changed")) | .filename')
# filter out files that are not markdown files
Expand Down Expand Up @@ -112,23 +112,23 @@ jobs:

working-directory: ${{ github.workspace }}/mdn/content
run: |
mkdir -p ${{ env.BUILD_OUT_ROOT }}
mkdir -p ${BUILD_OUT_ROOT}
# Don't use `yarn build` (from mdn/content) because that one hardcodes
# the BUILD_OUT_ROOT and CONTENT_ROOT env vars.
node node_modules/@mdn/yari/build/cli.js ${{ env.GIT_DIFF_CONTENT }}
node node_modules/@mdn/yari/build/cli.js ${GIT_DIFF_CONTENT}
echo "Disk usage size of build"
du -sh ${{ env.BUILD_OUT_ROOT }}
du -sh ${BUILD_OUT_ROOT}
# Save the PR number into the build
echo ${{ github.event.number }} > ${{ env.BUILD_OUT_ROOT }}/NR
echo ${{ github.event.number }} > ${BUILD_OUT_ROOT}/NR
# Download the raw diff blob and store that inside the build
# directory.
# The purpose of this is for the PR Review Companion to later
# be able to use this raw diff file for the benefit of analyzing.
wget https://github.com/${{ github.repository }}/compare/${{ env.BASE_SHA }}...${{ env.HEAD_SHA }}.diff -O ${{ env.BUILD_OUT_ROOT }}/DIFF
wget https://github.com/${{ github.repository }}/compare/${BASE_SHA}...${HEAD_SHA}.diff -O ${BUILD_OUT_ROOT}/DIFF
# Set the output variable so the next job could skip if there are no assets
echo "has_assets=true" >> "$GITHUB_OUTPUT"
Expand All @@ -137,9 +137,9 @@ jobs:
if: ${{ env.GIT_DIFF_CONTENT }}
run: |
# Exclude the .map files, as they're used for debugging JS and CSS.
rsync -a --exclude "*.map" ${{ github.workspace }}/mdn/content/node_modules/@mdn/yari/client/build/ ${{ env.BUILD_OUT_ROOT }}
rsync -a --exclude "*.map" ${{ github.workspace }}/mdn/content/node_modules/@mdn/yari/client/build/ ${BUILD_OUT_ROOT}
# Show the final disk usage size of the build.
du -sh ${{ env.BUILD_OUT_ROOT }}
du -sh ${BUILD_OUT_ROOT}
- uses: actions/upload-artifact@v4
if: ${{ env.GIT_DIFF_CONTENT }}
Expand All @@ -154,9 +154,9 @@ jobs:
CONTENT_TRANSLATED_ROOT: ${{ github.workspace }}/files
working-directory: ${{ github.workspace }}/mdn/content
run: |
echo ${{ env.GIT_DIFF_FILES }}
echo ${GIT_DIFF_FILES}
yarn filecheck ${{ env.GIT_DIFF_FILES }}
yarn filecheck ${GIT_DIFF_FILES}
review:
needs: tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-translated-content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
} >> "$GITHUB_ENV"
- name: Create PR with sync for ${{ matrix.lang }}
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: "${{ matrix.lang }}: sync translated content"
branch: content-sync-${{ matrix.lang }}
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ See the [Creating a pull request](#creating-a-pull-request) for more details on

If you're not certain of the changes that you want to make, [get in touch with us][]!

> **Note:** You can click the **View the source on GitHub** or **Edit the page on GitHub** link at the bottom of an MDN page to jump directly to the page source on GitHub.
> **Note:** You may click the **View this page on GitHub** or **Report a problem with this content** link at the bottom of an MDN page, to either jump directly to the page source or raise an issue on GitHub.
### Forking and cloning the repository

Expand Down
6 changes: 3 additions & 3 deletions docs/ko/guides/glossary-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

## 용어 안내서 `참고 링크` 우선 순위

- 1. 해당 단어에 대한 의견을 나눈 PR 링크
- 2. 적절한 ko MDN 문서 링크
- 3. 적절한 en-us MDN 문서 링크
1. 해당 단어에 대한 의견을 나눈 PR 링크
2. 적절한 ko MDN 문서 링크
3. 적절한 en-us MDN 문서 링크

## Section Title

Expand Down
2 changes: 0 additions & 2 deletions docs/ko/guides/macro-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,3 @@ EmbedLiveSample/MacroLiveSampleError 오류 찾는 [스크립트 링크 참고](
## 매크로 수정 및 번역

MDN은 초창기에 [kuma](https://github.com/mdn/kuma) 플랫폼으로 MDN 웹 문서를 구동해왔습니다. 그 당시 사용한 많은 매크로들이 레거시로 남아 있습니다. 레거시로 남은 매크로를 [Kumascript](https://github.com/mdn/kumascript)라고 부릅니다. 현재는 [yari 저장소 내의 kumascript 폴더](https://github.com/mdn/yari/tree/main/kumascript)로 대체되어 사용되고 있습니다([참고](https://egas.tistory.com/168#%EB%AF%B8%EC%82%AC%EC%9A%A9-macro-%EC%A0%9C%EA%B1%B0)).

만약 `{{DOMAttributeMethods}}` 매크로를 수정하자고 한다면 `kumascript/macros/DOMAttributeMethods.ejs`를 확인하면 됩니다([관련 PR](https://github.com/mdn/yari/pull/10502)).
43 changes: 10 additions & 33 deletions docs/ko/guides/translation-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,57 +41,34 @@

| 용어 | 번역 | 참고 링크 |
| ------------- | ---------------- | ----------------------------- |
| Note | 참고 | |
| Warning | 경고 | |
| Callout | 알림 | |
| Objective | 목표 | [링크][What_is_accessibility] |
| Prerequisites | 필요한 사전 지식 | [링크][What_is_accessibility] |

### 교육 과정 callout

```markdown
> **알림:**
> [!CALLOUT]
>
> #### 프론트엔드 웹 개발자가 되고자 하시나요?
>
> 목표를 달성하기 위한 모든 필수 정보가 들어있는 교육 과정을 준비했습니다.
> 프론트엔드 웹 개발자가 되고 싶지만 무엇을 먼저 배워야 할지 모르겠다면, MDN 커리큘럼을 참고해 학습 계획을 세우는 것을 추천합니다. 이 커리큘럼은 성공적인 프론트엔드 개발자가 되기 위한 필수 기술과 실습을 체계적으로 학습할 수 있는 경로를 제공하며, 추천 학습 자료도 함께 제공합니다.
>
> [**시작하기**](/ko/docs/Learn/Front-end_web_developer)
> [**시작하기**](/ko/curriculum/)
```

### 카드 번역
## GFM Alerts

카드는 참고, 경고 그리고 알림의 세 가지 유형이 있으며, 영어 원문에서는 다음과 같이 표시됩니다.
`> [!NOTE]`, `> [!TIP]`, `> [!IMPORTANT]`, `> [!CAUTION]`, `> [!WARNING]`은 새로 추가된 github markdown으로 영어 문법만 사용할 수 있습니다.

```markdown
# 참고

> **Note:** This is a note.

# 경고

> **Warning:** This is a warning.

# 알림
// bad

> **Callout:** This is a callout.
> [!참고]
> ...
```

이런 카드는 아래와 같이 번역해주시면 됩니다.

```markdown
# 참고

> **참고:** 참고입니다.

# 경고

> **경고:** 경고입니다.

# 알림

> **알림:** 알림입니다.
```
- [[Markdown] An option to highlight a "Note" and "Warning" using blockquote (Beta)](https://github.com/orgs/community/discussions/16925)
- [Incorrect formatting for highlighted notes in GitHub flavoured Markdown](https://github.com/prettier/prettier/issues/16454)

## 역주/역자주

Expand Down
41 changes: 21 additions & 20 deletions docs/zh-cn/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,27 @@

## 标题/表格

| 英文词汇 | 翻译 | 备注 | 引用来源 |
| ---------------------- | ------------ | ------------------ | --------------------------------------------------------------------------- |
| Accessibility concerns | 无障碍考虑 | | https://github.com/mdn/translated-content/issues/11456 |
| Active learning | 动手练习 | | https://github.com/mdn/translated-content/pull/12696#discussion_r1164859935 |
| Associated interfaces | 相关接口 | | |
| Associated roles | 相关角色 | | |
| Browser compatibility | 浏览器兼容性 | | |
| Conclusion | 总结 | | https://github.com/mdn/translated-content/pull/13329#discussion_r1199677894 |
| Examples | 示例 | | |
| Exceptions | 异常 | | |
| Formal Definition | 形式定义 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Formal syntax | 形式语法 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Objective | 目标 | 在学习区表格中使用 | |
| Parameters | 参数 | | |
| Prerequisites | 前提 | 在学习区表格中使用 | |
| See also | 参见 | | |
| Specifications | 规范 | | |
| Technical summary | 技术概要 | | https://github.com/mdn/translated-content/issues/11456 |
| Test your skills | 技能测试 | | |
| Usage notes | 使用说明 | | https://github.com/mdn/translated-content/pull/12600#discussion_r1161045585 |
| 英文词汇 | 翻译 | 备注 | 引用来源 |
| ---------------------- | ------------ | ------------------ | ---------------------------------------------------------------------------- |
| Accessibility concerns | 无障碍考虑 | | https://github.com/mdn/translated-content/issues/11456 |
| Active learning | 动手练习 | | https://github.com/mdn/translated-content/pull/12696#discussion_r1164859935 |
| Associated interfaces | 相关接口 | | |
| Associated roles | 相关角色 | | |
| Browser compatibility | 浏览器兼容性 | | |
| Conclusion | 总结 | | https://github.com/mdn/translated-content/pull/13329#discussion_r1199677894 |
| Examples | 示例 | | |
| Exceptions | 异常 | | |
| Formal Definition | 形式定义 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Formal syntax | 形式语法 | | https://zh.wikipedia.org/zh-cn/形式文法 |
| Objective | 目标 | 在学习区表格中使用 | |
| Parameters | 参数 | | |
| Prerequisites | 前提 | 在学习区表格中使用 | |
| See also | 参见 | | |
| Specifications | 规范 | | |
| Technical summary | 技术概要 | | https://github.com/mdn/translated-content/issues/11456 |
| Test your skills | 技能测试 | | |
| Usage context | 使用上下文 | | https://github.com/mdn/translated-content/pull/23257#issuecomment-2309852450 |
| Usage notes | 使用说明 | | https://github.com/mdn/translated-content/pull/12600#discussion_r1161045585 |

## 通用术语

Expand Down
Loading

0 comments on commit dbd85b5

Please sign in to comment.