From 09e271497b4c18e988d8f104c3398acb6f1e48f2 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Tue, 6 Feb 2024 23:45:48 +0500 Subject: [PATCH 1/2] Improve English locale --- options/locale/locale_en-US.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9cd2d11230..59c7974259 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -447,7 +447,7 @@ activate_email.text = Please click the following link to verify your email addre admin.new_user.subject = New user %s just signed up admin.new_user.user_info = User Information -admin.new_user.text = Please click here to manage the user from the admin panel. +admin.new_user.text = Please click here to manage this user from the admin panel. register_notify = Welcome to Forgejo register_notify.title = %[1]s, welcome to %[2]s @@ -624,7 +624,7 @@ settings = User Settings form.name_reserved = The username "%s" is reserved. form.name_pattern_not_allowed = The pattern "%s" is not allowed in a username. -form.name_chars_not_allowed = User name "%s" contains invalid characters. +form.name_chars_not_allowed = Username "%s" contains invalid characters. [settings] profile = Profile @@ -648,7 +648,7 @@ webauthn = Two-Factor Authentication (Security Keys) public_profile = Public Profile biography_placeholder = Tell us a little bit about yourself! (You can use Markdown) location_placeholder = Share your approximate location with others -profile_desc = Control how your profile is show to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations. +profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations. password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details. full_name = Full Name website = Website @@ -973,7 +973,7 @@ all_branches = All branches fork_no_valid_owners = This repository can not be forked because there are no valid owners. use_template = Use this template clone_in_vsc = Clone in VS Code -clone_in_vscodium = Clone in VS Codium +clone_in_vscodium = Clone in VSCodium download_zip = Download ZIP download_tar = Download TAR.GZ download_bundle = Download BUNDLE @@ -1012,7 +1012,7 @@ mirror_sync = synced mirror_sync_on_commit = Sync when commits are pushed mirror_address = Clone From URL mirror_address_desc = Put any required credentials in the Authorization section. -mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the url correctly. +mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the URL correctly. mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring. mirror_lfs = Large File Storage (LFS) mirror_lfs_desc = Activate mirroring of LFS data. @@ -1772,7 +1772,7 @@ pulls.required_status_check_missing = Some required checks are missing. pulls.required_status_check_administrator = As an administrator, you may still merge this pull request. pulls.blocked_by_approvals = "This pull request doesn't have enough approvals yet. %d of %d approvals granted." pulls.blocked_by_rejection = "This pull request has changes requested by an official reviewer." -pulls.blocked_by_official_review_requests = "This pull request has official review requests." +pulls.blocked_by_official_review_requests = "This pull request is blocked because it is missing approval from one or more official reviewers." pulls.blocked_by_outdated_branch = "This pull request is blocked because it's outdated." pulls.blocked_by_changed_protected_files_1= "This pull request is blocked because it changes a protected file:" pulls.blocked_by_changed_protected_files_n= "This pull request is blocked because it changes protected files:" From 859020409e668799ef160f5848271f288ccaf0e8 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 7 Feb 2024 12:19:56 +0100 Subject: [PATCH 2/2] [CI] pin go 1.21 --- .forgejo/workflows/build-release.yml | 2 +- .forgejo/workflows/cascade-setup-end-to-end.yml | 2 +- .forgejo/workflows/publish-release.yml | 2 +- .forgejo/workflows/testing.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index e02bf15901..ebd99ea62f 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -40,7 +40,7 @@ jobs: - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" check-latest: true - name: version from ref_name diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml index be07d87767..cb180ad595 100644 --- a/.forgejo/workflows/cascade-setup-end-to-end.yml +++ b/.forgejo/workflows/cascade-setup-end-to-end.yml @@ -46,7 +46,7 @@ jobs: su forgejo -c 'set -ex ; for b in ${{ env.FEATURE_BRANCHES }} ; do git merge -m $b origin/forgejo-$b ; done' - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" - name: make deps-backend run: | su forgejo -c 'make deps-backend' diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index 536ac23837..1afa941952 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -61,7 +61,7 @@ jobs: if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" check-latest: true - name: update the _release.experimental DNS record if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index de1298eff8..dd0b280dc4 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -17,7 +17,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" check-latest: true - run: make deps-backend deps-tools - run: make lint-backend @@ -32,7 +32,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" check-latest: true - run: make deps-backend deps-tools - run: make --always-make checks-backend # ensure the "go-licenses" make target runs @@ -52,7 +52,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: ">=1.21" + go-version: "1.21" - run: | git config --add safe.directory '*' adduser --quiet --comment forgejo --disabled-password forgejo