Update index.ts

* New translations en.json (Russian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Japanese)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Japanese)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Russian)

* New translations en.json (Russian)

.github/workflows/assets.yml

@@ -131,9 +131,6 @@ jobs:
       - name: Install dependencies
         run: bun install
 
-      - name: Lint
-        run: bun run lint:website
-
       - name: Download depots
         uses: actions/download-artifact@v4
         with:

.github/workflows/host-bot.yml

@@ -22,6 +22,19 @@ env:
   PUBLIC_WARGAMING_APPLICATION_ID: ${{ secrets.PUBLIC_WARGAMING_APPLICATION_ID }}
   PUBLIC_ASSET_FAST_USER: ${{ secrets.PUBLIC_ASSET_FAST_USER }}
   PUBLIC_ASSET_FAST_REPO: ${{ secrets.PUBLIC_ASSET_FAST_REPO }}
+  PUBLIC_PROMOTE_OPENTEST: ${{ secrets.PUBLIC_PROMOTE_OPENTEST }}
+  ALLOW_ROBOTS: ${{ secrets.ALLOW_ROBOTS }}
+  WOTB_GLOSSARY: ${{ secrets.WOTB_GLOSSARY }}
+  PUBLIC_GOOGLE_TAG_MANAGER_ID: ${{ secrets.PUBLIC_GOOGLE_TAG_MANAGER_ID }}
+  PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID: ${{ secrets.PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID }}
+  GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+  WOTB_GLOSSARY_DOMAIN: ${{ secrets.WOTB_GLOSSARY_DOMAIN }}
+  WOTB_GLOSSARY_PATH: ${{ secrets.WOTB_GLOSSARY_PATH }}
+  PUBLIC_DISCORD_SERVER_ID: ${{ secrets.PUBLIC_DISCORD_SERVER_ID }}
+  PUBLIC_ASSET_BASE: ${{ secrets.PUBLIC_ASSET_BASE }}
+  PUBLIC_BRANCH: ${{ secrets.PUBLIC_BRANCH }}
+  PUBLIC_GUIDE_WEBSITE: ${{ secrets.PUBLIC_GUIDE_WEBSITE }}
+  SERVICING: ${{ secrets.SERVICING }}
 
 jobs:
   host:

.gitignore

@@ -24,7 +24,32 @@ public/sitemap*
 target
 # packages/core/src/protos/*.ts
 /.vercel
-/.astro
+.astro
 .vercel
 /src
-/packages/bot/src/prisma
+/packages/bot/src/prisma
+dev-dist
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.prettierrc

@@ -1,7 +0,0 @@
-{
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "printWidth": 80
-}

.vscode/settings.json

@@ -21,6 +21,7 @@
     "AYUV",
     "battleresults",
     "bbox",
+    "beforeinstallprompt",
     "bepaint",
     "betakrieg",
     "BINORMAL",
@@ -76,13 +77,16 @@
     "echarts",
     "Everytime",
     "FASTNAME",
+    "favicons",
     "flexdirection",
+    "fontsource",
     "FOURCC",
     "frameloop",
     "fsformat",
     "Fullscreen",
     "fullstats",
     "fuzzysort",
+    "gamemode",
     "gameplay",
     "glsl",
     "GLTF",
@@ -154,6 +158,7 @@
     "Pyogenics",
     "ratingleaderboard",
     "raycaster",
+    "Redirector",
     "researchable",
     "Resvg",
     "rizz",
@@ -167,6 +172,7 @@
     "searchtanks",
     "SHAREDEXP",
     "SKLLD",
+    "smoothstep",
     "Smri",
     "Specularity",
     "SSAO",
@@ -186,6 +192,7 @@
     "tankopedia",
     "tankopedias",
     "tankstats",
+    "tauri",
     "texconv",
     "TEXCOORD",
     "tresabhi",
@@ -222,12 +229,7 @@
     "yolo",
     "youtuber",
     "youtubers",
-    "zoomable",
-    "zustand"
+    "zoomable"
   ],
-  "deno.enable": false,
-  "deno.unstable": false,
-  "cSpell.enableFiletypes": ["glsl", "proto3"],
-  "typescript.tsdk": "node_modules\\typescript\\lib",
-  "liveServer.settings.multiRootWorkspaceName": "blitzkit"
+  "typescript.tsdk": "node_modules\\typescript\\lib"
 }

README.md

@@ -1,13 +1,49 @@
-## BlitzKit
+# BlitzKit
 
-Your premier source for all things Blitz.
+Tools for everything and anything, World of Tanks Blitz.
 
-### https://blitzkit.app/
+This GitHub repository contains the code for BlitzKit and all its services. If you are here, looking to use BlitzKit, go to https://blitzkit.app/.
 
-![BlitzKit website](https://i.imgur.com/KaxUxmt.png)
+If you intend to contribute to the code, note that you may need to check out sensitive, closed-source submodules to locally develop certain aspects of BlitzKit. Communicate with `@tresabhi` on Discord to get started or discuss sensitive content, such as environment variables or submodules.
 
-## Invite the bot
+## Packages
 
-Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
+| Package                              | Title                | Source                                                                                                                                                                                     | Memo                                                                                                                     |
+| ------------------------------------ | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------ |
+| [packages/app](packages/app)         | BlitzKit             | [Play Store](https://play.google.com/store/apps/details?id=com.tresabhi.blitzkit), [App Store](https://apps.apple.com/app/4321), [Microsoft Store](https://apps.microsoft.com/detail/zyxw) | The native app of BlitzKit for all platforms. Unavailable from stores at this time.                                      |
+| [packages/bot](packages/bot)         | BlitzKit Discord Bot | [Discord Application Directory](https://discord.com/discovery/applications/1097673957865443370)                                                                                            | The one-in-all Discord bot for statistics.                                                                               |
+| [packages/core](packages/core)       |                      |                                                                                                                                                                                            | Mutual internal code shared between all other packages.                                                                  |
+| [packages/i18n](packages/i18n)       |                      | [Crowdin](https://crowdin.com/project/blitzkrieg)                                                                                                                                          | Translations served as JSON shared across all other packages, including some utility code.                               |
+| [packages/scripts](packages/scripts) |                      |                                                                                                                                                                                            | CLI utilities for the development and deployment of BlitzKit services.                                                   |
+| [packages/varuna](packages/varuna)   | Varuna               | [NPM](https://www.npmjs.com/package/varuna)                                                                                                                                                | React and Astro-oriented state management library, awaiting separation from BlitzKit. Unavailable from NPM at this time. |
+| [packages/website](packages/website) | BlitzKit | https://blitzkit.app | The BlitzKit website provides a wide range of tools, APIs, and interconnects all other services.                      |
 
-![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png)
+## Submodules
+
+| Submodule                                                    | Title       | Source                                                      | Memo                                                                                                                                                                        |
+| ------------------------------------------------------------ | ----------- | ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [submodules/blitzkit-closed](submodules/blitzkit-closed)     | ClosedKit   | [blitzkit/closed](https://github.com/blitzkit/closed)       | Closed source, sensitive code hidden from the public to prevent bad actors from abusing the game. Discuss with `@tresabhi` on Discord for **special permission** to access. |
+| [submodules/blitzkit-internal](submodules/blitzkit-internal) | InternalKit | [blitzkit/internal](https://github.com/blitzkit/internal)   | Closed source, sensitive internal documentation hidden from the public to prevent bad actors from abusing the game. Access to this submodule is **not negotiable**.         |
+| [submodules/CUE4Parse](submodules/CUE4Parse)                 | CUE4Parse   | [FabianFG/CUE4Parse](https://github.com/FabianFG/CUE4Parse) | An Unreal Engine archives and packages parsing library in C#.                                                                                                               |
+
+## Environment Variables
+
+| Name                                                          | Source                                                                           | BlitzKit Default                    | Memo                                                                                                                                |
+| ------------------------------------------------------------- | -------------------------------------------------------------------------------- | ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `PUBLIC_WARGAMING_APPLICATION_ID`                             | [Wargaming Developer's Room](https://developers.wargaming.net/)                  |                                     | Application ID needed to communicate with Wargaming APIs.                                                                           |
+| `PUBLIC_PROMOTE_OPENTEST`                                     |                                                                                  | `false`                             | Optional boolean dictating whether the website advertises [the opentest subdomain of BlitzKit](https://opentest.blitzkit.app/).      |
+| `ALLOW_ROBOTS`                                                |                                                                                  | `true`                              | Toggles between `Allow: /` and `Disallow: /` in the website's `/robots.txt`. This is usually `false` for all BlitzKit's subdomains. |
+| `WOTB_GLOSSARY`, `WOTB_GLOSSARY_DOMAIN`, `WOTB_GLOSSARY_PATH` |                                                                                  |                                     |                                                                                                                                     |
+| `PUBLIC_GOOGLE_TAG_MANAGER_ID`                                | [Google Tag Manager](https://tagmanager.google.com/)                             | `G-GL2JVHCGPQ`                      | Google Tag Manager's unique identifier for analytical purposes.                                                                     |
+| `PUBLIC_GOOGLE_ANALYTICS_PROPERTY_ID`                         | [Google Analytics](https://analytics.google.com/)                                | `430711767`                         | Google Analytics' unique property ID for [BlitzKit's apex domain](https://blitzkit.app/) and subdomains.                            |
+| `GOOGLE_APPLICATION_CREDENTIALS`                              | [Google Cloud](https://cloud.google.com/)                                        |                                     | Google Cloud's API key, primarily used for ranking popular tanks and finding relevant tank review videos in Tankopedia.             |
+| `PUBLIC_DISCORD_SERVER_ID`                                    | [BlitzKit Discord Server](https://discord.gg/nDt7AjGJQH)                         | `734786591205359697`                | BlitzKit Discord Server's id.                                                                                                       |
+| `PUBLIC_ASSET_BASE`                                           | [blitzkit/assets](https://github.com/blitzkit/assets)                            | `https://blitzkit.github.io/assets` | The root domain and path that serves the external assets like tank models and icons.                                                |
+| `PUBLIC_BRANCH`                                               |                                                                                  | `main`                              | The branch that the website is operating on. This is completely nominal.                                                            |
+| `PUBLIC_GUIDE_WEBSITE`                                        | [GuidesBlitz](https://guidesblitz.com/)                                          | `https://guidesblitz.com`           | The website that serves the encyclopedia-like content in BlitzKit.                                                                  |
+| `SERVICING`                                                   |                                                                                  | `false`                             | Wether the website is down for servicing.                                                                                           |
+| `DISCORD_CLIENT_ID`                                           | [Discord Developer Portal](https://discord.com/developers/applications)          | `1097673957865443370`               | The BlitzKit Discord Bot's user ID.                                                                                                 |
+| `GH_TOKEN`                                                    | [GitHub Fine-Grained Tokens](https://github.com/settings/personal-access-tokens) |                                     | The GitHub API key used for checking out private submodules and pushing content to the asset repository.                            |
+| `DISCORD_TOKEN`                                               | [Discord Developer Portal](https://discord.com/developers/applications)          |                                     | The Discord API Key for the BlitzKit Discord Bot.                                                                                   |
+| `DATABASE_URL`                                                | [CockroachDB](https://www.cockroachlabs.com/)                                    |                                     | The CockroachDB-SQL database URL used to link Wargaming and Discord users.                                                          |
+| `WOTB_DLC_CDN`                                                |                                                                                  |                                     |                                                                                                                                     |

docs/changelogs/1.27.18.md

@@ -0,0 +1,11 @@
+# BlitzKit 1.27.18
+
+## Features
+
+- Added a mini-game to BlitzKit similar to "Guess Who's That Pokemon" but with tanks: http://blitzkit.vercel.app/guess
+- Switched to a new renderer for better lighting for the Tankopedia
+
+## Fixes
+
+- The loading bar for the Tankopedia sandbox now shows up again
+- Removed a lot of dead code, improving performance

docs/changelogs/1.27.19.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.27.19
+
+Two updates in a day? I just got a little excited by the new Tankopedia lighting.
+
+## Features
+
+- The camera is now lower down in the Tankopedia, giving the tank a more heroic feel
+- Tanks are better framed across all devices, minimizing whitespace
+- Added a skip button for the reload visualizer to skip to the next event
+
+## Fixes
+
+- Removed the useless "show grid" setting
+- Taking screenshots now no longer includes the scene props like the floor
+- The subtler color contrast for the advanced highlighting has now been reverted back to the higher contrast
+- The shot display card is now properly aligned as a proper table again
+- Tank modules are once again considered in the penetration tester
+- Tank filters in the antagonist selector in the Tankopedia sandbox are now properly aligned

docs/changelogs/1.27.20.md

@@ -0,0 +1,13 @@
+# BlitzKit 1.27.20
+
+It's all technical updates! The HD tanks will be rolled out over the span of few days.
+
+## Technical Changes
+
+- Shadows are disabled if your framerate drops below 30fps
+- Pages that redirect to other pages (like the old /tools/tankopedia) now load a few hundred times faster
+- Replaced Zustand with a custom state manager called Varuna with the goal to rewrite a significant portion of the website to not require any React for rendering increasing performance
+- The transition wireframe in the Tankopedia sandbox now uses a lower quality model for performance reasons
+- Tanks with PBR now use the correct maximum resolution textures
+  - This is a significant update as you can now literally see individual splats of dust on tanks and scratches haha
+- Baked the ambient occlusion maps into the textures, hence reducing the overall model load times even with higher resolution textures

docs/changelogs/1.28.0.md

@@ -0,0 +1,16 @@
+# BlitzKit 1.28.0
+
+BlitzKit, as an app and the new Mixer tool!
+
+## Features
+
+- Created the BlitzKit app that can be downloaded on most devices
+- Re-did the BlitzKit logo to be a bit warmer
+- Added the Mixer tool which lets you combine tank models into Frankensteins
+- Updated all dependencies to the latest version for a decent performance boost
+
+## Fixes
+
+- BlitzKit no longer forgets persistent data if the app crashes without properly closing
+- The tools list in the navbar no longer overflows into the neighboring elements on certain devices
+- Added keying to a few places, speeding up re-rendering

docs/changelogs/1.28.1.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.28.1
+
+## Fixes
+
+- The lights no longer crash the Mixer tool

docs/changelogs/1.28.2.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.28.2
+
+## Fixes
+
+- BlitzKit no longer tries to redirect translated pages to the same page, over and over again

docs/changelogs/1.28.3.md

@@ -0,0 +1,18 @@
+# BlitzKit 1.28.3
+
+## Features
+
+- Turrets and guns can now be rotated in Mixer without any pitch or yaw limits
+- Added nation icons to the search results for Guesser
+- The table now occupies the whole screen in Compare
+- Added the ability to log in with a Wargaming account in the navbar
+- Added owned/unowned filters in the Tankopedia filters
+- Revamped Tankopedia quick controls to be more accessible and obvious
+
+## Fixes
+
+- Missing tank icons across the website have been fixed
+- Events of starting and stopping of the transform tanks now use an asynchronous event instead of a reactive state, making them faster
+- Removed a hook call on root context, speeding up load times
+- Tankopedia's pitch input now follows the same sign convention as the pitch and yaw visualizer
+- Shadows are no longer disabled when the scene is unloaded when the user scrolls away from the canvas

package.json

@@ -1,7 +1,7 @@
 {
   "name": "blitzkit",
   "private": true,
-  "version": "1.27.17",
+  "version": "1.28.3",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "type": "module",
   "types": "./types.d.ts",
@@ -16,11 +16,14 @@
     "build:prisma": "prisma generate",
     "build:sitemap": "bun scripts/sitemap.ts",
     "build:docs": "vitepress build docs",
+    "build:proxyclient": "cd packages/scripts && bun run build:proxyclient",
     "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
+    "build:app": "cd packages/app && bun run build",
     "dev:bot": "bun run build:bot --dev && bun start:bot",
     "start:bot": "bun dist/bot/main.js",
     "dev:docs": "vitepress dev docs",
     "dev:website": "cd packages/website && bun run dev",
+    "dev:app": "cd packages/app && bun run dev",
     "dev": "bun run dev:website",
     "dev:api": "bun --filter=@blitzkit/api run dev",
     "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
@@ -41,19 +44,22 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@types/xmpp__client": "^0.13.3",
+    "@xmpp/client": "^0.13.6",
+    "astro-favicons": "^3.1.5",
     "cheerio": "^1.1.2",
-    "googleapis": "^144.0.0",
+    "googleapis": "^160.0.0",
     "lodash-es": "^4.17.21",
-    "protobufjs": "^7.5.2",
+    "protobufjs": "^7.5.4",
     "quicklime": "^1.2.0",
-    "sharp": "^0.33.5"
+    "sharp": "^0.34.4"
   },
   "devDependencies": {
-    "@types/bun": "latest",
+    "@types/bun": "^1.2.22",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "prettier": "^3.5.3",
-    "prisma": "^6.6.0",
-    "typescript": "^5.8.3"
+    "@types/node": "^24.5.2",
+    "prettier": "^3.6.2",
+    "prisma": "^6.16.2",
+    "typescript": "^5.9.2"
   }
 }

packages/app/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@blitzkit/app",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview",
+    "tauri": "tauri"
+  },
+  "dependencies": {
+    "@tauri-apps/api": "^2",
+    "@tauri-apps/plugin-opener": "^2",
+    "@tauri-apps/cli": "^2",
+    "vite": "^6.0.3",
+    "typescript": "~5.6.2"
+  }
+}

packages/app/src-tauri/.gitignore

@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+
+# Generated by Tauri
+# will have schema files for capabilities auto-completion
+/gen/schemas

packages/app/src-tauri/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "blitzkit"
+version = "0.1.0"
+description = "A Tauri App"
+authors = ["you"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+# The `_lib` suffix may seem redundant but it is necessary
+# to make the lib name unique and wouldn't conflict with the bin name.
+# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
+name = "blitzkit_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = [] }
+tauri-plugin-opener = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+

packages/app/src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}

packages/app/src-tauri/capabilities/default.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Capability for the main window",
+  "windows": ["main"],
+  "permissions": [
+    "core:default",
+    "opener:default"
+  ]
+}

packages/app/src-tauri/src/lib.rs

@@ -0,0 +1,14 @@
+// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
+#[tauri::command]
+fn greet(name: &str) -> String {
+    format!("Hello, {}! You've been greeted from Rust!", name)
+}
+
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_opener::init())
+        .invoke_handler(tauri::generate_handler![greet])
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}

packages/app/src-tauri/src/main.rs

@@ -0,0 +1,27 @@
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+use std::process::{Command, Stdio};
+use tauri::Manager;
+
+fn main() {
+  tauri::Builder::default()
+    .setup(|app| {
+      let app_handle = app.handle();
+
+      let entry = app_handle
+        .path_resolver()
+        .resolve_resource("../../dist/website/server/entry.mjs")
+        .expect("failed to resolve server.ts");
+
+      Command::new("bun")
+        .arg("run")
+        .arg(entry)
+        .stderr(Stdio::null())
+        .spawn()
+        .expect("failed to start Bun server");
+
+      Ok(())
+    })
+    .run(tauri::generate_context!())
+    .expect("error while running Tauri app");
+}

packages/app/src-tauri/tauri.conf.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "blitzkit",
+  "version": "0.1.0",
+  "identifier": "com.tresabhi.blitzkit",
+  "build": {
+    "beforeDevCommand": "cd ../website && bun run dev",
+    "_beforeBuildCommand": "cd ../website && bun run build",
+    "frontendDist": "../../../dist/website/client",
+    "devUrl": "http://localhost:4321"
+  },
+  "app": {
+    "withGlobalTauri": true,
+    "windows": [
+      {
+        "url": "http://localhost:4321",
+        "title": "BlitzKit",
+        "fullscreen": false,
+        "resizable": true,
+        "maximized": true
+      }
+    ],
+    "security": {
+      "csp": null
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/[email protected]",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
+  }
+}

packages/app/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": ["../../tsconfig.json"],
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  }
+}

packages/bot/package.json

@@ -6,14 +6,14 @@
   "dependencies": {
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
-    "satori": "^0.10.14",
+    "satori": "^0.18.3",
     "@resvg/resvg-js": "^2.6.2",
-    "discord.js": "^14.16.3",
-    "react": "^18.3.1",
+    "discord.js": "^14.22.1",
+    "react": "^19.1.1",
     "@radix-ui/colors": "^3.0.0",
-    "fuzzysort": "^2.0.4",
+    "fuzzysort": "^3.1.0",
     "bepaint": "^0.1.0-beta.3",
-    "dotenv": "^16.4.5",
+    "dotenv": "^17.2.2",
     "markdown-escape": "^2.0.0"
   },
   "scripts": {

packages/bot/src/commands/auction.ts

@@ -1,144 +0,0 @@
-import {
-  BlitzTankClass,
-  Region,
-  regionToRegionSubdomain,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
-import { chunkLines } from '../core/discord/chunkLines';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-
-type Auction = null | {
-  count: number;
-  has_next: boolean;
-  results: Result[];
-};
-
-type Result =
-  | {
-      id?: number;
-      type: 'vehicle';
-      countable?: boolean;
-      entity?: Entity;
-      initial_count: number;
-      current_count: number;
-      saleable?: boolean;
-      available_from?: Date;
-      available_before?: Date;
-      price?: Price;
-      next_price: Price | null;
-      available: true;
-      display?: boolean;
-      next_price_datetime: Date;
-      next_price_timestamp: number;
-    }
-  | {
-      available: false;
-      type: 'vehicle';
-    };
-
-interface Entity {
-  id: number;
-  name: string;
-  nation: string;
-  subnation: string;
-  use_subnation_flag: boolean;
-  type_slug: BlitzTankClass;
-  level: number;
-  roman_level: string;
-  user_string: string;
-  image_url: string;
-  preview_image_url: string;
-  is_premium: boolean;
-  is_collectible: boolean;
-}
-
-interface Price {
-  currency: Currency;
-  value: number;
-}
-
-interface Currency {
-  name: 'gold';
-  count: number;
-  title: 'Gold';
-  image_url: string;
-  sizes: unknown;
-  type: 'currency';
-}
-
-const WARNING_COUNT = 500;
-
-export const auctionCommand = new Promise<CommandRegistry>((resolve) => {
-  resolve({
-    command: createLocalizedCommand('auction'),
-
-    async handler(interaction) {
-      const { strings } = translator(interaction.locale);
-      const awaitedTankDefinitions = await tankDefinitions;
-      const region: Region = 'com';
-      const pageSize = 80;
-      const saleable = true;
-      const data = await fetch(
-        `https://${regionToRegionSubdomain(
-          region,
-        )}.wotblitz.com/en/api/events/items/auction/?page_size=${
-          pageSize
-        }&type[]=vehicle&saleable=${saleable}`,
-      ).then((response) => response.json() as Promise<Auction>);
-
-      if (data === null) {
-        return strings.bot.commands.auction.errors.no_auction;
-      }
-
-      const saleableTanks = data.results.filter((result) => result.available);
-      const nextPricesTimestamp = saleableTanks[0].next_price_timestamp;
-
-      const title = `# ${strings.bot.commands.auction.body.title}`;
-      const subtitle = `${literals(strings.bot.commands.auction.body.subtitle, [
-        `${saleableTanks.length} / ${data.results.length}`,
-        `<t:${nextPricesTimestamp}:R>`,
-        '<https://wotblitz.com/auction/>',
-      ])}`;
-      const body = saleableTanks.map((data, index) => {
-        const tank = awaitedTankDefinitions.tanks[data.entity!.id];
-
-        if (!tank) return '';
-
-        const name = `[${tank.name}](<https://blitzkit.app/tanks/${
-          tank.slug
-        }>)`;
-        const next =
-          data.next_price === null
-            ? ''
-            : `\n-# ${literals(strings.bot.commands.auction.body.next, [
-                `<:gold:1317173197082333244> ${data.next_price.value.toLocaleString(
-                  interaction.locale,
-                )}`,
-              ])}`;
-        const available = literals(
-          strings.bot.commands.auction.body.available,
-          [
-            data.current_count.toLocaleString(interaction.locale),
-            data.initial_count.toLocaleString(interaction.locale),
-          ],
-        );
-        const isOut = data.current_count === 0;
-        const outString = isOut ? '~~' : '';
-        const isLow = data.current_count <= WARNING_COUNT;
-
-        return `${index + 1}. ${
-          outString
-        }${name} <:gold:1317173197082333244> ${data.price!.value.toLocaleString(
-          interaction.locale,
-        )}${outString}\n-#${isLow ? ' ‼️ ' : ' '}${available}${isOut ? '' : next}`;
-      });
-      const header = `${title}\n${subtitle}`;
-      const lines = [header, ...body];
-
-      return chunkLines(lines, '\n\n');
-    },
-  });
-});

packages/bot/src/commands/breakdown/render.tsx

@@ -6,23 +6,23 @@ import {
   getTankStats,
   getWN8Percentile,
   TankDefinition,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { chunk } from 'lodash-es';
-import * as Breakdown from '../../components/Breakdown';
-import { CommandWrapper } from '../../components/CommandWrapper';
-import { NoData } from '../../components/NoData';
-import { TitleBar } from '../../components/TitleBar';
-import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
-import { tankDefinitions } from '../../core/blitzkit/nonBlockingPromises';
-import { UserError } from '../../core/blitzkit/userError';
-import { filterStats, StatFilters } from '../../core/blitzstars/filterStats';
-import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
-import { blitzStarsTankAverages } from '../../core/blitzstars/tankAverages';
-import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
-import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
-import { translator } from '../../core/localization/translator';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { chunk } from "lodash-es";
+import * as Breakdown from "../../components/Breakdown";
+import { CommandWrapper } from "../../components/CommandWrapper";
+import { NoData } from "../../components/NoData";
+import { TitleBar } from "../../components/TitleBar";
+import { filtersToDescription } from "../../core/blitzkit/filtersToDescription";
+import { tankDefinitions } from "../../core/blitzkit/nonBlockingPromises";
+import { UserError } from "../../core/blitzkit/userError";
+import { filterStats, StatFilters } from "../../core/blitzstars/filterStats";
+import { getStatsInPeriod } from "../../core/blitzstars/getStatsInPeriod";
+import { blitzStarsTankAverages } from "../../core/blitzstars/tankAverages";
+import { ResolvedPeriod } from "../../core/discord/resolvePeriodFromCommand";
+import { ResolvedPlayer } from "../../core/discord/resolvePlayerFromCommand";
+import { translator } from "../../core/localization/translator";
 
 const ROWS_PER_PAGE = 8;
 const MAX_PAGES = 9;
@@ -31,7 +31,7 @@ export async function renderBreakdown(
   { region, id }: ResolvedPlayer,
   { start, end, name }: ResolvedPeriod,
   filters: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { strings, unwrap } = translator(locale);
   const awaitedTankDefinitions = await tankDefinitions;
@@ -39,7 +39,7 @@ export async function renderBreakdown(
   const statsInPeriod = await getStatsInPeriod(region, id, start, end, locale);
   const { filteredOrder } = await filterStats(statsInPeriod, filters);
   const accountInfo = await getAccountInfo(region, id);
-  const clanData = await getClanAccountInfo(region, id, ['clan']);
+  const clanData = await getClanAccountInfo(region, id, ["clan"]);
   const tankStats = await getTankStats(region, id);
   const filterDescriptions = await filtersToDescription(filters, locale);
   const orderedCurrentStats: BlitzStats[] = [];
@@ -74,63 +74,63 @@ export async function renderBreakdown(
     orderedCareerWN8Full.push(
       tankAveragesEntry
         ? calculateWN8(tankAveragesEntry.all, tank.all)
-        : undefined,
+        : undefined
     );
   });
 
   const currentBattles = orderedCurrentStats.reduce(
     (accumulator, current) => accumulator + current.battles,
-    0,
+    0
   );
   const careerBattles = tankStats.reduce(
     (accumulator, current) => accumulator + current.all.battles,
-    0,
+    0
   );
   const currentWinrate =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.wins,
-      0,
+      0
     ) / currentBattles;
   const careerWinrate =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.wins,
-      0,
+      0
     ) / careerBattles;
   const currentWN8 =
     orderedCurrentWN8.reduce<number>(
       (accumulator, current, index) =>
         accumulator + (current ?? 0) * orderedCurrentStats[index].battles,
-      0,
+      0
     ) /
     orderedCurrentStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCurrentWN8[index] === undefined ? 0 : current.battles),
-      0,
+      0
     );
   const careerWN8 =
     orderedCareerWN8Full.reduce<number>(
       (accumulator, current) => accumulator + (current ?? 0),
-      0,
+      0
     ) /
     tankStats.reduce(
       (accumulator, current, index) =>
         accumulator +
         (orderedCareerWN8Full[index] === undefined ? 0 : current.all.battles),
-      0,
+      0
     );
   const currentDamage =
     orderedCurrentStats.reduce(
       (accumulator, current) => accumulator + current.damage_dealt,
-      0,
+      0
     ) / currentBattles;
   const careerDamage =
     tankStats.reduce(
       (accumulator, current) => accumulator + current.all.damage_dealt,
-      0,
+      0
     ) / careerBattles;
 
-  const children: JSX.Element[] = [];
+  const children: React.JSX.Element[] = [];
 
   if (filteredOrder.length > 0) {
     children.push(
@@ -172,7 +172,7 @@ export async function renderBreakdown(
             delta: currentDamage - careerDamage,
           },
         ]}
-      />,
+      />
     );
 
     filteredOrder.forEach((id, index) => {
@@ -193,9 +193,9 @@ export async function renderBreakdown(
           title={
             tankDefinition
               ? unwrap(tankDefinition.name)
-              : literals(strings.bot.commands.breakdown.body.unknown_tank, [
-                  `${id}`,
-                ])
+              : literals(strings.bot.commands.breakdown.body.unknown_tank, {
+                  id,
+                })
           }
           stats={[
             {
@@ -206,7 +206,7 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.winrate,
               current: `${(100 * (current.wins / current.battles)).toFixed(
-                2,
+                2
               )}%`,
               career: `${(100 * (career.wins / career.battles)).toFixed(2)}%`,
               delta:
@@ -230,24 +230,24 @@ export async function renderBreakdown(
             {
               title: strings.bot.commands.breakdown.body.damage,
               current: Math.round(
-                current.damage_dealt / current.battles,
+                current.damage_dealt / current.battles
               ).toLocaleString(),
               career: Math.round(
-                career.damage_dealt / career.battles,
+                career.damage_dealt / career.battles
               ).toLocaleString(),
               delta:
                 current.damage_dealt / current.battles -
                 career.damage_dealt / career.battles,
             },
           ]}
-        />,
+        />
       );
     });
   }
 
   const pages = chunk(
     children,
-    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE),
+    Math.max(Math.ceil(children.length / MAX_PAGES), ROWS_PER_PAGE)
   );
 
   if (filteredOrder.length > 0) {

packages/bot/src/commands/inactive.tsx

@@ -1,44 +1,44 @@
-import { getAccountInfo, getClanInfo } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { GenericStats } from '../components/GenericStats';
-import { NoData } from '../components/NoData';
-import { TitleBar } from '../components/TitleBar';
-import { addClanChoices } from '../core/discord/addClanChoices';
-import { autocompleteClan } from '../core/discord/autocompleteClan';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { localizationObject } from '../core/discord/localizationObject';
-import { resolveClanFromCommand } from '../core/discord/resolveClanFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { getAccountInfo, getClanInfo } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { GenericStats } from "../components/GenericStats";
+import { NoData } from "../components/NoData";
+import { TitleBar } from "../components/TitleBar";
+import { addClanChoices } from "../core/discord/addClanChoices";
+import { autocompleteClan } from "../core/discord/autocompleteClan";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { localizationObject } from "../core/discord/localizationObject";
+import { resolveClanFromCommand } from "../core/discord/resolveClanFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_THRESHOLD = 7;
 
 export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('inactive')
+    command: createLocalizedCommand("inactive")
       .addStringOption(addClanChoices)
       .addNumberOption((option) => {
         const { strings } = translator(Locale.EnglishUS);
 
         return option
-          .setName('threshold')
+          .setName("threshold")
           .setNameLocalizations(
             localizationObject(
               (strings) => strings.bot.commands.inactive.options.threshold.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.inactive.options.threshold.description,
+            strings.bot.commands.inactive.options.threshold.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.inactive.options.threshold.description,
-            ),
+                strings.bot.commands.inactive.options.threshold.description
+            )
           )
           .setMinValue(0);
       }),
@@ -47,7 +47,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
       const { strings } = translator(interaction.locale);
       const { region, id } = await resolveClanFromCommand(interaction);
       const threshold =
-        interaction.options.getNumber('threshold')! ?? DEFAULT_THRESHOLD;
+        interaction.options.getNumber("threshold")! ?? DEFAULT_THRESHOLD;
       const time = new Date().getTime() / 1000;
       const clanInfo = await getClanInfo(region, id);
       const accountInfo = await getAccountInfo(region, clanInfo.members_ids);
@@ -57,7 +57,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
             [
               account.nickname,
               (time - account.last_battle_time) / 60 / 60 / 24,
-            ] as [string, number],
+            ] as [string, number]
         )
         .filter(([, inactiveDays]) => inactiveDays >= threshold)
         .sort((a, b) => b[1] - a[1])
@@ -65,10 +65,10 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
           ([name, days]) =>
             [
               name,
-              literals(strings.bot.commands.inactive.body.listing, [
-                days.toFixed(0),
-              ]),
-            ] as [string, string],
+              literals(strings.bot.commands.inactive.body.listing, {
+                days: days.toFixed(0),
+              }),
+            ] as [string, string]
         );
       const hasInactiveMembers = inactive.length > 0;
 
@@ -79,7 +79,7 @@ export const inactiveCommand = new Promise<CommandRegistry>((resolve) => {
             image={`https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clanInfo.emblem_set_id}.png`}
             description={`${literals(
               strings.bot.commands.inactive.body.subtitle,
-              [`${threshold}`],
+              { days: threshold }
             )} • ${new Date().toLocaleDateString(interaction.locale)}`}
           />
 

packages/bot/src/commands/ownedTanks.tsx

@@ -5,31 +5,31 @@ import {
   flags,
   getAccountInfo,
   getTankStats,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import markdownEscape from 'markdown-escape';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import markdownEscape from "markdown-escape";
 import {
   gameDefinitions,
   tankDefinitions,
-} from '../core/blitzkit/nonBlockingPromises';
-import { addTierChoices } from '../core/discord/addTierChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { chunkLines } from '../core/discord/chunkLines';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "../core/blitzkit/nonBlockingPromises";
+import { addTierChoices } from "../core/discord/addTierChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { chunkLines } from "../core/discord/chunkLines";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('owned-tanks')
+    command: createLocalizedCommand("owned-tanks")
       .addStringOption(addTierChoices)
       .addStringOption(addUsernameChoices),
 
     async handler(interaction) {
       const { strings, unwrap } = translator(interaction.locale);
-      const tier = Number(interaction.options.getString('tier'));
+      const tier = Number(interaction.options.getString("tier"));
       const { id, region } = await resolvePlayerFromCommand(interaction);
       const accountInfo = await getAccountInfo(region, id);
       const tankStats = await getTankStats(region, id);
@@ -43,7 +43,7 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
           tankStats.map(async (tankData) => ({
             tankDefinitions: (await tankDefinitions).tanks[tankData.tank_id]!,
             id: tankData.tank_id,
-          })),
+          }))
         )
       ).filter((tank) => tank.tankDefinitions?.tier === tier);
       const groupedTanks: Record<string, TankDefinition[]> = {};
@@ -60,25 +60,25 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
 
       const awaitedTankDefinitions = await tankDefinitions;
       const awaitedGameDefinitions = await gameDefinitions;
-      const title = literals(strings.bot.commands.owned_tanks.body.title, [
-        markdownEscape(accountInfo.nickname),
-        TIER_ROMAN_NUMERALS[tier],
-      ]);
+      const title = literals(strings.bot.commands.owned_tanks.body.title, {
+        name: markdownEscape(accountInfo.nickname),
+        tier: TIER_ROMAN_NUMERALS[tier],
+      });
       const tankList = tankStats
         .map(({ tank_id }) => awaitedTankDefinitions.tanks[tank_id])
         .filter((tank) => tank.tier === tier)
         .sort(
           (a, b) =>
-            TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class),
+            TANK_CLASSES.indexOf(a.class) - TANK_CLASSES.indexOf(b.class)
         )
         .sort(
           (a, b) =>
             awaitedGameDefinitions.nations.indexOf(a.nation) -
-            awaitedGameDefinitions.nations.indexOf(b.nation),
+            awaitedGameDefinitions.nations.indexOf(b.nation)
         )
         .map(
           (tank) =>
-            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`,
+            `[${flags[tank.nation]} ${markdownEscape(unwrap(tank.name))}](<https://blitzkit.app/tanks/${tank.slug}>)`
         );
       const lines = [title, ...tankList];
 

packages/bot/src/commands/permissions.ts

@@ -1,11 +1,11 @@
-import { literals } from '@blitzkit/i18n';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { literals } from "@blitzkit/i18n";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('permissions'),
+    command: createLocalizedCommand("permissions"),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
@@ -14,33 +14,33 @@ export const permissionsCommand = new Promise<CommandRegistry>((resolve) => {
         new Date().getDay() === 5 && new Date().getDate() === 13;
       const permissions = [
         [
-          interaction.appPermissions?.has('ViewChannel'),
+          interaction.appPermissions?.has("ViewChannel"),
           strings.bot.commands.permissions.body.view_channels,
         ],
         [
-          interaction.appPermissions?.has('ReadMessageHistory'),
+          interaction.appPermissions?.has("ReadMessageHistory"),
           strings.bot.commands.permissions.body.read_message_history,
         ],
         [
-          interaction.appPermissions?.has('AttachFiles'),
+          interaction.appPermissions?.has("AttachFiles"),
           strings.bot.commands.permissions.body.attach_files,
         ],
         [
-          interaction.appPermissions?.has('UseExternalEmojis'),
+          interaction.appPermissions?.has("UseExternalEmojis"),
           strings.bot.commands.permissions.body.external_emojis,
         ],
       ];
       const body = permissions
         .map(([hasPermission, description]) => {
           if (hasPermission) {
-            return `${isFridayThe13th ? '😇' : '✅'} ${description}`;
+            return `${isFridayThe13th ? "😇" : "✅"} ${description}`;
           } else {
-            return `${isFridayThe13th ? '💀' : '❌'} ${description}`;
+            return `${isFridayThe13th ? "💀" : "❌"} ${description}`;
           }
         })
-        .join('\n');
+        .join("\n");
 
-      return literals(strings.bot.commands.permissions.body.title, [body]);
+      return literals(strings.bot.commands.permissions.body.title, { body });
     },
   });
 });

packages/bot/src/commands/ping.ts

@@ -1,15 +1,15 @@
-import { literals } from '@blitzkit/i18n';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { literals } from "@blitzkit/i18n";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const pingCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
     handlesInteraction: true,
 
-    command: createLocalizedCommand('ping', [
-      { subcommand: 'blitzkit' },
-      { subcommand: 'wotb' },
+    command: createLocalizedCommand("ping", [
+      { subcommand: "blitzkit" },
+      { subcommand: "wotb" },
     ]),
 
     async handler(interaction) {
@@ -17,17 +17,17 @@ export const pingCommand = new Promise<CommandRegistry>((resolve) => {
       const subcommand = interaction.options.getSubcommand();
       const executionStart = Date.now();
 
-      if (subcommand === 'blitzkit') {
+      if (subcommand === "blitzkit") {
         await interaction.editReply(strings.bot.commands.ping.body.pong);
       } else {
-        await fetch('https://api.wotblitz.com/');
+        await fetch("https://api.wotblitz.com/");
       }
 
       const executionTime = Date.now() - executionStart;
       interaction.editReply(
-        literals(strings.bot.commands.ping.body.pong_with_time, [
-          `${Math.round(executionTime)}`,
-        ]),
+        literals(strings.bot.commands.ping.body.pong_with_time, {
+          time: executionTime.toFixed(0),
+        })
       );
     },
   });

packages/bot/src/commands/playerInfo.ts

@@ -1,19 +1,19 @@
-import { getAccountInfo } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import markdownEscape from 'markdown-escape';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { markdownTable } from '../core/discord/markdownTable';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { getAccountInfo } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import markdownEscape from "markdown-escape";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { markdownTable } from "../core/discord/markdownTable";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
     command:
-      createLocalizedCommand('player-info').addStringOption(addUsernameChoices),
+      createLocalizedCommand("player-info").addStringOption(addUsernameChoices),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
@@ -22,9 +22,9 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
       const accountInfo = await getAccountInfo(region, id);
 
       return embedInfo(
-        literals(strings.bot.commands.player_info.body.title, [
-          markdownEscape(accountInfo.nickname),
-        ]),
+        literals(strings.bot.commands.player_info.body.title, {
+          name: markdownEscape(accountInfo.nickname),
+        }),
 
         markdownTable([
           [
@@ -51,16 +51,16 @@ export const playerInfoCommand = new Promise<CommandRegistry>((resolve) => {
           [
             strings.bot.commands.player_info.body.created,
             new Date(accountInfo.created_at * 1000).toLocaleDateString(
-              interaction.locale,
+              interaction.locale
             ),
           ],
           [
             strings.bot.commands.player_info.body.last_battle,
             new Date(accountInfo.last_battle_time * 1000).toLocaleDateString(
-              interaction.locale,
+              interaction.locale
             ),
           ],
-        ]),
+        ])
       );
     },
 

packages/bot/src/commands/rating.tsx

@@ -8,42 +8,42 @@ import {
   getRatingInfo,
   getRatingNeighbors,
   imgur,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { SlashCommandSubcommandBuilder } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { DeltaCaret } from '../components/DeltaCaret';
-import { TitleBar } from '../components/TitleBar';
-import { normalizeLeagueIcon } from '../core/blitz/normalizeLeagueIcon';
-import { iconPng } from '../core/blitzkit/iconPng';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-import { theme } from '../stitches.config';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { SlashCommandSubcommandBuilder } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { Glow } from "../components/AllStatsOverview/components/HeroStat/components/Glow";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { DeltaCaret } from "../components/DeltaCaret";
+import { TitleBar } from "../components/TitleBar";
+import { normalizeLeagueIcon } from "../core/blitz/normalizeLeagueIcon";
+import { iconPng } from "../core/blitzkit/iconPng";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
+import { theme } from "../stitches.config";
 
 const LEAGUE_ACCENT = [
-  '_purple',
-  '_sand',
-  '_amber',
-  '_mauve',
-  '_brown',
+  "_purple",
+  "_sand",
+  "_amber",
+  "_mauve",
+  "_brown",
 ] as const;
 
 export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('rating', [
+    command: createLocalizedCommand("rating", [
       {
-        subcommand: 'today',
+        subcommand: "today",
         modify(option: SlashCommandSubcommandBuilder) {
           option.addStringOption(addUsernameChoices);
         },
       },
       {
-        subcommand: 'season',
+        subcommand: "season",
         modify(option: SlashCommandSubcommandBuilder) {
           option.addStringOption(addUsernameChoices);
         },
@@ -52,11 +52,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
     async handler(interaction) {
       const subcommand = interaction.options.getSubcommand(true) as
-        | 'season'
-        | 'today';
+        | "season"
+        | "today";
       const { strings } = translator(interaction.locale);
       const { id, region } = await resolvePlayerFromCommand(interaction);
-      const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+      const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
 
       const ratingInfo = await getRatingInfo(region);
@@ -67,20 +67,20 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
       const leaderboard = await getArchivedRatingLeaderboard(
         region,
-        ratingInfo.current_season - (subcommand === 'today' ? 0 : 1),
+        ratingInfo.current_season - (subcommand === "today" ? 0 : 1)
       );
 
-      if (leaderboard.version!.$case === 'v1') {
+      if (leaderboard.version!.$case === "v1") {
         throw new Error(
-          'Encountered bkrl minimal format in latest season. Wait till next cron?',
+          "Encountered bkrl minimal format in latest season. Wait till next cron?"
         );
       }
 
       const accountInfo = await getAccountInfo(region, id, [
-        'statistics.rating',
+        "statistics.rating",
       ]);
       const statsIndex = leaderboard.version!.value.entries.findIndex(
-        (entry) => entry.id === id,
+        (entry) => entry.id === id
       );
       const statsA = leaderboard
         ? leaderboard.version!.value.entries[statsIndex!]
@@ -90,9 +90,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
       const statsB2Array = (await getRatingNeighbors(region, id, 0)).neighbors;
 
       if (statsB2Array === undefined) {
-        return literals(strings.bot.commands.rating.errors.no_participation, [
-          markdownEscape(accountInfo.nickname),
-        ]);
+        return literals(strings.bot.commands.rating.errors.no_participation, {
+          name: markdownEscape(accountInfo.nickname),
+        });
       }
 
       const [statsB2] = statsB2Array;
@@ -102,15 +102,15 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
         return strings.bot.commands.rating.errors.unrecorded_stats;
       }
       if (!statsB1) {
-        return literals(strings.bot.commands.rating.errors.no_participation, [
-          markdownEscape(accountInfo.nickname),
-        ]);
+        return literals(strings.bot.commands.rating.errors.no_participation, {
+          name: markdownEscape(accountInfo.nickname),
+        });
       }
 
       const reward = ratingInfo.rewards.find(
         (reward) =>
           statsB2.number >= reward.from_position &&
-          statsB2.number <= reward.to_position,
+          statsB2.number <= reward.to_position
       );
       const positionDelta = leaderboard
         ? statsB2.number - positionA!
@@ -118,11 +118,11 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
       const delta = deltaBkrlBlitzStats(
         statsA,
         accountInfo.statistics.rating!,
-        statsB2,
+        statsB2
       );
       const leagueTheme = LEAGUE_ACCENT[league.index];
       let rewardImage = reward
-        ? reward.type === 'vehicle'
+        ? reward.type === "vehicle"
           ? reward.vehicle.preview_image_url
           : reward.stuff.image_url
         : undefined;
@@ -131,7 +131,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
         const { ok } = await fetch(rewardImage);
 
         if (!ok) {
-          rewardImage = imgur('kP88vqr');
+          rewardImage = imgur("kP88vqr");
         }
       }
 
@@ -147,24 +147,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
           <div
             style={{
-              position: 'relative',
-              display: 'flex',
-              overflow: 'hidden',
+              position: "relative",
+              display: "flex",
+              overflow: "hidden",
             }}
           >
             <div
               style={{
-                position: 'relative',
+                position: "relative",
                 padding: 16,
                 backgroundColor: theme.colors[`appBackground2${leagueTheme}`],
                 borderRadius: 4,
                 border: `1px solid ${
                   theme.colors[`componentInteractive${leagueTheme}`]
                 }`,
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-                width: '100%',
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "space-between",
+                width: "100%",
               }}
             >
               {reward === undefined && (
@@ -172,17 +172,17 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   endOpacity={3 / 4}
                   color={theme.colors[`solidBackground${leagueTheme}`]}
                   style={{
-                    transform: 'translateX(-16px) rotate(90deg)',
+                    transform: "translateX(-16px) rotate(90deg)",
                   }}
                 />
               )}
 
               <div
                 style={{
-                  display: 'flex',
+                  display: "flex",
                   gap: 8,
-                  justifyContent: 'center',
-                  alignItems: 'center',
+                  justifyContent: "center",
+                  alignItems: "center",
                 }}
               >
                 <img
@@ -190,24 +190,24 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   style={{
                     width: 64,
                     height: 64,
-                    objectFit: 'contain',
+                    objectFit: "contain",
                   }}
                   src={normalizeLeagueIcon(
-                    ratingInfo.leagues[league.index].big_icon,
+                    ratingInfo.leagues[league.index].big_icon
                   )}
                 />
 
                 <div
                   style={{
-                    display: 'flex',
-                    flexDirection: 'column',
+                    display: "flex",
+                    flexDirection: "column",
                   }}
                 >
                   <div
                     style={{
-                      display: 'flex',
-                      alignItems: 'center',
-                      justifyContent: 'flex-start',
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "flex-start",
                     }}
                   >
                     <span
@@ -232,7 +232,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           }}
                         >
                           {Math.abs(delta.score).toLocaleString(
-                            interaction.locale,
+                            interaction.locale
                           )}
                         </span>
                       </>
@@ -241,9 +241,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
                   <div
                     style={{
-                      display: 'flex',
-                      alignItems: 'center',
-                      justifyContent: 'flex-start',
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "flex-start",
                     }}
                   >
                     <span
@@ -267,7 +267,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           }}
                         >
                           {Math.abs(positionDelta).toLocaleString(
-                            interaction.locale,
+                            interaction.locale
                           )}
                         </span>
                       </>
@@ -279,23 +279,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               {reward && (
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 8,
-                    justifyContent: 'center',
-                    alignItems: 'center',
+                    justifyContent: "center",
+                    alignItems: "center",
                   }}
                 >
                   <div
                     style={{
-                      display: 'flex',
-                      flexDirection: 'column',
+                      display: "flex",
+                      flexDirection: "column",
                     }}
                   >
                     <div
                       style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'flex-end',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "flex-end",
                       }}
                     >
                       <span
@@ -303,13 +303,13 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                           color: theme.colors[`textHighContrast${leagueTheme}`],
                           fontSize: 16,
                           maxWidth: 136,
-                          textAlign: 'right',
-                          whiteSpace: 'nowrap',
-                          textOverflow: 'ellipsis',
-                          overflow: 'hidden',
+                          textAlign: "right",
+                          whiteSpace: "nowrap",
+                          textOverflow: "ellipsis",
+                          overflow: "hidden",
                         }}
                       >
-                        {reward.type === 'vehicle'
+                        {reward.type === "vehicle"
                           ? reward.vehicle.user_string
                           : reward.stuff.title}
                       </span>
@@ -317,9 +317,9 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
 
                     <div
                       style={{
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'flex-end',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "flex-end",
                       }}
                     >
                       <span
@@ -329,7 +329,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                         }}
                       >
                         Reward
-                        {reward.type === 'stuff' ? ` x${reward.count}` : ''}
+                        {reward.type === "stuff" ? ` x${reward.count}` : ""}
                       </span>
                     </div>
                   </div>
@@ -338,7 +338,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                     style={{
                       width: 64,
                       height: 64,
-                      objectFit: 'cover',
+                      objectFit: "cover",
                     }}
                     src={await iconPng(rewardImage!)}
                   />
@@ -350,7 +350,7 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                   endOpacity={3 / 4}
                   color={theme.colors[`solidBackground${leagueTheme}`]}
                   style={{
-                    transform: 'translateX(16px) rotate(-90deg)',
+                    transform: "translateX(16px) rotate(-90deg)",
                   }}
                 />
               )}
@@ -362,10 +362,10 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
                 direction="reverse"
                 color={theme.colors[`solidBackground${leagueTheme}`]}
                 style={{
-                  position: 'absolute',
+                  position: "absolute",
                   top: -40,
-                  left: '50%',
-                  transform: 'translateX(-50%)',
+                  left: "50%",
+                  transform: "translateX(-50%)",
                 }}
               />
             )}
