diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index 66c06473dc..4d60d0feb6 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -15,6 +15,7 @@ module.exports = [ 'actions/setup-node@v1', 'actions/setup-ruby@v1', 'actions/stale@v3', + 'crowdin/github-action@1.0.10', 'dawidd6/action-delete-branch@v3', 'docker://chinthakagodawita/autoupdate-action:v1', 'github/codeql-action/analyze@v1', diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml new file mode 100644 index 0000000000..48100cbbe1 --- /dev/null +++ b/.github/workflows/crowdin.yml @@ -0,0 +1,50 @@ +# Please ping @github/docs-localization in the PR whenever you update this file! + +name: Crowdin Sync + +on: + push: + branches: + - main + +jobs: + sync_with_crowdin: + name: Sync with Crowdin + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Sync + uses: crowdin/github-action@1.0.10 + with: + upload_translations: true + download_translations: true + create_pull_request: true + + # Using a custom config temporarily to avoid clobbering the existing crowdin.yml + # that is used by the github-help-docs OAuth integration. + config: 'crowdin-actions-config.yml' + + # This is the name of the git branch that Crowdin will create when opening a pull request. + # This branch does NOT need to be manually created. It will be created automatically by the action. + localization_branch_name: automated-crowdin-translations + + # This is the name of the top-level directory that Crowdin will use for files. + # Note that this is not a "branch" in the git sense, but more like a top-level directory in your Crowdin project. + # This branch does NOT need to be manually created. It will be created automatically by the action. + crowdin_branch_name: crowdin-main + + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # This is a numeric id, not to be confused with Crowdin API v1 "project identifier" string + # See "API v2" on https://crowdin.com/project//settings#api + CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} + + # A personal access token, not to be confused with Crowdin API v1 "API key" + # See https://crowdin.com/settings#api-key to generate a token + # This token was created by logging into Crowdin with the octoglot user + CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} + + \ No newline at end of file diff --git a/assets/images/help/codespaces/choose-branch-vscode.png b/assets/images/help/codespaces/choose-branch-vscode.png new file mode 100644 index 0000000000..b430d0e933 Binary files /dev/null and b/assets/images/help/codespaces/choose-branch-vscode.png differ diff --git a/assets/images/help/codespaces/choose-repository-vscode.png b/assets/images/help/codespaces/choose-repository-vscode.png new file mode 100644 index 0000000000..5c530046fa Binary files /dev/null and b/assets/images/help/codespaces/choose-repository-vscode.png differ diff --git a/assets/images/help/codespaces/create-codespace-vscode.png b/assets/images/help/codespaces/create-codespace-vscode.png new file mode 100644 index 0000000000..2a27566d5e Binary files /dev/null and b/assets/images/help/codespaces/create-codespace-vscode.png differ diff --git a/assets/images/help/codespaces/delete-codespace-vscode.png b/assets/images/help/codespaces/delete-codespace-vscode.png new file mode 100644 index 0000000000..ac288111c4 Binary files /dev/null and b/assets/images/help/codespaces/delete-codespace-vscode.png differ diff --git a/content/admin/configuration/network-ports.md b/content/admin/configuration/network-ports.md index 461826edce..d8eafa1d6f 100644 --- a/content/admin/configuration/network-ports.md +++ b/content/admin/configuration/network-ports.md @@ -34,7 +34,7 @@ Application ports provide web application and Git access for end users. | 443 | HTTPS | Access to the web application and Git over HTTPS. | | 80 | HTTP | Access to the web application. All requests are redirected to the HTTPS port when SSL is enabled. | | 22 | SSH | Access to Git over SSH. Supports clone, fetch, and push operations to public and private repositories. | -| 9418 | Git | Git protocol port supports clone and fetch operations to public repositories with unencrypted network communication. | +| 9418 | Git | Git protocol port supports clone and fetch operations to public repositories with unencrypted network communication. {% data reusables.enterprise_installation.when-9418-necessary %} | {% data reusables.enterprise_installation.terminating-tls %} diff --git a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md index 43c178dfd9..93dc802d2b 100644 --- a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md +++ b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md @@ -10,7 +10,7 @@ versions: {% data reusables.codespaces.release-stage %} -### Connecting the {% data variables.product.prodname_vs_codespaces %} extension to your {% data variables.product.prodname_dotcom %} account +### Prerequisites Before you can develop in a codespace directly in {% data variables.product.prodname_vscode %}, you must configure the {% data variables.product.prodname_vs_codespaces %} extension to connect to your {% data variables.product.product_name %} account. @@ -29,11 +29,27 @@ Before you can develop in a codespace directly in {% data variables.product.prod 8. To authorize {% data variables.product.prodname_vscode %} to access your account on {% data variables.product.product_name %}, click **Allow**. 9. Sign in to {% data variables.product.product_name %} to approve the extension. -### Opening a codespace in {% data variables.product.prodname_vscode %} +### Creating a codespace in {% data variables.product.prodname_vscode %} -After you've connected your {% data variables.product.product_name %} account to the {% data variables.product.prodname_vs_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} directly in {% data variables.product.prodname_vscode %}. +After you connect your {% data variables.product.product_name %} account to the {% data variables.product.prodname_vs_codespaces %} extension, you can develop in a codespace that you created on {% data variables.product.product_name %} or in {% data variables.product.prodname_vscode %}. + +{% data reusables.codespaces.click-remote-explorer-icon-vscode %} +2. Click the Add icon, then click **Create New Codespace**. +![The Create new Codespace option in {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/create-codespace-vscode.png) +3. Type, then click the repository's name you want to develop in. +![Searching for repository to create a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-repository-vscode.png) +4. Click the branch you want to develop in. +![Searching for a branch to create a new {% data variables.product.prodname_codespaces %}](/assets/images/help/codespaces/choose-branch-vscode.png) + +### Opening a codespace in {% data variables.product.prodname_vscode %} {% data reusables.codespaces.click-remote-explorer-icon-vscode %} 2. Under Codespaces, click the codespace you want to develop in. 3. Click the Connect to Codespace icon. ![The Connect to Codespace icon in {% data variables.product.prodname_vscode %}](/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png) + +### Deleting a codespace in {% data variables.product.prodname_vscode %} + +1. Under Codespaces, right-click the codespace you want to delete. +2. In the drop-down menu, click **Delete Codespace**. +![Deleting a codespace in {% data variables.product.prodname_dotcom %}](/assets/images/help/codespaces/delete-codespace-vscode.png) diff --git a/crowdin-actions-config.yml b/crowdin-actions-config.yml new file mode 100644 index 0000000000..ef80b4ec26 --- /dev/null +++ b/crowdin-actions-config.yml @@ -0,0 +1,25 @@ +files: + - source: /content/**/*.md + translation: /translations/%locale%/%original_path%/%original_file_name% + ignore: [ + "/content/README.md" + ] + - source: /data/**/*.yml + translation: /translations/%locale%/%original_path%/%original_file_name% + - source: /data/**/*.md + translation: /translations/%locale%/%original_path%/%original_file_name% + ignore: [ + "data/README.md", + "data/reusables/README.md", + "data/variables/product.yml", + "data/variables/README.md", + "data/graphql", + "data/products.yml" + ] + +# These end up as env vars used by the GitHub Actions workflow +project_id_env: CROWDIN_PROJECT_ID +api_token_env: CROWDIN_PERSONAL_TOKEN + +# https://support.crowdin.com/configuration-file-v3/#saving-directory-structure-on-server +preserve_hierarchy: true \ No newline at end of file diff --git a/data/reusables/codespaces/use-visual-studio-features.md b/data/reusables/codespaces/use-visual-studio-features.md index 131cd4021a..a5b1cf9151 100644 --- a/data/reusables/codespaces/use-visual-studio-features.md +++ b/data/reusables/codespaces/use-visual-studio-features.md @@ -1 +1 @@ -After you open a codespace, you can develop using {% data variables.product.prodname_vscode %}'s features, such as text editing, debugging, and Git commands. For more information, see the [{% data variables.product.prodname_vscode %} documentation](https://code.visualstudio.com/docs). +You can edit code, debug, and use Git commands while developing in a codespace with {% data variables.product.prodname_vscode %}. For more information, see the [{% data variables.product.prodname_vscode %} documentation](https://code.visualstudio.com/docs). diff --git a/data/reusables/enterprise_installation/necessary_ports.md b/data/reusables/enterprise_installation/necessary_ports.md index 787f59ea35..041209e5b4 100644 --- a/data/reusables/enterprise_installation/necessary_ports.md +++ b/data/reusables/enterprise_installation/necessary_ports.md @@ -9,4 +9,4 @@ | 1194/UDP | VPN | Secure replication network tunnel in high availability configuration. | | 8080 | HTTP | Plain-text web based {% data variables.enterprise.management_console %}. *Not required unless SSL is disabled manually.* | | 8443 | HTTPS | Secure web based {% data variables.enterprise.management_console %}. *Required for basic installation and configuration.* | -| 9418 | Git | Simple Git protocol port. Clone and fetch operations to public repositories only. *Unencrypted network communication.* | +| 9418 | Git | Simple Git protocol port. Clone and fetch operations to public repositories only. *Unencrypted network communication.* {% data reusables.enterprise_installation.when-9418-necessary %} | diff --git a/data/reusables/enterprise_installation/when-9418-necessary.md b/data/reusables/enterprise_installation/when-9418-necessary.md new file mode 100644 index 0000000000..7eed264bd2 --- /dev/null +++ b/data/reusables/enterprise_installation/when-9418-necessary.md @@ -0,0 +1 @@ +If you have enabled private mode on your instance, then opening this port is only required if you also enabled anonymous Git read access. For more information, see "[Enforcing repository management policies in your enterprise](/admin/policies/enforcing-repository-management-policies-in-your-enterprise#configuring-anonymous-git-read-access)." \ No newline at end of file