Merge pull request 'rc(v05.06.00): security backports, actions deadlock fix, dep bumps' (#228) from rc/05.06.00 into main

rc(v05.06.00): security backports, actions deadlock fix, dep bumps (#228)

.mokogitea/workflows/auto-bump.yml

@@ -8,7 +8,7 @@
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.mokogitea/workflows/auto-bump.yml
 # VERSION: 09.02.00
-# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
+# BRIEF: Auto patch-bump version on every push to dev
 
 name: "Universal: Auto Version Bump"
 
@@ -16,9 +16,9 @@ on:
   push:
     branches:
       - dev
+      - main
 
 env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
   GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
 
 permissions:
@@ -26,12 +26,11 @@ permissions:
 
 jobs:
   bump:
-    name: Version Bump
+    name: Patch Bump
     runs-on: release
     if: >-
       !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip bump]') &&
+      !contains(github.event.head_commit.message, '[skip bump]')
-      !startsWith(github.event.head_commit.message, 'Merge pull request')
 
     steps:
       - name: Checkout
@@ -57,7 +56,18 @@ jobs:
 
       - name: Bump version
         run: |
-          BUMP=$(php ${MOKO_CLI}/version_bump.php --path . 2>&1) || true
+          BRANCH="${{ github.ref_name }}"
+
+          # main = minor bump, dev = patch bump
+          if [ "$BRANCH" = "main" ]; then
+            BUMP_TYPE="--minor"
+            BUMP_LABEL="minor"
+          else
+            BUMP_TYPE=""
+            BUMP_LABEL="patch"
+          fi
+
+          BUMP=$(php ${MOKO_CLI}/version_bump.php --path . $BUMP_TYPE 2>&1) || true
           echo "$BUMP"
 
           VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null) || true
@@ -65,7 +75,7 @@ jobs:
 
           # Propagate to platform manifests
           php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$VERSION" --branch dev 2>/dev/null || true
+            --path . --version "$VERSION" --branch "$BRANCH" 2>/dev/null || true
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
           # Commit if anything changed
@@ -78,7 +88,7 @@ jobs:
           git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://jmiller:${{ secrets.GA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
           git add -A
-          git commit -m "chore(version): patch bump to ${VERSION} [skip ci]" \
+          git commit -m "chore(version): ${BUMP_LABEL} bump to ${VERSION} [skip ci]" \
             --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
-          git push origin dev
+          git push origin "$BRANCH"
-          echo "Bumped to ${VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "Bumped to ${VERSION} (${BUMP_LABEL})" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/auto-release.yml

@@ -87,7 +87,7 @@ jobs:
             --from auto --to release-candidate \
             --token "${{ secrets.GA_TOKEN }}" \
             --api-base "${API_BASE}" \
-            --branch "${{ github.event.pull_request.head.ref || 'dev' }}"
+            --branch "${{ github.event.pull_request.head.ref }}"
 
       - name: Cascade lesser channels
         continue-on-error: true
@@ -180,17 +180,7 @@ jobs:
             echo "::notice::No RC release — full build pipeline"
           fi
 
-      - name: "Step 1b: Minor bump version"
+      # Version bump handled by auto-bump.yml (minor on main, patch on dev)
-        id: bump
-        if: >-
-          steps.version.outputs.skip != 'true' &&
-          steps.rc.outputs.promote != 'true'
-        run: |
-          MOKO_API="/tmp/moko-platform-api/cli"
-          php ${MOKO_API}/version_bump.php --path . --minor 2>&1 || true
-          VERSION=$(php ${MOKO_API}/version_read.php --path .)
-          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "Bumped to: ${VERSION}"
 
       - name: Check if already released
         if: steps.version.outputs.skip != 'true'
@@ -217,7 +207,7 @@ jobs:
           steps.version.outputs.skip != 'true' &&
           steps.check.outputs.already_released != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           php /tmp/moko-platform-api/cli/release_validate.php \
             --path . --version "$VERSION" --output-summary --github-output || true
 
@@ -228,7 +218,7 @@ jobs:
         run: |
           BRANCH="${{ steps.version.outputs.branch }}"
           IS_MINOR="${{ steps.version.outputs.is_minor }}"
-          PATCH="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          PATCH="${{ steps.version.outputs.version }}"
           PATCH_NUM=$(echo "$PATCH" | awk -F. '{print $3}')
 
           # Check if branch exists
@@ -247,7 +237,7 @@ jobs:
           steps.version.outputs.skip != 'true' &&
           steps.check.outputs.already_released != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           php /tmp/moko-platform-api/cli/version_set_platform.php \
             --path . --version "$VERSION" --branch main
 
@@ -255,7 +245,7 @@ jobs:
       - name: "Step 4: Update version badges"
         if: steps.version.outputs.skip != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           php /tmp/moko-platform-api/cli/badge_update.php --path . --version "${VERSION}" 2>/dev/null || true
           php /tmp/moko-platform-api/cli/version_check.php --path . --fix 2>/dev/null || true
 
@@ -270,7 +260,7 @@ jobs:
             echo "No changes to commit"
             exit 0
           fi
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
           git config --local user.name "gitea-actions[bot]"
           # Set push URL with token for branch-protected repos
@@ -302,7 +292,7 @@ jobs:
           steps.version.outputs.skip != 'true' &&
           steps.rc.outputs.promote == 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php /tmp/moko-platform-api/cli/release_promote.php \
             --from release-candidate --to stable \
@@ -317,7 +307,7 @@ jobs:
           steps.version.outputs.skip != 'true' &&
           steps.rc.outputs.promote != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php /tmp/moko-platform-api/cli/release_create.php \
@@ -333,7 +323,7 @@ jobs:
           steps.version.outputs.skip != 'true' &&
           steps.rc.outputs.promote != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php /tmp/moko-platform-api/cli/release_package.php \
@@ -345,7 +335,7 @@ jobs:
       - name: "Step 5: Write update stream"
         if: steps.version.outputs.skip != 'true'
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           SHA256="${{ steps.package.outputs.sha256_zip }}"
 
           # Fetch latest updates.xml from main so preserve logic has all channels
@@ -378,15 +368,29 @@ jobs:
       # -- STEP 8b: Update release description with changelog ----------------------
       - name: "Step 8b: Update release body"
         if: steps.version.outputs.skip != 'true'
-        continue-on-error: true
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
-          php /tmp/moko-platform-api/cli/release_body_update.php \
+          MOKO_CLI="/tmp/moko-platform-api/cli"
+
+          php ${MOKO_CLI}/release_body_update.php \
             --path . --version "${VERSION}" --tag "${RELEASE_TAG}" \
             --token "${{ secrets.GA_TOKEN }}" \
             --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            2>&1 || true
+            2>/dev/null || {
+            # Fallback: simple body update if CLI not available
+            API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+            RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
+              "${API_BASE}/releases/tags/${RELEASE_TAG}" 2>/dev/null | \
+              python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+            if [ -n "$RELEASE_ID" ] && [ "$RELEASE_ID" != "None" ]; then
+              BODY="## ${VERSION} ($(date +%Y-%m-%d))\n\nChecksum files attached as \`*.sha256\` assets."
+              curl -sf -X PATCH -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
+                -H "Content-Type: application/json" \
+                "${API_BASE}/releases/${RELEASE_ID}" \
+                -d "{\"body\":\"${BODY}\"}" > /dev/null 2>&1
+            fi
+          }
           echo "Release body updated" >> $GITHUB_STEP_SUMMARY
 
       # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
