You've already forked library-registry
mirror of
https://github.com/arduino/library-registry.git
synced 2025-07-28 02:41:51 +03:00
Configure documentation links to allow localization
github.com and wikipedia.org have different localization behaviors depending on the URL. If a language code is specified via the URL, then that language version of the page is loaded, regardless of the language setting of the user's browser or GitHub. For example, this URL will take the user to the English version of the page even if their browser is configured for Chinese: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github If no language code is specified via the URL, then it redirects to the version of the page localized for the user's language preference, where available. For example, if the user has selected "Chinese" as their preferred language in their browser settings, then this URL: https://docs.github.com/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github redirects to: https://docs.github.com/cn/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github
This commit is contained in:
8
.github/workflows/manage-prs.yml
vendored
8
.github/workflows/manage-prs.yml
vendored
@ -13,7 +13,7 @@ on:
|
||||
# comment and merge.
|
||||
# Note that this means the version of the workflow from the PR base ref will be used as opposed to the head ref, as is
|
||||
# the case with pull_request triggered workflows.
|
||||
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request_target
|
||||
# See: https://docs.github.com/actions/reference/events-that-trigger-workflows#pull_request_target
|
||||
pull_request_target:
|
||||
types:
|
||||
- opened
|
||||
@ -61,7 +61,7 @@ jobs:
|
||||
head: ${{ steps.head.outputs.head }}
|
||||
|
||||
env:
|
||||
# See: https://docs.github.com/en/rest/reference/pulls#custom-media-types-for-pull-requests
|
||||
# See: https://docs.github.com/rest/reference/pulls#custom-media-types-for-pull-requests
|
||||
DIFF_IDENTIFIER: diff
|
||||
JSON_IDENTIFIER: raw+json
|
||||
|
||||
@ -535,7 +535,7 @@ jobs:
|
||||
${{ env.ERROR_MESSAGE_PREFIX }}Your submission meets all requirements. However, the pull request could not be merged.
|
||||
|
||||
Please follow this guide to sync your fork:
|
||||
https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
|
||||
https://docs.github.com/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
|
||||
|
||||
Once that is done, it will be merged automatically.
|
||||
|
||||
@ -554,7 +554,7 @@ jobs:
|
||||
${{ env.ERROR_MESSAGE_PREFIX }}Your submission meets all requirements. However, the pull request could not be merged.
|
||||
|
||||
Please follow this guide to resolve a merge conflict:
|
||||
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github
|
||||
https://docs.github.com/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github
|
||||
|
||||
Once that is done, it will be merged automatically.
|
||||
|
||||
|
Reference in New Issue
Block a user