Merge pull request #2598 from makeplane/sync/ce-ee

Sync: Community Changes

.github/workflows/build-branch.yml

@@ -299,32 +299,6 @@ jobs:
           buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
           buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }}
 
-  attach_assets_to_build:
-    if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
-    name: Attach Assets to Release
-    runs-on: ubuntu-22.04
-    needs: [branch_build_setup]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Update Assets
-        run: |
-          cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
-
-      - name: Attach Assets
-        id: attach_assets
-        uses: actions/upload-artifact@v4
-        with:
-          name: selfhost-assets
-          retention-days: 2
-          path: |
-            ${{ github.workspace }}/deploy/selfhost/setup.sh
-            ${{ github.workspace }}/deploy/selfhost/swarm.sh
-            ${{ github.workspace }}/deploy/selfhost/restore.sh
-            ${{ github.workspace }}/deploy/selfhost/docker-compose.yml
-            ${{ github.workspace }}/deploy/selfhost/variables.env
-
   publish_release:
     if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
     name: Build Release
@@ -338,7 +312,6 @@ jobs:
         branch_build_push_live,
         branch_build_push_apiserver,
         branch_build_push_proxy,
-        attach_assets_to_build,
       ]
     env:
       REL_VERSION: ${{ needs.branch_build_setup.outputs.release_version }}
@@ -349,6 +322,8 @@ jobs:
       - name: Update Assets
         run: |
           cp ./deploy/selfhost/install.sh deploy/selfhost/setup.sh
+          sed -i 's/${APP_RELEASE:-stable}/${APP_RELEASE:-'${REL_VERSION}'}/g' deploy/selfhost/docker-compose.yml
+          sed -i 's/APP_RELEASE=stable/APP_RELEASE='${REL_VERSION}'/g' deploy/selfhost/variables.env
 
       - name: Create Release
         id: create_release

packages/i18n/src/constants/language.ts

@@ -8,6 +8,7 @@ export const SUPPORTED_LANGUAGES: ILanguageOption[] = [
   { label: "Español", value: "es" },
   { label: "日本語", value: "ja" },
   { label: "中文", value: "zh-CN" },
+  { label: "Русский", value: "ru" },
 ];
 
 export const STORAGE_KEY = "userLanguage";

packages/i18n/src/store/index.ts

@@ -156,6 +156,8 @@ export class TranslationStore {
         return import("../locales/ja/translations.json");
       case "zh-CN":
         return import("../locales/zh-CN/translations.json");
+      case "ru":
+        return import("../locales/ru/translations.json");
       default:
         throw new Error(`Unsupported language: ${language}`);
     }

packages/i18n/src/types/language.ts

@@ -1,4 +1,4 @@
-export type TLanguage = "en" | "fr" | "es" | "ja" | "zh-CN";
+export type TLanguage = "en" | "fr" | "es" | "ja" | "zh-CN" | "ru";
 
 export interface ILanguageOption {
   label: string;