Merge branch 'main' into dev

.github/workflows/website.yml

@@ -2,8 +2,7 @@ name: Website
 
 on:
   push:
-    branches:
+    branches: main
-      - main
   workflow_dispatch:
 
   schedule:

crowdin.yml

@@ -1,3 +1,3 @@
 files:
-  - source: /packages/core/lang/en-US.json
+  - source: /packages/core/lang/en.json
     translation: /%original_path%/%locale%.json

docs/about/credits.md

@@ -5,6 +5,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo.
 | Role                           | People                         |
 | ------------------------------ | ------------------------------ |
 | Bot verification               | S0AP                           |
+| General testing | Prince_NA |
 | Bot advertisement platform     | S0AP                           |
 | Bot rendering pipeline         | Vovko                          |
 | Game asset decompression       | Maddox                         |
@@ -12,7 +13,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo.
 | Game file layout               | Aeson                          |
 | 3-caliber rule edge cases      | Minitelrose, ChickenMan7777    |
 | Embed UX                       | \_34, HisRoyalFatness, Synx    |
-| Tankopedia pre-release testing | [OPTML], Aeson, \_34 |
+| Tankopedia pre-release testing | [OPTML], Aeson, \_34, xkdkw |
 | Website advertisement platform | Aeson                |
 | Compare pre-release testing    | [OPTML]              |
 | Redacted                       | GonnaHetzMe                    |

packages/website/src/components/Embeds/GenerateURL.tsx

@@ -3,7 +3,7 @@ import {
   type AccountListItem,
   type AccountListWithServer,
 } from '@blitzkit/core';
-import strings from '@blitzkit/core/lang/en-US.json';
+import strings from '@blitzkit/core/lang/en.json';
 import { CaretLeftIcon, Link2Icon, PersonIcon } from '@radix-ui/react-icons';
 import {
   Badge,

packages/website/src/components/Embeds/breakdown.tsx

@@ -8,7 +8,7 @@ import {
   sumCompositeStats,
   type IndividualTankStats,
 } from '@blitzkit/core';
-import strings from '@blitzkit/core/lang/en-US.json';
+import strings from '@blitzkit/core/lang/en.json';
 import { ReloadIcon } from '@radix-ui/react-icons';
 import { ContextMenu } from '@radix-ui/themes';
 import { useEffect, useMemo, useState } from 'react';

packages/website/src/components/Footer.astro

@@ -5,6 +5,7 @@ import packageJson from '../../../../package.json';
 import { getStrings } from '../core/i18n/getStrings';
 
 const gameDefinitions = await fetchGameDefinitions();
+const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH);
 const { locale } = Astro.params;
 const strings = getStrings(locale);
 ---
@@ -122,7 +123,15 @@ const strings = getStrings(locale);
   <Flex gap="5" display={{ initial: 'flex', sm: 'none' }}>
     <Flex direction="column" justify="between" align="end">
       <Text size="2" color="gray">BlitzKit</Text>
-      <Text size="2" color="gray">WoT Blitz</Text>
+
+      {
+        PUBLIC_ASSET_BRANCH !== 'opentest' && (
+          <Text size="2" color="gray">
+            WoT Blitz
+          </Text>
+        )
+      }
+
       <Text size="2" color="gray">CDN</Text>
     </Flex>
 
@@ -130,11 +139,17 @@ const strings = getStrings(locale);
       <Code size="2" color="gray">
         {packageJson.version}
       </Code>
+
+      {
+        PUBLIC_ASSET_BRANCH !== 'opentest' && (
           <Code size="2" color="gray">
             {gameDefinitions.version}
           </Code>
+        )
+      }
+
       <Code size="2" color="gray">
-        {assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}
+        {PUBLIC_ASSET_BRANCH}
       </Code>
     </Flex>
   </Flex>
@@ -144,13 +159,23 @@ const strings = getStrings(locale);
     <Code size="2" color="gray">
       {packageJson.version}
     </Code>
-    <Text size="2" color="gray">WoT Blitz</Text>
+
+    {
+      PUBLIC_ASSET_BRANCH !== 'opentest' && (
+        <>
+          <Text size="2" color="gray">
+            WoT Blitz
+          </Text>
           <Code size="2" color="gray">
             {gameDefinitions.version}
           </Code>
+        </>
+      )
+    }
+
     <Text size="2" color="gray">CDN</Text>
     <Code size="2" color="gray">
-      {assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}
+      {PUBLIC_ASSET_BRANCH}
     </Code>
   </Flex>
 </Flex>

packages/website/src/components/TanksEmbed.tsx

@@ -6,7 +6,7 @@ import {
   type CompositeStats,
   type CompositeStatsKey,
 } from '@blitzkit/core';
-import strings from '@blitzkit/core/lang/en-US.json';
+import strings from '@blitzkit/core/lang/en.json';
 import { amberDark, blueDark } from '@radix-ui/colors';
 import { Flex, Text, type FlexProps } from '@radix-ui/themes';
 import { times } from 'lodash-es';

packages/website/src/pages/[...locale]/index.astro

@@ -26,7 +26,8 @@ import {
 import { getStrings } from '../../core/i18n/getStrings';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 
-const branch = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH);
+const PUBLIC_ASSET_BRANCH = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH);
+const MODE = assertSecret(import.meta.env.MODE);
 const locale = Astro.params.locale ?? DEFAULT_LOCALE;
 const strings = getStrings(Astro.params.locale);
 
@@ -69,7 +70,7 @@ export const getStaticPaths = (() => {
   <Plugs client:idle />
 
   {
-    branch === 'preview' && (
+    PUBLIC_ASSET_BRANCH === 'preview' && (
       <Flex justify="center" my="8" px="4">
         <AesonPlug />
       </Flex>
@@ -80,7 +81,11 @@ export const getStaticPaths = (() => {
     <Flex maxWidth="64rem" flexGrow="1" gap="4" direction="column">
       <ToolCard tool={tankopediaTool} />
 
+      {
+        (PUBLIC_ASSET_BRANCH === 'main' || MODE === 'development') && (
           <HomePageHotTanks {locale} />
+        )
+      }
 
       <Flex gap="4" direction={{ initial: 'column', sm: 'row' }}>
         {/* <ToolCard tool={playerStatsTool} /> */}

packages/website/src/pages/[...locale]/tools/session/_index.tsx

@@ -13,7 +13,7 @@ import {
   type IndividualAccountInfo,
   type IndividualTankStats,
 } from '@blitzkit/core';
-import strings from '@blitzkit/core/lang/en-US.json';
+import strings from '@blitzkit/core/lang/en.json';
 import {
   ArrowDownIcon,
   MagnifyingGlassIcon,

vercel.json

@@ -1,5 +0,0 @@
-{
-  "github": {
-    "enabled": false
-  }
-}