@@ -373,32 +373,32 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               <Glow
                 color={theme.colors[`solidBackground${leagueTheme}`]}
                 style={{
-                  position: 'absolute',
+                  position: "absolute",
                   bottom: -40,
-                  left: '50%',
-                  transform: 'translateX(-50%)',
+                  left: "50%",
+                  transform: "translateX(-50%)",
                 }}
               />
             )}
           </div>
 
           {delta.battles > 0 && (
-            <div style={{ padding: '8px 0', display: 'flex' }}>
+            <div style={{ padding: "8px 0", display: "flex" }}>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {delta.battles.toLocaleString(interaction.locale)}
@@ -414,19 +414,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(100 * (delta.wins / delta.battles)).toFixed(0)}%
@@ -442,23 +442,23 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {Math.round(delta.damage / delta.battles).toLocaleString(
-                    interaction.locale,
+                    interaction.locale
                   )}
                 </span>
                 <span
@@ -472,19 +472,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(100 * (delta.survived / delta.battles)).toFixed(0)}%
@@ -500,19 +500,19 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
               </div>
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
                   gap: 4,
                   flex: 1,
-                  flexDirection: 'column',
+                  flexDirection: "column",
                 }}
               >
                 <span
                   style={{
                     fontSize: 24,
                     color: theme.colors.textHighContrast,
-                    fontWeight: 'bold',
+                    fontWeight: "bold",
                   }}
                 >
                   {(delta.kills / delta.battles).toFixed(2)}

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -13,27 +13,27 @@ import {
   RatingInfo,
   RatingLeaderboard,
   Region,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
 import {
   APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandSubcommandBuilder,
-} from 'discord.js';
-import { range } from 'lodash-es';
-import markdownEscape from 'markdown-escape';
-import { CommandWrapper } from '../components/CommandWrapper';
-import * as Leaderboard from '../components/Leaderboard';
-import { TitleBar } from '../components/TitleBar';
-import { UserError } from '../core/blitzkit/userError';
-import { addRegionChoices } from '../core/discord/addRegionChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteUsername } from '../core/discord/autocompleteUsername';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { localizationObject } from '../core/discord/localizationObject';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "discord.js";
+import { range } from "lodash-es";
+import markdownEscape from "markdown-escape";
+import { CommandWrapper } from "../components/CommandWrapper";
+import * as Leaderboard from "../components/Leaderboard";
+import { TitleBar } from "../components/TitleBar";
+import { UserError } from "../core/blitzkit/userError";
+import { addRegionChoices } from "../core/discord/addRegionChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteUsername } from "../core/discord/autocompleteUsername";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { localizationObject } from "../core/discord/localizationObject";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 interface SimplifiedPlayer {
   id: number;
@@ -51,7 +51,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
     const onGoingSeason = await isOnGoingRatingSeason();
     const seasonNumbers = range(
       FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
-      latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1,
+      latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1
     );
 
     function addOptions(option: SlashCommandSubcommandBuilder) {
@@ -66,51 +66,50 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.limit.name,
                 undefined,
-                true,
-              ),
+                true
+              )
             )
             .setDescription(
               literals(
                 strings.bot.commands.rating_leaderboard.options.limit
                   .description,
-                [`${DEFAULT_LIMIT}`],
-              ),
+                { count: DEFAULT_LIMIT }
+              )
             )
             .setDescriptionLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.limit
                     .description,
-                [`${DEFAULT_LIMIT}`],
-              ),
+                { count: DEFAULT_LIMIT }
+              )
             )
             .setRequired(false)
             .setMinValue(5)
-            .setMaxValue(30),
+            .setMaxValue(30)
         )
         .addStringOption((option) =>
           option
             .setName(
-              strings.bot.commands.rating_leaderboard.options.season.name,
+              strings.bot.commands.rating_leaderboard.options.season.name
             )
             .setNameLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.season.name,
                 undefined,
-                true,
-              ),
+                true
+              )
             )
             .setDescription(
-              strings.bot.commands.rating_leaderboard.options.season
-                .description,
+              strings.bot.commands.rating_leaderboard.options.season.description
             )
             .setDescriptionLocalizations(
               localizationObject(
                 (strings) =>
                   strings.bot.commands.rating_leaderboard.options.season
-                    .description,
-              ),
+                    .description
+              )
             )
             .setRequired(false)
             .addChoices(
@@ -124,7 +123,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? literals(
                           strings.bot.commands.rating_leaderboard.options.season
                             .choices.current,
-                          [`${number}`],
+                          { season: number }
                         )
                       : `${number}`,
                     value: `${number}`,
@@ -133,27 +132,27 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           (strings) =>
                             strings.bot.commands.rating_leaderboard.options
                               .season.choices.current,
-                          [`${number}`],
+                          { season: number }
                         )
                       : undefined,
                   } satisfies APIApplicationCommandOptionChoice<string>;
                 })
-                .reverse(),
-            ),
+                .reverse()
+            )
         );
     }
 
     resolve({
-      command: createLocalizedCommand('rating-leaderboard', [
+      command: createLocalizedCommand("rating-leaderboard", [
         {
-          subcommand: 'neighbors',
+          subcommand: "neighbors",
           modify(option: SlashCommandSubcommandBuilder) {
             option.addStringOption(addUsernameChoices);
             addOptions(option);
           },
         },
         {
-          subcommand: 'league',
+          subcommand: "league",
           modify(option: SlashCommandSubcommandBuilder) {
             option
               .addStringOption((option) => {
@@ -161,7 +160,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
 
                 return option
                   .setName(
-                    strings.bot.commands.rating_leaderboard.options.league.name,
+                    strings.bot.commands.rating_leaderboard.options.league.name
                   )
                   .setNameLocalizations(
                     localizationObject(
@@ -169,19 +168,19 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         strings.bot.commands.rating_leaderboard.options.league
                           .name,
                       undefined,
-                      true,
-                    ),
+                      true
+                    )
                   )
                   .setDescription(
                     strings.bot.commands.rating_leaderboard.options.league
-                      .description,
+                      .description
                   )
                   .setDescriptionLocalizations(
                     localizationObject(
                       (strings) =>
                         strings.bot.commands.rating_leaderboard.options.league
-                          .description,
-                    ),
+                          .description
+                    )
                   )
                   .addChoices(
                     ...LEAGUES.map(
@@ -195,10 +194,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                             (strings) =>
                               (
                                 strings.common.leagues as Record<string, string>
-                              )[name],
+                              )[name]
                           ),
-                        }) satisfies APIApplicationCommandOptionChoice<string>,
-                    ),
+                        }) satisfies APIApplicationCommandOptionChoice<string>
+                    )
                   )
                   .setRequired(true);
               })
@@ -213,10 +212,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
       async handler(interaction) {
         const { strings } = translator(interaction.locale);
         const subcommand = interaction.options.getSubcommand(true) as
-          | 'league'
-          | 'neighbors';
-        const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
-        const seasonOption = interaction.options.getString('season');
+          | "league"
+          | "neighbors";
+        const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT;
+        const seasonOption = interaction.options.getString("season");
         const season = seasonOption
           ? parseInt(seasonOption)
           : onGoingSeason
@@ -232,11 +231,11 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         let playerId: number | undefined;
         let regionRatingInfo: RatingInfo | null;
 
-        if (subcommand === 'league') {
+        if (subcommand === "league") {
           const leagueIndex = parseInt(
-            interaction.options.getString('league')!,
+            interaction.options.getString("league")!
           );
-          const region = interaction.options.getString('region') as Region;
+          const region = interaction.options.getString("region") as Region;
           regionRatingInfo = await (isCurrentSeason
             ? getRatingInfo(region)
             : null);
@@ -259,8 +258,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       position: player.number,
                       clan: player.clan_tag,
                       nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer,
-                ),
+                    }) satisfies SimplifiedPlayer
+                )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
                 async (players) => {
@@ -269,17 +268,17 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? 0
                       : players.version!.value.entries.findIndex(
                           (player) =>
-                            player.score < LEAGUES[leagueIndex - 1].minScore,
+                            player.score < LEAGUES[leagueIndex - 1].minScore
                         );
                   const lastPlayerIndex = firstPlayerIndex + limit - 1;
                   const trimmed = players.version!.value.entries.slice(
                     firstPlayerIndex,
-                    lastPlayerIndex + 1,
+                    lastPlayerIndex + 1
                   );
                   const clanData = await getClanAccountInfo(
                     region,
                     trimmed.map(({ id }) => id),
-                    ['clan'],
+                    ["clan"]
                   );
 
                   return trimmed.map(
@@ -294,16 +293,16 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                           literals(
                             strings.bot.commands.rating_leaderboard.body
                               .deleted_player,
-                            [`${player.id}`],
+                            { id: player.id }
                           ),
-                      }) satisfies SimplifiedPlayer,
+                      }) satisfies SimplifiedPlayer
                   );
-                },
+                }
               );
           const leagueInfo = LEAGUES[leagueIndex];
           archivedLeaderboard = await getArchivedRatingLeaderboard(
             region,
-            season,
+            season
           );
 
           players = result;
@@ -316,12 +315,12 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
               ? (strings.common.leagues as Record<string, string>)[
                   LEAGUES[leagueInfo.index].name
                 ]