@@ -396,7 +400,7 @@ jobs:
           secrets.GH_TOKEN != ''
         continue-on-error: true
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
@@ -423,16 +427,13 @@ jobs:
           git push github origin/main:refs/heads/main --force 2>/dev/null \
             && echo "main branch pushed to GitHub mirror" \
             || echo "WARNING: GitHub mirror push failed"
-          git push github origin/main:refs/heads/version --force 2>/dev/null \
-            && echo "version branch pushed to GitHub mirror" \
-            || echo "WARNING: GitHub mirror version push failed"
 
       # -- Clean up lesser pre-releases (cascade) ---------------------------------
       # stable → deletes all | rc → beta,alpha,dev | beta → alpha,dev | alpha → dev
       - name: "Delete lesser pre-release channels"
         continue-on-error: true
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php /tmp/moko-platform-api/cli/release_cascade.php \
             --stability stable \
@@ -459,26 +460,6 @@ jobs:
 
           echo "Dev branch reset from main (keeps dev ahead after release)" >> $GITHUB_STEP_SUMMARY
 
-      - name: "Step 12: Update version branch from main"
-        if: steps.version.outputs.skip != 'true'
-        continue-on-error: true
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          TOKEN="${{ secrets.GA_TOKEN }}"
-          MAIN_SHA=$(git rev-parse HEAD)
-
-          # Try delete + recreate (handles protected branch edge cases)
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
-            "${API_BASE}/branches/version" 2>/dev/null && echo "Deleted old version branch"
-
-          curl -sf -X POST -H "Authorization: token ${TOKEN}" \
-            -H "Content-Type: application/json" \
-            "${API_BASE}/branches" \
-            -d '{"new_branch_name":"version","old_branch_name":"main"}' 2>/dev/null \
-            && echo "Created version branch from main (${MAIN_SHA})" \
-            || echo "WARNING: version branch update failed"
-
-          echo "Version branch updated to main (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY
 
       # -- Dolibarr post-release: Reset dev version -----------------------------
       - name: "Post-release: Reset dev version"
@@ -494,7 +475,7 @@ jobs:
       - name: Pipeline Summary
         if: always()
         run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          VERSION="${{ steps.version.outputs.version }}"
           PLATFORM="${{ steps.platform.outputs.platform }}"
           if [ "${{ steps.version.outputs.skip }}" = "true" ]; then
             echo "## Release Skipped" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/pre-release.yml

@@ -52,19 +52,28 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GA_TOKEN }}
 
-      - name: Setup moko-platform tools
+      - name: Setup tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+          # Update moko-platform CLI tools if available; install PHP if missing
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          if command -v moko-platform-update &> /dev/null; then
+            moko-platform-update
+          elif [ -d "/opt/moko-platform" ]; then
+            cd /opt/moko-platform && git pull origin main --quiet 2>/dev/null || true
+          else
+            if ! command -v php &> /dev/null; then
+              sudo apt-get update -qq
+              sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl >/dev/null 2>&1
+            fi
+            git clone --depth 1 --branch main --quiet \
+              "https://x-access-token:${{ secrets.GA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
+              /tmp/moko-platform-api
+          fi
+          # Set MOKO_CLI to whichever path exists
+          if [ -d "/opt/moko-platform/cli" ]; then
+            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
+          else
+            echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
           fi
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
 
       - name: Detect platform
         id: platform
@@ -120,50 +129,131 @@ jobs:
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
           echo "ext_element=${EXT_ELEMENT}" >> "$GITHUB_OUTPUT"
+          echo "manifest=${MANIFEST}" >> "$GITHUB_OUTPUT"
 
           echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION}${SUFFIX} ==="
 
