Merge 21fc654592 into 097673b845

chore: i18n use cache key (#20885 )
* chore: i18n use cache key * Fix indentation in Dockerfile for pip command * Add build argument for GIT_COMMIT_HASH in CI workflow * Add short-sha output to action.yml * Update build args to use short SHA output * build: use vite .env * Remove unnecessary newline in Dockerfile * Define proxy host variable in vite.config.ts Add a new line to define the proxy host variable.
2025-12-20 20:16:42 +03:00 · 2025-11-17 11:01:23 +00:00 · 2025-11-14 09:36:46 -06:00 · 2025-11-14 09:23:43 -06:00 · 2025-10-13 11:44:04 +00:00
7 changed files with 14 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,6 +15,7 @@ frigate/version.py
 web/build
 web/node_modules
 web/coverage
+web/.env
 core
 !/web/**/*.ts
 .idea/*
--- a/1
+++ b/1
@ -14,6 +14,7 @@ push-boards: $(BOARDS:%=push-%)

 version:
 	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
+	echo 'VITE_GIT_COMMIT_HASH=$(COMMIT_HASH)' > web/.env

 local: version
 	docker buildx build --target=frigate --file docker/main/Dockerfile . \
--- a/web/.gitignore
+++ b/web/.gitignore
@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env
--- a/web/package-lock.json
+++ b/web/package-lock.json
@ -43,7 +43,7 @@
        "embla-carousel-react": "^8.2.0",
        "framer-motion": "^11.5.4",
        "hls.js": "^1.5.20",
-        "i18next": "^24.2.0",
+        "i18next": "^25.6.0",
        "i18next-http-backend": "^3.0.1",
        "idb-keyval": "^6.2.1",
        "immer": "^10.1.1",
@ -198,13 +198,10 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
-      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
      "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
      "engines": {
        "node": ">=6.9.0"
      }
@ -6502,9 +6499,9 @@
      }
    },
    "node_modules/i18next": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.0.tgz",
-      "integrity": "sha512-ArJJTS1lV6lgKH7yEf4EpgNZ7+THl7bsGxxougPYiXRTJ/Fe1j08/TBpV9QsXCIYVfdE/HWG/xLezJ5DOlfBOA==",
+      "version": "25.6.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.6.0.tgz",
+      "integrity": "sha512-tTn8fLrwBYtnclpL5aPXK/tAYBLWVvoHM1zdfXoRNLcI+RvtMsoZRV98ePlaW3khHYKuNh/Q65W/+NVFUeIwVw==",
      "funding": [
        {
          "type": "individual",
@ -6521,7 +6518,7 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.23.2"
+        "@babel/runtime": "^7.27.6"
      },
      "peerDependencies": {
        "typescript": "^5"
@ -8630,11 +8627,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
--- a/web/package.json
+++ b/web/package.json
@ -49,7 +49,7 @@
    "embla-carousel-react": "^8.2.0",
    "framer-motion": "^11.5.4",
    "hls.js": "^1.5.20",
-    "i18next": "^24.2.0",
+    "i18next": "^25.6.0",
    "i18next-http-backend": "^3.0.1",
    "idb-keyval": "^6.2.1",
    "immer": "^10.1.1",
--- a/web/src/utils/i18n.ts
+++ b/web/src/utils/i18n.ts
@ -33,7 +33,7 @@ i18n
    fallbackLng: "en", // use en if detected lng is not available

    backend: {
-      loadPath: "locales/{{lng}}/{{ns}}.json",
+      loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.VITE_GIT_COMMIT_HASH || "unknown"}`,
    },

    ns: [
--- a/web/src/views/settings/UiSettingsView.tsx
+++ b/web/src/views/settings/UiSettingsView.tsx
@ -157,7 +157,7 @@ export default function UiSettingsView() {
                  checked={cameraNames}
                  onCheckedChange={setCameraName}
                />
-                <Label className="cursor-pointer" htmlFor="auto-live">
+                <Label className="cursor-pointer" htmlFor="camera-names">
                  {t("general.liveDashboard.displayCameraNames.label")}
                </Label>
              </div>
Author	SHA1	Message	Date
dependabot[bot]	7b10b2dcb5	Merge `21fc654592` into `097673b845`	2025-11-17 11:01:23 +00:00
GuoQing Liu	097673b845	chore: i18n use cache key (#20885 ) Some checks failed CI / AMD64 Build (push) Has been cancelled Details CI / ARM Build (push) Has been cancelled Details CI / Jetson Jetpack 6 (push) Has been cancelled Details CI / AMD64 Extra Build (push) Has been cancelled Details CI / ARM Extra Build (push) Has been cancelled Details CI / Synaptics Build (push) Has been cancelled Details CI / Assemble and push default build (push) Has been cancelled Details * chore: i18n use cache key * Fix indentation in Dockerfile for pip command * Add build argument for GIT_COMMIT_HASH in CI workflow * Add short-sha output to action.yml * Update build args to use short SHA output * build: use vite .env * Remove unnecessary newline in Dockerfile * Define proxy host variable in vite.config.ts Add a new line to define the proxy host variable.	2025-11-14 09:36:46 -06:00
GuoQing Liu	d56cf59b9a	fix: fix "Always Show Camera Names" label switch id wrong (#20922 )	2025-11-14 09:23:43 -06:00
dependabot[bot]	21fc654592	Bump i18next from 24.2.0 to 25.6.0 in /web Bumps [i18next](https://github.com/i18next/i18next) from 24.2.0 to 25.6.0. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v24.2.0...v25.6.0) --- updated-dependencies: - dependency-name: i18next dependency-version: 25.6.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-13 11:44:04 +00:00