-              : ''
+              : ""
           } - ${strings.common.regions.short[region]}`;
           titleImage = imgur(leagueInfo.icon);
           titleDescription = literals(
             strings.bot.commands.rating_leaderboard.body.top_players,
-            [`${limit}`],
+            { count: limit }
           );
         } else {
           const { region, id } = await resolvePlayerFromCommand(interaction);
@@ -338,7 +337,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
           }
 
           const accountInfo = await getAccountInfo(region, id);
-          const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+          const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
           const neighbors = isCurrentSeason
             ? await getRatingNeighbors(region, id, Math.round(limit / 2)).then(
                 (players) =>
@@ -350,13 +349,13 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         score: player.score,
                         clan: player.clan_tag,
                         nickname: player.nickname,
-                      }) satisfies SimplifiedPlayer,
-                  ),
+                      }) satisfies SimplifiedPlayer
+                  )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
                 async (players) => {
                   const playerIndex = players.version!.value.entries.findIndex(
-                    (player) => player.id === id,
+                    (player) => player.id === id
                   );
 
                   if (playerIndex === -1) {
@@ -364,20 +363,20 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       literals(
                         strings.bot.commands.rating_leaderboard.body
                           .no_participation,
-                        [markdownEscape(accountInfo.nickname), `${season}`],
-                      ),
+                        { player: markdownEscape(accountInfo.nickname), season }
+                      )
                     );
                   }
 
                   const halfRange = Math.round(limit / 2);
                   const trimmed = players.version!.value.entries.slice(
                     playerIndex - halfRange,
-                    playerIndex + halfRange + 1,
+                    playerIndex + halfRange + 1
                   );
                   const clanData = await getClanAccountInfo(
                     region,
                     trimmed.map((player) => player.id),
-                    ['clan'],
+                    ["clan"]
                   );
 
                   return trimmed.map((player, index) => ({
@@ -389,18 +388,18 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       ? clanData[index]!.account_name
                       : `Deleted ${player.id}`,
                   }));
-                },
+                }
               );
           archivedLeaderboard = await getArchivedRatingLeaderboard(
             region,
-            season,
+            season
           );
 
           players = neighbors;
           titleImage = clan
             ? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
             : undefined;
-          titleName = neighbors ? accountInfo.nickname : '';
+          titleName = neighbors ? accountInfo.nickname : "";
           titleDescription =
             strings.bot.commands.rating_leaderboard.body.neighbors;
           playersAfter =
@@ -414,7 +413,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         const items = players.map((player) => {
           const midnightIndex =
             archivedLeaderboard?.version!.value.entries.findIndex(
-              (item) => item.id === player.id,
+              (item) => item.id === player.id
             );
           const midnightScore =
             midnightIndex === undefined
@@ -453,7 +452,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   <Leaderboard.Gap
                     message={literals(
                       strings.bot.commands.rating_leaderboard.body.more,
-                      [`${playersAfter.toLocaleString(interaction.locale)}`],
+                      { count: playersAfter.toLocaleString(interaction.locale) }
                     )}
                   />
                 )}
@@ -465,5 +464,5 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
 
       autocomplete: autocompleteUsername,
     });
-  },
+  }
 );

packages/bot/src/commands/research.tsx

@@ -8,31 +8,31 @@ import {
   TANK_ICONS,
   TankType,
   TIER_ROMAN_NUMERALS,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { escapeMarkdown, Locale } from 'discord.js';
-import { CommandWrapper } from '../components/CommandWrapper';
-import { TitleBar } from '../components/TitleBar';
-import { resolveTankId } from '../core/blitz/resolveTankId';
-import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
-import { iconPng } from '../core/blitzkit/iconPng';
-import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
-import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
-import { tankIconPng } from '../core/blitzkit/tankIconPng';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { autocompleteTanks } from '../core/discord/autocompleteTanks';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { localizationObject } from '../core/discord/localizationObject';
-import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
-import { theme } from '../stitches.config';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { escapeMarkdown, Locale } from "discord.js";
+import { CommandWrapper } from "../components/CommandWrapper";
+import { TitleBar } from "../components/TitleBar";
+import { resolveTankId } from "../core/blitz/resolveTankId";
+import { buildTechTreeLine } from "../core/blitzkit/buildTechTreeLine";
+import { iconPng } from "../core/blitzkit/iconPng";
+import { tankDefinitions } from "../core/blitzkit/nonBlockingPromises";
+import { resolveAncestry } from "../core/blitzkit/resolveAncestry";
+import { tankIconPng } from "../core/blitzkit/tankIconPng";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { autocompleteTanks } from "../core/discord/autocompleteTanks";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { localizationObject } from "../core/discord/localizationObject";
+import { resolvePlayerFromCommand } from "../core/discord/resolvePlayerFromCommand";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
+import { theme } from "../stitches.config";
 
 export const researchCommand = new Promise<CommandRegistry>((resolve) => {
   const { strings } = translator(Locale.EnglishUS);
 
   resolve({
-    command: createLocalizedCommand('research')
+    command: createLocalizedCommand("research")
       .addStringOption((option) =>
         option
           .setName(strings.bot.commands.research.options.target_tank.name)
@@ -41,20 +41,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.research.options.target_tank.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.research.options.target_tank.description,
+            strings.bot.commands.research.options.target_tank.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.research.options.target_tank.description,
-            ),
+                strings.bot.commands.research.options.target_tank.description
+            )
           )
           .setAutocomplete(true)
-          .setRequired(true),
+          .setRequired(true)
       )
       .addStringOption((option) =>
         option
@@ -64,20 +64,20 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.research.options.starting_tank.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
-            strings.bot.commands.research.options.starting_tank.description,
+            strings.bot.commands.research.options.starting_tank.description
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
-                strings.bot.commands.research.options.starting_tank.description,
-            ),
+                strings.bot.commands.research.options.starting_tank.description
+            )
           )
           .setAutocomplete(true)
-          .setRequired(false),
+          .setRequired(false)
       )
       .addStringOption(addUsernameChoices),
 
@@ -85,11 +85,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
       const { strings, unwrap } = translator(interaction.locale);
       const awaitedTankDefinitions = await tankDefinitions;
       const targetTankId = await resolveTankId(
-        interaction.options.getString('target-tank', true),
+        interaction.options.getString("target-tank", true),
         interaction.locale,
-        true,
+        true
       );
-      const startingTankRaw = interaction.options.getString('starting-tank');
+      const startingTankRaw = interaction.options.getString("starting-tank");
       const targetTank = awaitedTankDefinitions.tanks[targetTankId];
       const { id, region } = await resolvePlayerFromCommand(interaction);
       let startingTankId: number;
@@ -99,46 +99,45 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
         startingTankId = await resolveTankId(
           startingTankRaw,
           interaction.locale,
-          true,
+          true
         );
 
         if (targetTankId === startingTankId) {
           return literals(
             strings.bot.commands.research.errors.start_end_equal,
-            [escapeMarkdown(unwrap(targetTank.name))],
+            { tank: escapeMarkdown(unwrap(targetTank.name)) }
           );
         }
 
         const startingTank = awaitedTankDefinitions.tanks[startingTankId];
 
         if (startingTank.tier > targetTank.tier) {
-          return literals(strings.bot.commands.research.errors.unordered, [
-            escapeMarkdown(unwrap(startingTank.name)),
-            escapeMarkdown(unwrap(targetTank.name)),
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.unordered, {
+            tank_1: escapeMarkdown(unwrap(startingTank.name)),
+            tank_2: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         if (!targetTankAncestry.includes(startingTankId)) {
           return literals(
             strings.bot.commands.research.errors.tanks_not_on_line,
-            [
-              escapeMarkdown(unwrap(targetTank.name)),
-              escapeMarkdown(unwrap(startingTank.name)),
-            ],
+            {
+              tank_1: escapeMarkdown(unwrap(targetTank.name)),
+              tank_2: escapeMarkdown(unwrap(startingTank.name)),
+            }
           );
         }
       } else {
         if (targetTank.type !== TankType.RESEARCHABLE) {
-          return literals(strings.bot.commands.research.errors.non_tech_tree, [
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.non_tech_tree, {
+            tank: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         if (targetTank.tier === 1) {
-          return literals(strings.bot.commands.research.errors.tier_1, [
-            escapeMarkdown(unwrap(targetTank.name)),
-          ]);
+          return literals(strings.bot.commands.research.errors.tier_1, {
+            tank: escapeMarkdown(unwrap(targetTank.name)),
+          });
         }
 
         const tankStats = await getTankStats(region, id);
@@ -150,18 +149,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
         if (tankStats.some(({ tank_id }) => tank_id === targetTankId)) {
           return literals(
             strings.bot.commands.research.errors.already_researched,
-            [escapeMarkdown(unwrap(targetTank.name))],
+            { tank: escapeMarkdown(unwrap(targetTank.name)) }
           );
         }
 
         const foundAncestor = targetTankAncestry.find(
           (id) =>
             awaitedTankDefinitions.tanks[id].tier === 1 ||
-            tankStats.some(({ tank_id }) => tank_id === id),
+            tankStats.some(({ tank_id }) => tank_id === id)
         );
 
         if (foundAncestor === undefined) {
-          throw new Error('No first owned tech tree found.');
+          throw new Error("No first owned tech tree found.");
         }
 
         startingTankId = foundAncestor;
@@ -169,12 +168,12 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
       const techTreeLine = await buildTechTreeLine(
         startingTankId,
-        targetTankId,
+        targetTankId
       );
 
       const line = [...techTreeLine, startingTankId].reverse();
       const { nickname } = await getAccountInfo(region, id);
-      const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
+      const clan = (await getClanAccountInfo(region, id, ["clan"]))?.clan;
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
       const costs = await Promise.all(
         line.map(async (id) => {
@@ -187,18 +186,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.turrets.forEach((turret) => {
             if (
               turret.research_cost !== undefined &&
-              typeof turret.research_cost.research_cost_type!.value === 'number'
+              typeof turret.research_cost.research_cost_type!.value === "number"
             ) {
               turretXps.set(
                 turret.id,
-                turret.research_cost.research_cost_type!.value,
+                turret.research_cost.research_cost_type!.value
               );
             }
 
             turret.guns.forEach((gun) => {
               if (
                 gun.research_cost !== undefined &&
-                typeof gun.research_cost.research_cost_type!.value === 'number'
+                typeof gun.research_cost.research_cost_type!.value === "number"
               ) {
                 gunXps.set(gun.id, gun.research_cost.research_cost_type!.value);
               }
@@ -208,11 +207,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.engines.forEach((engine) => {
             if (
               engine.research_cost !== undefined &&
-              typeof engine.research_cost.research_cost_type!.value === 'number'
+              typeof engine.research_cost.research_cost_type!.value === "number"
             ) {
               engineXps.set(
                 engine.id,
-                engine.research_cost.research_cost_type!.value,
+                engine.research_cost.research_cost_type!.value
               );
             }
           });
@@ -220,11 +219,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           tank.tracks.forEach((track) => {
             if (
               track.research_cost !== undefined &&
-              typeof track.research_cost.research_cost_type!.value === 'number'
+              typeof track.research_cost.research_cost_type!.value === "number"
             ) {
               trackXps.set(
                 track.id,
-                track.research_cost.research_cost_type!.value,
+                track.research_cost.research_cost_type!.value
               );
             }
           });
@@ -249,10 +248,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
             purchase: tank.price.value,
             equipment: equipmentPriceMatrix[tank.tier].reduce(
               (a, b) => a + 3 * b,
-              0,
+              0
             ),
           };
-        }),
+        })
       );
 
       const image = (
@@ -267,14 +266,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
           <div
             style={{
-              display: 'flex',
-              flexDirection: 'column',
+              display: "flex",
+              flexDirection: "column",
               gap: 8,
             }}
           >
             <div
               style={{
-                display: 'flex',
+                display: "flex",
                 borderRadius: 4,
                 backgroundColor: theme.colors.appBackground2,
                 border: theme.borderStyles.subtle,
@@ -285,10 +284,10 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               <div
                 style={{
                   flex: 1,
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  position: 'relative',
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                  position: "relative",
                   right: 24,
                 }}
               >
@@ -304,23 +303,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
               <div
                 style={{
                   flex: 1,
-                  display: 'flex',
-                  flexDirection: 'column',
-                  justifyContent: 'center',
+                  display: "flex",
+                  flexDirection: "column",
+                  justifyContent: "center",
                   gap: 8,
-                  padding: '16px 0',
+                  padding: "16px 0",
                 }}
               >
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="XP icon"
-                    src={await iconPng(asset('icons/currencies/xp.webp'))}
+                    src={await iconPng(asset("icons/currencies/xp.webp"))}
                     width={16}
                     height={16}
                   />
@@ -330,7 +329,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Experience:{' '}
+                    Experience:{" "}
                     {costs
                       .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
                       .toLocaleString(interaction.locale)}
@@ -339,14 +338,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="Silver icon"
-                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    src={await iconPng(asset("icons/currencies/silver.webp"))}
                     width={16}
                     height={16}
                   />
@@ -356,7 +355,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Purchase:{' '}
+                    Purchase:{" "}
                     {costs
                       .reduce((a, b) => a + b.purchase, 0)
                       .toLocaleString(interaction.locale)}
@@ -365,14 +364,14 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                 <div
                   style={{
-                    display: 'flex',
+                    display: "flex",
                     gap: 4,
-                    alignItems: 'center',
+                    alignItems: "center",
                   }}
                 >
                   <img
                     alt="Silver icon"
-                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    src={await iconPng(asset("icons/currencies/silver.webp"))}
                     width={16}
                     height={16}
                   />
@@ -382,7 +381,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
-                    Equipment:{' '}
+                    Equipment:{" "}
                     {costs
                       .reduce((a, b) => a + b.equipment, 0)
                       .toLocaleString(interaction.locale)}
@@ -399,7 +398,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                   <div
                     key={id}
                     style={{
-                      display: 'flex',
+                      display: "flex",
                       borderRadius: 4,
                       backgroundColor: theme.colors.appBackground2,
                       border: theme.borderStyles.subtle,
@@ -408,9 +407,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         width: 48,
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'center',
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
                       }}
                     >
                       <span
@@ -426,9 +425,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         flex: 1,
-                        display: 'flex',
-                        position: 'relative',
-                        right: '5%',
+                        display: "flex",
+                        position: "relative",
+                        right: "5%",
                       }}
                     >
                       <img
@@ -437,23 +436,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         style={{
                           height: 100,
                           width: 100,
-                          objectFit: 'contain',
-                          position: 'absolute',
-                          left: '25%',
+                          objectFit: "contain",
+                          position: "absolute",
+                          left: "25%",
                           top: 0,
                         }}
                       />
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
-                          justifyContent: 'center',
-                          position: 'absolute',
+                          alignItems: "center",
+                          justifyContent: "center",
+                          position: "absolute",
                           bottom: 8,
-                          left: '50%',
-                          transform: 'translateX(-50%)',
+                          left: "50%",
+                          transform: "translateX(-50%)",
                         }}
                       >
                         <img
@@ -476,23 +475,23 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                     <div
                       style={{
                         flex: 1,
-                        display: 'flex',
-                        flexDirection: 'column',
-                        justifyContent: 'center',
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
                         gap: 8,
-                        padding: '16px 0',
+                        padding: "16px 0",
                       }}
                     >
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="XP icon"
-                          src={await iconPng(asset('icons/currencies/xp.webp'))}
+                          src={await iconPng(asset("icons/currencies/xp.webp"))}
                           width={16}
                           height={16}
                         />
@@ -504,11 +503,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.research,
-                            [
-                              `${costs[index].research?.toLocaleString(
-                                interaction.locale,
-                              )}`,
-                            ],
+                            {
+                              cost: costs[index].research?.toLocaleString(
+                                interaction.locale
+                              ),
+                            }
                           )}
                         </span>
                       </div>
@@ -516,15 +515,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       {costs[index].upgrades > 0 && (
                         <div
                           style={{
-                            display: 'flex',
+                            display: "flex",
                             gap: 4,
-                            alignItems: 'center',
+                            alignItems: "center",
                           }}
                         >
                           <img
                             alt="Free XP icon"
                             src={await iconPng(
-                              asset('icons/currencies/free-xp.webp'),
+                              asset("icons/currencies/free-xp.webp")
                             )}
                             width={16}
                             height={16}
@@ -537,7 +536,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                           >
                             {literals(
                               strings.bot.commands.research.body.upgrades,
-                              [costs[index].upgrades.toLocaleString()],
+                              { cost: costs[index].upgrades.toLocaleString() }
                             )}
                           </span>
                         </div>
@@ -545,15 +544,15 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="Silver icon"
                           src={await iconPng(
-                            asset('icons/currencies/silver.webp'),
+                            asset("icons/currencies/silver.webp")
                           )}
                           width={16}
                           height={16}
@@ -566,26 +565,26 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.purchase,
-                            [
-                              costs[index].purchase.toLocaleString(
-                                interaction.locale,
+                            {
+                              cost: costs[index].purchase.toLocaleString(
+                                interaction.locale
                               ),
-                            ],
+                            }
                           )}
                         </span>
                       </div>
 
                       <div
                         style={{
-                          display: 'flex',
+                          display: "flex",
                           gap: 4,
-                          alignItems: 'center',
+                          alignItems: "center",
                         }}
                       >
                         <img
                           alt="Silver icon"
                           src={await iconPng(
-                            asset('icons/currencies/silver.webp'),
+                            asset("icons/currencies/silver.webp")
                           )}
                           width={16}
                           height={16}
@@ -598,18 +597,18 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                         >
                           {literals(
                             strings.bot.commands.research.body.equipment,
-                            [
-                              costs[index].equipment.toLocaleString(
-                                interaction.locale,
+                            {
+                              cost: costs[index].equipment.toLocaleString(
+                                interaction.locale
                               ),
-                            ],
+                            }
                           )}
                         </span>
                       </div>
                     </div>
                   </div>
                 );
-              }),
+              })
             )}
           </div>
         </CommandWrapper>
@@ -621,7 +620,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
     },
 
     autocomplete(interaction) {
-      autocompleteTanks(interaction, true, ['target-tank', 'starting-tank']);
+      autocompleteTanks(interaction, true, ["target-tank", "starting-tank"]);
     },
   });
 });

packages/bot/src/commands/searchClans.ts

@@ -1,23 +1,23 @@
-import { ClanList, fetchBlitz, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { addClanChoices } from '../core/discord/addClanChoices';
-import { addRegionChoices } from '../core/discord/addRegionChoices';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { localizationObject } from '../core/discord/localizationObject';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+import { ClanList, fetchBlitz, Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { addClanChoices } from "../core/discord/addClanChoices";
+import { addRegionChoices } from "../core/discord/addRegionChoices";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { localizationObject } from "../core/discord/localizationObject";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_LIMIT = 25;
 
 export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
   resolve({
-    command: createLocalizedCommand('search-clans')
+    command: createLocalizedCommand("search-clans")
       .addStringOption(addRegionChoices)
       .addStringOption((option) =>
-        addClanChoices(option).setAutocomplete(false),
+        addClanChoices(option).setAutocomplete(false)
       )
       .addIntegerOption((option) => {
         const { strings } = translator(Locale.EnglishUS);
@@ -28,21 +28,21 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
             localizationObject(
               (strings) => strings.bot.commands.search_clans.options.limit.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
             literals(
               strings.bot.commands.search_clans.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
                 strings.bot.commands.search_clans.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setMinValue(1)
           .setMaxValue(100);
@@ -50,24 +50,24 @@ export const searchClansCommand = new Promise<CommandRegistry>((resolve) => {
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
-      const region = interaction.options.getString('region') as Region;
-      const clan = interaction.options.getString('clan')!;
-      const limit = interaction.options.getInteger('limit') ?? DEFAULT_LIMIT;
-      const clanList = await fetchBlitz<ClanList>(region, 'clans/list', {
+      const region = interaction.options.getString("region") as Region;
+      const clan = interaction.options.getString("clan")!;
+      const limit = interaction.options.getInteger("limit") ?? DEFAULT_LIMIT;
+      const clanList = await fetchBlitz<ClanList>(region, "clans/list", {
         search: clan,
         limit,
       });
 
       return embedInfo(
-        literals(strings.bot.commands.search_clans.body.title, [
-          markdownEscape(clan),
-          strings.common.regions.normal[region],
-        ]),
+        literals(strings.bot.commands.search_clans.body.title, {
+          search: markdownEscape(clan),
+          region: strings.common.regions.normal[region],
+        }),
         clanList.length === 0
           ? strings.bot.commands.search_clans.body.no_results
           : `\`\`\`\n${clanList
               .map((clan) => `${clan.name} [${clan.tag}]`)
-              .join('\n')}\n\`\`\``,
+              .join("\n")}\n\`\`\``
       );
     },
   });

packages/bot/src/commands/searchPlayers.ts

@@ -3,17 +3,17 @@ import {
   fetchBlitz,
   Region,
   usernamePattern,
-} from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { addRegionChoices } from '../core/discord/addRegionChoices';
-import { addUsernameChoices } from '../core/discord/addUsernameChoices';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { embedInfo } from '../core/discord/embedInfo';
-import { localizationObject } from '../core/discord/localizationObject';
-import { translator } from '../core/localization/translator';
-import { CommandRegistry } from '../events/interactionCreate';
+} from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { addRegionChoices } from "../core/discord/addRegionChoices";
+import { addUsernameChoices } from "../core/discord/addUsernameChoices";
+import { createLocalizedCommand } from "../core/discord/createLocalizedCommand";
+import { embedInfo } from "../core/discord/embedInfo";
+import { localizationObject } from "../core/discord/localizationObject";
+import { translator } from "../core/localization/translator";
+import { CommandRegistry } from "../events/interactionCreate";
 
 const DEFAULT_LIMIT = 25;
 
@@ -21,10 +21,10 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
   const { strings } = translator(Locale.EnglishUS);
 
   resolve({
-    command: createLocalizedCommand('search-players')
+    command: createLocalizedCommand("search-players")
       .addStringOption(addRegionChoices)
       .addStringOption((option) =>
-        addUsernameChoices(option).setAutocomplete(false).setRequired(true),
+        addUsernameChoices(option).setAutocomplete(false).setRequired(true)
       )
       .addIntegerOption((option) =>
         option
@@ -34,49 +34,49 @@ export const searchPlayersCommand = new Promise<CommandRegistry>((resolve) => {
               (strings) =>
                 strings.bot.commands.search_players.options.limit.name,
               undefined,
-              true,
-            ),
+              true
+            )
           )
           .setDescription(
             literals(
               strings.bot.commands.search_players.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setDescriptionLocalizations(
             localizationObject(
               (strings) =>
                 strings.bot.commands.search_players.options.limit.description,
-              [`${DEFAULT_LIMIT}`],
-            ),
+              { limit: DEFAULT_LIMIT }
+            )
           )
           .setMinValue(1)
-          .setMaxValue(100),
+          .setMaxValue(100)
       ),
 
     async handler(interaction) {
       const { strings } = translator(interaction.locale);
-      const region = interaction.options.getString('region') as Region;
-      const name = interaction.options.getString('username')!;
-      const limit = interaction.options.getInteger('limit') ?? 25;
+      const region = interaction.options.getString("region") as Region;
+      const name = interaction.options.getString("username")!;
+      const limit = interaction.options.getInteger("limit") ?? 25;
       const trimmedSearch = name.trim();
       const players = usernamePattern.test(trimmedSearch)
-        ? await fetchBlitz<AccountList>(region, 'account/list', {
+        ? await fetchBlitz<AccountList>(region, "account/list", {
             search: trimmedSearch,
             limit,
           })
         : [];
 
       return embedInfo(
-        literals(strings.bot.commands.search_players.body.title, [
-          markdownEscape(trimmedSearch),
-          strings.common.regions.normal[region],
-        ]),
+        literals(strings.bot.commands.search_players.body.title, {
+          search: markdownEscape(trimmedSearch),
+          region: strings.common.regions.normal[region],
+        }),
         `\`\`\`${
           players.length === 0
             ? strings.bot.commands.search_players.body.no_results
-            : players.map((player) => player.nickname).join('\n')
-        }\`\`\``,
+            : players.map((player) => player.nickname).join("\n")
+        }\`\`\``
       );
     },
   });

packages/bot/src/core/blitz/resolveTankId.ts

@@ -1,33 +1,33 @@
-import { SEARCH_KEYS } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { go } from 'fuzzysort';
-import markdownEscape from 'markdown-escape';
-import { tankDefinitions, tankNames } from '../blitzkit/nonBlockingPromises';
-import { UserError } from '../blitzkit/userError';
-import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
-import { translator } from '../localization/translator';
+import { SEARCH_KEYS } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { go } from "fuzzysort";
+import markdownEscape from "markdown-escape";
+import { tankDefinitions, tankNames } from "../blitzkit/nonBlockingPromises";
+import { UserError } from "../blitzkit/userError";
+import { tankNamesTechTreeOnly } from "../discord/autocompleteTanks";
+import { translator } from "../localization/translator";
 
 export async function resolveTankId(
   tank: string | number,
   locale: Locale,
-  techTreeOnly = false,
+  techTreeOnly = false
 ) {
   const { strings } = translator(locale);
-  const number = typeof tank === 'string' ? Number(tank) : tank;
+  const number = typeof tank === "string" ? Number(tank) : tank;
 
   if (Number.isNaN(number)) {
     const searchResult = go(
       `${tank}`,
       await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
-      { keys: SEARCH_KEYS, limit: 1 },
+      { keys: SEARCH_KEYS, limit: 1 }
     );
 
     if (searchResult.length === 0) {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_name_not_found, [
-          markdownEscape(`${tank}`),
-        ]),
+        literals(strings.bot.common.errors.tank_name_not_found, {
+          search: markdownEscape(`${tank}`),
+        })
       );
     } else {
       return searchResult[0].obj.id;
@@ -39,7 +39,9 @@ export async function resolveTankId(
       return number;
     } else {
       throw new UserError(
-        literals(strings.bot.common.errors.tank_id_not_found, [`${number}`]),
+        literals(strings.bot.common.errors.tank_id_not_found, {
+          search: number,
+        })
       );
     }
   }

packages/bot/src/core/blitzkit/filtersToDescription.ts

@@ -1,12 +1,12 @@
-import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { StatFilters } from '../blitzstars/filterStats';
-import { translator } from '../localization/translator';
+import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { StatFilters } from "../blitzstars/filterStats";
+import { translator } from "../localization/translator";
 
 export async function filtersToDescription(
   { nation, tier, type, class: tankClass, tank }: StatFilters,
-  locale: Locale,
+  locale: Locale
 ) {
   const { strings, bkLocale } = translator(locale);
   const awaitedTankDefinitions = await fetchTankDefinitions();
@@ -18,11 +18,13 @@ export async function filtersToDescription(
     info.push((strings.common.nations as Record<string, string>)[nation]);
   if (tier) {
     info.push(
-      literals(strings.bot.common.filters.tier, [TIER_ROMAN_NUMERALS[tier]]),
+      literals(strings.bot.common.filters.tier, {
+        tier: TIER_ROMAN_NUMERALS[tier],
+      })
     );
   }
   if (tankClass) info.push(strings.common.tank_class_short[tankClass]);
   if (type) info.push(strings.common.tree_type[type]);
 
-  return info.length === 0 ? strings.bot.common.filters.none : info.join(', ');
+  return info.length === 0 ? strings.bot.common.filters.none : info.join(", ");
 }

packages/bot/src/core/blitzkit/jsxToPng.ts

@@ -1,7 +1,7 @@
-import { jsxToSvg } from './jsxToSvg';
-import { svgToPng } from './svgToPng';
+import { jsxToSvg } from "./jsxToSvg";
+import { svgToPng } from "./svgToPng";
 
-export async function jsxToPng(jsx: JSX.Element) {
+export async function jsxToPng(jsx: React.JSX.Element) {
   const svg = await jsxToSvg(jsx);
   const png = svgToPng(svg);
 

packages/bot/src/core/blitzkit/jsxToPngThreaded.ts

@@ -1,10 +1,10 @@
-import { jsxToSvg } from './jsxToSvg';
-import { RenderConfiguration } from './renderConfiguration';
-import { svgToPngThreaded } from './svgToPngThreaded';
+import { jsxToSvg } from "./jsxToSvg";
+import { RenderConfiguration } from "./renderConfiguration";
+import { svgToPngThreaded } from "./svgToPngThreaded";
 
 export async function jsxToPngThreaded(
-  jsx: JSX.Element,
-  renderConfiguration: RenderConfiguration,
+  jsx: React.JSX.Element,
+  renderConfiguration: RenderConfiguration
 ) {
   const svg = await jsxToSvg(jsx, renderConfiguration);
   const png = await svgToPngThreaded(svg);

packages/bot/src/core/blitzkit/jsxToSvg/index.ts

@@ -1,9 +1,9 @@
-import { readFile } from 'fs/promises';
-import satori from 'satori';
-import { RenderConfiguration } from '../renderConfiguration';
-import robotoBlack from './Roboto-Black.ttf';
-import robotoBold from './Roboto-Bold.ttf';
-import roboto from './Roboto.ttf';
+import { readFile } from "fs/promises";
+import satori from "satori";
+import { RenderConfiguration } from "../renderConfiguration";
+import robotoBlack from "./Roboto-Black.ttf";
+import robotoBold from "./Roboto-Bold.ttf";
+import roboto from "./Roboto.ttf";
 
 const fontsPromise = [
   { file: roboto, weight: 400 as const },
@@ -11,12 +11,12 @@ const fontsPromise = [
   { file: robotoBlack, weight: 900 as const },
 ].map(async ({ file, weight }) => {
   const data = await readFile(`${__dirname}/${file}`);
-  return { name: 'Roboto', weight, data };
+  return { name: "Roboto", weight, data };
 });
 
 export async function jsxToSvg(
-  jsx: JSX.Element,
-  renderConfiguration = new RenderConfiguration(),
+  jsx: React.JSX.Element,
+  renderConfiguration = new RenderConfiguration()
 ) {
   const fonts = await Promise.all(fontsPromise);
   return await satori(jsx, { width: renderConfiguration.width, fonts });

packages/bot/src/core/discord/addTierChoices.ts

@@ -1,13 +1,13 @@
-import { numberToRomanNumeral } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
+import { numberToRomanNumeral } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
 import {
   APIApplicationCommandOptionChoice,
   Locale,
   SlashCommandStringOption,
-} from 'discord.js';
-import { range } from 'lodash-es';
-import { translator } from '../localization/translator';
-import { localizationObject } from './localizationObject';
+} from "discord.js";
+import { range } from "lodash-es";
+import { translator } from "../localization/translator";
+import { localizationObject } from "./localizationObject";
 
 export function addTierChoices(option: SlashCommandStringOption) {
   const { strings } = translator(Locale.EnglishUS);
@@ -18,30 +18,30 @@ export function addTierChoices(option: SlashCommandStringOption) {
       localizationObject(
         (strings) => strings.bot.common.options.tier.name,
         undefined,
-        true,
-      ),
+        true
+      )
     )
     .setDescription(strings.bot.common.options.tier.description)
     .setDescriptionLocalizations(
       localizationObject(
-        (strings) => strings.bot.common.options.tier.description,
-      ),
+        (strings) => strings.bot.common.options.tier.description
+      )
     )
     .setChoices(
       ...range(10, 0).map(
         (tier) =>
           ({
-            name: literals(strings.bot.common.options.tier.choices.tier, [
-              `${tier}`,
-              numberToRomanNumeral(tier),
-            ]),
+            name: literals(strings.bot.common.options.tier.choices.tier, {
+              tier_1: tier,
+              tier_2: numberToRomanNumeral(tier),
+            }),
             value: `${tier}`,
             name_localizations: localizationObject(
               (strings) => strings.bot.common.options.tier.choices.tier,
-              [`${tier}`, numberToRomanNumeral(tier)],
+              { tier_1: tier, tier_2: numberToRomanNumeral(tier) }
             ),
-          }) satisfies APIApplicationCommandOptionChoice,
-      ),
+          }) satisfies APIApplicationCommandOptionChoice
+      )
     )
     .setRequired(true);
 }

packages/bot/src/core/discord/getPeriodOptionName.ts

@@ -1,11 +1,11 @@
-import { literals } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { translator } from '../localization/translator';
-import { PeriodSize } from './addPeriodSubCommands';
+import { literals } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { translator } from "../localization/translator";
+import { PeriodSize } from "./addPeriodSubCommands";
 
 export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
   const { strings } = translator(locale);
-  if (period === 'career') return strings.bot.common.periods.career;
-  if (period === 'today') return strings.bot.common.periods.today;
-  return literals(strings.bot.common.periods.days, [period]);
+  if (period === "career") return strings.bot.common.periods.career;
+  if (period === "today") return strings.bot.common.periods.today;
+  return literals(strings.bot.common.periods.days, { days: period });
 }

packages/bot/src/core/discord/localizationObject.ts