-      - name: Create release
+      - name: Build package
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          if [ ! -d "$SOURCE_DIR" ]; then
+            echo "::error::No src/ or htdocs/ directory"
+            exit 1
+          fi
+
+          MANIFEST="${{ steps.meta.outputs.manifest }}"
+          EXT_TYPE=""
+          if [ -n "$MANIFEST" ]; then
+            EXT_TYPE=$(sed -n 's/.*<extension[^>]*type="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1)
+          fi
+
+          EXCLUDES="sftp-config* .ftpignore *.ppk *.pem *.key .env* *.local .build-trigger"
+
+          mkdir -p build/package
+
+          if [ "$EXT_TYPE" = "package" ] && [ -d "${SOURCE_DIR}/packages" ]; then
+            echo "=== Building Joomla PACKAGE (multi-extension) ==="
+            for ext_dir in "${SOURCE_DIR}"/packages/*/; do
+              [ ! -d "$ext_dir" ] && continue
+              EXT_NAME=$(basename "$ext_dir")
+              echo "  Packaging sub-extension: ${EXT_NAME}"
+              cd "$ext_dir"
+              zip -r "../../build/package/${EXT_NAME}.zip" . -x $EXCLUDES
+              cd "$OLDPWD"
+            done
+            for f in "${SOURCE_DIR}"/*.xml "${SOURCE_DIR}"/*.php; do
+              [ -f "$f" ] && cp "$f" build/package/
+            done
+          else
+            echo "=== Building standard extension ==="
+            rsync -a \
+              --exclude='sftp-config*' \
+              --exclude='.ftpignore' \
+              --exclude='*.ppk' \
+              --exclude='*.pem' \
+              --exclude='*.key' \
+              --exclude='.env*' \
+              --exclude='*.local' \
+              --exclude='.build-trigger' \
+              "${SOURCE_DIR}/" build/package/
+          fi
+
+      - name: Create ZIP
+        id: zip
+        run: |
+          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
+          cd build/package
+          zip -r "../${ZIP_NAME}" .
+          cd ..
+
+          SHA256=$(sha256sum "${ZIP_NAME}" | cut -d' ' -f1)
+          echo "sha256=${SHA256}" >> "$GITHUB_OUTPUT"
+          echo "ZIP: ${ZIP_NAME} (SHA: ${SHA256:0:16}...)"
+
+      - name: Create or replace Gitea release
         id: release
         run: |
           TAG="${{ steps.meta.outputs.tag }}"
           VERSION="${{ steps.meta.outputs.version }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          STABILITY="${{ steps.meta.outputs.stability }}"
-          php ${MOKO_CLI}/release_create.php \
+          SHA256="${{ steps.zip.outputs.sha256 }}"
-            --path . --version "$VERSION" --tag "$TAG" \
+          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
-            --token "${{ secrets.GA_TOKEN }}" --api-base "$API_BASE" \
+          EXT_ELEMENT="${{ steps.meta.outputs.ext_element }}"
-            --repo "${GITEA_REPO}" --branch dev --prerelease
+          TOKEN="${{ secrets.GA_TOKEN }}"
+          API="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          BRANCH=$(git branch --show-current)
 
-      - name: Build package and upload
+          BODY="## ${VERSION} ($(date +%Y-%m-%d))
-        id: package
+          **Channel:** ${STABILITY}
-        run: |
+          **SHA-256:** \`${SHA256}\`"
-          VERSION="${{ steps.meta.outputs.version }}"
+
-          TAG="${{ steps.meta.outputs.tag }}"
+          # Delete existing release
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          EXISTING_ID=$(curl -sS -H "Authorization: token ${TOKEN}" \
-          php ${MOKO_CLI}/release_package.php \
+            "${API}/releases/tags/${TAG}" | jq -r '.id // empty' 2>/dev/null)
-            --path . --version "$VERSION" --tag "$TAG" \
+          if [ -n "$EXISTING_ID" ]; then
-            --token "${{ secrets.GA_TOKEN }}" --api-base "$API_BASE" \
+            curl -sS -X DELETE -H "Authorization: token ${TOKEN}" \
-            --repo "${GITEA_REPO}" --output /tmp || true
+              "${API}/releases/${EXISTING_ID}" 2>/dev/null || true
+            curl -sS -X DELETE -H "Authorization: token ${TOKEN}" \
+              "${API}/tags/${TAG}" 2>/dev/null || true
+          fi
+
+          # Create release
+          RELEASE_ID=$(curl -sS -X POST -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${API}/releases" \
+            -d "$(jq -n \
+              --arg tag "$TAG" \
+              --arg target "$BRANCH" \
+              --arg name "${EXT_ELEMENT} ${VERSION} (${STABILITY})" \
+              --arg body "$BODY" \
+              '{tag_name: $tag, target_commitish: $target, name: $name, body: $body, prerelease: true}'
+            )" | jq -r '.id')
+
+          echo "release_id=${RELEASE_ID}" >> "$GITHUB_OUTPUT"
+
+          # Upload ZIP
+          curl -sS -X POST -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/octet-stream" \
+            "${API}/releases/${RELEASE_ID}/assets?name=${ZIP_NAME}" \
+            --data-binary "@build/${ZIP_NAME}"
+
+          echo "Released: ${EXT_ELEMENT} ${VERSION} (${STABILITY})"
 
       - name: Update updates.xml
         if: steps.platform.outputs.platform == 'joomla'
         run: |
           VERSION="${{ steps.meta.outputs.version }}"
           STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
 
           if [ ! -f "updates.xml" ]; then
             echo "No updates.xml -- skipping"
             exit 0
           fi
 
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
           php ${MOKO_CLI}/updates_xml_build.php \
             --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
+            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}"
-            ${SHA_FLAG}
 
           # Commit and push
           if ! git diff --quiet updates.xml 2>/dev/null; then
@@ -212,7 +302,7 @@ jobs:
           VERSION="${{ steps.meta.outputs.version }}"
           STABILITY="${{ steps.meta.outputs.stability }}"
           ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
+          SHA256="${{ steps.zip.outputs.sha256 }}"
           echo "## Pre-Release Complete" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY

build/generate-openapi.go

@@ -34,19 +34,16 @@ const (
 	swaggerSpecPath = "templates/swagger/v1_json.tmpl"
 	openapi3OutPath = "templates/swagger/v1_openapi3_json.tmpl"
 
-	appSubUrlVar  = "{{.SwaggerAppSubUrl}}"
+	appSubUrlVar = "{{.SwaggerAppSubUrl}}"
-	appVerVar     = "{{.SwaggerAppVer}}"
+	appVerVar    = "{{.SwaggerAppVer}}"
-	appNameVar    = "{{.SwaggerAppName}}"
 
-	appSubUrlPlaceholder  = "GITEA_APP_SUB_URL_PLACEHOLDER"
+	appSubUrlPlaceholder = "GITEA_APP_SUB_URL_PLACEHOLDER"
-	appVerPlaceholder     = "0.0.0-gitea-placeholder"
+	appVerPlaceholder    = "0.0.0-gitea-placeholder"
-	appNamePlaceholder    = "GiteaAppNamePlaceholder"
 )
 
 var (
 	appSubUrlRe = regexp.MustCompile(regexp.QuoteMeta(appSubUrlVar))
 	appVerRe    = regexp.MustCompile(regexp.QuoteMeta(appVerVar))
-	appNameRe   = regexp.MustCompile(regexp.QuoteMeta(appNameVar))
 
 	enumScanDirs = []string{
 		"modules/structs",
@@ -73,7 +70,6 @@ func main() {
 
 	cleaned := appSubUrlRe.ReplaceAll(data, []byte(appSubUrlPlaceholder))
 	cleaned = appVerRe.ReplaceAll(cleaned, []byte(appVerPlaceholder))
-	cleaned = appNameRe.ReplaceAll(cleaned, []byte(appNamePlaceholder))
 
 	oas3, err := openapi3gen.Convert(cleaned, astEnumMap)
 	if err != nil {
@@ -91,7 +87,6 @@ func main() {
 
 	result := strings.ReplaceAll(string(out), appSubUrlPlaceholder, appSubUrlVar)
 	result = strings.ReplaceAll(result, appVerPlaceholder, appVerVar)
-	result = strings.ReplaceAll(result, appNamePlaceholder, appNameVar)
 	result = strings.TrimSpace(result)
 
 	if err := os.WriteFile(openapi3OutPath, []byte(result), 0o644); err != nil {

modules/translation/i18n/i18n_test.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/setting"
-
 	"github.com/stretchr/testify/assert"
 )
 
@@ -68,21 +66,6 @@ func TestLocaleStore(t *testing.T) {
 	assert.Equal(t, "<no-such>", string(res))
 }
 
-func TestLocaleAppNameSubstitution(t *testing.T) {
-	setting.AppName = "TestApp"
-
-	ls := NewLocaleStore()
-	assert.NoError(t, ls.AddLocaleByJSON("lang1", "Lang1", []byte(`{"greeting":"Welcome to ${APP_NAME}","plain":"No placeholder here"}`), nil))
-	lang1, _ := ls.Locale("lang1")
-
-	assert.Equal(t, "Welcome to TestApp", lang1.TrString("greeting"))
-	assert.Equal(t, "No placeholder here", lang1.TrString("plain"))
-
-	// Verify it responds to runtime AppName changes
-	setting.AppName = "ChangedApp"
-	assert.Equal(t, "Welcome to ChangedApp", lang1.TrString("greeting"))
-}
-
 func TestLocaleStoreMoreSource(t *testing.T) {
 	testData1 := []byte(`
 {

modules/translation/i18n/localestore.go

@@ -9,11 +9,9 @@ import (
 	"html"
 	"html/template"
 	"slices"
-	"strings"
 
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/json"
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/log"
-	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/setting"
 )
 
 // This file implements the static LocaleStore that will not watch for changes
@@ -144,9 +142,6 @@ func (l *locale) TrString(trKey string, trArgs ...any) string {
 	if format == "" { // still missing, use the key itself
 		format = html.EscapeString(trKey)
 	}
-	if strings.Contains(format, "${APP_NAME}") {
-		format = strings.ReplaceAll(format, "${APP_NAME}", setting.AppName)
-	}
 	msg, err := Format(format, trArgs...)
 	if err != nil {
 		log.Error("Error whilst formatting %q in %s: %v", trKey, l.langName, err)

options/locale/locale_en-US.json

@@ -25,7 +25,7 @@
   "enable_javascript": "This website requires JavaScript.",
   "toc": "Table of Contents",
   "licenses": "Licenses",
-  "return_to_gitea": "Return to ${APP_NAME}",
+  "return_to_gitea": "Return to MokoGitea",
   "more_items": "More items",
   "username": "Username",
   "email": "Email Address",
@@ -222,7 +222,7 @@
   "filter.string.asc": "A–Z",
   "filter.string.desc": "Z–A",
   "error.occurred": "An error occurred",
-  "error.report_message": "If you believe that this is a ${APP_NAME} bug, please search for issues on <a href=\"%s\" target=\"_blank\">GitHub</a> or open a new issue if necessary.",
+  "error.report_message": "If you believe that this is a MokoGitea bug, please search for issues on <a href=\"%s\" target=\"_blank\">GitHub</a> or open a new issue if necessary.",
   "error.not_found": "The target couldn't be found.",
   "error.permission_denied": "Permission denied.",
   "error.network_error": "Network error",
@@ -230,16 +230,16 @@
   "startpage.install": "Easy to install",
   "startpage.install_desc": "Simply <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%[1]s\">run the binary</a> for your platform, ship it with <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%[2]s\">Docker</a>, or get it <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%[3]s\">packaged</a>.",
   "startpage.platform": "Cross-platform",
-  "startpage.platform_desc": "${APP_NAME} runs anywhere <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">Go</a> can compile for: Windows, macOS, Linux, ARM, etc. Choose the one you love!",
+  "startpage.platform_desc": "MokoGitea runs anywhere <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">Go</a> can compile for: Windows, macOS, Linux, ARM, etc. Choose the one you love!",
   "startpage.lightweight": "Lightweight",
-  "startpage.lightweight_desc": "${APP_NAME} has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!",
+  "startpage.lightweight_desc": "MokoGitea has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!",
   "startpage.license": "Open Source",
   "startpage.license_desc": "Go get <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%[1]s\">%[2]s</a>! Join us by <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%[3]s\">contributing</a> to make this project even better. Don't hesitate to contribute!",
   "install.install": "Installation",
   "install.installing_desc": "Installing now, please wait…",
   "install.title": "Initial Configuration",
-  "install.docker_helper": "If you run ${APP_NAME} inside Docker, please read the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">documentation</a> before changing any settings.",
+  "install.docker_helper": "If you run MokoGitea inside Docker, please read the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">documentation</a> before changing any settings.",
-  "install.require_db_desc": "${APP_NAME} requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQL protocol).",
+  "install.require_db_desc": "MokoGitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQL protocol).",
   "install.db_title": "Database Settings",
   "install.db_type": "Database Type",
   "install.host": "Host",
@@ -250,12 +250,12 @@
   "install.db_schema_helper": "Leave blank for database default (\"public\").",
   "install.ssl_mode": "SSL",
   "install.path": "Path",
-  "install.sqlite_helper": "File path for the SQLite3 database.<br>Enter an absolute path if you run ${APP_NAME} as a service.",
+  "install.sqlite_helper": "File path for the SQLite3 database.<br>Enter an absolute path if you run MokoGitea as a service.",
-  "install.reinstall_error": "You are trying to install into an existing ${APP_NAME} database",
+  "install.reinstall_error": "You are trying to install into an existing MokoGitea database",
-  "install.reinstall_confirm_message": "Re-installing with an existing ${APP_NAME} database can cause multiple problems. In most cases, you should use your existing \"app.ini\" to run ${APP_NAME}. If you know what you are doing, confirm the following:",
+  "install.reinstall_confirm_message": "Re-installing with an existing MokoGitea database can cause multiple problems. In most cases, you should use your existing \"app.ini\" to run MokoGitea. If you know what you are doing, confirm the following:",
   "install.reinstall_confirm_check_1": "The data encrypted by the SECRET_KEY in app.ini may be lost: users may not be able to log in with 2FA/OTP and mirrors may not function correctly. By checking this box, you confirm that the current app.ini file contains the correct SECRET_KEY.",
   "install.reinstall_confirm_check_2": "The repositories and settings may need to be resynchronized. By checking this box, you confirm that you will resynchronize the hooks for the repositories and authorized_keys file manually. You confirm that you will ensure that repository and mirror settings are correct.",
-  "install.reinstall_confirm_check_3": "You confirm that you are absolutely sure that this ${APP_NAME} is running with the correct app.ini location and that you are sure that you have to re-install. You confirm that you acknowledge the above risks.",
+  "install.reinstall_confirm_check_3": "You confirm that you are absolutely sure that this MokoGitea is running with the correct app.ini location and that you are sure that you have to re-install. You confirm that you acknowledge the above risks.",
   "install.err_empty_db_path": "The SQLite3 database path cannot be empty.",
   "install.no_admin_and_disable_registration": "You cannot disable user self-registration without creating an administrator account.",
   "install.err_empty_admin_password": "The administrator password cannot be empty.",
@@ -271,14 +271,14 @@
   "install.lfs_path": "Git LFS Root Path",
   "install.lfs_path_helper": "Files tracked by Git LFS will be stored in this directory. Leave empty to disable.",
   "install.run_user": "Run As Username",
-  "install.run_user_helper": "The operating system username that ${APP_NAME} runs as, it must have write access to the data paths. This value is auto-detected and cannot be changed here. To use a different user, restart ${APP_NAME} under that account.",
+  "install.run_user_helper": "The operating system username that MokoGitea runs as, it must have write access to the data paths. This value is auto-detected and cannot be changed here. To use a different user, restart MokoGitea under that account.",
   "install.domain": "Server Domain",
   "install.domain_helper": "Domain or host address for the server.",
   "install.ssh_port": "SSH Server Port",
   "install.ssh_port_helper": "Port number your SSH server listens on. Leave empty to disable.",
-  "install.http_port": "${APP_NAME} HTTP Listen Port",
+  "install.http_port": "MokoGitea HTTP Listen Port",
-  "install.http_port_helper": "Port number the ${APP_NAME} web server will listen on.",
+  "install.http_port_helper": "Port number the MokoGitea web server will listen on.",
-  "install.app_url": "${APP_NAME} Base URL",
+  "install.app_url": "MokoGitea Base URL",
   "install.app_url_helper": "Base address for HTTP(S) clone URLs and email notifications.",
   "install.log_root_path": "Log Path",
   "install.log_root_path_helper": "Log files will be written to this directory.",
@@ -288,7 +288,7 @@
   "install.smtp_port": "SMTP Port",
   "install.smtp_from": "Send Email As",
   "install.smtp_from_invalid": "The \"Send Email As\" address is invalid",
-  "install.smtp_from_helper": "Email address ${APP_NAME} will use. Enter a plain email address or use the \"Name\" <email@example.com> format.",
+  "install.smtp_from_helper": "Email address MokoGitea will use. Enter a plain email address or use the \"Name\" <email@example.com> format.",
   "install.mailer_user": "SMTP Username",
   "install.mailer_password": "SMTP Password",
   "install.register_confirm": "Require Email Confirmation to Register",
@@ -311,7 +311,7 @@
   "install.admin_password": "Password",
   "install.confirm_password": "Confirm Password",
   "install.admin_email": "Email Address",
-  "install.install_btn_confirm": "Install ${APP_NAME}",
+  "install.install_btn_confirm": "Install MokoGitea",
   "install.test_git_failed": "Could not test 'git' command: %v",
   "install.invalid_db_setting": "The database settings are invalid: %v",
   "install.invalid_db_table": "The database table \"%s\" is invalid: %v",
@@ -385,7 +385,7 @@
   "auth.forgot_password_title": "Forgot Password",
   "auth.forgot_password": "Forgot password?",
   "auth.need_account": "Need an account?",
-  "auth.sign_up_tip": "You are registering the first account in the system, which has administrator privileges. Please carefully remember your username and password. If you forget the username or password, please refer to the ${APP_NAME} documentation to recover the account.",
+  "auth.sign_up_tip": "You are registering the first account in the system, which has administrator privileges. Please carefully remember your username and password. If you forget the username or password, please refer to the MokoGitea documentation to recover the account.",
   "auth.sign_up_now": "Register now.",
   "auth.sign_up_successful": "Account was successfully created. Welcome!",
   "auth.confirmation_mail_sent_prompt_ex": "A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process. If your registration email address is incorrect, you can sign in again and change it.",
@@ -409,7 +409,7 @@
   "auth.reset_password_helper": "Recover Account",
   "auth.reset_password_wrong_user": "You are signed in as %s, but the account recovery link is meant for %s",
   "auth.password_too_short": "Password length cannot be less than %d characters.",
-  "auth.non_local_account": "Non-local users cannot update their password through the ${APP_NAME} web interface.",
+  "auth.non_local_account": "Non-local users cannot update their password through the MokoGitea web interface.",
   "auth.verify": "Verify",
   "auth.scratch_code": "Scratch code",
   "auth.use_scratch_code": "Use a scratch code",
@@ -726,7 +726,7 @@
   "settings.retype_new_password": "Confirm New Password",
   "settings.password_incorrect": "The current password is incorrect.",
   "settings.change_password_success": "Your password has been updated. Sign in using your new password from now on.",
-  "settings.password_change_disabled": "Non-local users cannot update their password through the ${APP_NAME} web interface.",
+  "settings.password_change_disabled": "Non-local users cannot update their password through the MokoGitea web interface.",
   "settings.emails": "Email Addresses",
   "settings.manage_emails": "Manage Email Addresses",
   "settings.manage_themes": "Select default theme",
@@ -734,7 +734,7 @@
   "settings.email_desc": "Your primary email address will be used for notifications, password recovery and, provided that it is not hidden, web-based Git operations.",
   "settings.theme_desc": "This will be your default theme across the site.",
   "settings.theme_colorblindness_help": "Color blindness Theme Support",
-  "settings.theme_colorblindness_prompt": "${APP_NAME} only has a few themes with basic color blindness support, which only have a few colors defined. The work is still in progress. More improvements could be made by defining more colors in the theme CSS files.",
+  "settings.theme_colorblindness_prompt": "MokoGitea only has a few themes with basic color blindness support, which only have a few colors defined. The work is still in progress. More improvements could be made by defining more colors in the theme CSS files.",
   "settings.primary": "Primary",
   "settings.activated": "Activated",
   "settings.requires_activation": "Requires activation",
@@ -843,7 +843,7 @@
   "settings.unbind_success": "The social account has been removed successfully.",
   "settings.manage_access_token": "Manage Access Tokens",
   "settings.generate_new_token": "Generate New Token",
-  "settings.tokens_desc": "These tokens grant access to your account using the ${APP_NAME} API.",
+  "settings.tokens_desc": "These tokens grant access to your account using the Gitea API.",
   "settings.token_name": "Token Name",
   "settings.generate_token": "Generate Token",
   "settings.generate_token_success": "Your new token has been generated. Copy it now as it will not be shown again.",
@@ -869,7 +869,7 @@
   "settings.permissions_list": "Permissions:",
   "settings.manage_oauth2_applications": "Manage OAuth2 Applications",
   "settings.edit_oauth2_application": "Edit OAuth2 Application",
-  "settings.oauth2_applications_desc": "OAuth2 applications enable your third-party application to securely authenticate users at this ${APP_NAME} instance.",
+  "settings.oauth2_applications_desc": "OAuth2 applications enable your third-party application to securely authenticate users at this MokoGitea instance.",
   "settings.remove_oauth2_application": "Remove OAuth2 Application",
   "settings.remove_oauth2_application_desc": "Removing an OAuth2 application will revoke access to all signed access tokens. Continue?",
   "settings.remove_oauth2_application_success": "The application has been deleted.",
@@ -890,9 +890,9 @@
   "settings.oauth2_application_edit": "Edit",
   "settings.oauth2_application_create_description": "OAuth2 applications give your third-party application access to user accounts on this instance.",
   "settings.oauth2_application_remove_description": "Removing an OAuth2 application will prevent it from accessing authorized user accounts on this instance. Continue?",
-  "settings.oauth2_application_locked": "${APP_NAME} pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.",
+  "settings.oauth2_application_locked": "MokoGitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information.",
   "settings.authorized_oauth2_applications": "Authorized OAuth2 Applications",
-  "settings.authorized_oauth2_applications_description": "You have granted access to your personal ${APP_NAME} account to these third-party applications. Please revoke access for applications you no longer need.",
+  "settings.authorized_oauth2_applications_description": "You have granted access to your personal MokoGitea account to these third-party applications. Please revoke access for applications you no longer need.",
   "settings.revoke_key": "Revoke",
   "settings.revoke_oauth2_grant": "Revoke Access",
   "settings.revoke_oauth2_grant_description": "Revoking access for this third-party application will prevent this application from accessing your data. Are you sure?",
@@ -923,11 +923,11 @@
   "settings.webauthn_key_loss_warning": "If you lose your security keys, you will lose access to your account.",
   "settings.webauthn_alternative_tip": "You may want to configure an additional authentication method.",
   "settings.manage_account_links": "Manage Linked Accounts",
-  "settings.manage_account_links_desc": "These external accounts are linked to your ${APP_NAME} account.",
+  "settings.manage_account_links_desc": "These external accounts are linked to your MokoGitea account.",
-  "settings.account_links_not_available": "No external accounts are currently linked to your ${APP_NAME} account.",
+  "settings.account_links_not_available": "No external accounts are currently linked to your MokoGitea account.",
   "settings.link_account": "Link Account",
   "settings.remove_account_link": "Remove Linked Account",
-  "settings.remove_account_link_desc": "Removing a linked account will revoke its access to your ${APP_NAME} account. Continue?",
+  "settings.remove_account_link_desc": "Removing a linked account will revoke its access to your MokoGitea account. Continue?",
   "settings.remove_account_link_success": "The linked account has been removed.",
   "settings.hooks.desc": "Add webhooks which will be triggered for <strong>all repositories</strong> that you own.",
   "settings.orgs_none": "You are not a member of any organizations.",
@@ -943,7 +943,7 @@
   "settings.email_notifications.disable": "Disable Email Notifications",
   "settings.email_notifications.submit": "Set Email Preference",
   "settings.email_notifications.andyourown": "And Your Own Notifications",
-  "settings.email_notifications.actions.desc": "Notifications for workflow runs on repositories set up with <a target=\"_blank\" href=\"%s\">${APP_NAME} Actions</a>.",
+  "settings.email_notifications.actions.desc": "Notifications for workflow runs on repositories set up with <a target=\"_blank\" href=\"%s\">Gitea Actions</a>.",
   "settings.email_notifications.actions.failure_only": "Only notify for failed workflow runs",
   "settings.visibility": "User visibility",
   "settings.visibility.public": "Public",
@@ -1125,7 +1125,7 @@
   "repo.migrate.github.description": "Migrate data from github.com or other GitHub instances.",
   "repo.migrate.git.description": "Migrate a repository only from any Git service.",
   "repo.migrate.gitlab.description": "Migrate data from gitlab.com or other GitLab instances.",
-  "repo.migrate.gitea.description": "Migrate data from other ${APP_NAME} instances.",
+  "repo.migrate.gitea.description": "Migrate data from gitea.com or other Gitea instances.",
   "repo.migrate.gogs.description": "Migrate data from notabug.org or other Gogs instances.",
   "repo.migrate.onedev.description": "Migrate data from code.onedev.io or other OneDev instances.",
   "repo.migrate.codebase.description": "Migrate data from codebasehq.com.",
@@ -1891,7 +1891,7 @@
   "repo.pulls.cmd_instruction_checkout_title": "Checkout",
   "repo.pulls.cmd_instruction_checkout_desc": "From your project repository, check out a new branch and test the changes.",
   "repo.pulls.cmd_instruction_merge_title": "Merge",
-  "repo.pulls.cmd_instruction_merge_desc": "Merge the changes and update on ${APP_NAME}.",
+  "repo.pulls.cmd_instruction_merge_desc": "Merge the changes and update on MokoGitea.",
   "repo.pulls.cmd_instruction_merge_warning": "Warning: This operation cannot merge pull request because \"autodetect manual merge\" is not enabled.",
   "repo.pulls.clear_merge_message": "Clear merge message",
   "repo.pulls.clear_merge_message_hint": "Clearing the merge message will only remove the commit message content and keep generated git trailers such as \"Co-Authored-By…\".",
@@ -2199,11 +2199,11 @@
   "repo.settings.trust_model.collaborator.long": "Collaborator: Trust signatures by collaborators",
   "repo.settings.trust_model.collaborator.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\", whether they match the committer or not. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" if not.",
   "repo.settings.trust_model.committer": "Committer",
-  "repo.settings.trust_model.committer.long": "Committer: Trust signatures that match committers. This matches GitHub's behavior and will force commits signed by ${APP_NAME} to have ${APP_NAME} as the committer.",
+  "repo.settings.trust_model.committer.long": "Committer: Trust signatures that match committers. This matches GitHub's behavior and will force commits signed by MokoGitea to have MokoGitea as the committer.",
-  "repo.settings.trust_model.committer.desc": "Valid signatures will only be marked \"trusted\" if they match the committer, otherwise they will be marked \"unmatched\". This forces ${APP_NAME} to be the committer on signed commits, with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default ${APP_NAME} key must match a user in the database.",
+  "repo.settings.trust_model.committer.desc": "Valid signatures will only be marked \"trusted\" if they match the committer, otherwise they will be marked \"unmatched\". This forces MokoGitea to be the committer on signed commits, with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default MokoGitea key must match a user in the database.",
   "repo.settings.trust_model.collaboratorcommitter": "Collaborator+Committer",
   "repo.settings.trust_model.collaboratorcommitter.long": "Collaborator+Committer: Trust signatures by collaborators which match the committer",
-  "repo.settings.trust_model.collaboratorcommitter.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\" if they match the committer. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" otherwise. This will force ${APP_NAME} to be marked as the committer on signed commits, with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default ${APP_NAME} key must match a user in the database.",
+  "repo.settings.trust_model.collaboratorcommitter.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\" if they match the committer. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" otherwise. This will force MokoGitea to be marked as the committer on signed commits, with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default MokoGitea key must match a user in the database.",
   "repo.settings.wiki_delete": "Delete Wiki Data",
   "repo.settings.wiki_delete_desc": "Deleting repository wiki data is permanent and cannot be undone.",
   "repo.settings.wiki_delete_notices_1": "- This will permanently delete and disable the repository wiki for %s.",
@@ -2240,7 +2240,7 @@
   "repo.settings.remove_team_success": "The team's access to the repository has been removed.",
   "repo.settings.add_webhook": "Add Webhook",
   "repo.settings.add_webhook.invalid_channel_name": "Webhook channel name cannot be empty and cannot contain only a # character.",
-  "repo.settings.hooks_desc": "Webhooks automatically make HTTP POST requests to a server when certain ${APP_NAME} events trigger. Read more in the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">webhooks guide</a>.",
+  "repo.settings.hooks_desc": "Webhooks automatically make HTTP POST requests to a server when certain MokoGitea events trigger. Read more in the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">webhooks guide</a>.",
   "repo.settings.webhook_deletion": "Remove Webhook",
   "repo.settings.webhook_deletion_desc": "Removing a webhook deletes its settings and delivery history. Continue?",
   "repo.settings.webhook_deletion_success": "The webhook has been removed.",
@@ -2258,7 +2258,7 @@
   "repo.settings.githooks_desc": "Git Hooks are powered by Git itself. You can edit hook files below to set up custom operations.",
   "repo.settings.githook_edit_desc": "If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.",
   "repo.settings.update_githook": "Update Hook",
-  "repo.settings.add_webhook_desc": "${APP_NAME} will send <code>POST</code> requests with a specified content type to the target URL. Read more in the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">webhooks guide</a>.",
+  "repo.settings.add_webhook_desc": "MokoGitea will send <code>POST</code> requests with a specified content type to the target URL. Read more in the <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">webhooks guide</a>.",
   "repo.settings.payload_url": "Target URL",
   "repo.settings.http_method": "HTTP Method",
   "repo.settings.content_type": "POST Content Type",
@@ -2326,9 +2326,9 @@
   "repo.settings.event_pull_request_merge": "Pull Request Merge",
   "repo.settings.event_header_workflow": "Workflow Events",
   "repo.settings.event_workflow_run": "Workflow Run",
-  "repo.settings.event_workflow_run_desc": "${APP_NAME} Actions Workflow run queued, waiting, in progress, or completed.",
+  "repo.settings.event_workflow_run_desc": "Gitea Actions Workflow run queued, waiting, in progress, or completed.",
   "repo.settings.event_workflow_job": "Workflow Jobs",
-  "repo.settings.event_workflow_job_desc": "${APP_NAME} Actions Workflow job queued, waiting, in progress, or completed.",
+  "repo.settings.event_workflow_job_desc": "Gitea Actions Workflow job queued, waiting, in progress, or completed.",
   "repo.settings.event_package": "Package",
   "repo.settings.event_package_desc": "Package created or deleted in a repository.",
   "repo.settings.branch_filter": "Branch filter",
@@ -2349,7 +2349,7 @@
   "repo.settings.slack_domain": "Domain",
   "repo.settings.slack_channel": "Channel",
   "repo.settings.add_web_hook_desc": "Integrate <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">%s</a> into your repository.",
-  "repo.settings.web_hook_name_gitea": "${APP_NAME}",
+  "repo.settings.web_hook_name_gitea": "MokoGitea",
   "repo.settings.web_hook_name_gogs": "Gogs",
   "repo.settings.web_hook_name_slack": "Slack",
   "repo.settings.web_hook_name_discord": "Discord",
@@ -2634,7 +2634,7 @@
   "repo.release.delete_release": "Delete Release",
   "repo.release.delete_tag": "Delete Tag",
   "repo.release.deletion": "Delete Release",
-  "repo.release.deletion_desc": "Deleting a release only removes it from ${APP_NAME}. It will not affect the Git tag, the contents of your repository or its history. Continue?",
+  "repo.release.deletion_desc": "Deleting a release only removes it from MokoGitea. It will not affect the Git tag, the contents of your repository or its history. Continue?",
   "repo.release.deletion_success": "The release has been deleted.",
   "repo.release.deletion_tag_desc": "Will delete this tag from repository. Repository contents and history remain unchanged. Continue?",
   "repo.release.deletion_tag_success": "The tag has been deleted.",
@@ -2913,7 +2913,7 @@
   "admin.last_page": "Last",
   "admin.total": "Total: %d",
   "admin.settings": "Admin Settings",
-  "admin.dashboard.new_version_hint": "${APP_NAME} %s is now available, you are running %s. Check <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">the blog</a> for more details.",
+  "admin.dashboard.new_version_hint": "MokoGitea %s is now available, you are running %s. Check <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">the blog</a> for more details.",
   "admin.dashboard.statistic": "Summary",
   "admin.dashboard.maintenance_operations": "Maintenance Operations",
   "admin.dashboard.system_status": "System Status",
@@ -2949,8 +2949,8 @@
   "admin.dashboard.deleted_branches_cleanup": "Clean up deleted branches",
   "admin.dashboard.update_migration_poster_id": "Update migration poster IDs",
   "admin.dashboard.git_gc_repos": "Garbage-collect all repositories",
-  "admin.dashboard.resync_all_sshkeys": "Update the '.ssh/authorized_keys' file with ${APP_NAME} SSH keys",
+  "admin.dashboard.resync_all_sshkeys": "Update the '.ssh/authorized_keys' file with MokoGitea SSH keys",
-  "admin.dashboard.resync_all_sshprincipals": "Update the '.ssh/authorized_principals' file with ${APP_NAME} SSH principals",
+  "admin.dashboard.resync_all_sshprincipals": "Update the '.ssh/authorized_principals' file with MokoGitea SSH principals",
   "admin.dashboard.resync_all_hooks": "Resynchronize git hooks of all repositories (pre-receive, update, post-receive, proc-receive, ...)",
   "admin.dashboard.reinit_missing_repos": "Reinitialize all missing Git repositories for which records exist",
   "admin.dashboard.sync_external_users": "Synchronize external user data",
@@ -3030,7 +3030,7 @@
   "admin.users.is_admin": "Is Administrator",
   "admin.users.is_restricted": "Is Restricted",
   "admin.users.allow_git_hook": "May Create Git Hooks",
-  "admin.users.allow_git_hook_tooltip": "Git Hooks are executed as the OS user running ${APP_NAME} and will have the same level of host access. As a result, users with this special Git Hook privilege can access and modify all ${APP_NAME} repositories as well as the database used by ${APP_NAME}. Consequently they are also able to gain ${APP_NAME} administrator privileges.",
+  "admin.users.allow_git_hook_tooltip": "Git Hooks are executed as the OS user running MokoGitea and will have the same level of host access. As a result, users with this special Git Hook privilege can access and modify all MokoGitea repositories as well as the database used by MokoGitea. Consequently they are also able to gain MokoGitea administrator privileges.",
   "admin.users.allow_import_local": "May Import Local Repositories",
   "admin.users.allow_create_organization": "May Create Organizations",
   "admin.users.update_profile": "Update User Account",
@@ -3100,11 +3100,11 @@
   "admin.packages.size": "Size",
   "admin.packages.published": "Published",
   "admin.defaulthooks": "Default Webhooks",
-  "admin.defaulthooks.desc": "Webhooks automatically make HTTP POST requests to a server when certain ${APP_NAME} events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the <a target=\"_blank\" rel=\"noopener\" href=\"%s\">webhooks guide</a>.",
+  "admin.defaulthooks.desc": "Webhooks automatically make HTTP POST requests to a server when certain MokoGitea events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the <a target=\"_blank\" rel=\"noopener\" href=\"%s\">webhooks guide</a>.",
   "admin.defaulthooks.add_webhook": "Add Default Webhook",
   "admin.defaulthooks.update_webhook": "Update Default Webhook",
   "admin.systemhooks": "System Webhooks",
-  "admin.systemhooks.desc": "Webhooks automatically make HTTP POST requests to a server when certain ${APP_NAME} events trigger. Webhooks defined here will act on all repositories on the system, so please consider any performance implications this may have. Read more in the <a target=\"_blank\" rel=\"noopener\" href=\"%s\">webhooks guide</a>.",
+  "admin.systemhooks.desc": "Webhooks automatically make HTTP POST requests to a server when certain MokoGitea events trigger. Webhooks defined here will act on all repositories on the system, so please consider any performance implications this may have. Read more in the <a target=\"_blank\" rel=\"noopener\" href=\"%s\">webhooks guide</a>.",
   "admin.systemhooks.add_webhook": "Add System Webhook",
   "admin.systemhooks.update_webhook": "Update System Webhook",
   "admin.auths.auth_manage_panel": "Authentication Source Management",
@@ -3125,7 +3125,7 @@
   "admin.auths.user_base": "User Search Base",
   "admin.auths.user_dn": "User DN",
   "admin.auths.attribute_username": "Username Attribute",
-  "admin.auths.attribute_username_placeholder": "Leave empty to use the username entered in ${APP_NAME}.",
+  "admin.auths.attribute_username_placeholder": "Leave empty to use the username entered in MokoGitea.",
   "admin.auths.attribute_name": "First Name Attribute",
   "admin.auths.attribute_surname": "Surname Attribute",
   "admin.auths.attribute_mail": "Email Attribute",
@@ -3232,7 +3232,7 @@
   "admin.auths.invalid_openIdConnectAutoDiscoveryURL": "Invalid Auto Discovery URL (this must be a valid URL starting with http:// or https://)",
   "admin.config.server_config": "Server Configuration",
   "admin.config.app_name": "Site Title",
-  "admin.config.app_ver": "${APP_NAME} Version",
+  "admin.config.app_ver": "MokoGitea Version",
   "admin.config.custom_conf": "Configuration File Path",
   "admin.config.custom_file_root_path": "Custom File Root Path",
   "admin.config.disable_router_log": "Disable Router Log",
@@ -3272,7 +3272,7 @@
   "admin.config.service_config": "Service Configuration",
   "admin.config.register_email_confirm": "Require Email Confirmation to Register",
   "admin.config.disable_register": "Disable Self-Registration",
-  "admin.config.allow_only_internal_registration": "Allow Registration Only Through ${APP_NAME} itself",
+  "admin.config.allow_only_internal_registration": "Allow Registration Only Through MokoGitea itself",
   "admin.config.allow_only_external_registration": "Allow Registration Only Through External Services",
   "admin.config.enable_openid_signup": "Enable OpenID Self-Registration",
   "admin.config.enable_openid_signin": "Enable OpenID Sign-In",
@@ -3414,11 +3414,11 @@
   "admin.self_check.no_problem_found": "No problem found yet.",
   "admin.self_check.startup_warnings": "Startup warnings:",
   "admin.self_check.database_collation_mismatch": "Expect database to use collation: %s",
-  "admin.self_check.database_collation_case_insensitive": "Database is using collation %s, which is a case-insensitive collation. Although ${APP_NAME} could work with it, there might be some rare cases which don't work as expected.",
+  "admin.self_check.database_collation_case_insensitive": "Database is using collation %s, which is a case-insensitive collation. Although MokoGitea could work with it, there might be some rare cases which don't work as expected.",
   "admin.self_check.database_inconsistent_collation_columns": "Database is using collation %s, but these columns are using mismatched collations. This might cause some unexpected problems.",
   "admin.self_check.database_fix_mysql": "For MySQL/MariaDB users, you could use the \"gitea doctor convert\" command to fix the collation problems, or you could also fix the problem manually with \"ALTER ... COLLATE ...\" SQL queries.",
   "admin.self_check.database_fix_mssql": "For MSSQL users, you could only fix the problem manually with \"ALTER ... COLLATE ...\" SQL queries at the moment.",
-  "admin.self_check.location_origin_mismatch": "Current URL (%[1]s) doesn't match the URL seen by ${APP_NAME} (%[2]s). If you are using a reverse proxy, please make sure the \"Host\" and \"X-Forwarded-Proto\" headers are set correctly.",
+  "admin.self_check.location_origin_mismatch": "Current URL (%[1]s) doesn't match the URL seen by MokoGitea (%[2]s). If you are using a reverse proxy, please make sure the \"Host\" and \"X-Forwarded-Proto\" headers are set correctly.",
   "action.create_repo": "created repository <a href=\"%s\">%s</a>",
   "action.rename_repo": "renamed repository from <code>%[1]s</code> to <a href=\"%[2]s\">%[3]s</a>",
   "action.commit_repo": "pushed to <a href=\"%[2]s\">%[3]s</a> at <a href=\"%[1]s\">%[4]s</a>",
@@ -3771,8 +3771,8 @@
   "actions.runs.status_no_select": "All status",
   "actions.runs.no_results": "No results matched.",
   "actions.runs.no_workflows": "There are no workflows yet.",
-  "actions.runs.no_workflows.quick_start": "Don't know how to start with ${APP_NAME} Actions? See <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">the quick start guide</a>.",
+  "actions.runs.no_workflows.quick_start": "Don't know how to start with Gitea Actions? See <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">the quick start guide</a>.",
-  "actions.runs.no_workflows.documentation": "For more information on ${APP_NAME} Actions, see <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">the documentation</a>.",
+  "actions.runs.no_workflows.documentation": "For more information on Gitea Actions, see <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"%s\">the documentation</a>.",
   "actions.runs.no_runs": "The workflow has no runs yet.",
   "actions.runs.empty_commit_message": "(empty commit message)",
   "actions.runs.expire_log_message": "Logs have been purged because they were too old.",

routers/web/repo/githttp.go

@@ -147,11 +147,11 @@ func httpBase(ctx *context.Context, optGitService ...string) *serviceHandler {
 		if !ctx.IsSigned {
 			// TODO: support digit auth - which would be Authorization header with digit
 			if setting.OAuth2.Enabled {
-				// `Basic realm="<AppName>"` tells the GCM to use builtin OAuth2 application: https://github.com/git-ecosystem/git-credential-manager/pull/1442
+				// `Basic realm="Gitea"` tells the GCM to use builtin OAuth2 application: https://github.com/git-ecosystem/git-credential-manager/pull/1442
-				ctx.Resp.Header().Set("WWW-Authenticate", fmt.Sprintf(`Basic realm="%s"`, setting.AppName))
+				ctx.Resp.Header().Set("WWW-Authenticate", `Basic realm="Gitea"`)
 			} else {
 				// If OAuth2 is disabled, then use another realm to avoid GCM OAuth2 attempt
-				ctx.Resp.Header().Set("WWW-Authenticate", fmt.Sprintf(`Basic realm="%s (Basic Auth)"`, setting.AppName))
+				ctx.Resp.Header().Set("WWW-Authenticate", `Basic realm="Gitea (Basic Auth)"`)
 			}
 			ctx.HTTPError(http.StatusUnauthorized)
 			return nil

routers/web/swagger_json.go

@@ -13,7 +13,6 @@ import (
 // SwaggerV1Json render swagger v1 json
 func SwaggerV1Json(ctx *context.Context) {
 	ctx.Data["SwaggerAppVer"] = template.HTML(template.JSEscapeString(setting.AppVer))
-	ctx.Data["SwaggerAppName"] = template.HTML(template.JSEscapeString(setting.AppName))
 	ctx.Data["SwaggerAppSubUrl"] = setting.AppSubURL // it is JS-safe
 	ctx.JSONTemplate("swagger/v1_json")
 }
@@ -21,7 +20,6 @@ func SwaggerV1Json(ctx *context.Context) {
 // OpenAPI3Json render OpenAPI 3.0 json (auto-converted from Swagger 2.0)
 func OpenAPI3Json(ctx *context.Context) {
 	ctx.Data["SwaggerAppVer"] = template.HTML(template.JSEscapeString(setting.AppVer))
-	ctx.Data["SwaggerAppName"] = template.HTML(template.JSEscapeString(setting.AppName))
 	ctx.Data["SwaggerAppSubUrl"] = setting.AppSubURL // it is JS-safe
 	ctx.JSONTemplate("swagger/v1_openapi3_json")
 }

templates/admin/dashboard.tmpl

@@ -2,7 +2,7 @@
 	<div class="admin-setting-content">
 		{{if .NeedUpdate}}
 		<div class="ui positive message">
-			<div class="header">{{svg "octicon-info"}} {{AppName}} Update Available</div>
+			<div class="header">{{svg "octicon-info"}} MokoGitea Update Available</div>
 			<p>A new version <strong>{{.LatestVersion}}</strong> is available{{if .UpdateChannel}} ({{.UpdateChannel}} channel){{end}}.
 			{{if .ReleaseURL}}<a href="{{.ReleaseURL}}" target="_blank" rel="noopener noreferrer">View release notes</a>{{end}}</p>
 			{{if .DockerImage}}<p><code>docker pull {{.DockerImage}}</code></p>{{end}}

templates/base/footer_content.tmpl

@@ -1,7 +1,7 @@
 <footer class="page-footer" role="group" aria-label="{{ctx.Locale.Tr "aria.footer"}}">
 	<div class="left-links" role="contentinfo" aria-label="{{ctx.Locale.Tr "aria.footer.software"}}">
 		{{if ShowFooterPoweredBy}}
-			<a target="_blank" href="https://git.mokoconsulting.tech/MokoConsulting/MokoGitea">{{ctx.Locale.Tr "powered_by" AppName}}</a>
+			<a target="_blank" href="https://git.mokoconsulting.tech/MokoConsulting/MokoGitea">{{ctx.Locale.Tr "powered_by" "MokoGitea"}}</a>
 		{{end}}
 		{{if (or .ShowFooterVersion .PageIsAdmin)}}
 			<span>

templates/swagger/openapi-viewer.tmpl

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		{{ctx.HeadMetaContentSecurityPolicy}}
-		<title>{{AppName}} API</title>
+		<title>Gitea API</title>
 		<link rel="stylesheet" href="{{ctx.CurrentWebTheme.PublicAssetURI}}">
 		{{/* HINT: SWAGGER-CSS-IMPORT: import swagger styles ahead to avoid UI flicker (e.g.: the swagger-back-link element) */}}
 		<link rel="stylesheet" href="{{AssetURI "css/swagger.css"}}">

templates/swagger/v1_json.tmpl

@@ -11,8 +11,8 @@
   ],
   "swagger": "2.0",
   "info": {
-    "description": "This documentation describes the {{.SwaggerAppName}} API.",
+    "description": "This documentation describes the Gitea API.",
-    "title": "{{.SwaggerAppName}} API",
+    "title": "Gitea API",
     "license": {
       "name": "MIT",
       "url": "http://opensource.org/licenses/MIT"

templates/swagger/v1_openapi3_json.tmpl

@@ -10588,12 +10588,12 @@
     }
   },
   "info": {
-    "description": "This documentation describes the {{.SwaggerAppName}} API.",
+    "description": "This documentation describes the Gitea API.",
     "license": {
       "name": "MIT",
       "url": "http://opensource.org/licenses/MIT"
     },
-    "title": "{{.SwaggerAppName}} API",
+    "title": "Gitea API",
     "version": "{{.SwaggerAppVer}}"
   },
   "openapi": "3.0.3",