diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 5f25dd8e3..c7e02863f 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -2,8 +2,7 @@ name: Website
on:
push:
- branches:
- - main
+ branches: main
workflow_dispatch:
schedule:
diff --git a/crowdin.yml b/crowdin.yml
index 7d2ed5d7a..c329bb496 100644
--- a/crowdin.yml
+++ b/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
diff --git a/docs/about/credits.md b/docs/about/credits.md
index 801f272d8..a031d21c9 100644
--- a/docs/about/credits.md
+++ b/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 |
diff --git a/packages/website/src/components/Embeds/GenerateURL.tsx b/packages/website/src/components/Embeds/GenerateURL.tsx
index cf01f1a82..9d1d31c8f 100644
--- a/packages/website/src/components/Embeds/GenerateURL.tsx
+++ b/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,
diff --git a/packages/website/src/components/Embeds/breakdown.tsx b/packages/website/src/components/Embeds/breakdown.tsx
index dd77ea942..279a3dad4 100644
--- a/packages/website/src/components/Embeds/breakdown.tsx
+++ b/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';
diff --git a/packages/website/src/components/Footer.astro b/packages/website/src/components/Footer.astro
index 465eeb7d4..12e02d6dd 100644
--- a/packages/website/src/components/Footer.astro
+++ b/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);
BlitzKit
- WoT Blitz
+
+ {
+ PUBLIC_ASSET_BRANCH !== 'opentest' && (
+
+ WoT Blitz
+
+ )
+ }
+
CDN
@@ -130,11 +139,17 @@ const strings = getStrings(locale);
{packageJson.version}
+
+ {
+ PUBLIC_ASSET_BRANCH !== 'opentest' && (
+
+ {gameDefinitions.version}
+
+ )
+ }
+
- {gameDefinitions.version}
-
-
- {assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}
+ {PUBLIC_ASSET_BRANCH}
@@ -144,13 +159,23 @@ const strings = getStrings(locale);
{packageJson.version}
- WoT Blitz
-
- {gameDefinitions.version}
-
+
+ {
+ PUBLIC_ASSET_BRANCH !== 'opentest' && (
+ <>
+
+ WoT Blitz
+
+
+ {gameDefinitions.version}
+
+ >
+ )
+ }
+
CDN
- {assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}
+ {PUBLIC_ASSET_BRANCH}
diff --git a/packages/website/src/components/TanksEmbed.tsx b/packages/website/src/components/TanksEmbed.tsx
index 2da57e7f0..3d969047c 100644
--- a/packages/website/src/components/TanksEmbed.tsx
+++ b/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';
diff --git a/packages/website/src/pages/[...locale]/index.astro b/packages/website/src/pages/[...locale]/index.astro
index b1b43a2d4..d96f67d92 100644
--- a/packages/website/src/pages/[...locale]/index.astro
+++ b/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 = (() => {
{
- branch === 'preview' && (
+ PUBLIC_ASSET_BRANCH === 'preview' && (
@@ -80,7 +81,11 @@ export const getStaticPaths = (() => {
-
+ {
+ (PUBLIC_ASSET_BRANCH === 'main' || MODE === 'development') && (
+
+ )
+ }
{/* */}
diff --git a/packages/website/src/pages/[...locale]/tools/session/_index.tsx b/packages/website/src/pages/[...locale]/tools/session/_index.tsx
index 3013623d8..2e46d4438 100644
--- a/packages/website/src/pages/[...locale]/tools/session/_index.tsx
+++ b/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,
diff --git a/vercel.json b/vercel.json
deleted file mode 100644
index 80e57248a..000000000
--- a/vercel.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "github": {
- "enabled": false
- }
-}