@@ -1,15 +1,15 @@
-import { BlitzKitStrings, literals as literalsFunc } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
-import { SUPPORTED_LOCALES_DISCORD } from '../localization/strings/constants';
-import { translator } from '../localization/translator';
+import { BlitzKitStrings, literals as literalsFunc } from "@blitzkit/i18n";
+import { Locale } from "discord.js";
+import { SUPPORTED_LOCALES_DISCORD } from "../localization/strings/constants";
+import { translator } from "../localization/translator";
 
 const validNameRegex =
   /^[\p{Ll}\p{Lm}\p{Lo}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u;
 
 export function localizationObject(
   path: (strings: BlitzKitStrings) => string,
-  literals: string[] = [],
-  strict = false,
+  literals?: Record<string, string | number>,
+  strict = false
 ) {
   return SUPPORTED_LOCALES_DISCORD.reduce<Partial<Record<Locale, string>>>(
     (localizations, locale) => {
@@ -20,7 +20,7 @@ export function localizationObject(
 
       if (!isValid) {
         console.warn(
-          `Invalid localization for ${locale} (${path}): ${translation}; skipping...`,
+          `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
         );
         return localizations;
       }
@@ -30,6 +30,6 @@ export function localizationObject(
         [locale]: translation,
       };
     },
-    {},
+    {}
   );
 }

packages/bot/src/core/discord/normalizeInteractionReturnable.tsx

@@ -6,14 +6,14 @@ import {
   InteractionEditReplyOptions,
   InteractionReplyOptions,
   MessageEditOptions,
-} from 'discord.js';
-import { InteractionReturnable } from '../../events/interactionCreate';
-import { Writeable } from '../../types/writable';
-import { jsxToPngThreaded } from '../blitzkit/jsxToPngThreaded';
-import { RenderConfiguration } from '../blitzkit/renderConfiguration';
+} from "discord.js";
+import { InteractionReturnable } from "../../events/interactionCreate";
+import { Writeable } from "../../types/writable";
+import { jsxToPngThreaded } from "../blitzkit/jsxToPngThreaded";
+import { RenderConfiguration } from "../blitzkit/renderConfiguration";
 
 export async function normalizeInteractionReturnable(
-  returnable: InteractionReturnable,
+  returnable: InteractionReturnable
 ) {
   const images: [number, Buffer][] = [];
   const reply: InteractionEditReplyOptions &
@@ -27,7 +27,7 @@ export async function normalizeInteractionReturnable(
 
   await Promise.all(
     normalizedReturnable.map(async (item, index) => {
-      if (typeof item === 'string') {
+      if (typeof item === "string") {
         reply.content = item;
       } else if (item instanceof EmbedBuilder) {
         if (!reply.embeds) reply.embeds = [];
@@ -36,7 +36,7 @@ export async function normalizeInteractionReturnable(
         if (!reply.components)
           reply.components = [new ActionRowBuilder<ButtonBuilder>()];
         (reply.components[0] as ActionRowBuilder<ButtonBuilder>).addComponents(
-          item,
+          item
         );
       } else if (item instanceof AttachmentBuilder) {
         if (!reply.files) reply.files = [];
@@ -49,14 +49,14 @@ export async function normalizeInteractionReturnable(
         const image = await jsxToPngThreaded(item, renderConfiguration);
         images.push([index, image]);
       }
-    }),
+    })
   );
 
   if (images.length > 0) {
     images.sort(([a], [b]) => b - a);
     if (!reply.files) reply.files = [];
     images.forEach(([, image]) =>
-      (reply.files as Writeable<typeof reply.files>)?.push(image),
+      (reply.files as Writeable<typeof reply.files>)?.push(image)
     );
   }
 

packages/bot/src/core/discord/resolveClanFromCommand.ts

@@ -1,35 +1,35 @@
-import { Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { ChatInputCommandInteraction } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { searchClansAcrossRegionsBotWrapper } from '../blitz/searchClansAcrossRegionsBotWrapper';
-import { UserError } from '../blitzkit/userError';
-import { translator } from '../localization/translator';
+import { Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { ChatInputCommandInteraction } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { searchClansAcrossRegionsBotWrapper } from "../blitz/searchClansAcrossRegionsBotWrapper";
+import { UserError } from "../blitzkit/userError";
+import { translator } from "../localization/translator";
 
 export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
 
 export async function resolveClanFromCommand(
-  interaction: ChatInputCommandInteraction,
+  interaction: ChatInputCommandInteraction
 ) {
   const { strings } = translator(interaction.locale);
-  const clan = interaction.options.getString('clan', true);
+  const clan = interaction.options.getString("clan", true);
 
   if (serverAndIdPattern.test(clan)) {
-    const [server, accountId] = clan.split('/');
+    const [server, accountId] = clan.split("/");
     return { region: server as Region, id: Number(accountId) };
   } else {
     const accounts = await searchClansAcrossRegionsBotWrapper(
       clan,
-      interaction.locale,
+      interaction.locale
     );
 
     if (accounts[0]) {
       return { region: accounts[0].region, id: accounts[0].clan_id };
     } else {
       throw new UserError(
-        literals(strings.bot.common.errors.clan_not_found, [
-          markdownEscape(clan),
-        ]),
+        literals(strings.bot.common.errors.clan_not_found, {
+          search: markdownEscape(clan),
+        })
       );
     }
   }

packages/bot/src/core/discord/resolvePeriodFromCommand.ts

@@ -1,11 +1,11 @@
-import { getTimeDaysAgo, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import { getPeriodNow } from '../blitzkit/getPeriodNow';
-import { getPeriodStart } from '../blitzkit/getPeriodStart';
-import { translator } from '../localization/translator';
-import { PeriodType } from './addPeriodSubCommands';
-import { getPeriodOptionName } from './getPeriodOptionName';
+import { getTimeDaysAgo, Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { CacheType, ChatInputCommandInteraction } from "discord.js";
+import { getPeriodNow } from "../blitzkit/getPeriodNow";
+import { getPeriodStart } from "../blitzkit/getPeriodStart";
+import { translator } from "../localization/translator";
+import { PeriodType } from "./addPeriodSubCommands";
+import { getPeriodOptionName } from "./getPeriodOptionName";
 
 export interface ResolvedPeriod {
   name: string;
@@ -16,7 +16,7 @@ export interface ResolvedPeriod {
 export function resolvePeriodFromCommand(
   region: Region,
   interaction: ChatInputCommandInteraction<CacheType>,
-  forcedPeriod?: PeriodType,
+  forcedPeriod?: PeriodType
 ) {
   const { strings } = translator(interaction.locale);
   let name: string;
@@ -26,16 +26,16 @@ export function resolvePeriodFromCommand(
     ? forcedPeriod
     : (interaction.options.getSubcommand() as PeriodType);
 
-  if (periodSubcommand === 'custom') {
-    const startOption = interaction.options.getInteger('start', true);
-    const endOption = interaction.options.getInteger('end', true);
+  if (periodSubcommand === "custom") {
+    const startOption = interaction.options.getInteger("start", true);
+    const endOption = interaction.options.getInteger("end", true);
     const startDaysAgoMin = Math.min(startOption, endOption);
     const endDaysAgoMax = Math.max(startOption, endOption);
 
-    name = literals(strings.bot.common.periods.custom, [
-      `${startDaysAgoMin}`,
-      `${endDaysAgoMax}`,
-    ]);
+    name = literals(strings.bot.common.periods.custom, {
+      day_1: startDaysAgoMin,
+      day_2: endDaysAgoMax,
+    });
     start = getTimeDaysAgo(region, endDaysAgoMax);
     end = getTimeDaysAgo(region, startDaysAgoMin);
   } else {

packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts

@@ -1,11 +1,11 @@
-import { idToRegion, Region } from '@blitzkit/core';
-import { literals } from '@blitzkit/i18n';
-import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import markdownEscape from 'markdown-escape';
-import { searchPlayersAcrossRegionsBotWrapper } from '../../blitz/searchPlayersAcrossRegionsBotWrapper';
-import { getBlitzFromDiscord } from '../../blitzkit/getBlitzFromDiscord';
-import { UserError } from '../../blitzkit/userError';
-import { translator } from '../../localization/translator';
+import { idToRegion, Region } from "@blitzkit/core";
+import { literals } from "@blitzkit/i18n";
+import { CacheType, ChatInputCommandInteraction } from "discord.js";
+import markdownEscape from "markdown-escape";
+import { searchPlayersAcrossRegionsBotWrapper } from "../../blitz/searchPlayersAcrossRegionsBotWrapper";
+import { getBlitzFromDiscord } from "../../blitzkit/getBlitzFromDiscord";
+import { UserError } from "../../blitzkit/userError";
+import { translator } from "../../localization/translator";
 
 export interface ResolvedPlayer {
   region: Region;
@@ -13,10 +13,10 @@ export interface ResolvedPlayer {
 }
 
 export async function resolvePlayerFromCommand(
-  interaction: ChatInputCommandInteraction<CacheType>,
+  interaction: ChatInputCommandInteraction<CacheType>
 ) {
   const { strings } = translator(interaction.locale);
-  const commandUsername = interaction.options.getString('username');
+  const commandUsername = interaction.options.getString("username");
 
   if (commandUsername !== null) {
     const id = parseInt(commandUsername);
@@ -27,7 +27,7 @@ export async function resolvePlayerFromCommand(
     } else {
       const accounts = await searchPlayersAcrossRegionsBotWrapper(
         commandUsername,
-        interaction.locale,
+        interaction.locale
       );
 
       if (accounts[0]) {
@@ -37,9 +37,9 @@ export async function resolvePlayerFromCommand(
         } satisfies ResolvedPlayer;
       } else {
         throw new UserError(
-          literals(strings.bot.common.errors.player_not_found, [
-            markdownEscape(commandUsername),
-          ]),
+          literals(strings.bot.common.errors.player_not_found, {
+            search: markdownEscape(commandUsername),
+          })
         );
       }
     }

packages/bot/src/core/localization/strings/constants.ts

@@ -1,7 +1,7 @@
-import { DEFAULT_LOCALE, SupportedLocale } from '@blitzkit/i18n';
-import { Locale } from 'discord.js';
+import locales from "@blitzkit/i18n/locales.json";
+import { Locale } from "discord.js";
 
-const SUPPORTED_LOCALES_DISCORD_MAP: Record<SupportedLocale, Locale> = {
+const SUPPORTED_LOCALES_DISCORD_MAP: Record<string, Locale> = {
   en: Locale.EnglishUS,
   es: Locale.SpanishES,
   pt: Locale.PortugueseBR,
@@ -14,12 +14,12 @@ const SUPPORTED_LOCALES_DISCORD_MAP: Record<SupportedLocale, Locale> = {
 };
 
 export const SUPPORTED_LOCALES_DISCORD_MAP_INVERSE = Object.fromEntries(
-  Object.entries(SUPPORTED_LOCALES_DISCORD_MAP).map(([k, v]) => [v, k]),
-) as Record<Locale, SupportedLocale>;
+  Object.entries(SUPPORTED_LOCALES_DISCORD_MAP).map(([k, v]) => [v, k])
+) as Record<Locale, string>;
 
 export const SUPPORTED_LOCALES_DISCORD = Object.values(
-  SUPPORTED_LOCALES_DISCORD_MAP,
+  SUPPORTED_LOCALES_DISCORD_MAP
 );
 
 export const DEFAULT_LOCALE_DISCORD =
-  SUPPORTED_LOCALES_DISCORD_MAP[DEFAULT_LOCALE];
+  SUPPORTED_LOCALES_DISCORD_MAP[locales.default];

packages/bot/src/core/streams/wotbreplay.ts

@@ -1,8 +1,8 @@
-import { ReadStream } from '@blitzkit/core';
-import AdmZip from 'adm-zip';
-import { readFile, writeFile } from 'fs/promises';
-import { Parser } from 'pickleparser';
-import protobuf from 'protobufjs';
+import { ReadStream } from "@blitzkit/core";
+import AdmZip from "adm-zip";
+import { readFile } from "fs/promises";
+import { Parser } from "pickleparser";
+import protobuf from "protobufjs";
 
 interface WotbReplayMetaJson {
   version: string;
@@ -24,26 +24,24 @@ export class WotbReplayReadStream extends ReadStream {
   async wotbReplay() {
     const pickleParser = new Parser();
     const zip = new AdmZip(Buffer.from(this.buffer));
-    const metaJsonBuffer = zip.getEntry('meta.json')?.getData();
-    const battleResultsDat = zip.getEntry('battle_results.dat')?.getData();
+    const metaJsonBuffer = zip.getEntry("meta.json")?.getData();
+    const battleResultsDat = zip.getEntry("battle_results.dat")?.getData();
 
     if (!metaJsonBuffer || !battleResultsDat)
-      throw new SyntaxError('meta.json not found');
+      throw new SyntaxError("meta.json not found");
 
     const metaJson = JSON.parse(
-      metaJsonBuffer.toString(),
+      metaJsonBuffer.toString()
     ) as WotbReplayMetaJson;
     const unpickledBattleResults = pickleParser.parse(battleResultsDat);
     const [, battleResultsString] = unpickledBattleResults as [number, string];
     const root = await protobuf.load(
-      `${__dirname}/../../protos/BattleResultsClient.proto`,
+      `${__dirname}/../../protos/BattleResultsClient.proto`
     );
     const BattleResults = root.lookupType(
-      'BattleResultsGenerated.BattleResultsClient',
+      "BattleResultsGenerated.BattleResultsClient"
     );
 
-    writeFile('test.dat', Buffer.from(battleResultsString));
-
     const reader = protobuf.Reader.create(Buffer.from(battleResultsString));
 
     // const decodedBattleResults = BattleResults.decodeDelimited(
@@ -53,7 +51,7 @@ export class WotbReplayReadStream extends ReadStream {
   }
 }
 
-const replay = await readFile('temp/test3.wotbreplay');
+const replay = await readFile("temp/test3.wotbreplay");
 const stream = new WotbReplayReadStream(replay.buffer as ArrayBuffer);
 
 stream.wotbReplay();

packages/bot/src/events/interactionCreate/index.ts

@@ -1,4 +1,4 @@
-import { assertSecret } from '@blitzkit/core';
+import { assertSecret } from "@blitzkit/core";
 import {
   AttachmentBuilder,
   AutocompleteInteraction,
@@ -13,30 +13,30 @@ import {
   SlashCommandBuilder,
   SlashCommandOptionsOnlyBuilder,
   SlashCommandSubcommandsOnlyBuilder,
-} from 'discord.js';
-import { aboutCommand } from '../../commands/about';
-import { breakdownCommand } from '../../commands/breakdown';
-import { debugCommand } from '../../commands/debug';
-import { evolutionCommand } from '../../commands/evolution';
-import { fullStatsCommand } from '../../commands/fullStats';
-import { inactiveCommand } from '../../commands/inactive';
-import { verifyCommand } from '../../commands/link';
-import { ownedTanksCommand } from '../../commands/ownedTanks';
-import { permissionsCommand } from '../../commands/permissions';
-import { pingCommand } from '../../commands/ping';
-import { playerInfoCommand } from '../../commands/playerInfo';
-import { ratingCommand } from '../../commands/rating';
-import { ratingLeaderboardCommand } from '../../commands/ratingLeaderboard';
-import { replayCommand } from '../../commands/replay';
-import { researchCommand } from '../../commands/research';
-import { searchClansCommand } from '../../commands/searchClans';
-import { searchPlayersCommand } from '../../commands/searchPlayers';
-import { statsCommand } from '../../commands/stats';
-import { todayCommand } from '../../commands/today';
-import { RenderConfiguration } from '../../core/blitzkit/renderConfiguration';
-import { handleAutocomplete } from './handlers/autocomplete';
-import { handleButton } from './handlers/button';
-import { handleChatInputCommand } from './handlers/chatInputCommand';
+} from "discord.js";
+import { aboutCommand } from "../../commands/about";
+import { breakdownCommand } from "../../commands/breakdown";
+import { debugCommand } from "../../commands/debug";
+import { evolutionCommand } from "../../commands/evolution";
+import { fullStatsCommand } from "../../commands/fullStats";
+import { inactiveCommand } from "../../commands/inactive";
+import { verifyCommand } from "../../commands/link";
+import { ownedTanksCommand } from "../../commands/ownedTanks";
+import { permissionsCommand } from "../../commands/permissions";
+import { pingCommand } from "../../commands/ping";
+import { playerInfoCommand } from "../../commands/playerInfo";
+import { ratingCommand } from "../../commands/rating";
+import { ratingLeaderboardCommand } from "../../commands/ratingLeaderboard";
+import { replayCommand } from "../../commands/replay";
+import { researchCommand } from "../../commands/research";
+import { searchClansCommand } from "../../commands/searchClans";
+import { searchPlayersCommand } from "../../commands/searchPlayers";
+import { statsCommand } from "../../commands/stats";
+import { todayCommand } from "../../commands/today";
+import { RenderConfiguration } from "../../core/blitzkit/renderConfiguration";
+import { handleAutocomplete } from "./handlers/autocomplete";
+import { handleButton } from "./handlers/button";
+import { handleChatInputCommand } from "./handlers/chatInputCommand";
 
 export type InteractionRawReturnable =
   | string
@@ -44,7 +44,7 @@ export type InteractionRawReturnable =
   | ButtonBuilder
   | AttachmentBuilder
   | RenderConfiguration
-  | JSX.Element
+  | React.JSX.Element
   | null;
 export type InteractionIterableReturnable =
   | InteractionRawReturnable
@@ -58,7 +58,7 @@ interface CommandRegistryBase {
     | SlashCommandBuilder
     | SlashCommandSubcommandsOnlyBuilder
     | SlashCommandOptionsOnlyBuilder
-    | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
+    | Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">;
 
   autocomplete?: (interaction: AutocompleteInteraction<CacheType>) => void;
   button?: (interaction: ButtonInteraction<CacheType>) => InteractionReturnable;
@@ -72,7 +72,7 @@ interface CommandRegistryImplicit extends CommandRegistryBase {
 interface CommandRegistryExplicit extends CommandRegistryBase {
   handlesInteraction?: false;
   handler: (
-    interaction: ChatInputCommandInteraction<CacheType>,
+    interaction: ChatInputCommandInteraction<CacheType>
   ) => InteractionReturnable;
 }
 
@@ -104,16 +104,16 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
 export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {
   return rawCommands.reduce<Record<string, CommandRegistry>>(
     (commands, registry, index) => {
-      if (registry.status === 'rejected') {
+      if (registry.status === "rejected") {
         console.warn(
           `Command ${index} failed to load; skipping...`,
-          registry.reason,
+          registry.reason
         );
         return commands;
       }
       return { ...commands, [registry.value.command.name]: registry.value };
     },
-    {},
+    {}
   );
 });
 
@@ -121,12 +121,12 @@ const rest = new REST().setToken(assertSecret(import.meta.env.DISCORD_TOKEN));
 
 commands.then((awaitedCommands) => {
   const body = Object.values(awaitedCommands).map((registry) =>
-    registry.command.toJSON(),
+    registry.command.toJSON()
   );
 
   rest.put(
     Routes.applicationCommands(assertSecret(import.meta.env.DISCORD_CLIENT_ID)),
-    { body },
+    { body }
   );
 });
 

packages/core/package.json

@@ -4,20 +4,20 @@
   "type": "module",
   "main": "src/index.ts",
   "dependencies": {
-    "@octokit/plugin-throttling": "^8.2.0",
-    "@octokit/rest": "^20.1.1",
-    "@prisma/client": "^6.6.0",
+    "@octokit/plugin-throttling": "^11.0.1",
+    "@octokit/rest": "^22.0.0",
+    "@prisma/client": "^6.16.2",
     "adm-zip": "^0.5.16",
     "crc": "^4.3.2",
-    "dotenv": "^16.4.5",
+    "dotenv": "^17.2.2",
     "lz4js": "^0.2.0",
     "pickleparser": "^0.2.1",
-    "protobufjs": "^7.4.0",
-    "ts-proto": "^2.2.2",
-    "yaml": "^2.5.0"
+    "protobufjs": "^7.5.4",
+    "ts-proto": "^2.7.7",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/adm-zip": "^0.5.5",
+    "@types/adm-zip": "^0.5.7",
     "@types/lz4js": "^0.2.1"
   }
 }

packages/core/src/blitzkit/assertSecret.ts

@@ -1,4 +1,4 @@
-export function assertSecret(secret?: string) {
-  if (secret === undefined) throw new Error('Missing secret');
+export function assertSecret<Type>(secret?: Type) {
+  if (secret === undefined) throw new Error("Missing secret");
   return secret;
 }

packages/core/src/blitzkit/tankIcon.ts

@@ -1,10 +1,7 @@
-import { asset } from '@blitzkit/core';
+import { asset } from "@blitzkit/core";
 
 export const BLITZKIT_TANK_ICON_SIZE = { width: 40 * 16, height: 30 * 16 };
 
-export function tankIcon(
-  id: number,
-  size: 'big' | 'small' | 'blitzkit' = 'blitzkit',
-) {
+export function tankIcon(id: number, size: "big" | "small" = "big") {
   return asset(`icons/tanks/${size}/${id}.webp`);
 }

packages/core/src/blitzkit/tankNames.ts

@@ -1,8 +1,8 @@
-import { deburr } from 'lodash-es';
-import { SUPPORTED_LOCALES } from '../../../i18n/src/strings';
-import { I18nString } from '../protos';
-import { fetchCamouflageDefinitions } from './camouflageDefinitions';
-import { fetchTankDefinitions } from './tankDefinitions';
+import locales from "@blitzkit/i18n/locales.json";
+import { deburr } from "lodash-es";
+import { I18nString } from "../protos";
+import { fetchCamouflageDefinitions } from "./camouflageDefinitions";
+import { fetchTankDefinitions } from "./tankDefinitions";
 
 export async function fetchTankNames() {
   const [tankDefinitions, camouflageDefinitions] = await Promise.all([
@@ -26,25 +26,27 @@ export async function fetchTankNames() {
         searchableNameDeburr,
         camouflages: tank.camouflages
           ?.map((id) =>
-            SUPPORTED_LOCALES.map(
-              (locale) =>
-                camouflageDefinitions.camouflages[id]?.name.locales[locale],
-            ),
+            locales.supported.map(
+              ({ locale }) =>
+                camouflageDefinitions.camouflages[id]?.name.locales[locale]
+            )
           )
           .flat()
           .filter(Boolean)
           .map(deburr)
-          .join(' '),
+          .join(" "),
         treeType: tank.type,
       };
-    }),
+    })
   );
 }
 
 export const SEARCH_KEYS = [
-  ...SUPPORTED_LOCALES.map((locale) => [
-    `searchableName.locales.${locale}`,
-    `searchableNameDeburr.locales.${locale}`,
-  ]).flat(),
-  'camouflages',
+  ...locales.supported
+    .map(({ locale }) => [
+      `searchableName.locales.${locale}`,
+      `searchableNameDeburr.locales.${locale}`,
+    ])
+    .flat(),
+  "camouflages",
 ];

packages/i18n/package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "main": "src/index.ts",
   "dependencies": {
-    "ts-deepmerge": "^7.0.2"
+    "ts-deepmerge": "^7.0.3"
   },
   "devDependencies": {}
 }

packages/i18n/src/index.ts

@@ -1,3 +1,4 @@
-export * from './literals';
-export * from './strings';
-export * from './unwrapper';
+export * from "./literals";
+export * from "./strings";
+export * from "./unwrapper";
+export * from "./wrapper";

packages/i18n/src/literals.ts

@@ -1,5 +1,18 @@
-export function literals(string: string, literals: string[]) {
-  return literals.reduce((accumulator, literal, index) => {
-    return accumulator.replace(`%s${index + 1}`, literal);
-  }, string);
+import { assertSecret } from "@blitzkit/core";
+
+export function literals(
+  string: string,
+  literals?: Record<string, string | number | undefined>
+) {
+  for (const key in literals) {
+    const mutated = string.replaceAll(`{${key}}`, `${literals[key]}`);
+
+    if (import.meta.env.DEV && mutated === string) {
+      console.warn(`Could not find literal {${key}} in string "${string}"`);
+    }
+
+    string = mutated;
+  }
+
+  return string;
 }

packages/i18n/src/strings.ts

@@ -1,98 +1,66 @@
-import { merge } from 'ts-deepmerge';
-import en from '../strings/en.json';
-import es from '../strings/es.json';
-import fr from '../strings/fr.json';
-import ja from '../strings/ja.json';
-import pl from '../strings/pl.json';
-import pt from '../strings/pt.json';
-import ru from '../strings/ru.json';
-import uk from '../strings/uk.json';
-import zh from '../strings/zh.json';
+import { merge } from "ts-deepmerge";
+import locales from "../locales.json";
+import en from "../strings/en.json";
+import es from "../strings/es.json";
+import fr from "../strings/fr.json";
+import ja from "../strings/ja.json";
+import pl from "../strings/pl.json";
+import pt from "../strings/pt.json";
+import ru from "../strings/ru.json";
+import uk from "../strings/uk.json";
+import zh from "../strings/zh.json";
 
 export type BlitzKitStrings = typeof en;
 
-const stringsRaw = { en, es, fr, ja, pl, pt, ru, uk, zh };
+const stringsRaw: Record<string, TranslationTree> = {
+  en,
+  es,
+  fr,
+  ja,
+  pl,
+  pt,
+  ru,
+  uk,
+  zh,
+};
 
-export const SUPPORTED_LOCALES = Object.keys(stringsRaw) as SupportedLocale[];
-
-export const DEFAULT_LOCALE = SUPPORTED_LOCALES[0];
-
-function redact(string: string) {
-  const matches = [...string.matchAll(/%s\d+/g)];
-  const characters = string
-    .split('')
-    .map((char) => (char === ' ' ? ' ' : '█')) as string[];
-
-  matches.forEach((match) => {
-    const start = match.index;
-    const matchText = match[0];
-    for (let i = 0; i < matchText.length; i++) {
-      characters[start + i] = matchText[i];
-    }
-  });
-
-  return characters.join('');
-}
-
-function nuke(object: TranslationTree) {
-  for (const key in object) {
-    const typedKey = key as keyof typeof object;
-
-    if (typeof object[typedKey] === 'string') {
-      const value = object[typedKey];
-      object[typedKey] = redact(value as string);
-    } else nuke(object[typedKey] as TranslationTree);
-  }
-}
-
-const stringsPartial: Partial<Record<SupportedLocale, TranslationTree>> = {};
+export const STRINGS: Record<string, BlitzKitStrings> = {};
 
 for (const locale in stringsRaw) {
-  if (locale === DEFAULT_LOCALE) {
-    stringsPartial[DEFAULT_LOCALE] = stringsRaw[DEFAULT_LOCALE];
+  if (locale === locales.default) {
+    STRINGS[locales.default] = stringsRaw[locales.default] as BlitzKitStrings;
     continue;
   }
 
-  const localeStrings = stringsRaw[locale as SupportedLocale];
-  stringsPartial[locale as SupportedLocale] = merge(
-    stringsRaw[DEFAULT_LOCALE],
-    localeStrings,
-  );
-
-  if (import.meta.env.PUBLIC_DEBUG_MISSING_I18N === 'true') {
-    nuke(stringsPartial[locale as SupportedLocale]!);
-  }
+  const localeStrings = stringsRaw[locale];
+  STRINGS[locale] = merge(
+    stringsRaw[locales.default],
+    localeStrings
+  ) as BlitzKitStrings;
 }
 
-export const STRINGS = stringsPartial as Record<
-  SupportedLocale,
-  BlitzKitStrings
->;
-
-export type SupportedLocale = keyof typeof stringsRaw;
-
-export const SUPPORTED_LOCALE_BLITZ_MAP: Record<SupportedLocale, string> = {
-  en: 'en',
-  es: 'es',
-  fr: 'fr',
-  ja: 'ja',
-  pt: 'pt',
-  ru: 'ru',
-  uk: 'uk',
-  zh: 'zh-Hans',
-  pl: 'pl',
+export const SUPPORTED_LOCALE_BLITZ_MAP: Record<string, string> = {
+  en: "en",
+  es: "es",
+  fr: "fr",
+  ja: "ja",
+  pt: "pt",
+  ru: "ru",
+  uk: "uk",
+  zh: "zh-Hans",
+  pl: "pl",
 };
 
-export const SUPPORTED_LOCALE_FLAGS: Record<SupportedLocale, string> = {
-  en: '🇺🇸',
-  es: '🇪🇸',
-  fr: '🇫🇷',
-  ja: '🇯🇵',
-  pt: '🇵🇹',
-  ru: '🇷🇺',
-  uk: '🇺🇦',
-  zh: '🇨🇳',
-  pl: '🇵🇱',
+export const SUPPORTED_LOCALE_FLAGS: Record<string, string> = {
+  en: "🇺🇸",
+  es: "🇪🇸",
+  fr: "🇫🇷",
+  ja: "🇯🇵",
+  pt: "🇵🇹",
+  ru: "🇷🇺",
+  uk: "🇺🇦",
+  zh: "🇨🇳",
+  pl: "🇵🇱",
 };
 
 export type TranslationTree = { [key: string]: TranslationNode };

packages/i18n/src/unwrapper.ts

@@ -1,12 +1,12 @@
-import { I18nString } from '@blitzkit/core';
-import { DEFAULT_LOCALE } from './strings';
+import { I18nString } from "@blitzkit/core";
+import locales from "@blitzkit/i18n/locales.json";
 
-export function unwrapper(locale: string) {
+export function unwrapper(locale = locales.default) {
   return function (i18nString: I18nString) {
     if (locale in i18nString.locales) {
       return i18nString.locales[locale];
     }
 
-    return i18nString.locales[DEFAULT_LOCALE];
+    return i18nString.locales[locales.default];
   };
 }

packages/i18n/src/wrapper.ts

@@ -0,0 +1,15 @@
+import locales from "../locales.json";
+import { BlitzKitStrings, STRINGS } from "./strings";
+
+export function wrapper(slicer: (strings: BlitzKitStrings) => string) {
+  const defaultString = slicer(STRINGS[locales.default] as BlitzKitStrings);
+
+  const object = { [locales.default]: defaultString };
+
+  for (const { locale } of locales.supported) {
+    const string = slicer(STRINGS[locale] as BlitzKitStrings);
+    if (string !== defaultString) object[locale] = string;
+  }
+
+  return object;
+}

packages/i18n/strings/en.json

@@ -1,19 +1,21 @@
 {
   "test": {
     "default": "test",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is %s1 because it has the color of %s2. I like it so much that I will say its name 3 times! %s1! %s1! %s1! Once again, it's %s2, not %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "The quick brown fox jumps over the lazy dog."
   },
 
   "common": {
+    "name": "BlitzKit",
+
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1hp",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
 
     "gun_types": {
@@ -204,11 +206,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Could not find clan\nCouldn't find \"%s1\". Try selecting a clan from the search result.",
-        "player_not_found": "# Could not find user\nI couldn't find user \"%s1\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Use `/link` to get started\nI don't know who you are but you can tell me today!",
-        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"%s1\".",
-        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"%s1\". Try typing the name of the tank instead of a number.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# No tank stats available\nThis player doesn't have any stats available. This may not be the player you are looking for.",
         "get_help": "Help Discord server",
         "uncaught_error": "# BlitzKit ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
@@ -313,7 +315,7 @@
           "description": "Tier",
 
           "choices": {
-            "tier": "Tier %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
@@ -321,13 +323,13 @@
       "periods": {
         "career": "Career",
         "today": "Today",
-        "days": "%s1 days",
-        "custom": "%s1 - %s2 days"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
 
       "filters": {
         "none": "No filters",
-        "tier": "Tier %s1"
+        "tier": "Tier {tier}"
       },
 
       "no_data": {
@@ -354,24 +356,6 @@
     },
 
     "commands": {
-      "auction": {
-        "name": "auction",
-        "description": "Tanks available right now in the auction",
-
-        "body": {
-          "title": "Blitz Auction",
-          "subtitle": "%s1 available • next prices %s2\nBid now: %s3",
-          "next": "Next price: %s1",
-          "available": "Available: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# No ongoing auction\n\nCurrently, there are no tanks available for purchase in the auction. If you think this is an error, please report this discrepancy in [the official Discord Server](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Bid now"
-        }
-      },
-
       "replay": {
         "name": "replay",
         "description": "Display replay results"
@@ -395,20 +379,20 @@
         "body": {
           "subtitle": "Research",
           "total": "Total",
-          "research": "Research: %s1",
-          "upgrades": "Upgrades: %s1",
-          "purchase": "Purchase: %s1",
-          "equipment": "Equipment: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# This is an estimation!\n\nThis list may include already researched tanks because of the inaccurate information Wargaming provides. Try providing a `starting-tank` from the line when using the command if you can."
         },
 
         "errors": {
-          "non_tech_tree": "# %s1 is not on the tech tree\n\nYou cannot research a premium/collector tank.",
-          "tier_1": "# %s1 is a tier I\n\nTier I tanks are always unlocked for free for all players.",
-          "already_researched": "# %s1 is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
-          "start_end_equal": "# %s1 was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# %s1 and %s2 are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# %s1 higher tiered to %s2\n\nMake sure to provide %s3 as the `starting-tank` instead as it is the lower tiered tank."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
 
@@ -454,7 +438,7 @@
           "wn8": "WN8",
           "winrate": "Winrate",
           "damage": "Damage",
-          "unknown_tank": "Unknown tank %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
 
@@ -497,13 +481,13 @@
         "options": {
           "threshold": {
             "name": "threshold",
-            "description": "The number of days inactive (default: %s1 days)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
 
         "body": {
-          "subtitle": "Inactive for %s1+ days",
-          "listing": "%s1 days"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
 
@@ -550,7 +534,7 @@
         "body": {
           "accounts_linked": "Accounts linked",
           "no_role_permissions": {
-            "title": "%s1 failed to verify",
+            "title": "{name} failed to verify",
             "description": "I don't have the permission to manage roles."
           }
         },
@@ -568,12 +552,12 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "The max number of clan results (default: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
 
         "body": {
-          "title": "Clan search for %s1 in region %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "No clans found"
         }
       },
@@ -585,12 +569,12 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "The max number of player results (default: %s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
 
         "body": {
-          "title": "Player search for %s1 in region %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "No players found"
         }
       },
@@ -614,7 +598,7 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "How many neighbors to display (default: %s1)"
+            "description": "How many neighbors to display (default: {count})"
           },
 
           "season": {
@@ -622,7 +606,7 @@
             "description": "Season number (default: current)",
 
             "choices": {
-              "current": "%s1 (current)"
+              "current": "{season} (current)"
             }
           },
 
@@ -633,12 +617,12 @@
         },
 
         "body": {
-          "top_players": "Top %s1 players",
-          "no_participation": "# %s1 didn't play rating in season %s2\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Deleted %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Rating neighbors",
-          "more": "+ %s1 more"
+          "more": "+ {count} more"
         }
       },
 
@@ -657,7 +641,7 @@
         "description": "Shows all own tanks in a tier",
 
         "body": {
-          "title": "# %s1's owned tier %s2 tanks\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
 
@@ -666,7 +650,7 @@
         "description": "Checks wether the bot has the required permissions to function",
 
         "body": {
-          "title": "# Permissions\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "View channels: needed to find the message the refresh button was used on",
           "read_message_history": "Read message history: needed to find the message to refresh",
           "attach_files": "Attach files: needed to add images to image-based commands",
@@ -680,7 +664,7 @@
 
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
 
         "subcommands": {
@@ -700,7 +684,7 @@
         "description": "Basic information about a player",
 
         "body": {
-          "title": "%s1's information",
+          "title": "{name}'s information",
           "nickname": "Nickname",
           "battles": "Battles",
           "winrate": "Winrate",
@@ -733,7 +717,7 @@
         },
 
         "errors": {
-          "no_participation": "# %s1 hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
         }
       }
@@ -763,13 +747,16 @@
       },
 
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Search tanks...",
         "recent": "Recently viewed",
         "select_all": "Select all",
         "count_singular": "1 tank",
-        "count_plural": "%s1 tanks",
-        "sorting_by": "Sorting by %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "No tanks found.",
           "search_again": "Try searching again.",
@@ -833,6 +820,15 @@
     },
 
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
+
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
@@ -840,16 +836,16 @@
       },
 
       "hero": {
-        "credit": "By %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Popular tanks",
-        "subtitle": "Last %s1 days"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Other cool projects"
       },
-      "help_translate": "Please help translate %s1 to %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Tools for everything World of Tanks Blitz"
     },
 
@@ -861,6 +857,15 @@
     },
 
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
+
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -873,7 +878,7 @@
           "next": "Next",
           "no_results": "No results"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
 
       "tankopedia": {
@@ -883,10 +888,14 @@
         "button": "Find tanks",
         "description": "Blitz tank encyclopedia",
         "seo_description": "Statistics, armor, and more for all tanks in World of Tanks Blitz",
-        "tank_seo_title": "%s1 - Tier %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 armor, statistics, equipment, provisions, and more. %s2 DPM, %s3hp alpha, %s4mm penetration, %s5kph top speed, %s6hp health.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
 
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
+
           "assault": {
             "title": "Assault shells"
           },
@@ -910,7 +919,6 @@
 
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -935,9 +943,7 @@
             "green_penetration": "Green penetration",
             "hide_model_under_armor": "Hide model under armor",
             "opaque": "Opaque",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Environment",
-            "show_grid": "Show grid"
+            "dev_wireframe": "DEV: wireframe"
           },
 
           "screenshot": {
@@ -963,7 +969,6 @@
             },
 
             "advanced": "Advanced highlighting",
-            "shooter": "Shooter:",
 
             "shot_card": {
               "element": {
@@ -975,15 +980,15 @@
                 "track": "Tracks"
               },
               "status": {
-                "penetration": "%s1hp penetration",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Blocked",
                 "ricochet": "Ricochet",
-                "splash": "%s1hp splash"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetration"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -1023,8 +1028,8 @@
         "tech_tree": {
           "title": "Tech tree",
           "battle": "1 battle",
-          "battles": "%s1 battles",
-          "route": "Route %s1 of %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
 
         "game_modes": {
@@ -1033,7 +1038,7 @@
 
         "review": {
           "title": "Review videos",
-          "join": "Apply to %s1 YouTuber program"
+          "join": "Apply to {name} YouTuber program"
         },
 
         "configuration": {
@@ -1072,15 +1077,15 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare",
-            "class": "Tier %s1 %s2",
-            "tier": "All of tier %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "All tanks"
           },
           "values": {
-            "shell_index": "Shell %s1",
-            "at_distance": "At %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Distance",
-            "dispersion_at_distance": "Dispersion at %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Gun flexibility",
             "speed": "Speed",
             "terrain_coefficients": "Terrain coefficients",
@@ -1236,9 +1241,9 @@
         "description": "Tank performance statistics",
         "seo_description": "Best tanks and their performances in World of Tanks Blitz",
         "estimation": {
-          "body": "Estimated stats based on %s1 players. Updated %s2 ago.",
-          "hours": "%s1 hours",
-          "minutes": "%s1 minutes"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Player count"
@@ -1270,10 +1275,10 @@
         "button": "Browse all",
         "description": "Blitz player avatars",
         "seo_description": "All World of Tanks Blitz player avatars",
-        "last_updated": "Last updated on %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Search avatars...",
-          "results": "%s1 avatars"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1288,8 +1293,8 @@
           "no_results": "No players found"
         },
         "controls": {
-          "title": "Tracking %s1",
-          "subtitle": "Since %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Reset",
           "change": "Change"
         },
@@ -1352,7 +1357,7 @@
               "cancel": "Cancel",
               "success": {
                 "title": "Copy URL",
-                "info": "Generated the URL for %s1. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Back",
                 "copy": "Copy URL"
               }
@@ -1437,17 +1442,11 @@
         "description": "Get started with BlitzKit",
         "seo_description": "Get started with BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analyze now",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "In-game session stats",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
 

packages/i18n/strings/es.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "test",
-    "long": "Esta es una cadena de prueba larga. NO DEBES verla NUNCA en la interfaz de usuario. Mi fruta favorita es %s1 porque tiene el color %s2. ¡Me gusta tanto que diré su nombre 3 veces! ¡ %s1! ¡ %s1! ¡ %s1! Una vez más, es %s2, no %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "El rápido zorro marrón salta sobre el perro perezoso."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1pv",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Auto cargador",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# No se pudo encontrar el clan\nNo se pudo encontrar \"%s\". Prueba seleccionando un clan de los resultados de búsqueda.",
-        "player_not_found": "# No se pudo encontrar el usuario\nNo pude encontrar al usuario \"%s\". Prueba eligiendo un usuario de los resultados de búsqueda, escribiendo un nombre de usuario aceptable o usando el comando `/vincular`.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Usa `/vincular` para empezar\n¡No sé quién eres, pero puedes decírmelo hoy!",
-        "tank_name_not_found": "# No se pudo encontrar el tanque\nNo se pudo encontrar el tanque con el nombre \"%s\".",
-        "tank_id_not_found": "# Tanque no encontrado\nNo se pudo encontrar al tanque del ID \"%s\". Prueba escribiendo el nombre del tanque en vez de un número.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# No hay estadísticas de tanque disponibles\nEste jugador no tiene estadísticas disponibles. Este podría no ser el jugador que estás buscando.",
         "get_help": "Servidor de ayuda de Discord",
         "uncaught_error": "# ¡Blitzkrieg sufrió un error!\nLo sentimos mucho. Siéntete libre de [unirte al servidor oficial de Discord](https://discord.gg/nDt7AjGJQH) para obtener ayuda.",
@@ -283,19 +284,19 @@
           "name": "tier",
           "description": "Nivel",
           "choices": {
-            "tier": "Nivel %s - %s"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Carrera",
         "today": "Hoy",
-        "days": "%s días",
-        "custom": "%s - %s días"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Sin filtros",
-        "tier": "Nivel %s"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "No hay batallas jugadas en este período",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "subasta",
-        "description": "Tanques disponibles ahora mismo en la subasta",
-        "body": {
-          "title": "Subasta Blitz",
-          "subtitle": "%s disponible • siguientes precios %s\nPujar ahora: %s",
-          "next": "Siguiente precio: %s",
-          "available": "Disponible: %s / %s"
-        },
-        "errors": {
-          "no_auction": "# No hay ninguna subasta\nActualmente no hay tanques disponibles para comprar en la subasta. Si crees que esto es un error, por favor, reporta esta discrepancia en [el servidor oficial de Discord](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Pujar ahora"
-        }
-      },
       "replay": {
         "name": "repetición",
         "description": "Mostrar resultados de la repetición"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Investigar",
           "total": "Total",
-          "research": "Investigar: %s",
-          "upgrades": "Mejoras: %s",
-          "purchase": "Comprar: %s",
-          "equipment": "Equipamiento: %s",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# ¡Esto es una estimación!\n\nEsta lista podría incluir tanques ya investigados debido a la información errónea que proporciona Wargaming. Si puedes, prueba proporcionando un `tanque-inicial` de la línea al usar el comando."
         },
         "errors": {
-          "non_tech_tree": "# %s no está en el árbol tecnológico\n\nNo puedes investigar un tanque prémium o coleccionista.",
-          "tier_1": "# %s es un nivel I\n\nLos tanque de nivel I están siempre desbloqueados gratuitamente para todos los jugadores.",
-          "already_researched": "# %s ya está investigado\n\nPrueba proporcionando un `tanque-inicial` al usar el comando para ver los totales para una línea que ya has investigado.",
-          "start_end_equal": "# %s fue proporcionado dos veces\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` son diferentes.",
-          "tanks_not_on_line": "# %s y %s no están en la misma línea\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` están en la misma línea del árbol tecnológico.",
-          "unordered": "# %s de nivel superior a %s\n\nAsegúrate de proporcionar %s como el `tanque-inicial` en su lugar ya que es el tanque de nivel inferior."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "Tasa de victorias",
           "damage": "Daño",
-          "unknown_tank": "Tanque desconocido %s"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "umbral",
-            "description": "El número de días inactivo (predeterminado: %s días)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Inactivo por %s+ días",
-          "listing": "%s días"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Cuentas vinculadas",
           "no_role_permissions": {
-            "title": "%s1 no se pudo verificar",
+            "title": "{name} failed to verify",
             "description": "No tengo permiso para administrar roles."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "límite",
-            "description": "El número máximo de resultados de clanes (predeterminado: %s)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Búsqueda del clan %s en la región %s",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "No se encontraron clanes"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "límite",
-            "description": "El número máximo para resultados de jugador (predeterminado: %s)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Búsqueda del jugador %s en la región %s",
+          "title": "Player search for {search} in region {region}",
           "no_results": "No se encontraron jugadores"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "Cuántos vecinos a mostrar (predeterminado: %s)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "temporada",
             "description": "Número de temporada (predeterminado: actual)",
             "choices": {
-              "current": "%s (actual)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Mejores %s jugadores",
-          "no_participation": "# %s no jugó clasificatoria en la temporada %s\n\nEste jugador no participó en esta temporada o no pasó de la calibración.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# No hay temporada en curso\n\nActualmente no hay ninguna temporada de clasificatoria.",
-          "deleted_player": "%s eliminado",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Vecinos de clasificatoria",
-          "more": "+ %s más"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "tanques en propiedad",
         "description": "Muestra todos los tanques propios en un nivel",
         "body": {
-          "title": "# Tanques de %s de nivel %s\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "permisos",
         "description": "Comprueba si el bot tiene los permisos requeridos para funcionar",
         "body": {
-          "title": "# Permisos\n\n%s",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "Ver canales: necesario para encontrar el mensaje en el cual el botón \"actualizar\" fue usado",
           "read_message_history": "Leer historial de mensajes: necesario para encontrar el mensaje a actualizar",
           "attach_files": "Adjuntar archivos: necesario para añadir imágenes a los comandos basados en estas",
@@ -600,7 +585,7 @@
         "description": "Comprueba si el bot está vivo.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "info del jugador",
         "description": "Información básica sobre un jugador",
         "body": {
-          "title": "Información de %s",
+          "title": "{name}'s information",
           "nickname": "Apodo",
           "battles": "Batallas",
           "winrate": "Tasa de victorias",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s no ha jugado clasificatoria\n\nEste jugador no ha participado en el modo clasificatoria esta temporada.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Estadísticas no disponibles actualmente\n\nWargaming podría estar sufriendo una caída del servidor. Si hay alguna temporada en curso, las estadísticas deberían estar disponibles en 24 horas."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Copiado!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Buscar tanques...",
         "recent": "Visto recientemente",
         "select_all": "Seleccionar todo",
         "count_singular": "1 tanque",
-        "count_plural": "%s1 tanques",
-        "sorting_by": "Ordenar por %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "No se encontraron tanques.",
           "search_again": "Intenta buscar de nuevo.",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "Por %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Tanques populares",
-        "subtitle": "Últimos %s1 días"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Otros proyectos interesantes"
       },
-      "help_translate": "¡Por favor ayuda a traducir %s1 a %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Herramientas para todo lo que es World of Tanks Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "Sin resultados"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "Encuentra tanques",
         "description": "Enciclopedia de tanques de WOTB",
         "seo_description": "Estadísticas, armaduras y más para todos los tanques en World of Tanks Blitz",
-        "tank_seo_title": "%s1 - Nivel %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 blindaje, estadisticas, equipamiento, proviciones y mas.\n%s2 DPM, %3hp alfa, %s4mm penetracion, %s5kph velocidad maxima, %s6 hp salud",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "Penetración verde",
             "hide_model_under_armor": "Ocultar modelo bajo la armadura",
             "opaque": "Opaco",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Entorno",
-            "show_grid": "Mostrar cuadrícula"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Descargar",
@@ -853,7 +857,6 @@
               "reset": "Restablecer"
             },
             "advanced": "Resaltado avanzado",
-            "shooter": "Tirador:",
             "shot_card": {
               "element": {
                 "primary": "Primario",
@@ -864,15 +867,15 @@
                 "track": "Orugas"
               },
               "status": {
-                "penetration": "%s1pv penetracion",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Bloqueado",
                 "ricochet": "Rebote",
-                "splash": "%s1pv splash"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetracion"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Árbol tecnológico",
           "battle": "1 batalla",
-          "battles": "%s1 batallas",
-          "route": "Ruta %s1 de %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Habilidades del modo de juego"
         },
         "review": {
           "title": "Vídeos de reseña",
-          "join": "Aplica para el programa de YouTube de %s1"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "",
@@ -954,15 +957,15 @@
           "title": "Características",
           "compare": {
             "label": "Comparar con",
-            "class": "Nivel %s1 - %s2",
-            "tier": "Todos de nivel %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "Todos los tanques"
           },
           "values": {
-            "shell_index": "Proyectil %s1",
-            "at_distance": "A %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Distancia",
-            "dispersion_at_distance": "Dispersión a %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Flexibilidad del arma",
             "speed": "Velocidad",
             "terrain_coefficients": "Coeficientes de terreno",
@@ -1111,9 +1114,9 @@
         "description": "Estadísticas de rendimiento del tanque",
         "seo_description": "Los mejores tanques y su rendimiento en World of Tanks Blitz",
         "estimation": {
-          "body": "Estadísticas estimadas basadas en %s1 jugadores. Actualizado hace %s2.",
-          "hours": "%s1 horas",
-          "minutes": "%s1 minutos"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Contador de jugadores"
@@ -1145,10 +1148,10 @@
         "button": "Explorar todo",
         "description": "Avatares para los jugadores de WOTB",
         "seo_description": "Todos los avatares del jugador en World of Tanks Blitz",
-        "last_updated": "Última actualización el %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Buscar avatares...",
-          "results": "%s1 avatares"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "No se encontraron jugadores"
         },
         "controls": {
-          "title": "Siguiendo a %s1",
-          "subtitle": "Desde %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Restablecer",
           "change": "Change"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancelar",
               "success": {
                 "title": "Copiar URL",
-                "info": "Se generó la URL para %s1. El embebido comenzará a rastrear tan pronto como se pegue. Restablece en cualquier momento haciendo clic derecho en PC o manteniendo presionado en móvil y luego seleccionando \"Restablecer\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Volver",
                 "copy": "Copiar URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Get started with BlitzKit",
         "seo_description": "Get started with BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analizar ahora",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "In-game session stats",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/fr.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "teste",
-    "long": "Ceci est une longue chaîne de test. Vous ne DEVEZ JAMAIS le voir dans l'interface utilisateur. Mon fruit préféré est %s1, car il a la couleur %s2. Je l'aime tellement que je vais dire son nom 3 fois ! %s1! %s1! %s1 ! Encore une fois, c'est %s2, pas %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "Le renard brun et rapide saute par-dessus le chien paresseux."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1ps",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Chargement auto",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Impossible de trouver le clan\nImpossible de trouver «%s1 ». Essayez de sélectionner un clan dans le résultat de la recherche.",
-        "player_not_found": "# Impossible de trouver l'utilisateur\nJe n'ai pas pu trouver l'utilisateur \"%s1\". Essayez de choisir un utilisateur dans le résultat de la recherche, en tapant un nom d'utilisateur valide, ou en utilisant la commande `/link`.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Utilisez `/link` pour commencer\nJe ne sais pas qui vous êtes, mais vous pouvez me le dire aujourd'hui !",
-        "tank_name_not_found": "Impossible de trouver le char sous le nom \"%s1\".",
-        "tank_id_not_found": "# Réservoir introuvable\nImpossible de trouver le char avec l'ID \"%s1\". Essayez de taper le nom du char au lieu d'un nombre.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# Aucune statistique de tank disponible\nCe joueur n'a pas de statistiques disponibles. Ce n'est peut-être pas le joueur que vous cherchez.",
         "get_help": "Aidez le serveur Discord",
         "uncaught_error": "# Blitzkit a rencontré une erreur !\nNous sommes désolés de cela. N'hésitez pas à [rejoindre le serveur officiel Discord](https://discord.gg/nDt7AjGJQH) pour obtenir de l'aide.",
@@ -283,19 +284,19 @@
           "name": "rang",
           "description": "Rang",
           "choices": {
-            "tier": "Rang %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Carrière",
         "today": "Aujourd'hui",
-        "days": "%s1 jour",
-        "custom": "%s1 - %s2 jours"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Aucun filtre",
-        "tier": "Rang %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "Char cible",
-        "description": "Des chars sont disponibles dès maintenant dans la vente aux enchères",
-        "body": {
-          "title": "Enchères Blitz",
-          "subtitle": "%s1 disponible • prochains prix %s2\nOffre : %s3",
-          "next": "Prochain prix : %s1",
-          "available": "Disponible : %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# Pas de vente aux enchères\n\nActuellement, il n'y a pas de chars disponibles à l'achat dans la vente aux enchères. Si vous pensez qu'il s'agit d'une erreur, veuillez signaler cette anomalie dans [le serveur officiel Discord](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Enchérir maintenant"
-        }
-      },
       "replay": {
         "name": "rejouer",
         "description": "Afficher les résultats de la relecture"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Recherche",
           "total": "Total",
-          "research": "Recherche: %s1",
-          "upgrades": "Améliorations : %s1",
-          "purchase": "Achat : %s1",
-          "equipment": "Equipment: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# Ceci est une estimation !\n\nCette liste peut inclure des chars déjà recherchés en raison de l'information inexacte fournie par Wargaming. Essayez de fournir un `char de départ` depuis la ligne lorsque vous utilisez la commande si vous le pouvez."
         },
         "errors": {
-          "non_tech_tree": "# %s1 n'est pas dans l'arbre technologique\n\nVous ne pouvez pas rechercher un char prenium/de collection.",
-          "tier_1": "# %s1 est un char de tier I\n\nLe char de tier 1 sont déverrouillé gratuitement pour tous les joueurs.",
-          "already_researched": "# %s1 est déjà recherché\n\nEssayez de fournir un `char de départ` en utilisant la commande pour voir la progression d'une lignée.",
-          "start_end_equal": "# %s1 was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# %s1 and %s2 are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# %s1 higher tiered to %s2\n\nMake sure to provide %s3 as the `starting-tank` instead as it is the lower tiered tank."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -380,7 +365,7 @@
           },
           "embeds": {
             "name": "intègre",
-            "description": "How embeds work"
+            "description": "Comment fonctionnent les intégrations"
           },
           "introduction": {
             "name": "introduction",
@@ -402,14 +387,14 @@
       },
       "breakdown": {
         "name": "décomposition",
-        "description": "A period's breakdown by tanks played",
+        "description": "Répartition d'une période par chars joués",
         "body": {
           "total": "Total",
           "battles": "Batailles",
           "wn8": "WN8",
           "winrate": "Taux de victoires",
           "damage": "Dégâts",
-          "unknown_tank": "Char %s1 inconnu"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "seuil",
-            "description": "Le nombre de jours inactifs (par défaut: %s1 jours)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Inactif depuis %s1+ de jours",
-          "listing": "%s1 jour"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -471,7 +456,7 @@
               "accuracy": "Précision"
             },
             "lethality": {
-              "title": "Lethality",
+              "title": "Létalité",
               "average_damage": "Dégâts moyens",
               "damage_per_tier": "Dégâts par tier",
               "damage_ratio": "Rapport de dégâts",
@@ -493,26 +478,26 @@
         "body": {
           "accounts_linked": "Comptes liés",
           "no_role_permissions": {
-            "title": "La vérification de %s1 a échoué",
+            "title": "{name} failed to verify",
             "description": "Je n'ai pas l'autorisation de gérer les rôles."
           }
         },
         "embed": {
           "title": "Compte invalide ?",
-          "description": "Use the command again and select a username from the search results."
+          "description": "Utilisez à nouveau la commande et sélectionnez un nom d'utilisateur à partir des résultats de recherche."
         }
       },
       "search_clans": {
-        "name": "search-clans",
-        "description": "Search clans",
+        "name": "clans de recherche",
+        "description": "Rechercher des clans",
         "options": {
           "limit": {
             "name": "limite",
-            "description": "The max number of clan results (default: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for %s1 in region %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "Pas de clan trouvé"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "Le nombre maximum de résultats de joueur (par défaut: %s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Recherche de %s1 dans la région %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "Pas de joueur de trouvé"
         }
       },
@@ -535,77 +520,77 @@
         "description": "Statistiques des batailles de cotés",
         "subcommands": {
           "neighbors": {
-            "name": "neighbors",
-            "description": "Neighboring players on the leaderboard"
+            "name": "voisins",
+            "description": "Joueurs voisins dans le classement"
           },
           "league": {
             "name": "ligue",
-            "description": "Top players of a league"
+            "description": "Meilleurs joueurs d'une ligue"
           }
         },
         "options": {
           "limit": {
             "name": "limite",
-            "description": "How many neighbors to display (default: %s1)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
-            "name": "season",
-            "description": "Season number (default: current)",
+            "name": "saison",
+            "description": "Numéro de saison (défaut : courant)",
             "choices": {
-              "current": "%s1 (current)"
+              "current": "{season} (current)"
             }
           },
           "league": {
             "name": "ligue",
-            "description": "The league to display"
+            "description": "La ligue à afficher"
           }
         },
         "body": {
-          "top_players": "Top %s1 players",
-          "no_participation": "# %s1 didn't play rating in season %s2\n\nThis player did not participate in this season or did not get past calibration.",
-          "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Deleted %s1",
-          "neighbors": "Rating neighbors",
-          "more": "+ %s1 more"
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
+          "no_ongoing_season": "Pas de saison en cours\n\nIl n'y a pas de saison de notation en cours actuellement.",
+          "deleted_player": "Deleted {id}",
+          "neighbors": "évaluer les voisins",
+          "more": "+ {count} more"
         }
       },
       "today": {
         "name": "aujourd'hui",
-        "description": "Today's played tanks and statistics"
+        "description": "Les chars et les statistiques joués aujourd'hui"
       },
       "stats": {
         "name": "statistiques",
-        "description": "Quick statistics for a period"
+        "description": "Statistiques rapides pour une période"
       },
       "owned_tanks": {
-        "name": "owned-tanks",
-        "description": "Shows all own tanks in a tier",
+        "name": "chars possédés",
+        "description": "Affiche tous les chars d'un niveau",
         "body": {
-          "title": "# %s1's owned tier %s2 tanks\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "permissions",
-        "description": "Checks wether the bot has the required permissions to function",
+        "description": "Vérifie si le bot a les permissions nécessaires pour fonctionner",
         "body": {
-          "title": "# Permissions\n\n%s1",
-          "view_channels": "View channels: needed to find the message the refresh button was used on",
-          "read_message_history": "Read message history: needed to find the message to refresh",
-          "attach_files": "Attach files: needed to add images to image-based commands",
-          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
+          "title": "# Permissions\n\n{body}",
+          "view_channels": "Afficher les canaux : nécessaire pour trouver le message sur lequel le bouton d'actualisation a été utilisé",
+          "read_message_history": "Lire l'historique des messages : nécessaire pour trouver le message à rafraîchir",
+          "attach_files": "Joindre des fichiers : nécessaire pour ajouter des images à des commandes basées sur l'image",
+          "external_emojis": "Émoticônes externes: nécessaire pour ajouter des drapeaux nationaux et des émojis de classe de char"
         }
       },
       "ping": {
         "name": "ping",
-        "description": "Check wether the bot is alive.",
+        "description": "Vérifiez si le bot est en vie.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
             "name": "blitzkit",
-            "description": "Ping BlitzKit"
+            "description": "Ping blitzkit"
           },
           "wotb": {
             "name": "wotb",
@@ -614,10 +599,10 @@
         }
       },
       "player_info": {
-        "name": "player-info",
-        "description": "Basic information about a player",
+        "name": "info-joueur",
+        "description": "Informations de base sur un joueur",
         "body": {
-          "title": "%s1's information",
+          "title": "{name}'s information",
           "nickname": "Nickname",
           "battles": "Batailles",
           "winrate": "Taux de victoires",
@@ -635,7 +620,7 @@
             "description": "Today's rating statistics"
           },
           "season": {
-            "name": "season",
+            "name": "saison",
             "description": "This season's rating statistics"
           }
         },
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Copied!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Search tanks...",
         "recent": "Recently viewed",
         "select_all": "Select all",
         "count_singular": "1 tank",
-        "count_plural": "%s1 tanks",
-        "sorting_by": "Sorting by %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "No tanks found.",
           "search_again": "Try searching again.",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "By %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Popular tanks",
-        "subtitle": "Last %s1 days"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Other cool projects"
       },
-      "help_translate": "Please help translate %s1 to %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Tools for everything World of Tanks Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "No results"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "Find tanks",
         "description": "Blitz tank encyclopedia",
         "seo_description": "Statistics, armor, and more for all tanks in World of Tanks Blitz",
-        "tank_seo_title": "%s1 - Tier %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 armor, statistics, equipment, provisions, and more. %s2 DPM, %s3hp alpha, %s4mm penetration, %s5kph top speed, %s6hp health.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "Green penetration",
             "hide_model_under_armor": "Hide model under armor",
             "opaque": "Opaque",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Environment",
-            "show_grid": "Show grid"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Download",
@@ -853,7 +857,6 @@
               "reset": "Reset"
             },
             "advanced": "Advanced highlighting",
-            "shooter": "Shooter:",
             "shot_card": {
               "element": {
                 "primary": "Primary",
@@ -864,15 +867,15 @@
                 "track": "Tracks"
               },
               "status": {
-                "penetration": "%s1hp penetration",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Blocked",
                 "ricochet": "Ricochet",
-                "splash": "%s1hp splash"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetration"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Arbre technologique",
           "battle": "1 battle",
-          "battles": "%s1 battles",
-          "route": "Route %s1 of %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Game mode abilities"
         },
         "review": {
           "title": "Review videos",
-          "join": "Apply to %s1 YouTuber program"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "Configuration",
@@ -954,15 +957,15 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier %s1 %s2",
-            "tier": "All of tier %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "All tanks"
           },
           "values": {
-            "shell_index": "Shell %s1",
-            "at_distance": "At %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Distance",
-            "dispersion_at_distance": "Dispersion at %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Gun flexibility",
             "speed": "Speed",
             "terrain_coefficients": "Terrain coefficients",
@@ -1111,9 +1114,9 @@
         "description": "Tank performance statistics",
         "seo_description": "Best tanks and their performances in World of Tanks Blitz",
         "estimation": {
-          "body": "Estimated stats based on %s1 players. Updated %s2 ago.",
-          "hours": "%s1 hours",
-          "minutes": "%s1 minutes"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Player count"
@@ -1145,10 +1148,10 @@
         "button": "Browse all",
         "description": "Blitz player avatars",
         "seo_description": "All World of Tanks Blitz player avatars",
-        "last_updated": "Last updated on %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Search avatars...",
-          "results": "%s1 avatars"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "Pas de joueur de trouvé"
         },
         "controls": {
-          "title": "Tracking %s1",
-          "subtitle": "Since %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Reset",
           "change": "Change"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancel",
               "success": {
                 "title": "Copy URL",
-                "info": "Generated the URL for %s1. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Back",
                 "copy": "Copy URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Get started with BlitzKit",
         "seo_description": "Get started with BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analyze now",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "In-game session stats",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/ja.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "test",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is %s1 because it has the color of %s2. I like it so much that I will say its name 3 times! %s1! %s1! %s1! Once again, it's %s2, not %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "すばしっこい茶色のキツネが怠け者の犬を飛び越した。"
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1hp",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "自動装填砲",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# クランが見つかりませんでした\n\"%s1\"は見つかりませんでした。検索結果からクランを選択してください。",
-        "player_not_found": "# ユーザーが見つかりませんでした\nユーザー「\"%s1\"」は見つかりませんでした。検索結果からユーザーを選択するか、有効な名前を入力してください。`/link`コマンドを使用することも可能です。",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# `/link`を使用して始めましょう\nはじめまして！あなたが誰か、私に教えてください。",
-        "tank_name_not_found": "# 車輌が見つかりませんでした\n\"%s1\"という名前の車輌は見つかりませんでした。",
-        "tank_id_not_found": "# 車輌が見つかりませんでした\n\"%s1\"というIDの車輌は見つかりませんでした。番号ではなく名前で検索してください。",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# 利用可能な車輌統計がありません\nこのプレイヤーには利用可能な統計がありません。あなたが探しているプレイヤーではない可能性があります。",
         "get_help": "Discordサーバーに参加する",
         "uncaught_error": "# BlitzKitがエラーに遭遇しました！\n申し訳ありません。お気軽に[公式Discordサーバー](https://discord.gg/nDt7AjGJQH)にお問い合わせください。",
@@ -283,19 +284,19 @@
           "name": "tier",
           "description": "Tier",
           "choices": {
-            "tier": "Tier %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Career",
         "today": "Today",
-        "days": "%s1 days",
-        "custom": "%s1 - %s2 days"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "フィルターなし",
-        "tier": "Tier %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "No battles played in this period",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "オークション",
-        "description": "現在オークションで購入可能な車輌",
-        "body": {
-          "title": "Blitzオークション",
-          "subtitle": "%s1 残り• 次の価格 %s2\n今すぐ入札: %s3",
-          "next": "次の価格: %s1",
-          "available": "残り: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# 進行中のオークションはありません\n現在、オークションで購入可能な車輌はありません。もしこれが間違いの場合、[公式Discardサーバー](https://discord.gg/nDt7AjGJQH)に報告してください。"
-        },
-        "actions": {
-          "bid": "今すぐ入札"
-        }
-      },
       "replay": {
         "name": "replay",
         "description": "Display replay results"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Research",
           "total": "トータル",
-          "research": "Research: %s1",
-          "upgrades": "Upgrades: %s1",
-          "purchase": "Purchase: %s1",
-          "equipment": "Equipment: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# This is an estimation!\n\nThis list may include already researched tanks because of the inaccurate information Wargaming provides. Try providing a `starting-tank` from the line when using the command if you can."
         },
         "errors": {
-          "non_tech_tree": "# %s1 is not on the tech tree\n\nYou cannot research a premium/collector tank.",
-          "tier_1": "# %s1 is a tier I\n\nTier I tanks are always unlocked for free for all players.",
-          "already_researched": "# %s1 is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
-          "start_end_equal": "# %s1 was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
-          "tanks_not_on_line": "# %s1 and %s2 are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
-          "unordered": "# %s1 higher tiered to %s2\n\nMake sure to provide %s3 as the `starting-tank` instead as it is the lower tiered tank."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "勝率",
           "damage": "ダメージ",
-          "unknown_tank": "Unknown tank %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "threshold",
-            "description": "The number of days inactive (default: %s1 days)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Inactive for %s1+ days",
-          "listing": "%s1 days"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Accounts linked",
           "no_role_permissions": {
-            "title": "%s1 failed to verify",
+            "title": "{name} failed to verify",
             "description": "I don't have the permission to manage roles."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "The max number of clan results (default: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for %s1 in region %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "No clans found"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "The max number of player results (default: %s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Player search for %s1 in region %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "No players found"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "How many neighbors to display (default: %s1)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "season",
             "description": "Season number (default: current)",
             "choices": {
-              "current": "%s1 (current)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Top %s1 players",
-          "no_participation": "# %s1 didn't play rating in season %s2\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Deleted %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Rating neighbors",
-          "more": "+ %s1 more"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "owned-tanks",
         "description": "Shows all own tanks in a tier",
         "body": {
-          "title": "# %s1's owned tier %s2 tanks\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "permissions",
         "description": "Checks wether the bot has the required permissions to function",
         "body": {
-          "title": "# Permissions\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "View channels: needed to find the message the refresh button was used on",
           "read_message_history": "Read message history: needed to find the message to refresh",
           "attach_files": "Attach files: needed to add images to image-based commands",
@@ -600,7 +585,7 @@
         "description": "Check wether the bot is alive.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "player-info",
         "description": "Basic information about a player",
         "body": {
-          "title": "%s1's information",
+          "title": "{name}'s information",
           "nickname": "Nickname",
           "battles": "戦闘数",
           "winrate": "勝率",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "コピーしました!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "車輌名を入力…",
         "recent": "最近の閲覧",
         "select_all": "全て選択",
         "count_singular": "1 輌",
-        "count_plural": "%s1輌",
-        "sorting_by": ":%s1で並び替え",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "該当する車輌が存在しません。",
           "search_again": "もう一度検索してください。",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "By %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "人気の車輌",
-        "subtitle": "過去 %s1日間"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "他のプロジェクト"
       },
-      "help_translate": "%s1の %s2への翻訳にご協力ください！",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "World of Tanks Blitz全般のツール"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "該当なし"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "戦車を探す",
         "description": "Blitz戦車百科",
         "seo_description": "Statistics, armor, and more for all tanks in World of Tanks Blitz",
-        "tank_seo_title": "%s1 - Tier %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 armor, statistics, equipment, provisions, and more. %s2 DPM, %s3hp alpha, %s4mm penetration, %s5kph top speed, %s6hp health.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "貫通可能域を緑色表示",
             "hide_model_under_armor": "車輌モデルを非表示",
             "opaque": "貫通アシストを不透明にする",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "環境",
-            "show_grid": "グリッドを表示"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "保存する",
@@ -853,7 +857,6 @@
               "reset": "リセット"
             },
             "advanced": "高度なハイライト",
-            "shooter": "自車両",
             "shot_card": {
               "element": {
                 "primary": "主装甲",
@@ -864,15 +867,15 @@
                 "track": "履帯"
               },
               "status": {
-                "penetration": "%s1hp 貫通",
+                "penetration": "{damage}hp penetration",
                 "blocked": "非貫通",
                 "ricochet": "跳弾",
-                "splash": "%s1hp 爆風ダメージ"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm 装甲",
-                "ricochet_loss": "%s1% penetration"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "技術ツリー",
           "battle": "1 戦",
-          "battles": "%s1 戦",
-          "route": "ルート %s1 / %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "ゲームモードアビリティ"
         },
         "review": {
           "title": "Review videos",
-          "join": "%s1 YouTuberプログラムに応募する"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "構成",
@@ -954,15 +957,15 @@
           "title": "性能値",
           "compare": {
             "label": "比較対象",
-            "class": "Tier %s1 %s2",
-            "tier": "Tier %s1 全車輌",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "全車輌"
           },
           "values": {
-            "shell_index": "Shell %s1",
-            "at_distance": "At %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "距離",
-            "dispersion_at_distance": "%s1m での散布界",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "主砲旋回上限",
             "speed": "最高速度",
             "terrain_coefficients": "地形走破能力",
@@ -1111,9 +1114,9 @@
         "description": "車輌の戦闘統計",
         "seo_description": "Best tanks and their performances in World of Tanks Blitz",
         "estimation": {
-          "body": "%s1 人のプレイヤーの推定統計。 %s2前に更新されました。",
-          "hours": "%s1 時間",
-          "minutes": "%s1 分"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "統計期間:"
@@ -1145,10 +1148,10 @@
         "button": "全て見る",
         "description": "Blitzアバター図鑑",
         "seo_description": "World of Tanks Blitz の 全ての プレイヤーアバター",
-        "last_updated": "最終更新: %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "アバターを検索...",
-          "results": "検索結果: %s1 個"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "プレイヤーが見つかりませんでした"
         },
         "controls": {
-          "title": "%s1 を追跡中",
-          "subtitle": "開始日時: %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "リセット",
           "change": "変更"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancel",
               "success": {
                 "title": "Copy URL",
-                "info": "Generated the URL for %s1. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "戻る",
                 "copy": "Copy URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "さあ、BlitzKit を始めよう!",
         "seo_description": "さあ、BlitzKit を始めよう!"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analyze now",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "ゲーム内のセッション統計",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/pl.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "",
-    "long": "To jest długi ciąg testowy. NIGDY NIE ZOBACZYSZ tego w interfejsie użytkownika. Mój ulubiony owoc to %s1, ponieważ ma kolor %s2. Tak bardzo je lubię, że powiem ich nazwę 3 razy! %s1! %s1! %s1! Po raz kolejny to %s2, a nie %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "Szybki brązowy lis przeskoczył nad leniwym psem."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1hp",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Auto loader",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Nie można znaleźć klanu\nNie można znaleźć \"%s1\". Spróbuj wybrać klan z wyników wyszukiwania.",
-        "player_not_found": "# Nie można znaleźć użytkownika\nNie mogłem znaleźć użytkownika \"%s1\". Spróbuj wybrać użytkownika z wyniku wyszukiwania, wpisując poprawną nazwę użytkownika lub używając polecenia `/link`.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Użyj `/link` aby zacząć\nNie wiem, kim jesteś, ale możesz mi dziś powiedzieć!",
-        "tank_name_not_found": "# Czołg nie został znaleziony\nNie można znaleźć czołgu o nazwie \"%s1\".",
-        "tank_id_not_found": "# Czołg nie został znaleziony\nNie można znaleźć czołgu o ID \"%s1\". Spróbuj wpisać nazwę czołgu zamiast liczby.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# Brak dostępnych statystyk czołgów\nTen gracz nie ma żadnych dostępnych statystyk. Może to nie być gracz, którego szukasz.",
         "get_help": "Pomóż serwerowi Discord",
         "uncaught_error": "# BlitzKit wpadł w błąd!\nPrzepraszamy za to. Możesz [dołączyć do oficjalnego serwera Discord](https://discord.gg/nDt7AjGJQH), aby uzyskać pomoc.",
@@ -283,19 +284,19 @@
           "name": "poziom",
           "description": "Poziom",
           "choices": {
-            "tier": "Poziom %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Kariera",
         "today": "Dzisiaj",
-        "days": "%s1 dzień",
-        "custom": "%s1 - %s2 dni"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Brak filtrów",
-        "tier": "Poziom %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "Brak bitew w tym okresie",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "aukcja",
-        "description": "Czołgi dostępne na aukcji",
-        "body": {
-          "title": "Aukcja Blitz",
-          "subtitle": "%s1 dostępne • następne ceny %s2\nOferta teraz: %s3",
-          "next": "Następna cena: %s1",
-          "available": "Dostępne: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# Brak bieżącej aukcji\n\nObecnie nie ma dostępnych czołgów do zakupu na aukcji. Jeśli uważasz, że to błąd, zgłoś go na [oficjalnym serwerze Discord](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Oferta teraz"
-        }
-      },
       "replay": {
         "name": "powtórz",
         "description": "Wyświetl wyniki powtórki"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Rozpocznij badania",
           "total": "Całkowity",
-          "research": "Badanie: %s1",
-          "upgrades": "Ulepszenie: %s1",
-          "purchase": "Zakup: %s1",
-          "equipment": "Wyposażenie: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# To jest szacunek!\n\nTa lista może zawierać już zbadane czołgi z powodu niedokładnych informacji dostarczanych przez Wargaming. Spróbuj podać `starting-tank` z wiersza podczas używania polecenia, jeśli możesz."
         },
         "errors": {
-          "non_tech_tree": "# %s1 nie jest na drzewie technologii\n\nNie możesz zbadać czołg premium/kolekcjonerski.",
-          "tier_1": "# %s1 jest czołgami poziomu I\n\nPoziom I są zawsze odblokowane za darmo dla wszystkich graczy.",
-          "already_researched": "# %s1 jest już zbadany\n\nSpróbuj podać `starting-tank` gdy użyjesz komendy aby zobaczyć sumy dla linii, którą już zbadałeś.",
-          "start_end_equal": "# %s1 został dostarczony dwa razy\n\nUpewnij się, że `starting-tank` i `target-tank` są inne.",
-          "tanks_not_on_line": "# %s i %s nie znajdują się w tej samej linii\n\nUpewnij się, że `starting-tank` i `target-tank` znajdują się na tej samej linii drzewa technicznego.",
-          "unordered": "# %s1 wyższy stopień %s2\n\nUpewnij się, że zamiast tego %s3 jest `starting-tank`, ponieważ jest tierowo niższym czołgiem."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "Śr. wygranych",
           "damage": "Uszkodzenia",
-          "unknown_tank": "Nieznany czołg %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "threshold",
-            "description": "Liczba dni nieaktywnych (domyślnie: %s dni)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Inactive for %s1+ days",
-          "listing": "%s1 dzień"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Accounts linked",
           "no_role_permissions": {
-            "title": "%s1 failed to verify",
+            "title": "{name} failed to verify",
             "description": "I don't have the permission to manage roles."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "The max number of clan results (default: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for %s1 in region %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "No clans found"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "Maksymalna liczba wyników gracza (domyślnie: %s)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Player search for %s1 in region %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "No players found"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "limit",
-            "description": "How many neighbors to display (default: %s1)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "season",
             "description": "Season number (default: current)",
             "choices": {
-              "current": "%s1 (current)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Top %s1 players",
-          "no_participation": "# %s1 didn't play rating in season %s2\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Usunięto %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Rating neighbors",
-          "more": "+ %s1 więcej"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "posiadane czołgi",
         "description": "Pokazuje wszystkie własne czołgi na poziomie",
         "body": {
-          "title": "# %s1 posiadany poziom %s2 czołgi\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "uprawnienia",
         "description": "Sprawdza, czy bot ma wymagane uprawnienia do funkcji",
         "body": {
-          "title": "# Uprawnienia\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "Wyświetl kanały: potrzebne do znalezienia wiadomości użyty przycisk odświeżania",
           "read_message_history": "Przeczytaj historię wiadomości: potrzebne do znalezienia wiadomości do odświeżenia",
           "attach_files": "Dołącz pliki: potrzebne do dodawania obrazów do komend opartych na obrazach",
@@ -600,7 +585,7 @@
         "description": "Sprawdź, czy bot żyje.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "informacje o graczu",
         "description": "Podstawowe informacje o graczu",
         "body": {
-          "title": "Informacje o %s1",
+          "title": "{name}'s information",
           "nickname": "Nick",
           "battles": "Bitwy",
           "winrate": "Śr. wygranych",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 nie grał w \n\nTen gracz nie uczestniczył w grze oceniającej w tym sezonie.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Copied!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Search tanks...",
         "recent": "Recently viewed",
         "select_all": "Select all",
         "count_singular": "1 tank",
-        "count_plural": "%s1 tanks",
-        "sorting_by": "Sorting by %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "No tanks found.",
           "search_again": "Try searching again.",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "By %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Popular tanks",
-        "subtitle": "Last %s1 days"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Other cool projects"
       },
-      "help_translate": "Please help translate %s1 to %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Tools for everything World of Tanks Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "Brak wyników"
         },
-        "stats": ""
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "Find tanks",
         "description": "Blitz tank encyclopedia",
         "seo_description": "Statistics, armor, and more for all tanks in World of Tanks Blitz",
-        "tank_seo_title": "%s1 - Tier %s2 %s3 %s4 | %s5 Tankopedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 armor, statistics, equipment, provisions, and more. %s2 DPM, %s3hp alpha, %s4mm penetration, %s5kph top speed, %s6hp health.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "Green penetration",
             "hide_model_under_armor": "Hide model under armor",
             "opaque": "Opaque",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Environment",
-            "show_grid": "Show grid"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Download",
@@ -853,7 +857,6 @@
               "reset": "Reset"
             },
             "advanced": "Advanced highlighting",
-            "shooter": "Shooter:",
             "shot_card": {
               "element": {
                 "primary": "Primary",
@@ -864,15 +867,15 @@
                 "track": "Tracks"
               },
               "status": {
-                "penetration": "%s1hp penetration",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Blocked",
                 "ricochet": "Ricochet",
-                "splash": "%s1hp splash"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetration"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Tech tree",
           "battle": "1 battle",
-          "battles": "%s1 battles",
-          "route": "Route %s1 of %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Game mode abilities"
         },
         "review": {
           "title": "Review videos",
-          "join": "Apply to %s1 YouTuber program"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "Configuration",
@@ -954,15 +957,15 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier %s1 %s2",
-            "tier": "All of tier %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "All tanks"
           },
           "values": {
-            "shell_index": "Shell %s1",
-            "at_distance": "At %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Distance",
-            "dispersion_at_distance": "Dispersion at %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Gun flexibility",
             "speed": "Speed",
             "terrain_coefficients": "Terrain coefficients",
@@ -1111,9 +1114,9 @@
         "description": "Tank performance statistics",
         "seo_description": "Best tanks and their performances in World of Tanks Blitz",
         "estimation": {
-          "body": "Estimated stats based on %s1 players. Updated %s2 ago.",
-          "hours": "%s1 hours",
-          "minutes": "%s1 minutes"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Player count"
@@ -1145,10 +1148,10 @@
         "button": "Browse all",
         "description": "Blitz player avatars",
         "seo_description": "All World of Tanks Blitz player avatars",
-        "last_updated": "Last updated on %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Search avatars...",
-          "results": "%s1 avatars"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "No players found"
         },
         "controls": {
-          "title": "Tracking %s1",
-          "subtitle": "Since %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Reset",
           "change": "Change"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancel",
               "success": {
                 "title": "Copy URL",
-                "info": "Generated the URL for %s1. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Back",
                 "copy": "Copy URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Get started with BlitzKit",
         "seo_description": "Get started with BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analyze now",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "In-game session stats",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/pt.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "teste",
-    "long": "Esta é uma sequência de testes longa. Você NUNCA DEVE ver isto na UI. Minha fruta favorita é %s1 porque tem a cor de %s2. Eu gosto tanto dela que vou dizer o nome dela 3 vezes! %s1! %s1! %s1! Mais uma vez, é %s2, não %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "A ágil raposa castanha salta por cima do cão preguiçoso."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1m",
-      "mm": "%s1mm",
-      "deg": "%s1°",
-      "hp": "%s1hp",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/s"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Autocarregador",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Não foi possível encontrar o clã\nNão foi possível encontrar \"%s1\". Tente selecionar um clã do resultado de pesquisa.",
-        "player_not_found": "# Não foi possível encontrar o usuário\nEu não consegui encontrar o usuário \"%s1\". Tente escolher um usuário do resultado de pesquisa, digitando um nome de usuário válido, ou usando o comando `/link`.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "Digite \"/link\" para começar.\nEu posso não saber quem é você, mas pode-me dizer hoje sobre isso!",
-        "tank_name_not_found": "# Tanque não encontrado\nNão foi possível encontrar um tanque pelo nome \"%s1\".",
-        "tank_id_not_found": "# Tanque não encontrado\nNão foi possível encontrar o tanque pelo ID \"%s1\". Tente digitar o nome do tanque ao invés de um número.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# Nenhuma estatística de tanques disponível\nEsse jogador não tem as suas estatísticas disponíveis. Talvez esse pode não ser o jogador que procura.",
         "get_help": "Servidor de Ajuda no Discord",
         "uncaught_error": "# O BlitzKit apresentou um erro!\nSentimos muito por isso. Sinta-se a vontade para [entrar no servidor oficial no Discord]\n(https://discord.gg/nDt7AjGJQH) para conseguir ajuda.",
@@ -283,19 +284,19 @@
           "name": "nível",
           "description": "Nível",
           "choices": {
-            "tier": "Nível %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Carreira",
         "today": "Hoje",
-        "days": "%s1 dias",
-        "custom": "%s1 - %s2 dias"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Sem filtros",
-        "tier": "Nível %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "Não há batalhas jogadas neste período",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "leilão",
-        "description": "Tanques disponíveis agora mesmo no leilão",
-        "body": {
-          "title": "Leilão Blitz",
-          "subtitle": "%s1 disponível • próximos preços %s2 oferta agora: %s3",
-          "next": "Próximo preço: %s1",
-          "available": "Disponível: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# Nenhum leilão em curso\n\nNo momento, não há tanques disponíveis para compra no leilão. Se você acha que isso é um erro, relate esta discrepância no [servidor oficial do Discord](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Ofertar agora"
-        }
-      },
       "replay": {
         "name": "replay",
         "description": "Exibir resultados de replays"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Pesquisa",
           "total": "Total",
-          "research": "Pesquisa: %s1",
-          "upgrades": "Melhorias: %s1",
-          "purchase": "Compra: %s1",
-          "equipment": "Equipamento: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# Esta é uma estimativa!\n\nEsta lista pode incluir tanques já pesquisados devido à informação imprecisa que a Wargaming fornece. Tente fornecer um `tanque-inicial` da linha ao usar o comando, se puder."
         },
         "errors": {
-          "non_tech_tree": "# %s1 não está na árvore tecnológica\n\nVocê não pode pesquisar um tanque premium/colecionador.",
-          "tier_1": "# %s1 é um nível I\n\nOs tanques de nível I sempre são desbloqueados gratuitamente para todos os jogadores.",
-          "already_researched": "# %s1 já foi pesquisado\n\nTente fornecer um `tanque-inicial` ao usar o comando para ver os totais de uma linha que você já pesquisou.",
-          "start_end_equal": "# %s1 foi fornecido duas vezes\n\nCertifique-se de que `tanque-inicial` e `tanque-alvo` são diferentes.",
-          "tanks_not_on_line": "# %s1 e %s2 não estão na mesma linha\n\nCertifique-se de que `tanque-inicial` e `tanque-alvo` estão na mesma linha tecnológica.",
-          "unordered": "# %s1 de nível mais alto para %s2\n\nCertifique-se de fornecer %s3 como o `tanque-inicial` em vez disso, pois é o tanque de nível inferior."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "Taxa de vitória",
           "damage": "Dano",
-          "unknown_tank": "Tanque desconhecido %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "limite",
-            "description": "O número de dias inativos (padrão: %s1 dias)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Inativo por %s1+ dias",
-          "listing": "%s1 dias"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Contas vinculadas",
           "no_role_permissions": {
-            "title": "%s1 falhou ao verificar",
+            "title": "{name} failed to verify",
             "description": "Eu não tenho permissão para gerenciar funções."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "O número máximo de resultados do clã (padrão: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Pesquisa do clã para %s1 na região %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "Nenhum clã encontrado"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "O número máximo de resultados do jogador (padrão: %s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Busca de jogador para %s1 na região %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "Nenhum jogador encontrado"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "limite",
-            "description": "Quantos vizinhos exibir (padrão: %s1)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "temporada",
             "description": "Número da temporada (padrão: atual)",
             "choices": {
-              "current": "%s1 (atual)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Melhores %s1 jogadores",
-          "no_participation": "# %s1 não jogou classificação na temporada %s2\n\nEste jogador não participou nesta temporada ou não passou da calibração.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# Nenhuma temporada em andamento\n\nNão há uma temporada de classificação em execução no momento.",
-          "deleted_player": "Excluído %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Classificação de vizinhos",
-          "more": "+ %s1 mais"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "tanques-possuídos",
         "description": "Mostra todos os tanques possuídos em um nível",
         "body": {
-          "title": "# %s1's possuía nível %s2 tanques\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "Permissões",
         "description": "Verifica se o bot tem as permissões necessárias para funcionar",
         "body": {
-          "title": "# Permissões\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "Ver canais: necessário para encontrar a mensagem em que o botão atualizar foi usado",
           "read_message_history": "Histórico de mensagens lidas: necessário para encontrar a mensagem para atualizar",
           "attach_files": "Anexar arquivos: necessário para adicionar imagens a comandos baseados em imagens",
@@ -600,7 +585,7 @@
         "description": "Verifique se o bot está vivo.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "informação do jogador",
         "description": "Informações básicas sobre um jogador",
         "body": {
-          "title": "%s1's informações",
+          "title": "{name}'s information",
           "nickname": "Apelido",
           "battles": "Batalhas",
           "winrate": "Taxa de vitória",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 não jogou classificação\n\nEste jogador não participou do modo de classificação nesta temporada.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Estatísticas atualmente indisponível\n\nWargaming pode estar no momento, enfrentando tempo de inatividade do servidor. Se houver uma temporada em curso, as estatísticas deverão ser disponibilizadas dentro de 24 horas."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Copiado!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Procurar tanques...",
         "recent": "Visto recentemente",
         "select_all": "Selecionar todos",
         "count_singular": "1 tanque",
-        "count_plural": "%s1 tanques",
-        "sorting_by": "Ordenando por %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "Nenhum tanque encontrado.",
           "search_again": "Tente pesquisar novamente.",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "Por %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Tanques populares",
-        "subtitle": "Últimos %s1 dias"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Outros projetos legais"
       },
-      "help_translate": "Por favor, ajude a traduzir %s1 para %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Ferramentas para tudo World of Tanks Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "Sem resultados"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "Encontrar tanques",
         "description": "Blitz enciclopédia de tanques",
         "seo_description": "Estatísticas, blindagem, e mais para todos os tanques de Wolrd of Tanks Blitz",
-        "tank_seo_title": "%s1 - Nível %s2 %s3 %s4 | %s5 Tanquepedia | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 blindagem, estatísticas, equipamentos, provisões e mais. %s2 DPM, %s3hp alfa, %s4mm de penetração, %s5km/h velocidade máxima, %s6hp vida.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "Penetração verde",
             "hide_model_under_armor": "Ocultar modelo sob blindagem",
             "opaque": "Opaco",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Ambiente",
-            "show_grid": "Exibir grade"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Download",
@@ -853,7 +857,6 @@
               "reset": "Restaurar"
             },
             "advanced": "Realce avançado",
-            "shooter": "Atirador:",
             "shot_card": {
               "element": {
                 "primary": "Primário",
@@ -864,15 +867,15 @@
                 "track": "Esteiras"
               },
               "status": {
-                "penetration": "%s1HP penetração",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Bloqueado",
                 "ricochet": "Ricochete",
-                "splash": "%s1hp respingo"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetração"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Árvore tecnológica",
           "battle": "1 batalha",
-          "battles": "%s1 batalhas",
-          "route": "Rota %s1 de %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Habilidades do modo de jogo"
         },
         "review": {
           "title": "Vídeos de análise",
-          "join": "Candidate-se para %s1 um programa YouTuber"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "Configuração",
@@ -954,15 +957,15 @@
           "title": "Características",
           "compare": {
             "label": "Comparar com",
-            "class": "Nível %s1 %s2",
-            "tier": "Tudo de nível %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "Todos os tanques"
           },
           "values": {
-            "shell_index": "Projétil %s1",
-            "at_distance": "À %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Distância",
-            "dispersion_at_distance": "Dispersão à %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Flexibilidade da arma",
             "speed": "Velocidade",
             "terrain_coefficients": "Coeficientes do terreno",
@@ -1111,9 +1114,9 @@
         "description": "Estatísticas de desempenho do tanque",
         "seo_description": "Melhores tanques e suas performances no World of Tanks Blitz",
         "estimation": {
-          "body": "Estatísticas estimadas baseadas em %s1 jogadores. Atualizado %s2 atrás.",
-          "hours": "%s1 horas",
-          "minutes": "%s1 minutos"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Número de jogadores"
@@ -1145,10 +1148,10 @@
         "button": "Procurar todos",
         "description": "Avatares do jogador Blitz",
         "seo_description": "Todos os avatares do jogador World of Tanks Blitz",
-        "last_updated": "Última atualização em %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Procurar avatares...",
-          "results": "%s1 avatares"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "Nenhum jogador encontrado"
         },
         "controls": {
-          "title": "Rastreando %s1",
-          "subtitle": "Desde %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Restaurar",
           "change": "Mudança"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancelar",
               "success": {
                 "title": "Copiar URL",
-                "info": "Gerou a URL para %s1. A incorporação começará a rastrear assim que a URL for colada. Redefina a qualquer momento clicando com o botão direito no PC ou pressionando longamente no celular e, em seguida, selecionando \"Redefinir\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Voltar",
                 "copy": "Copiar URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Comece com BlitzKit",
         "seo_description": "Comece com BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "AnaliseBlitz[]",
-        "button": "Analise agora",
-        "description": "Estatísticas médias históricas ricas",
-        "seo_description": "Estatísticas médias históricas ricas no World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Assistente Blitz",
-        "button": "Descubra hoje",
-        "description": "Estatísticas da temporada dentro do jogo",
-        "seo_description": "Estatísticas da sessão no jogo World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/ru.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "тест",
-    "long": "Это длинная тестовая строка. Вы НИКОГДА не должны видеть её в пользовательском интерфейсе. Мой любимый фрукт - %s1, потому что его цвет %s2. Он мне так нравится, что я произнесу его имя 3 раза! %s1! %s1! %s1! И ещё раз, это %s2, а не %s3.",
-    "fox": "Это длинная тестовая строка. Вы НИКОГДА не должны видеть её в пользовательском интерфейсе. Мой любимый фрукт - %s1, потому что его цвет %s2. Он мне так нравится, что я произнесу его имя 3 раза! %s1! %s1! %s1! И ещё раз, это %s2, а не %s3."
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
+    "fox": "Съешь же ещё этих мягких французских булок, да выпей чаю."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1м",
-      "mm": "%s1мм",
-      "deg": "%s1°",
-      "hp": "%s1hp",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/с"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Барабан",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Не удалось найти клан\nНе найден «%s1». Попробуйте выбрать клан из результатов поиска.",
-        "player_not_found": "# Не удалось найти пользователя\nНе удалось найти пользователя «%s1». Попробуйте выбрать пользователя из результатов поиска, введя правильное имя пользователя или используя команду «/link».",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Используйте «/link», чтобы начать\nЯ не знаю, кто ты, но давай познакомимся сегодня!",
-        "tank_name_not_found": "# Танк не найден\nНе удалось найти танк по названию «%s1».",
-        "tank_id_not_found": "# Танк не найден\nНе удалось найти танк по ID «%s1». Попробуйте ввести название танка вместо числа.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# Статистика танка недоступна\nУ этого игрока нет доступной статистики. Возможно, это не тот игрок, которого вы ищете.",
         "get_help": "Получить помощь",
         "uncaught_error": "# BlitzKit столкнулся с ошибкой!\nНам очень жаль. Не стесняйтесь и [присоединяйтесь к официальному серверу Discord](https://discord.gg/nDt7AjGJQH), чтобы получить помощь.",
@@ -283,19 +284,19 @@
           "name": "уровень",
           "description": "Уровень",
           "choices": {
-            "tier": "Уровень %s - %s"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Карьера",
         "today": "Cегодня",
-        "days": "%s дней",
-        "custom": "%s - %s дней"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Без фильтров",
-        "tier": "Уровень %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "За этот период боёв не было",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "аукцион",
-        "description": "Танки доступные на аукционе сейчас",
-        "body": {
-          "title": "Blitz аукцион",
-          "subtitle": "%s доступные • следующие цены %s\nПокупка сейчас: %s",
-          "next": "Следующая цена: %s",
-          "available": "Доступно: %s / %s"
-        },
-        "errors": {
-          "no_auction": "# Аукцион сейчас не проходит\n\nНа данный момент нет танков для покупки на аукционе. Если считаете, что это ошибка, пожалуйста о несоответствии на [официальном сервере Discord](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Купить сейчас"
-        }
-      },
       "replay": {
         "name": "повтор",
         "description": "Показать результаты повтора"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Исследование",
           "total": "Всего",
-          "research": "Исследование: %s",
-          "upgrades": "Улучшения: %s",
-          "purchase": "Покупка: %s",
-          "equipment": "Снаряжение: %s",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# Это приблизительная оценка!\n\nВ этот список могут входить уже исследованные танки из-за неточной информации, предоставляемой Wargaming. Попробуйте указать «стартовый-танк» в строке при использовании команды, если сможете."
         },
         "errors": {
-          "non_tech_tree": "# %s отсутствует в дереве танков\n\nВы не можете исследовать премиум / коллекционный танк.",
-          "tier_1": "# %s - это уровень I\n\nУровень I всегда открыт бесплатно для всех игроков.",
-          "already_researched": "# %s уже исследован\n\nПопробуйте предоставить «starting-tank» при использовании команды для просмотра итогов уже исследованной ветки.",
-          "start_end_equal": "# %s был предоставлен дважды\n\nУбедитесь, что «starting-tank» и «target-tank» различаются.",
-          "tanks_not_on_line": "# %s и %s находятся не в одной ветке\n\nУбедитесь, что «starting-tank» и «target-tank» находятся на той же ветке дерева танков.",
-          "unordered": "# У %s более высокий уровень чем у %s\n\nОбязательно укажите %s в качестве «starting-tank», так как это танк более низкого уровня."
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "Коэффициент побед",
           "damage": "Урон",
-          "unknown_tank": "Неизвестный танк %s"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "порог",
-            "description": "Количество дней не активности (по умолчанию: %s дней)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Неактивен %s+ дней",
-          "listing": "%s дней"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Аккаунты привязаны",
           "no_role_permissions": {
-            "title": "%s1 не удалось проверить",
+            "title": "{name} failed to verify",
             "description": "У меня нет разрешения на управление ролями."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "лимит",
-            "description": "Максимальное количество результатов клана (по умолчанию: %s)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Поиск клана %s в регионе %s",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "Кланов не найдено"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "лимит",
-            "description": "Максимальное число результатов игрока (по умолчанию: %s)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Поиск игрока %s в регионе %s",
+          "title": "Player search for {search} in region {region}",
           "no_results": "Игроков не найдено"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "лимит",
-            "description": "Количество отображаемых ближайших игроков (по умолчанию: %s)"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "сезон",
             "description": "Номер сезона (по умолчанию: текущий)",
             "choices": {
-              "current": "%s (текущая)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Топ %s игроков",
-          "no_participation": "# %s не играл в рейтинг в сезоне %s\n\nЭтот игрок не участвовал в этом сезоне или не получил прошлую калибровку.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# Нет текущего сезона\n\nВ данный момент нет рейтингового сезона.",
-          "deleted_player": "Удалено %s",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Рейтинг ближайших игроков",
-          "more": "+ ещё %s"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "cобственные-танки",
         "description": "Показывает все принадлежащие танки на уровне",
         "body": {
-          "title": "# %s принадлежал уровень %s танков\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "разрешения",
         "description": "Проверяет, есть ли у бота необходимые разрешения для работы",
         "body": {
-          "title": "# Разрешения\n\n%s",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "Просмотр каналов: необходимо найти сообщение, на котором была использована кнопка обновления",
           "read_message_history": "Просмотр истории сообщений: необходимо найти сообщение для обновления",
           "attach_files": "Прикрепить файлы: необходимо для добавления изображений в команды на основе изображения",
@@ -600,7 +585,7 @@
         "description": "Проверьте, что бот жив.",
         "body": {
           "pong": "Понг 🏓",
-          "pong_with_time": "Понг 🏓 - %sмс"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "информация-об-игроке",
         "description": "Основная информация о игроке",
         "body": {
-          "title": "Информация о %s",
+          "title": "{name}'s information",
           "nickname": "Никнейм",
           "battles": "Боёв",
           "winrate": "Коэффициент побед",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s не получил рейтинга\n\nЭтот игрок в этом сезоне не участвовал в рейтинговом режиме.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Статистика недоступна в настоящее время\n\nВ настоящее время Wargaming, возможно, сталкивается с простоями сервера. Если сезон продолжается, статистика должна быть доступна в течение 24 часов."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Скопировано!"
       },
       "tank_search": {
+        "select_dialog_title": "Поиск танка",
+        "swap_dialog_title": "Заменить танк",
         "clear_filters": "Сбросить фильтры",
+        "login": "Login to use this",
         "search_bar_hint": "Поиск танков...",
         "recent": "Недавние",
         "select_all": "Выбрать всё",
         "count_singular": "1 танк",
-        "count_plural": "%s1 танк",
-        "sorting_by": "Сортировать по %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "Танков не найдено.",
           "search_again": "Попробуйте повторить поиск.",
@@ -693,7 +681,7 @@
           "survivability.volume": "объём",
           "survivability.length": "длина",
           "fire.dpm": "базовый ДПМ",
-          "fire.dpmPremium": "улучшенный ДПМ",
+          "fire.dpmPremium": "премиумный ДПМ",
           "fire.reload": "перезарядка",
           "fire.caliber": "калибр",
           "fire.standardPenetration": "базовое пробитие",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Установите приложение BlitzKit",
+        "new": "НОВИНКА",
+        "checking": "Проверка совместимости...",
+        "instructions": "Инструкция для устройств Apple.",
+        "install": "Установка",
+        "dismiss": "Отклонить"
+      },
       "discord": {
         "join_short": "Присоединяйтесь к крутым ребятам!",
         "join_long": "Присоединяйся к супер-дупер крутым ребятам!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "От %s1 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Популярные танки",
-        "subtitle": "За последнее %s1 дней"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Другие классные проекты"
       },
-      "help_translate": "Пожалуйста, помогите перевести %s1 на %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Инструменты для World of Tanks Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Смешиватель",
+        "button": "Смешать и собрать",
+        "description": "Модули смешанного танка",
+        "seo_description": "Смешивание и сбор корпусов, башен и пушек танков из World of Tanks Blitz",
+        "screenshot": "Скриншот",
+        "randomize": "Случайно"
+      },
       "guess": {
         "name": "Угадайте танк",
         "button": "Угадать",
@@ -776,7 +780,7 @@
           "next": "Следующий",
           "no_results": "Ничего не найденo"
         },
-        "stats": "%s1 / %s2 угадано верно"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Поиск характеристик...",
@@ -784,9 +788,12 @@
         "button": "Поиск танков",
         "description": "Танковая энциклопедия Blitz",
         "seo_description": "Статистика, броня и многое другое по всем танкам World of Tanks Blitz",
-        "tank_seo_title": "%s1 - %s4 %s3 %s2 уровня | Танкопедия %s5 | World of Tanks Blitz (WoTB)",
-        "tank_seo_description": "%s1 броня, статистика, оборудование, снабжение и многое другое. %s2 УВМ, %s3hp альфа, %s4mm пробитие, %s5км/ч лучшая скорость, %s6hp здоровье.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Пропуск"
+          },
           "assault": {
             "title": "Штурмовые снаряды"
           },
@@ -806,13 +813,12 @@
             "no_ricochet": "Разрывные снаряды не рикошетят"
           },
           "view_range": {
-            "camo": "Камо",
-            "percentage": "%s1%",
+            "camo": "Камуфляж",
             "ghost_factory": "Промзона",
             "dead_rail": "Эшелон"
           },
           "flexibility": {
-            "yaw": "Отклонение",
+            "yaw": "Поворот",
             "pitch": "Наклон",
             "min": "Вниз",
             "max": "Вверх"
@@ -829,9 +835,7 @@
             "green_penetration": "Зелёное пробитие",
             "hide_model_under_armor": "Скрыть модель под броней",
             "opaque": "Прозрачность",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Окружение",
-            "show_grid": "Показать сетку"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Загрузить",
@@ -853,7 +857,6 @@
               "reset": "Сброс"
             },
             "advanced": "Продвинутая подсветка",
-            "shooter": "Стреляет:",
             "shot_card": {
               "element": {
                 "primary": "Броня",
@@ -864,15 +867,15 @@
                 "track": "Гусеницы"
               },
               "status": {
-                "penetration": "Пробитие на %s1оп",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Не пробил",
                 "ricochet": "Рикошет",
-                "splash": "Урон осколками на %s1оп"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1мм %s2°",
-                "nominal": "%s1мм номинала",
-                "ricochet_loss": "%s1% пробития"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -902,7 +905,7 @@
           "tier": "Уровень",
           "type": "Тип",
           "dev_id": "DEV: ID",
-          "purchase": "Стоимость покупки",
+          "purchase": "Цена покупки",
           "restoration": "Цена восстановления",
           "sale": "Цена продажи",
           "research": "Необходимо опыта"
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Дерево танков",
           "battle": "1 бой",
-          "battles": "%s1 боёв",
-          "route": "Ветка %s1 из %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Способности в игровых режимах"
         },
         "review": {
           "title": "Видеообзоры",
-          "join": "Предложить ютубера для программы %s1"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "Конфигурация",
@@ -954,15 +957,15 @@
           "title": "Характеристики",
           "compare": {
             "label": "Сравнивать с",
-            "class": "%s2 %s1 уровня",
-            "tier": "Все %s1 уровня",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "Все танки"
           },
           "values": {
-            "shell_index": "Снаряд %s1",
-            "at_distance": "На %s1м",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Дистанция",
-            "dispersion_at_distance": "Разброс на %s1м",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Углы наводки",
             "speed": "Скорость",
             "terrain_coefficients": "Сопротивление грунтам",
@@ -978,7 +981,7 @@
             "dpmEffective": "Эффективность за 60с",
             "shells": "Снарядов в барабане",
             "mostOptimalShellIndex": "Самый эффективный снаряд",
-            "shellReloads": "Reloads",
+            "shellReloads": "Перезарядка",
             "shellReload": "Перезарядка",
             "intraClip": "Между снарядами",
             "caliber": "Калибр",
@@ -1038,8 +1041,8 @@
             "shellCapacity": "Боезапас",
             "gunType": "Тип орудия",
             "penetrationAt250m": "Пробитие на 250м",
-            "burstShells": "Burst shell count",
-            "burstInterShell": "Burst inter-shell"
+            "burstShells": "Кол-во разрывных снарядов",
+            "burstInterShell": "Взрыв между снарядами"
           }
         },
         "firepower": {
@@ -1111,9 +1114,9 @@
         "description": "Статистика эффективности танков",
         "seo_description": "Лучшие танки и их эффективность в World of Tanks Blitz",
         "estimation": {
-          "body": "Примерная статистика на основе %s1 игроков. Обновлено %s2 назад.",
-          "hours": "%s1 часов",
-          "minutes": "%s1 минут"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Количество игроков"
@@ -1136,7 +1139,7 @@
             "hits": "Уничтожен",
             "damage_ratio": "Коэф. урона",
             "damage_taken": "Получено урона",
-            "capture_points": "Ограничительные точки"
+            "capture_points": "Точки ограничения"
           }
         }
       },
@@ -1145,10 +1148,10 @@
         "button": "Просмотреть",
         "description": "Аватары игрока Blitz",
         "seo_description": "Все аватары игрока World of Tanks Blitz",
-        "last_updated": "Последнее обновление %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Поиск аватаров...",
-          "results": "%s1 аватар"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1157,14 +1160,14 @@
         "description": "Статистика сеанса игры",
         "seo_description": "Отслеживайте свою статистику в реальном времени во время игры World of Tanks Blitz",
         "search": {
-          "lookup": "Искать игрока, чтобы начать",
+          "lookup": "Введите ник игрока",
           "hint": "Поиск игроков...",
           "searching": "Поиск...",
           "no_results": "Игроков не найдено"
         },
         "controls": {
-          "title": "Отслеживание %s1",
-          "subtitle": "Начиная с %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Сброс",
           "change": "Изменить"
         },
@@ -1198,7 +1201,7 @@
         "button": "Создать",
         "description": "Встраиваемые элементы для стримов",
         "seo_description": "Создать вставки для стримов по World of Tanks Blitz с невероятной кастомизации",
-        "coming_soon": "Скоро появятся новые встраиваемые элементы.",
+        "coming_soon": "В скором времени появятся новые встраиваемые элементы.",
         "suggest": "Предложить идеи.",
         "preview": {
           "title": "Предпросмотр",
@@ -1224,7 +1227,7 @@
               "cancel": "Отмена",
               "success": {
                 "title": "Скопировать URL",
-                "info": "Сгенерирован URL для %s1. Встройка начнет отслеживание, как только URL будет вставлен. Можно сбросить, щелкнув правой кнопкой мыши на ПК или долгим нажатием на мобильном телефоне и выбором «Сброс».",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Назад",
                 "copy": "Скопировать URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Начните с BlitzKit",
         "seo_description": "Начните с BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Анализируй",
-        "description": "Богатая статистика",
-        "seo_description": "Богатые статистика по World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Открой для себя",
-        "description": "Статистика сеанса игры",
-        "seo_description": "Статистика сеанса игры в World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "К документации",
+        "description": "API сервера BlitzKit",
+        "seo_description": "Статический API сервера BlitzKit для World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/uk.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "тест",
-    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is %s1 because it has the color of %s2. I like it so much that I will say its name 3 times! %s1! %s1! %s1! Once again, it's %s2, not %s3.",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "Швидка бура лисиця перестрибує через лінивого собаку."
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1м",
-      "mm": "%s1мм",
-      "deg": "%s1°",
-      "hp": "%s1хп",
-      "x": "х%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1°/с"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "Магазинна система заряджання",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# Не вдалося знайти клан\nНе вдалося знайти клан \"%s1\". Спробуйте вибрати клан з пошукового результату.",
-        "player_not_found": "# Не вдалося знайти користувача\nЯ не зміг знайти користувача \"%s1\". Спробуйте вибрати користувача з результату пошуку, ввести коректний нікнейм, або використати команду '/link'.",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# Використайте команду \"/link\" щоб почати\nЯ не знаю, хто ви, але ви можете сказати мені сьогодні!",
-        "tank_name_not_found": "# Танк не знайдено\nНе вдалось знайти танк за ім'ям \"%s1\".",
-        "tank_id_not_found": "# Танк не знайдено\nНе вдалось знайти танк за ID \"%s1\". Спробуйте ввести назву танка замість числа.",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# Немає статистики для танка\nЦей гравець не має статистики.\nМожливо, це не той гравець, якого ви шукаєте.",
         "get_help": "Допомогти Discord серверу",
         "uncaught_error": "# Упс! BlitzKit зіткнувся з помилкою!\nНам дуже шкода. Можете попросити допомоги на [офіційному сервері Discord](https://discord.gg/nDt7AjGJQH).",
@@ -283,19 +284,19 @@
           "name": "рівень",
           "description": "Рівень",
           "choices": {
-            "tier": "Рівень %s1 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "Кар'єра",
         "today": "Сьогодні",
-        "days": "%s1 днів",
-        "custom": "%s1 - %s2 днів"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "Немає фільтрів",
-        "tier": "Рівень %s1"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "За цей період боїв не було",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "аукціон",
-        "description": "Танки доступні зараз на аукціоні",
-        "body": {
-          "title": "Бліц Аукціон",
-          "subtitle": "%s1 доступно • наступна ціна %s2\nПоточна ставка: %s3",
-          "next": "Наступна ціна:%s1",
-          "available": "Доступно: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# Немає поточного аукціону\n\nНаразі немає танків, доступних для купівлі на аукціоні. Якщо ви вважаєте це помилкою, будь ласка, повідомте про цю невідповідність на [офіційний Дискорд сервер](https://discord.gg/nDt7AjGJQH)."
-        },
-        "actions": {
-          "bid": "Поточна ставка"
-        }
-      },
       "replay": {
         "name": "реплей",
         "description": "Показати результати реплею"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "Дослідження",
           "total": "Загалом",
-          "research": "Дослідження: %s1",
-          "upgrades": "Покращення: %s1",
-          "purchase": "Придбання: %s1",
-          "equipment": "Спорядження: %s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# Це оцінка!\n\nЦей список може включати вже досліджені танки через неточну інформацію для вантажу. Спробуйте використати \"початковий танк\" з рядка за допомогою команди."
         },
         "errors": {
-          "non_tech_tree": "# %s1 не в технічному дереві\n\nВи не можете досліджувати преміум/колекційний танк.",
-          "tier_1": "# %s1 це рівень I\n\nТанки рівню I завжди відкриті для всіх гравців безкоштовно.",
-          "already_researched": "# %s1 уже досліджено!\n\nСпробуйте забезпечити `starting-tank` коли використовуєте команду щоб подивитись підсумки гілки, яку ви вже дослідили.",
-          "start_end_equal": "# %s1 було надано двічі\n\nПереконайся, що `starting-tank` та `target-tank` різні.",
-          "tanks_not_on_line": ".",
-          "unordered": ""
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "Відсоток перемог",
           "damage": "Шкода",
-          "unknown_tank": "Невідомий танк %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "поріг",
-            "description": "Кількість днів неактивності (за замовчуванням: %s1 днів)"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "Неактивний %s1+ днів",
-          "listing": "%s1 днів"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "Прив'язані акаунти",
           "no_role_permissions": {
-            "title": "%s1 не вдалося перевірити",
+            "title": "{name} failed to verify",
             "description": "У мене немає дозволу керувати ролями."
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": "Максимальна кількість результатів клану (за замовчуванням: %s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "Clan search for %s1 in region %s2",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "Жодного клану не знайдено"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": "The max number of player results (default: %s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "Player search for %s1 in region %s2",
+          "title": "Player search for {search} in region {region}",
           "no_results": "Гравця не знайдено"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "ліміт",
-            "description": ""
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "сезон",
             "description": "Базова інформація про гравця",
             "choices": {
-              "current": "%s1 (current)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "Top %s1 players",
-          "no_participation": "# %s1 didn't play rating in season %s2\n\nThis player did not participate in this season or did not get past calibration.",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# No ongoing season\n\nThere isn't a currently running rating season.",
-          "deleted_player": "Deleted %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "Rating neighbors",
-          "more": "+ %s1 more"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "отримані танки",
         "description": "Показує всі ваші танки даного рівня",
         "body": {
-          "title": "# %s1's owned tier %s2 tanks\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "дозволи",
         "description": "Checks wether the bot has the required permissions to function",
         "body": {
-          "title": "# Permissions\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "View channels: needed to find the message the refresh button was used on",
           "read_message_history": "Read message history: needed to find the message to refresh",
           "attach_files": "Attach files: needed to add images to image-based commands",
@@ -600,7 +585,7 @@
         "description": "Check wether the bot is alive.",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "player-info",
         "description": "Базова інформація про гравця",
         "body": {
-          "title": "%s1's information",
+          "title": "{name}'s information",
           "nickname": "Нік",
           "battles": "Бої",
           "winrate": "Відсоток перемог",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# Statistics currently unavailable\n\nWargaming may be currently be facing server downtime. If there is an on-going season, statistics should be available withing 24 hours."
         }
       }
@@ -671,13 +656,16 @@
         "copied": "Скопійовано!"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "Clear filters",
+        "login": "Login to use this",
         "search_bar_hint": "Шукайте техніку...",
         "recent": "Недавно переглянуті",
         "select_all": "Вибрати все",
         "count_singular": "1 танк",
-        "count_plural": "%s1 танків",
-        "sorting_by": "Сортувати за %s1",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "Нічого не знайдено.",
           "search_again": "Спробуйте шукати заново.",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "Join cool people!",
         "join_long": "Join super duper cool people!",
         "action": "Discord"
       },
       "hero": {
-        "credit": "Зроблено %s1 ❤"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "Популярні танки",
-        "subtitle": "Останні %s1 дні(в)"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "Інші класні проєкти"
       },
-      "help_translate": "Будь ласка, допоможіть перекласти %s1 на %s2!",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "Інструменти для всього, пов'язаного з WoT Blitz"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "Guess the tank",
         "button": "Guess away",
@@ -776,7 +780,7 @@
           "next": "Next",
           "no_results": "Немає результатів"
         },
-        "stats": "%s1 / %s2 guessed correctly"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "Search a stat...",
@@ -784,9 +788,12 @@
         "button": "Знайти танки",
         "description": "Танкова енциклопедія",
         "seo_description": "Характеристики, броня та інше для всіх танків WoT Blitz",
-        "tank_seo_title": "%s1 - Рівень %s2 %s3 %s4 | %s5 Танкопедія | WoT Blitz",
-        "tank_seo_description": "%s1 броня, характеристики, обладнання, амуніція та більше. %s2 шкода на хвилину, %s3 разова шкода, %s4 мм пробиття, %s5 км/год максимальна швидкість, %s6 міцність.",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "Skip"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "Camo",
-            "percentage": "%s1%",
             "ghost_factory": "Ghost Factory",
             "dead_rail": "Dead Rail"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "Зелене пробиття",
             "hide_model_under_armor": "Hide model under armor",
             "opaque": "Opaque",
-            "dev_wireframe": "DEV: wireframe",
-            "environment": "Environment",
-            "show_grid": "Show grid"
+            "dev_wireframe": "DEV: wireframe"
           },
           "screenshot": {
             "download": "Завантажити",
@@ -853,7 +857,6 @@
               "reset": "Reset"
             },
             "advanced": "Advanced highlighting",
-            "shooter": "Shooter:",
             "shot_card": {
               "element": {
                 "primary": "Primary",
@@ -864,15 +867,15 @@
                 "track": "Tracks"
               },
               "status": {
-                "penetration": "%s1hp penetration",
+                "penetration": "{damage}hp penetration",
                 "blocked": "Blocked",
                 "ricochet": "Рикошет",
-                "splash": "%s1hp splash"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "%s1mm %s2°",
-                "nominal": "%s1mm nominal",
-                "ricochet_loss": "%s1% penetration"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "Звичайний",
           "battle": "1 бій",
-          "battles": "%s1 battles",
-          "route": "Route %s1 of %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "Game mode abilities"
         },
         "review": {
           "title": "Review videos",
-          "join": "Apply to %s1 YouTuber program"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "Configuration",
@@ -954,15 +957,15 @@
           "title": "Characteristics",
           "compare": {
             "label": "Compare against",
-            "class": "Tier %s1 %s2",
-            "tier": "All of tier %s1",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "Усі танки"
           },
           "values": {
-            "shell_index": "Снаряд %s1",
-            "at_distance": "At %s1m",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "Відстань",
-            "dispersion_at_distance": "Dispersion at %s1m",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "Gun flexibility",
             "speed": "Швидкість",
             "terrain_coefficients": "Terrain coefficients",
@@ -1111,9 +1114,9 @@
         "description": "Tank performance statistics",
         "seo_description": "Best tanks and their performances in World of Tanks Blitz",
         "estimation": {
-          "body": "Estimated stats based on %s1 players. Updated %s2 ago.",
-          "hours": "%s1 hours",
-          "minutes": "%s1 minutes"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "Player count"
@@ -1145,10 +1148,10 @@
         "button": "Browse all",
         "description": "Blitz player avatars",
         "seo_description": "All World of Tanks Blitz player avatars",
-        "last_updated": "Last updated on %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "Search avatars...",
-          "results": "%s1 avatars"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "Гравця не знайдено"
         },
         "controls": {
-          "title": "Відстежуємо %s1",
-          "subtitle": "Від %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "Скинути",
           "change": "Змінити"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "Cancel",
               "success": {
                 "title": "Copy URL",
-                "info": "Generated the URL for %s1. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "Назад",
                 "copy": "Copy URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "Get started with BlitzKit",
         "seo_description": "Get started with BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "BlitzAnalysis[]",
-        "button": "Analyze now",
-        "description": "Rich historic average stats",
-        "seo_description": "Rich historic average stats in World of Tanks Blitz"
-      },
-      "blitz_insider": {
-        "name": "Blitz Insider",
-        "button": "Discover today",
-        "description": "In-game session stats",
-        "seo_description": "In-game session stats in World of Tanks Blitz"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/i18n/strings/zh.json

@@ -1,18 +1,19 @@
 {
   "test": {
     "default": "测试",
-    "long": "这是一个测试用长字符串。你不会在用户界面中看见这些。我最喜欢的水果是%s1因为它的颜色是%s2。我如此喜欢它以至于我会把它的名字念3次！%s1！%s1！%s1！重申一次，它是%s2而不是%s3。",
+    "long": "This is a long test string. You MUST NEVER see this in the UI. My favorite fruit is {fruit} because it has the color of {color}. I like it so much that I will say its name 3 times! {fruit}! {fruit}! {fruit}! Once again, it's {color}, not {not_color}.",
     "fox": "褐色的狐狸迅速地跳过那只懒狗"
   },
   "common": {
+    "name": "BlitzKit",
     "units": {
-      "m": "%s1公尺",
-      "mm": "%s1毫米",
-      "deg": "%s1度",
-      "hp": "%s1生命值",
-      "x": "x%s1",
-      "percentage": "%s1%",
-      "deg_s": "%s1度/秒"
+      "m": "{value}m",
+      "mm": "{value}mm",
+      "deg": "{value}°",
+      "hp": "{value}hp",
+      "x": "x{value}",
+      "percentage": "{value}%",
+      "deg_s": "{value}°/s"
     },
     "gun_types": {
       "auto_loader": "弹夹型战车",
@@ -185,11 +186,11 @@
   "bot": {
     "common": {
       "errors": {
-        "clan_not_found": "# 找不到公会\n找不到\"%s1\"。请尝试从搜索结果中选择一个公会。",
-        "player_not_found": "# 找不到玩家\n无法找到玩家 “%s1”。 尝试从搜索结果中选择玩家，或输入一个有效的玩家名称， 或使用“/link”命令。",
+        "clan_not_found": "# Could not find clan\nCouldn't find \"{search}\". Try selecting a clan from the search result.",
+        "player_not_found": "# Could not find user\nI couldn't find user \"{search}\". Try picking an user from the search result, typing in a valid username, or using the `/link` command.",
         "player_not_linked": "# 使用 `/link` 来开始\n我不知道你是谁，但你今天可以告诉我！",
-        "tank_name_not_found": "# 找不到战车\n找不到名为 “%s1 ”的战车。",
-        "tank_id_not_found": "# 找不到战车\n无法找到ID为 “%s1”的战车。 请尝试输入战车的名称而不是数字。",
+        "tank_name_not_found": "# Tank not found\nCould not find tank by the name \"{search}\".",
+        "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"{search}\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# 没有这辆战车的数据\n这个玩家没有可用资料。 这可能不是你要找的玩家。",
         "get_help": "Discord的协助服务器",
         "uncaught_error": "# BlitzKit 发生错误！\n我们对此感到抱歉。 欢迎加入[官方Discord](https://discord.gg/nDt7AjGJQH)，以方便帮助你解决问题。",
@@ -283,19 +284,19 @@
           "name": "阶级",
           "description": "阶级",
           "choices": {
-            "tier": "%s1阶 - %s2"
+            "tier": "Tier {tier_1} - {tier_2}"
           }
         }
       },
       "periods": {
         "career": "玩家资料",
         "today": "今日：",
-        "days": "%s1 天",
-        "custom": "%s1 - %s2 天"
+        "days": "{days} days",
+        "custom": "{day_1} - {day_2} days"
       },
       "filters": {
         "none": "无筛选器",
-        "tier": "%s1 阶级"
+        "tier": "Tier {tier}"
       },
       "no_data": {
         "battles_in_period": "在这段时间里没有参与任何战斗",
@@ -318,22 +319,6 @@
       }
     },
     "commands": {
-      "auction": {
-        "name": "拍卖",
-        "description": "目前拍卖中的战车",
-        "body": {
-          "title": "Blitz 拍卖会",
-          "subtitle": "%s1 可用 • 下一个价格 %s2\n现在出价： %s3",
-          "next": "下一个价格: %s1",
-          "available": "可用: %s1 / %s2"
-        },
-        "errors": {
-          "no_auction": "# 目前没有正在进行中的拍卖会\n\n拍卖中没有可供购买的战车。 如果您认为这是一个错误，请在[官方的 Discord服务器]（https://discord.gg/nDt7AjGJQH）中报告这个问题。"
-        },
-        "actions": {
-          "bid": "立刻购买"
-        }
-      },
       "replay": {
         "name": "回放",
         "description": "显示重播结果"
@@ -354,19 +339,19 @@
         "body": {
           "subtitle": "研发",
           "total": "全部",
-          "research": "研发：%s1",
-          "upgrades": "升级：%s1",
-          "purchase": "购买：%s1",
-          "equipment": "装备：%s1",
+          "research": "Research: {cost}",
+          "upgrades": "Upgrades: {cost}",
+          "purchase": "Purchase: {cost}",
+          "equipment": "Equipment: {cost}",
           "estimation": "# 这是一个估计值！\n\n这个列表可能包含已经研发过的战车，因为 Wargaming 提供了不正确的资料。 如果可以，请尝试在同一研发线路中提供一个 “起始战车” 。"
         },
         "errors": {
-          "non_tech_tree": "# \"%s1\" 不在科技树里\n\n你不能研究一个 加值/收藏家 战车。",
-          "tier_1": "# “%s1”是一阶战车\n\n一阶战车是可免费解锁的。",
-          "already_researched": "# \"%s1\" 已完成研发\n\n请尝试在同一研发线路上提供“起始战车”， 以查看全部您已研发过的战车。",
-          "start_end_equal": "# \"%s1\" 重复提供了\n\n请确认 \"初始战车\" 和 \"目标战车\" 是不同的。",
-          "tanks_not_on_line": "# “%s1” 和 “%s2” 不在同一个研发线路上\n\n请确认“起始战车” 和 “目标战车” 在同一研发线路中。",
-          "unordered": "# “%s1” 阶级比 “%s2” 高\n\n请以 %s3 作为起始战车，因为它的阶级更低。"
+          "non_tech_tree": "# {tank} is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# {tank} is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# {tank} is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# {tank} was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# {tank_1} and {tank_2} are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# {tank_1} higher tiered to {tank_2}\n\nMake sure to provide {tank_2} as the `starting-tank` instead as it is the lower tiered tank."
         }
       },
       "about": {
@@ -409,7 +394,7 @@
           "wn8": "WN8",
           "winrate": "胜率",
           "damage": "伤害",
-          "unknown_tank": "未知战车 %s1"
+          "unknown_tank": "Unknown tank {id}"
         }
       },
       "debug": {
@@ -445,12 +430,12 @@
         "options": {
           "threshold": {
             "name": "阈值",
-            "description": "未上线天数（ 默认：%s1 天）"
+            "description": "The number of days inactive (default: {days} days)"
           }
         },
         "body": {
-          "subtitle": "%s1+ 天以上未上线",
-          "listing": "%s1 天"
+          "subtitle": "Inactive for {days}+ days",
+          "listing": "{days} days"
         }
       },
       "full_stats": {
@@ -493,7 +478,7 @@
         "body": {
           "accounts_linked": "帐号已绑定",
           "no_role_permissions": {
-            "title": "%s1 验证失败",
+            "title": "{name} failed to verify",
             "description": "我没有管理身份的权限。"
           }
         },
@@ -508,11 +493,11 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "公会结果的最大数量 (默认：%s1)"
+            "description": "The max number of clan results (default: {limit})"
           }
         },
         "body": {
-          "title": "在 %s2 地区搜索 %s1 公会的结果",
+          "title": "Clan search for {search} in region {region}",
           "no_results": "没有找到该公会"
         }
       },
@@ -522,11 +507,11 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "最大玩家结果数 (默认：%s1)"
+            "description": "The max number of player results (default: {limit})"
           }
         },
         "body": {
-          "title": "在 %s2 地区搜索 %s1 玩家的结果",
+          "title": "Player search for {search} in region {region}",
           "no_results": "未找到玩家"
         }
       },
@@ -546,13 +531,13 @@
         "options": {
           "limit": {
             "name": "限制",
-            "description": "显示附近有多少玩家（默认：%s1）"
+            "description": "How many neighbors to display (default: {count})"
           },
           "season": {
             "name": "赛季",
             "description": "赛季数 (默认：当前)",
             "choices": {
-              "current": "%s1 (当前)"
+              "current": "{season} (current)"
             }
           },
           "league": {
@@ -561,12 +546,12 @@
           }
         },
         "body": {
-          "top_players": "前 %s1 玩家",
-          "no_participation": "# %s1 在赛季 %s2 没有进行过评价战斗\n\n该玩家没有参加该赛季或没有完成校准。",
+          "top_players": "Top {count} players",
+          "no_participation": "# {player} didn't play rating in season {season}\n\nThis player did not participate in this season or did not get past calibration.",
           "no_ongoing_season": "# 没有进行中的赛季\n\n目前没有赛季。",
-          "deleted_player": "已删除玩家 %s1",
+          "deleted_player": "Deleted {id}",
           "neighbors": "对邻居进行评分",
-          "more": "+ %s1 更多"
+          "more": "+ {count} more"
         }
       },
       "today": {
@@ -581,14 +566,14 @@
         "name": "已拥有的战车",
         "description": "显示该阶级中所有您已拥有的战车",
         "body": {
-          "title": "# %s1 所拥有的 %s2 阶战车\n\n"
+          "title": "# {name}'s owned tier {tier} tanks\n\n"
         }
       },
       "permissions": {
         "name": "权限",
         "description": "检查机器人是否拥有运行所需的权限",
         "body": {
-          "title": "# 权限\n\n%s1",
+          "title": "# Permissions\n\n{body}",
           "view_channels": "查看频道：需要找到重新整理按钮使用的讯息",
           "read_message_history": "读取消息历史: 需要找到消息以刷新",
           "attach_files": "附加文件：需要将图像添加到基于图像的命令",
@@ -600,7 +585,7 @@
         "description": "检查机器人是否处于活动状态。",
         "body": {
           "pong": "Pong 🏓",
-          "pong_with_time": "Pong 🏓 - %s1ms"
+          "pong_with_time": "Pong 🏓 - {time}ms"
         },
         "subcommands": {
           "blitzkit": {
@@ -617,7 +602,7 @@
         "name": "玩家信息",
         "description": "玩家基本信息",
         "body": {
-          "title": "%s1的信息",
+          "title": "{name}'s information",
           "nickname": "昵称",
           "battles": "战斗场次",
           "winrate": "胜率",
@@ -646,7 +631,7 @@
           }
         },
         "errors": {
-          "no_participation": "# %s1 未完成评价\n\n该玩家未参与本赛季的评价战斗。",
+          "no_participation": "# {name} hasn't played rating\n\nThis player hasn't participated in the rating gamemode this season.",
           "unrecorded_stats": "# 统计数据目前无法使用\n\nWargaming 可能暂停了服务器。 如果有连续的赛季，统计数据可能在24小时内提供。"
         }
       }
@@ -671,13 +656,16 @@
         "copied": "已拷贝！"
       },
       "tank_search": {
+        "select_dialog_title": "Search for tanks",
+        "swap_dialog_title": "Swap tank",
         "clear_filters": "清除筛选",
+        "login": "Login to use this",
         "search_bar_hint": "搜寻战车……",
         "recent": "最近查看的",
         "select_all": "全选",
         "count_singular": "1辆战车",
-        "count_plural": "%s1辆战车",
-        "sorting_by": "按 %s1 排序",
+        "count_plural": "{count} tanks",
+        "sorting_by": "Sorting by {name}",
         "no_tanks_found": {
           "body": "找不到战车。",
           "search_again": "请尝试重新搜索。",
@@ -739,22 +727,30 @@
       }
     },
     "home": {
+      "pwa": {
+        "title": "Install the BlitzKit App",
+        "new": "NEW",
+        "checking": "Checking compatibility...",
+        "instructions": "Instructions for Apple devices.",
+        "install": "Install",
+        "dismiss": "Dismiss"
+      },
       "discord": {
         "join_short": "加入超級酷的人群！",
         "join_long": "加入我們的Discord社群，和超酷的人一起聊天！",
         "action": "Discord"
       },
       "hero": {
-        "credit": "由 %s1 制作 ❤️"
+        "credit": "By {name} ❤️"
       },
       "hot_tanks": {
         "title": "受欢迎的坦克",
-        "subtitle": "过去 %s1 天"
+        "subtitle": "Last {days} days"
       },
       "other_projects": {
         "title": "其他酷炫的项目"
       },
-      "help_translate": "请帮忙将 %s1 翻译成 %s2！",
+      "help_translate": "Please help translate {name} to {language}!",
       "seo_description": "战车世界闪击战 全方位工具"
     },
     "docs": {
@@ -764,6 +760,14 @@
       }
     },
     "tools": {
+      "mixer": {
+        "name": "Mixer",
+        "button": "Mix and match",
+        "description": "Mix tank modules",
+        "seo_description": "Mix and match hulls, turrets, and guns of tanks in World of Tanks Blitz",
+        "screenshot": "Screenshot",
+        "randomize": "Randomize"
+      },
       "guess": {
         "name": "猜坦克",
         "button": "猜猜看",
@@ -776,7 +780,7 @@
           "next": "下一个",
           "no_results": "沒有結果"
         },
-        "stats": "猜对了 %s1 / %s2"
+        "stats": "{correct} / {total} guessed correctly"
       },
       "tankopedia": {
         "search": "搜索属性……",
@@ -784,9 +788,12 @@
         "button": "搜索战车",
         "description": "闪击战战车百科全书",
         "seo_description": "战车世界闪击战的所有坦克参数， 装甲， 等等...",
-        "tank_seo_title": "%s1 - %s2 阶 %s3 %s4 | %s5 战车百科 | 战车世界闪击战 (WoTB)",
-        "tank_seo_description": "%s1 装甲，统计设备，装备，供给等。 %s2 每分钟伤害， %s3生命值， %s4毫米穿透， %s5kph 最高速度， %s6hp 生命值。",
+        "tank_seo_title": "{name} - Tier {tier} {nationality} {class} | {website} Tankopedia | World of Tanks Blitz (WoTB)",
+        "tank_seo_description": "{name} armor, statistics, equipment, provisions, and more. {dpm} DPM, {alpha}hp alpha, {penetration}mm penetration, {speed}kph top speed, {health}hp health.",
         "visualizers": {
+          "reload": {
+            "skip": "跳过"
+          },
           "assault": {
             "title": "Assault shells"
           },
@@ -807,7 +814,6 @@
           },
           "view_range": {
             "camo": "迷彩",
-            "percentage": "%s1%",
             "ghost_factory": "幽灵工厂",
             "dead_rail": "死亡铁道"
           },
@@ -829,9 +835,7 @@
             "green_penetration": "可击穿区域",
             "hide_model_under_armor": "隐藏装甲下的模型",
             "opaque": "不透明",
-            "dev_wireframe": "开发选项：网格",
-            "environment": "环境",
-            "show_grid": "显示网格"
+            "dev_wireframe": "开发选项：网格"
           },
           "screenshot": {
             "download": "下载",
@@ -853,7 +857,6 @@
               "reset": "重置"
             },
             "advanced": "进阶高亮显示",
-            "shooter": "主视角射击者",
             "shot_card": {
               "element": {
                 "primary": "主装甲",
@@ -864,15 +867,15 @@
                 "track": "履带"
               },
               "status": {
-                "penetration": "%s1生命值 击穿",
+                "penetration": "{damage}hp penetration",
                 "blocked": "抵挡伤害",
                 "ricochet": "跳弹",
-                "splash": "%s1生命值 溅射"
+                "splash": "{damage}hp splash"
               },
               "stats": {
-                "thickness_and_angle": "等效%s1毫米 %s2度",
-                "nominal": "%s1毫米 装甲厚度",
-                "ricochet_loss": "%s1%概率击穿"
+                "thickness_and_angle": "{thickness}mm {angle}°",
+                "nominal": "{thickness}mm nominal",
+                "ricochet_loss": "{loss}% penetration"
               }
             }
           },
@@ -910,15 +913,15 @@
         "tech_tree": {
           "title": "科技树",
           "battle": "一场比赛",
-          "battles": "%s1场比赛",
-          "route": "路线 %s1 / %s2"
+          "battles": "{count} battles",
+          "route": "Route {index} of {count}"
         },
         "game_modes": {
           "title": "游戏模式技能"
         },
         "review": {
           "title": "回顾影片",
-          "join": "应用到 %s1 YouTuber程序"
+          "join": "Apply to {name} YouTuber program"
         },
         "configuration": {
           "title": "配置设定",
@@ -954,15 +957,15 @@
           "title": "属性",
           "compare": {
             "label": "比较",
-            "class": "%s1阶 %s2",
-            "tier": "所有 %s1 阶",
+            "class": "Tier {tier} {class}",
+            "tier": "All of tier {tier}",
             "all": "所有战车"
           },
           "values": {
-            "shell_index": "炮弹 %s1",
-            "at_distance": "在 %s1 公尺",
+            "shell_index": "Shell {index}",
+            "at_distance": "At {distance}m",
             "at_distance_slider_label": "距离",
-            "dispersion_at_distance": "%s1 公尺扩散度",
+            "dispersion_at_distance": "Dispersion at {distance}m",
             "gun_flexibility": "炮管转动界限",
             "speed": "速度",
             "terrain_coefficients": "地形系数",
@@ -1111,9 +1114,9 @@
         "description": "战车性能统计",
         "seo_description": "最好的战车及其在战车世界闪击战中的表现",
         "estimation": {
-          "body": "基于 %s1 个玩家的估计数据。更新于 %s2 之前。",
-          "hours": "%s1 小时",
-          "minutes": "%s1 分钟"
+          "body": "Estimated stats based on {count} players. Updated {age} ago.",
+          "hours": "{count} hours",
+          "minutes": "{count} minutes"
         },
         "player_count": {
           "label": "玩家数量"
@@ -1145,10 +1148,10 @@
         "button": "浏览全部",
         "description": "Blitz玩家头像",
         "seo_description": "所有战车世界闪击战玩家头像",
-        "last_updated": "最后更新于 %s1",
+        "last_updated": "Last updated on {time}",
         "search": {
           "hint": "搜索頭像……",
-          "results": "%s1 头像"
+          "results": "{count} avatars"
         }
       },
       "session": {
@@ -1163,8 +1166,8 @@
           "no_results": "找不到玩家"
         },
         "controls": {
-          "title": "追踪 %s1",
-          "subtitle": "起始于 %s1",
+          "title": "Tracking {name}",
+          "subtitle": "Since {time}",
           "reset": "重置",
           "change": "变更"
         },
@@ -1224,7 +1227,7 @@
               "cancel": "取消",
               "success": {
                 "title": "拷贝 URL",
-                "info": "已为 %s1 生成 URL。 当 URL 粘贴后，嵌入功能将开始追踪。 您可以随时在 PC 上点击右键或手机上长按并选择「重置」来重置。",
+                "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".",
                 "back": "返回",
                 "copy": "拷贝 URL"
               }
@@ -1307,17 +1310,11 @@
         "description": "开始使用 BlitzKit",
         "seo_description": "开始使用 BlitzKit"
       },
-      "blitz_analysis": {
-        "name": "闪击战分析",
-        "button": "立即分析",
-        "description": "丰富的历史平均统计",
-        "seo_description": "战车世界闪击战中丰富的历史平均统计"
-      },
-      "blitz_insider": {
-        "name": "闪击战内嵌插件",
-        "button": "开始探索",
-        "description": "游戏内场次统计",
-        "seo_description": "战车世界闪击战内的游戏内场次统计"
+      "api": {
+        "name": "API",
+        "button": "To the docs",
+        "description": "BlitzKit hosted API",
+        "seo_description": "BlitzKit hosted static API for World of Tanks Blitz"
       }
     },
     "footer": {

packages/scripts/package.json

@@ -11,20 +11,21 @@
     "build:ids": "bun src/discoverIds.ts",
     "build:bot": "bun src/buildBot.ts",
     "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts",
+    "build:proxyclient": "bun src/buildProxyClient.ts",
     "prunestrings": "bun src/pruneStrings.ts"
   },
   "dependencies": {
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
-    "@gltf-transform/core": "^4.0.10",
-    "@gltf-transform/extensions": "^4.0.10",
-    "@gltf-transform/functions": "^4.0.10",
-    "csv-parse": "^5.5.6",
+    "@gltf-transform/core": "^4.2.1",
+    "@gltf-transform/extensions": "^4.2.1",
+    "@gltf-transform/functions": "^4.2.1",
+    "csv-parse": "^6.1.0",
     "decompress": "^4.2.1",
-    "esbuild": "^0.19.12",
-    "fast-xml-parser": "^4.4.1",
+    "esbuild": "^0.25.10",
+    "fast-xml-parser": "^5.2.5",
     "progress": "^2.0.3",
-    "puppeteer": "^23.10.4"
+    "puppeteer": "^24.22.3"
   },
   "devDependencies": {
     "@types/decompress": "^4.2.7",

packages/scripts/src/buildAssets/blitzkitTankIcons.ts

@@ -1,11 +1,11 @@
-import { BLITZKIT_TANK_ICON_SIZE, fetchTankDefinitions } from '@blitzkit/core';
-import { launch } from 'puppeteer';
-import sharp from 'sharp';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
+import { BLITZKIT_TANK_ICON_SIZE, fetchTankDefinitions } from "@blitzkit/core";
+import { launch } from "puppeteer";
+import sharp from "sharp";
+import { commitAssets } from "../core/github/commitAssets";
+import { FileChange } from "../core/github/commitMultipleFiles";
 
 export async function blitzkitTankIcons() {
-  console.log('Building blitzkit tank icons...');
+  console.log("Building blitzkit tank icons...");
 
   const browser = await launch();
   const page = await browser.newPage();
@@ -21,7 +21,7 @@ export async function blitzkitTankIcons() {
 
     try {
       await page.goto(`http://localhost:4321/api/tankopedia/tank-icon/${id}/`, {
-        waitUntil: 'networkidle0',
+        waitUntil: "networkidle0",
       });
     } catch (error) {
       console.error(`${id} ${name} time out`, error);
@@ -29,21 +29,21 @@ export async function blitzkitTankIcons() {
     }
 
     const screenshot = await page.screenshot({
-      type: 'webp',
+      type: "webp",
       omitBackground: true,
     });
     const content = await sharp(screenshot).trim({ threshold: 100 }).toBuffer();
 
     index++;
     console.log(
-      `Rendered ${id} (${name}) ${((index / tanks.length) * 100).toFixed(2)}%`,
+      `Rendered ${id} (${name}) ${((index / tanks.length) * 100).toFixed(2)}%`
     );
 
-    files.push({ path: `icons/tanks/blitzkit/${id}.webp`, content });
+    files.push({ path: `icons/tanks/big/${id}.webp`, content });
   }
 
   await page.close();
   await browser.close();
 
-  await commitAssets('tank icons', files);
+  await commitAssets("tank icons", files);
 }

packages/scripts/src/buildAssets/index.ts

@@ -45,7 +45,7 @@ const methods = [
   camouflageIcons,
   boosterIcons,
   tankIcons,
-  blitzkitTankIcons,
+  // blitzkitTankIcons,
   // popularTanks,
   glossary,
 ];

packages/scripts/src/buildAssets/tankModels.ts

@@ -1,50 +1,52 @@
-import { toUniqueId } from '@blitzkit/core';
-import { NodeIO } from '@gltf-transform/core';
-import { ALL_EXTENSIONS } from '@gltf-transform/extensions';
-import { readdir } from 'fs/promises';
-import { extractModel } from '../core/blitz/extractModel';
-import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
-import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
-import { commitAssets } from '../core/github/commitAssets';
-import { FileChange } from '../core/github/commitMultipleFiles';
-import { DATA } from './constants';
-import { VehicleDefinitionList } from './definitions';
-import { TankParameters } from './tankIcons';
+import { toUniqueId } from "@blitzkit/core";
+import { NodeIO } from "@gltf-transform/core";
+import { ALL_EXTENSIONS } from "@gltf-transform/extensions";
+import { readdir } from "fs/promises";
+import { extractModel } from "../core/blitz/extractModel";
+import { readXMLDVPL } from "../core/blitz/readXMLDVPL";
+import { readYAMLDVPL } from "../core/blitz/readYAMLDVPL";
+import { commitAssets } from "../core/github/commitAssets";
+import { FileChange } from "../core/github/commitMultipleFiles";
+import { DATA } from "./constants";
+import { VehicleDefinitionList } from "./definitions";
+import { TankParameters } from "./tankIcons";
 
 export async function tankModels() {
-  console.log('Building tank models...');
+  console.log("Building tank models...");
 
   const nodeIO = new NodeIO().registerExtensions(ALL_EXTENSIONS);
   const nations = await readdir(`${DATA}/XML/item_defs/vehicles`).then(
-    (nations) => nations.filter((nation) => nation !== 'common'),
+    (nations) => nations.filter((nation) => nation !== "common")
   );
 
   for (const nationIndex in nations) {
     const nation = nations[nationIndex];
     const changes: FileChange[] = [];
     const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
-      `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`,
+      `${DATA}/XML/item_defs/vehicles/${nation}/list.xml`
     );
+    const entries = Object.entries(tanks.root);
 
     console.log(`Building models for ${nation}`);
 
-    for (const [tankKey, tank] of Object.entries(tanks.root)) {
-      if (tankKey.includes('tutorial_bot')) continue;
+    let index = 0;
+    for (const [tankKey, tank] of entries) {
+      console.log(`  ${++index} / ${entries.length} : ${tankKey}`);
+
+      if (tankKey.includes("tutorial_bot")) continue;
 
       const id = toUniqueId(nation, tank.id);
 
       const parameters = await readYAMLDVPL<TankParameters>(
-        `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`,
+        `${DATA}/3d/Tanks/Parameters/${nation}/${tankKey}.yaml`
       );
       const model = await extractModel(
         DATA,
-        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, ''),
+        parameters.resourcesPath.blitzModelPath.replace(/\.sc2$/, "")
       );
+      const content = Buffer.from(await nodeIO.writeBinary(model));
 
-      changes.push({
-        path: `3d/tanks/models/${id}.glb`,
-        content: Buffer.from(await nodeIO.writeBinary(model)),
-      });
+      changes.push({ path: `3d/tanks/models/${id}.glb`, content });
     }
 
     await commitAssets(`tank models ${nation}`, changes);

packages/scripts/src/buildProxyClient.ts

@@ -0,0 +1,45 @@
+import { readFile, writeFile } from "fs/promises";
+
+const IMPORT = "@protos/auto_legacy_proxy_client";
+const SOURCE =
+  "../../submodules/blitzkit-closed/protos/auto_legacy_proxy_client.proto";
+const TARGET =
+  "../../submodules/blitzkit-closed/src/unreal/methodPopulatedProxyClient.ts";
+
+const requestPattern = /message (\w+)Request {/g;
+const source = await readFile(SOURCE).then((buffer) => buffer.toString());
+const requests = source.matchAll(requestPattern);
+
+const imports: string[] = [];
+const methods: { name: string; method: string }[] = [];
+
+for (const match of requests) {
+  const name = match[1];
+  // const method =
+  //   name.charAt(0).toLowerCase() + name.slice(1).replace(/Async$/, "");
+  const method = name;
+
+  imports.push(`${name}Request`, `${name}Response`);
+  methods.push({ name, method });
+}
+
+let content = "";
+
+content += "import {\n";
+content += imports.map((i) => `  ${i},`).join("\n");
+content += `\n} from "${IMPORT}";\n`;
+
+content += 'import { BaseProxyClient } from "./baseProxyClient";\n\n';
+
+content +=
+  "export abstract class MethodPopulatedProxyClient extends BaseProxyClient {\n";
+content += methods
+  .map(({ name, method }) => {
+    return `  ${method}(data: ${name}Request) {
+    return this.request("${name}Request", ${name}Request, data, ${name}Response);
+  }\n`;
+  })
+  .join("");
+content += "}\n";
+
+await writeFile(TARGET, content);

packages/scripts/src/core/blitz/extractModel/constants.ts

@@ -1,13 +1,13 @@
-import { VertexAttribute, vertexAttributeVectorSizes } from '@blitzkit/core';
+import { VertexAttribute, vertexAttributeVectorSizes } from "@blitzkit/core";
 
 export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
   {
-    [VertexAttribute.VERTEX]: 'POSITION',
-    [VertexAttribute.NORMAL]: 'NORMAL',
-    [VertexAttribute.TEXCOORD0]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD1]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD2]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD3]: 'TEXCOORD_0',
+    [VertexAttribute.VERTEX]: "POSITION",
+    [VertexAttribute.NORMAL]: "NORMAL",
+    [VertexAttribute.TEXCOORD0]: "TEXCOORD_0",
+    [VertexAttribute.TEXCOORD1]: "TEXCOORD_1",
+    [VertexAttribute.TEXCOORD2]: "TEXCOORD_2",
+    [VertexAttribute.TEXCOORD3]: "TEXCOORD_3",
   };
 export const vertexAttributeGltfVectorSizes = {
   ...vertexAttributeVectorSizes,

packages/scripts/src/core/blitz/extractModel/index.ts

@@ -4,35 +4,35 @@ import {
   ScgReadStream,
   Textures,
   VertexAttribute,
-} from '@blitzkit/core';
-import { Document, Material, Node, Scene } from '@gltf-transform/core';
-import { dedup, prune } from '@gltf-transform/functions';
-import { times } from 'lodash-es';
-import { dirname } from 'path';
-import { Matrix4, Quaternion, Vector3, Vector4Tuple } from 'three';
-import { readDVPLFile } from '../readDVPLFile';
-import { readTexture } from '../readTexture';
-import { TextureMutation } from '../readTexture/constants';
+} from "@blitzkit/core";
+import { Document, Material, Node, Scene } from "@gltf-transform/core";
+import { dedup, prune } from "@gltf-transform/functions";
+import { times } from "lodash-es";
+import { dirname } from "path";
+import { readBaseColor } from "../readBaseColor";
+import { readDVPLFile } from "../readDVPLFile";
+import { readNormal } from "../readNormal";
+import { readRoughnessMetallic } from "../readRoughnessMetallic";
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
-} from './constants';
+} from "./constants";
 
 const ERROR_ON_UNKNOWN_COMPONENT = false;
 
 const omitMeshNames = {
-  start: ['chassis_chassis_', 'chassis_track_crash_', 'HP_'],
-  end: ['_POINT'],
+  start: ["chassis_chassis_", "chassis_track_crash_", "HP_"],
+  end: ["_POINT"],
 };
 
 export async function extractModel(data: string, path: string) {
   const sc2Path = `${data}/3d/${path}.sc2`;
   const scgPath = `${data}/3d/${path}.scg`;
   const sc2 = new Sc2ReadStream(
-    (await readDVPLFile(sc2Path)).buffer as ArrayBuffer,
+    (await readDVPLFile(sc2Path)).buffer as ArrayBuffer
   ).sc2();
   const scg = new ScgReadStream(
-    (await readDVPLFile(scgPath)).buffer as ArrayBuffer,
+    (await readDVPLFile(scgPath)).buffer as ArrayBuffer
   ).scg();
   const document = new Document();
   const scene = document.createScene();
@@ -41,8 +41,8 @@ export async function extractModel(data: string, path: string) {
 
   // create materials
   await Promise.all(
-    sc2['#dataNodes'].map(async (node) => {
-      const id = new DataView(node['#id']).getBigUint64(0, true);
+    sc2["#dataNodes"].map(async (node) => {
+      const id = new DataView(node["#id"]).getBigUint64(0, true);
 
       if (node.parentMaterialKey !== undefined) {
         /**
@@ -58,7 +58,7 @@ export async function extractModel(data: string, path: string) {
 
       if (node.textures) {
         textures = node.textures;
-      } else if (typeof node.configCount === 'number') {
+      } else if (typeof node.configCount === "number") {
         textures = node.configArchive_0.textures;
       }
 
@@ -66,26 +66,27 @@ export async function extractModel(data: string, path: string) {
         material.setBaseColorTexture(
           document
             .createTexture(node.materialName)
-            .setMimeType('image/jpeg')
+            .setMimeType("image/jpeg")
             .setImage(
-              await readTexture(
-                `${data}/3d/${dirname(path)}/${textures.albedo}`,
-                TextureMutation.Albedo,
-              ),
-            ),
+              await readBaseColor(
+                `${data}/3d/${dirname(path)}/${textures.baseColorMap ?? textures.albedo}`,
+                textures.miscMap
+                  ? `${data}/3d/${dirname(path)}/${textures.miscMap}`
+                  : undefined
+              )
+            )
         );
 
         if (textures.baseRMMap) {
           material.setMetallicRoughnessTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/jpeg')
+              .setMimeType("image/jpeg")
               .setImage(
-                await readTexture(
-                  `${data}/3d/${dirname(path)}/${textures.baseRMMap}`,
-                  TextureMutation.RoughnessMetallicness,
-                ),
-              ),
+                await readRoughnessMetallic(
+                  `${data}/3d/${dirname(path)}/${textures.baseRMMap}`
+                )
+              )
           );
         }
 
@@ -95,47 +96,33 @@ export async function extractModel(data: string, path: string) {
           material.setNormalTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/jpeg')
+              .setMimeType("image/jpeg")
               .setImage(
-                await readTexture(
+                await readNormal(
                   `${data}/3d/${dirname(path)}/${
                     textures.baseNormalMap ?? textures.normalmap
                   }`,
-                  isBase ? TextureMutation.Normal : undefined,
-                ),
-              ),
-          );
-        }
-
-        if (textures.miscMap) {
-          material.setOcclusionTexture(
-            document
-              .createTexture(node.materialName)
-              .setMimeType('image/jpeg')
-              .setImage(
-                await readTexture(
-                  `${data}/3d/${dirname(path)}/${textures.miscMap}`,
-                  TextureMutation.Miscellaneous,
-                ),
-              ),
+                  isBase
+                )
+              )
           );
         }
 
         materials.set(
-          new DataView(node['#id']).getBigUint64(0, true),
-          material,
+          new DataView(node["#id"]).getBigUint64(0, true),
+          material
         );
       }
-    }),
+    })
   );
 
   // replace children materials with parents
   materials.forEach((material, id) => {
-    if (typeof material !== 'bigint') return;
+    if (typeof material !== "bigint") return;
 
     let resolvedMaterial: Material | bigint | undefined = material;
 
-    while (typeof resolvedMaterial === 'bigint') {
+    while (typeof resolvedMaterial === "bigint") {
       const linkedParentMaterial = materials.get(resolvedMaterial);
 
       resolvedMaterial = linkedParentMaterial;
@@ -155,36 +142,36 @@ export async function extractModel(data: string, path: string) {
       const node = document.createNode(hierarchy.name);
       const components = times(
         hierarchy.components.count,
-        (index) => hierarchy.components[index.toString().padStart(4, '0')],
+        (index) => hierarchy.components[index.toString().padStart(4, "0")]
       );
 
       components.forEach((component) => {
-        switch (component['comp.typename']) {
-          case 'LodComponent':
+        switch (component["comp.typename"]) {
+          case "LodComponent":
             // found and used later by transform component
             // TODO: lod component always shows up before transform component; cache it before parsing transform
             break;
 
-          case 'TransformComponent': {
-            node.setTranslation(component['tc.localTranslation']);
-            node.setRotation(component['tc.localRotation']);
-            node.setScale(component['tc.localScale']);
+          case "TransformComponent": {
+            node.setTranslation(component["tc.localTranslation"]);
+            node.setRotation(component["tc.localRotation"]);
+            node.setScale(component["tc.localScale"]);
 
             break;
           }
 
-          case 'RenderComponent': {
-            const renderObject = component['rc.renderObj'];
+          case "RenderComponent": {
+            const renderObject = component["rc.renderObj"];
 
-            times(renderObject['ro.batchCount'], (batchIndex): void => {
+            times(renderObject["ro.batchCount"], (batchIndex): void => {
               const lodIndex = renderObject[`rb${batchIndex}.lodIndex`];
 
               if (lodIndex !== 0) return;
 
-              const batchKey = batchIndex.toString().padStart(4, '0');
-              const batch = renderObject['ro.batches'][batchKey];
-              const material = materials.get(batch['rb.nmatname']);
-              const polygonGroup = scg.get(batch['rb.datasource']);
+              const batchKey = batchIndex.toString().padStart(4, "0");
+              const batch = renderObject["ro.batches"][batchKey];
+              const material = materials.get(batch["rb.nmatname"]);
+              const polygonGroup = scg.get(batch["rb.datasource"]);
 
               if (!(material instanceof Material)) {
                 // probably shadow material
@@ -192,14 +179,14 @@ export async function extractModel(data: string, path: string) {
               }
               if (polygonGroup === undefined) {
                 throw new Error(
-                  `Missing polygon group ${batch['rb.datasource']}`,
+                  `Missing polygon group ${batch["rb.datasource"]}`
                 );
               }
 
               const lodNode = document.createNode(batchKey);
               const indicesAccessor = document
                 .createAccessor()
-                .setType('SCALAR')
+                .setType("SCALAR")
                 .setArray(new Uint16Array(polygonGroup.indices))
                 .setBuffer(buffer);
               const primitive = document
@@ -233,7 +220,7 @@ export async function extractModel(data: string, path: string) {
                 const vertexSize = vertexAttributeGltfVectorSizes[attribute];
                 const attributeAccessor = document
                   .createAccessor(name)
-                  .setType(vertexSize === 1 ? 'SCALAR' : `VEC${vertexSize}`)
+                  .setType(vertexSize === 1 ? "SCALAR" : `VEC${vertexSize}`)
                   .setArray(new Float32Array(value.flat()))
                   .setBuffer(buffer);
 
@@ -241,7 +228,7 @@ export async function extractModel(data: string, path: string) {
               });
 
               const mesh = document
-                .createMesh(batch['##name'])
+                .createMesh(batch["##name"])
                 .addPrimitive(primitive);
               lodNode.setMesh(mesh);
               node.addChild(lodNode);
@@ -253,24 +240,24 @@ export async function extractModel(data: string, path: string) {
           default: {
             if (ERROR_ON_UNKNOWN_COMPONENT) {
               throw new Error(
-                `Unhandled component type: ${component['comp.typename']}`,
+                `Unhandled component type: ${component["comp.typename"]}`
               );
             }
           }
         }
       });
 
-      if (hierarchy['#hierarchy']) {
-        parseHierarchies(hierarchy['#hierarchy'], node);
+      if (hierarchy["#hierarchy"]) {
+        parseHierarchies(hierarchy["#hierarchy"], node);
       }
 
       parent.addChild(node);
     });
   }
 
-  parseHierarchies(sc2['#hierarchy'], scene);
+  parseHierarchies(sc2["#hierarchy"], scene);
 
-  scene.addChild(document.createNode('test'));
+  scene.addChild(document.createNode("test"));
 
   await document.transform(prune({ keepAttributes: true }), dedup());
 

packages/scripts/src/core/blitz/readBaseColor.ts

@@ -0,0 +1,48 @@
+import sharp from "sharp";
+import { readTexture } from "./readTexture";
+
+export async function readBaseColor(path: string, occlusionPath?: string) {
+  const baseRaw = await readTexture(path);
+  const occlusionRaw = occlusionPath
+    ? await readTexture(occlusionPath)
+    : undefined;
+  const base = await sharp(baseRaw.data, { raw: baseRaw })
+    .removeAlpha()
+    .raw()
+    .toBuffer();
+  const occlusion = occlusionRaw
+    ? await sharp(occlusionRaw.data, { raw: occlusionRaw })
+        .extractChannel(3)
+        .raw()
+        .toBuffer()
+    : undefined;
+
+  const combined = Buffer.alloc(baseRaw.width * baseRaw.height * 3);
+
+  for (let i = 0; i < baseRaw.width * baseRaw.height; i++) {
+    let c = 1;
+
+    if (occlusionRaw) {
+      const x = i % baseRaw.width;
+      const y = Math.floor(i / baseRaw.width);
+      const u = Math.floor(x * (occlusionRaw.width / baseRaw.width));
+      const v = Math.floor(y * (occlusionRaw.height / baseRaw.height));
+
+      const occlusionI = u + v * occlusionRaw.width;
+
+      c = occlusion![occlusionI] / 255;
+    }
+
+    combined[i * 3 + 0] = Math.round(base[i * 3 + 0] * c);
+    combined[i * 3 + 1] = Math.round(base[i * 3 + 1] * c);
+    combined[i * 3 + 2] = Math.round(base[i * 3 + 2] * c);
+  }
+
+  const image = await sharp(combined, {
+    raw: { width: baseRaw.width, height: baseRaw.height, channels: 3 },
+  })
+    .jpeg()
+    .toBuffer();
+
+  return image;
+}

packages/scripts/src/core/blitz/readNormal.ts

@@ -0,0 +1,29 @@
+import sharp from "sharp";
+import { readTexture } from "./readTexture";
+
+export async function readNormal(path: string, isBase: boolean) {
+  const raw = await readTexture(path);
+
+  if (!isBase) {
+    return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer();
+  }
+
+  const bytes = 4 * raw.width * raw.height;
+
+  for (let index = 0; index < bytes; index += 4) {
+    /**
+     * Red is always 255 and blue is always 0. Only alpha and green contain any
+     * sort of information.
+     */
+    let x = raw.data[index + 3] * (2 / 255) - 1;
+    let y = raw.data[index + 1] * (2 / 255) - 1;
+    let z = Math.sqrt(Math.max(0, 1 - x ** 2 - y ** 2));
+
+    raw.data[index] = Math.round((x + 1) * (255 / 2));
+    raw.data[index + 1] = Math.round((y + 1) * (255 / 2));
+    raw.data[index + 2] = Math.round((z + 1) * (255 / 2));
+    raw.data[index + 3] = 255;
+  }
+
+  return await sharp(raw.data, { raw }).jpeg().toBuffer();
+}

packages/scripts/src/core/blitz/readRoughnessMetallic.ts

@@ -0,0 +1,24 @@
+import sharp from "sharp";
+import { readTexture } from "./readTexture";
+
+export async function readRoughnessMetallic(path: string) {
+  const raw = await readTexture(path);
+  const blitz = sharp(raw.data, { raw: raw });
+  const metallicness = await blitz?.extractChannel(1).raw().toBuffer();
+  const roughness = await blitz?.extractChannel(3).raw().toBuffer();
+
+  const combined = Buffer.alloc(raw.width * raw.height * 3);
+
+  for (let i = 0; i < raw.width * raw.height; i++) {
+    combined[i * 3 + 1] = roughness[i];
+    combined[i * 3 + 2] = metallicness[i];
+  }
+
+  const image = await sharp(combined, {
+    raw: { width: raw.width, height: raw.height, channels: 3 },
+  })
+    .jpeg()
+    .toBuffer();
+
+  return image;
+}

packages/scripts/src/core/blitz/readTexture/index.ts

@@ -1,81 +1,83 @@
-import { DdsReadStream, PvrReadStream } from '@blitzkit/core';
-import { existsSync } from 'fs';
-import sharp from 'sharp';
-import { DATA_COMPRESSED } from '../../../buildAssets/constants';
-import { readDVPLFile } from '../readDVPLFile';
-import { TextureMutation } from './constants';
+import { DdsReadStream, PvrReadStream } from "@blitzkit/core";
+import { existsSync } from "fs";
+import sharp from "sharp";
+import { DATA_COMPRESSED } from "../../../buildAssets/constants";
+import { readDVPLFile } from "../readDVPLFile";
+import { TextureMutation } from "./constants";
 
-export async function readTexture(path: string, mutation?: TextureMutation) {
-  const ddsTexturePath = path.replace('.tex', '.dx11.dds');
+export async function readTexture(path: string) {
+  const ddsTexturePath = path.replace(".tex", ".dx11.dds");
   const isDds = existsSync(
-    `${ddsTexturePath}${DATA_COMPRESSED ? '.dvpl' : ''}`,
+    `${ddsTexturePath}${DATA_COMPRESSED ? ".dvpl" : ""}`
   );
   const resolvedTexturePath = isDds
     ? ddsTexturePath
-    : ddsTexturePath.replace('.dds', '.pvr');
+    : ddsTexturePath.replace(".dds", ".pvr");
   const decompressedDvpl = await readDVPLFile(`${resolvedTexturePath}.dvpl`);
 
   const raw = isDds
     ? await new DdsReadStream(decompressedDvpl.buffer as ArrayBuffer).dds()
     : new PvrReadStream(decompressedDvpl.buffer as ArrayBuffer).pvr();
 
-  switch (mutation) {
-    case TextureMutation.Normal: {
-      const bytes = 4 * raw.width * raw.height;
-      for (let index = 0; index < bytes; index += 4) {
-        /**
-         * Red is always 255 and blue is always 0. Only alpha and green contain any
-         * sort of information.
-         */
-        let x = raw.data[index + 3] * (2 / 255) - 1;
-        let y = raw.data[index + 1] * (2 / 255) - 1;
-        const underSqrt = 1 - x ** 2 - y ** 2;
-        let z = underSqrt > 0 ? Math.sqrt(underSqrt) : -Math.sqrt(-underSqrt);
+  return raw;
 
-        raw.data[index] = Math.round((x + 1) * (255 / 2));
-        raw.data[index + 1] = Math.round((y + 1) * (255 / 2));
-        raw.data[index + 2] = Math.round((z + 1) * (255 / 2));
-        raw.data[index + 3] = 255;
-      }
+  // switch (mutation) {
+  //   case TextureMutation.Normal: {
+  //     const bytes = 4 * raw.width * raw.height;
+  //     for (let index = 0; index < bytes; index += 4) {
+  //       /**
+  //        * Red is always 255 and blue is always 0. Only alpha and green contain any
+  //        * sort of information.
+  //        */
+  //       let x = raw.data[index + 3] * (2 / 255) - 1;
+  //       let y = raw.data[index + 1] * (2 / 255) - 1;
+  //       const underSqrt = 1 - x ** 2 - y ** 2;
+  //       let z = underSqrt > 0 ? Math.sqrt(underSqrt) : -Math.sqrt(-underSqrt);
 
-      return await sharp(raw.data, { raw }).jpeg().toBuffer();
-    }
+  //       raw.data[index] = Math.round((x + 1) * (255 / 2));
+  //       raw.data[index + 1] = Math.round((y + 1) * (255 / 2));
+  //       raw.data[index + 2] = Math.round((z + 1) * (255 / 2));
+  //       raw.data[index + 3] = 255;
+  //     }
 
-    case TextureMutation.RoughnessMetallicness: {
-      const newImage = sharp(Buffer.alloc(raw.width * raw.height), {
-        raw: { ...raw, channels: 1 },
-      });
-      const metallicness = sharp(raw.data, { raw })
-        .extractChannel('green')
-        .jpeg()
-        .toBuffer();
-      const roughness = sharp(raw.data, { raw })
-        .extractChannel('alpha')
-        .jpeg()
-        .toBuffer();
+  //     return await sharp(raw.data, { raw }).jpeg().toBuffer();
+  //   }
 
-      return await newImage
-        .joinChannel(await Promise.all([roughness, metallicness]))
-        .jpeg()
-        .toBuffer();
-    }
+  //   case TextureMutation.RoughnessMetallicness: {
+  //     const newImage = sharp(Buffer.alloc(raw.width * raw.height), {
+  //       raw: { ...raw, channels: 1 },
+  //     });
+  //     const metallicness = sharp(raw.data, { raw })
+  //       .extractChannel("green")
+  //       .jpeg()
+  //       .toBuffer();
+  //     const roughness = sharp(raw.data, { raw })
+  //       .extractChannel("alpha")
+  //       .jpeg()
+  //       .toBuffer();
 
-    case TextureMutation.Miscellaneous: {
-      /**
-       * Alpha is ambient occlusion and green is emissive. But very few tanks
-       * use emissive so I am ignoring it for now.
-       */
-      return await sharp(raw.data, { raw })
-        .extractChannel('alpha')
-        .jpeg()
-        .toBuffer();
-    }
+  //     return await newImage
+  //       .joinChannel(await Promise.all([roughness, metallicness]))
+  //       .jpeg()
+  //       .toBuffer();
+  //   }
 
-    case TextureMutation.Albedo: {
-      return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer();
-    }
+  //   case TextureMutation.Miscellaneous: {
+  //     /**
+  //      * Alpha is ambient occlusion and green is emissive. But very few tanks
+  //      * use emissive so I am ignoring it for now.
+  //      */
+  //     return await sharp(raw.data, { raw })
+  //       .extractChannel("alpha")
+  //       .jpeg()
+  //       .toBuffer();
+  //   }
 
-    default:
-      return await sharp(raw.data, { raw }).jpeg().toBuffer();
-  }
+  //   case TextureMutation.Albedo: {
+  //     return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer();
+  //   }
+
+  //   default:
+  //     return await sharp(raw.data, { raw }).jpeg().toBuffer();
+  // }
 }

packages/scripts/src/protos.ts

@@ -1,47 +1,61 @@
-import { exec as execSync } from 'child_process';
-import { existsSync } from 'fs';
-import { readdir, rm, writeFile } from 'fs/promises';
-import { promisify } from 'util';
+import { exec as execSync } from "child_process";
+import { existsSync } from "fs";
+import { readdir, rm } from "fs/promises";
+import { promisify } from "util";
 
-const ROOT = 'packages/core/src/protos';
+const MAX_COMMAND_LENGTH = 2 ** 11;
+
+const roots = [
+  // "packages/core/src/protos",
+  "submodules/blitzkit-closed/protos",
+];
 
 const exec = promisify(execSync);
 
 let executableFileExtension: string;
 
-if (existsSync('node_modules/.bin/protoc-gen-ts_proto.exe')) {
-  executableFileExtension = '.exe';
+if (existsSync("node_modules/.bin/protoc-gen-ts_proto.exe")) {
+  executableFileExtension = ".exe";
 } else {
-  executableFileExtension = '';
+  executableFileExtension = "";
 }
 
-const filesRaw = await readdir(`${ROOT}`);
-await Promise.all(
-  filesRaw.map(async (file) => {
-    if (!file.endsWith('.proto')) {
-      await rm(`${ROOT}/${file}`);
+for (const root of roots) {
+  const filesRaw = await readdir(`${root}`);
+  const files: string[] = [];
+
+  for (const file of filesRaw) {
+    if (file.endsWith(".proto")) files.push(file);
+    if (file.endsWith(".ts")) await rm(`${root}/${file}`);
+  }
+
+  while (files.length > 0) {
+    let command = [
+      "protoc",
+      `--plugin=./node_modules/.bin/protoc-gen-ts_proto${executableFileExtension}`,
+      "--ts_proto_opt=esModuleInterop=true",
+      "--ts_proto_opt=oneof=unions-value",
+      // "--ts_proto_opt=removeEnumPrefix=true",
+      "--ts_proto_opt=unrecognizedEnum=false",
+      "--ts_proto_opt=snakeToCamel=false",
+      `--ts_proto_out=${root}`,
+      `-I=${root}`,
+    ].join(" ");
+
+    while (true) {
+      if (files.length === 0) break;
+
+      const file = files.at(-1);
+      const newLine = ` ${root}/${file}`;
+
+      if (command.length + newLine.length < MAX_COMMAND_LENGTH) {
+        command += newLine;
+        files.pop();
+      } else {
+        break;
+      }
     }
-  }),
-);
 
-const files = filesRaw.filter((file) => file.endsWith('.proto'));
-const args = [
-  `--plugin=./node_modules/.bin/protoc-gen-ts_proto${executableFileExtension}`,
-  '--ts_proto_opt=esModuleInterop=true',
-  '--ts_proto_opt=oneof=unions-value',
-  '--ts_proto_opt=removeEnumPrefix=true',
-  '--ts_proto_opt=unrecognizedEnum=false',
-  '--ts_proto_opt=snakeToCamel=false',
-  '--ts_proto_out=.',
-  ...files.map((file) => `${ROOT}/${file}`),
-];
-
-await exec(`protoc ${args.join(' ')}`);
-await writeFile(
-  `${ROOT}/index.ts`,
-  '// @ts-nocheck\n' +
-    files
-      .map((file) => file.replace('.proto', ''))
-      .map((file) => `export * from './${file}.ts';`)
-      .join('\n'),
-);
+    await exec(command);
+  }
+}

packages/scripts/src/pruneStrings.ts

@@ -1,29 +1,26 @@
-import {
-  DEFAULT_LOCALE,
-  SUPPORTED_LOCALES,
-  TranslationTree,
-} from '@blitzkit/i18n';
-import { writeFile } from 'fs/promises';
+import { type TranslationTree } from "@blitzkit/i18n";
+import locales from "@blitzkit/i18n/locales.json";
+import { writeFile } from "fs/promises";
 
-const ROOT = '@blitzkit/i18n/strings';
-const WORKING_ROOT = '../../packages/i18n/strings';
+const ROOT = "@blitzkit/i18n/strings";
+const WORKING_ROOT = "../../packages/i18n/strings";
 
-const defaultStrings = require(`${ROOT}/${DEFAULT_LOCALE}.json`).default;
-const nonDefaultLocales = SUPPORTED_LOCALES.filter(
-  (locale) => locale !== DEFAULT_LOCALE,
+const defaultStrings = require(`${ROOT}/${locales.default}.json`).default;
+const nonDefaultLocales = locales.supported.filter(
+  ({ locale }) => locale !== locales.default
 );
 
 function prune(defaultStrings: TranslationTree, strings: TranslationTree) {
   for (const key in strings) {
     if (key in defaultStrings) {
       if (typeof defaultStrings[key] === typeof strings[key]) {
-        if (typeof strings[key] === 'string') {
+        if (typeof strings[key] === "string") {
           if (
             // are equivalent regardless of %s flavor
-            (defaultStrings[key] as string).replaceAll(/%s\d/g, '%s') ===
-              (strings[key] as string).replaceAll(/%s\d/g, '%s') ||
+            (defaultStrings[key] as string).replaceAll(/%s\d/g, "%s") ===
+              (strings[key] as string).replaceAll(/%s\d/g, "%s") ||
             // string is empty
-            strings[key] === '' ||
+            strings[key] === "" ||
             // string has old flavor of %s
             strings[key].match(/%s([^\d]|$)/g) !== null
           ) {

packages/varuna/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "varuna",
+  "type": "module",
+  "main": "src/index.ts",
+  "dependencies": {
+    "react": "^19.1.1"
+  }
+}

packages/varuna/src/index.ts

@@ -0,0 +1,122 @@
+import { produce } from "immer";
+import { debounce, merge } from "lodash-es";
+import { useEffect, useRef, useState } from "react";
+
+export class Varuna<Type, Arguments = void> {
+  private listeners = new Set<(state: Type) => void>();
+
+  private initialized = false;
+  private _initial?: Type;
+  private _state?: Type;
+
+  constructor(
+    private creator: Type | ((...args: Arguments[]) => Type),
+    private persistence?: string
+  ) {
+    if (typeof creator !== "function") this.initialize(creator);
+  }
+
+  private initialize(initial: Type) {
+    let data = initial;
+
+    if (this.persistence && typeof localStorage !== "undefined") {
+      const dehydrated = localStorage.getItem(this.persistence);
+
+      if (dehydrated) {
+        const rehydrated = JSON.parse(dehydrated) as unknown;
+        data = merge(data, rehydrated);
+      }
+
+      window.addEventListener("beforeunload", this.store.bind(this));
+    }
+
+    this.initialized = true;
+    this._initial = data;
+    this._state = data;
+  }
+
+  useInitialization(...args: Arguments[]) {
+    const initializedThisMount = useRef(false);
+
+    if (initializedThisMount.current) return;
+
+    if (typeof this.creator !== "function") {
+      throw new Error("Provider must be used with a function creator");
+    }
+
+    this.initialize((this.creator as (...args: Arguments[]) => Type)(...args));
+    initializedThisMount.current = true;
+  }
+
+  private dispatch() {
+    const state = this.state;
+    this.listeners.forEach((callback) => callback(state));
+  }
+
+  on<Slice>(slicer: (state: Type) => Slice, callback: (state: Slice) => void) {
+    let last = slicer(this.state);
+
+    function listener(state: Type) {
+      const next = slicer(state);
+
+      if (next !== last) {
+        callback(next);
+        last = next;
+      }
+    }
+
+    this.listeners.add(listener);
+
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  mutate(mutator: (state: Type) => void) {
+    this.set(produce(this.state, mutator));
+  }
+
+  private assertInitialized() {
+    if (!this.initialized) {
+      throw new Error("Varuna store used before initialization");
+    }
+  }
+
+  get state() {
+    this.assertInitialized();
+    return this._state as Type;
+  }
+
+  set(state: Type) {
+    this.assertInitialized();
+    this._state = state;
+    this.dispatch();
+    this.storeDeferred();
+  }
+
+  get initial() {
+    this.assertInitialized();
+    return this._initial as Type;
+  }
+
+  use<Slice = Type>(
+    slicer: (state: Type) => Slice = (state) => state as unknown as Slice
+  ) {
+    return this.useDeferred(slicer, slicer(this.state));
+  }
+
+  useDeferred<Slice = Type>(slicer: (state: Type) => Slice, initial: Slice) {
+    const instance = this;
+    const [slice, setSlice] = useState(initial);
+
+    useEffect(() => instance.on(slicer, setSlice), []);
+
+    return slice;
+  }
+
+  store() {
+    localStorage.setItem(this.persistence!, JSON.stringify(this.state));
+  }
+
+  storeDeferred = debounce(this.store.bind(this), 500);
+}

packages/varuna/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}

packages/website/.gitignore

@@ -1,24 +0,0 @@
-# build output
-dist/
-# generated types
-.astro/
-
-# dependencies
-node_modules/
-
-# logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# environment variables
-.env
-.env.production
-
-# macOS-specific files
-.DS_Store
-
-# jetbrains setting folder
-.idea/
-.vercel/

packages/website/astro.config.mjs

@@ -1,35 +0,0 @@
-// @ts-check
-
-import react from '@astrojs/react';
-import sitemap from '@astrojs/sitemap';
-import { SUPPORTED_LOCALES } from '@blitzkit/i18n';
-import { defineConfig } from 'astro/config';
-
-export default defineConfig({
-  i18n: {
-    defaultLocale: 'en',
-    locales: [...SUPPORTED_LOCALES],
-    routing: {
-      prefixDefaultLocale: false,
-    },
-  },
-
-  devToolbar: { enabled: false },
-  output: 'static',
-  site: 'https://blitzkit.app',
-  outDir: '../../dist/website',
-  prefetch: true,
-
-  integrations: [react(), sitemap()],
-  vite: {
-    resolve: {
-      alias: {
-        '.prisma/client/index-browser':
-          '../../node_modules/.prisma/client/index-browser.js',
-      },
-    },
-    ssr: {
-      noExternal: [/^d3.*$/, /^@nivo.*$/],
-    },
-  },
-});

packages/website/astro.config.ts

@@ -0,0 +1,114 @@
+import node from "@astrojs/node";
+import react from "@astrojs/react";
+import { wrapper } from "@blitzkit/i18n";
+import locales from "@blitzkit/i18n/locales.json";
+import strings from "@blitzkit/i18n/strings/en.json";
+import { mauve, mauveDark } from "@radix-ui/colors";
+import AstroPWA from "@vite-pwa/astro";
+import favicons from "astro-favicons";
+import { defineConfig } from "astro/config";
+import packageJSON from "../../package.json";
+import { tools } from "./src/constants/tools";
+
+const POSSIBLE_TARGETS = ["app", "web"];
+
+const target = process.env.PUBLIC_TARGET;
+
+if (!target || !POSSIBLE_TARGETS.includes(target)) {
+  throw new Error("Invalid target");
+}
+
+export default defineConfig({
+  devToolbar: { enabled: false },
+
+  vite: { server: { allowedHosts: [] } },
+  output: target === "web" ? "static" : "server",
+  site: "https://blitzkit.app",
+  outDir: "../../dist/website",
+  prefetch: { defaultStrategy: "hover", prefetchAll: true },
+
+  build: { concurrency: 4 },
+  adapter: target === "app" ? node({ mode: "standalone" }) : undefined,
+
+  integrations: [
+    favicons({
+      name: strings.common.name,
+      short_name: strings.common.name,
+
+      background: mauveDark.mauve1,
+      themes: [mauve.mauve1, mauveDark.mauve1],
+      appleStatusBarStyle: "black-translucent",
+
+      version: packageJSON.version,
+
+      shortcuts: Object.values(tools)
+        .filter((tool) => !tool.disabled && !tool.href)
+        .map((tool) => {
+          const stringId = (tool.strings ??
+            tool.id) as keyof typeof strings.website.tools;
+
+          return {
+            name: strings.website.tools[stringId].name,
+            name_localized: wrapper(
+              (strings) => strings.website.tools[stringId].name
+            ),
+            description: strings.website.tools[stringId].description,
+            description_localized: wrapper(
+              (strings) => strings.website.tools[stringId].description
+            ),
+            short_name: strings.website.tools[stringId].name,
+            short_name_localized: wrapper(
+              (strings) => strings.website.tools[stringId].name
+            ),
+            url: `/${tool.id}`,
+            icon: `public/assets/images/tools/${tool.id}.webp`,
+          };
+        }),
+
+      manifest: {
+        description: strings.website.home.seo_description,
+        description_localized: wrapper(
+          (strings) => strings.website.home.seo_description
+        ),
+
+        dir: "ltr",
+        categories: ["utilities", "games", "developer", "developer tools"],
+
+        id: "com.tresabhi.blitzkit",
+        start_url: "/",
+        launch_handler: { client_mode: "navigate-new" },
+        display: "fullscreen",
+        display_override: ["fullscreen", "standalone", "minimal-ui"],
+
+        lang: locales.default,
+        orientation: "any",
+      },
+
+      icons: {
+        windows: true,
+        android: true,
+        appleIcon: true,
+        appleStartup: true,
+        favicons: true,
+        yandex: true,
+      },
+    }),
+
+    AstroPWA({
+      manifest: false,
+      devOptions: { enabled: true },
+      workbox: {
+        globPatterns: ["**/*.{html,css,js,png,webp,svg,xml,json}"],
+        runtimeCaching: [
+          {
+            urlPattern: ({ url }) =>
+              url.href.startsWith(import.meta.env.PUBLIC_ASSET_BASE),
+            handler: "NetworkFirst",
+          },
+        ],
+      },
+    }),
+
+    react(),
+  ],
+});

packages/website/package.json

@@ -2,53 +2,40 @@
   "name": "@blitzkit/website",
   "type": "module",
   "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev",
+    "dev": "PUBLIC_TARGET=web astro dev",
+    "build": "PUBLIC_TARGET=web astro build",
+    "preview": "PUBLIC_TARGET=web astro preview",
     "lint": "astro check",
-    "build": "astro check && astro build",
-    "preview": "astro preview",
     "astro": "astro"
   },
   "dependencies": {
-    "@astrolib/seo": "^1.0.0-beta.8",
-    "@blitzkit/core": "workspace:*",
-    "@blitzkit/i18n": "workspace:*",
-    "@fontsource/inter": "^5.2.5",
-    "@nanostores/persistent": "^0.10.2",
-    "@nanostores/react": "^0.7.3",
-    "@nivo/bar": "^0.87.0",
-    "@nivo/line": "^0.88.0",
-    "@radix-ui/colors": "^3.0.0",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^3.1.4",
-    "@react-three/drei": "^9.115.0",
-    "@react-three/fiber": "^8.17.10",
-    "compare-versions": "^6.1.1",
-    "echarts": "^5.5.1",
-    "immer": "^10.1.1",
-    "js-cookie": "^3.0.5",
-    "markdown-to-jsx": "^7.5.0",
-    "nanostores": "^0.11.3",
-    "quicklime": "^1.2.0",
-    "react": "^18.3.1",
-    "react-device-detect": "^2.2.3",
-    "react-dom": "^18.3.1",
-    "react-promise-suspense": "^0.3.4",
-    "three": "^0.169.0",
-    "urlon": "^3.1.0",
-    "zustand": "^4.5.5"
-  },
-  "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@astrojs/react": "^3.6.2",
-    "@astrojs/sitemap": "^3.2.1",
-    "@playform/compress": "^0.1.9",
-    "@playform/inline": "^0.1.2",
-    "@types/js-cookie": "^3.0.6",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/three": "^0.160.0",
-    "astro": "^4.16.7",
-    "astro-compressor": "^1.0.0"
+    "@astrojs/node": "^9.4.4",
+    "@astrojs/react": "^4.4.0",
+    "@astrolib/seo": "^1.0.0-beta.8",
+    "@fontsource/inter": "^5.2.8",
+    "@radix-ui/colors": "^3.0.0",
+    "@radix-ui/react-icons": "^1.3.2",
+    "@radix-ui/themes": "^3.2.1",
+    "@react-three/drei": "^10.7.6",
+    "@react-three/fiber": "^9.3.0",
+    "@types/react": "^19.1.14",
+    "@types/react-dom": "^19.1.9",
+    "@types/three": "^0.180.0",
+    "@vite-pwa/astro": "^1.1.0",
+    "astro": "^5.14.1",
+    "astro-favicons": "^3.1.5",
+    "compare-versions": "^6.1.1",
+    "fuzzysort": "^3.1.0",
+    "immer": "^10.1.3",
+    "markdown-to-jsx": "^7.7.13",
+    "pwa-install-handler": "^2.6.3",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "react-promise-suspense": "^0.3.4",
+    "three": "^0.180.0",
+    "three-stdlib": "^2.36.0",
+    "typescript": "^5.9.2",
+    "urlon": "^3.1.0"
   }
 }