Merge baf120ccc2 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-21 12:36: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-15 11:06:02 +00:00
7 changed files with 11 additions and 8 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
@ -105,7 +105,7 @@
        "eslint-plugin-jest": "^28.2.0",
        "eslint-plugin-prettier": "^5.0.1",
        "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-react-refresh": "^0.4.8",
+        "eslint-plugin-react-refresh": "^0.4.24",
        "eslint-plugin-vitest-globals": "^1.5.0",
        "fake-indexeddb": "^6.0.0",
        "jest-websocket-mock": "^2.5.0",
@ -5910,13 +5910,13 @@
      }
    },
    "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.8.tgz",
-      "integrity": "sha512-MIKAclwaDFIiYtVBLzDdm16E+Ty4GwhB6wZlCAG1R3Ur+F9Qbo6PRxpA5DK7XtDgm+WlCoAY2WxAwqhmIDHg6Q==",
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.24.tgz",
+      "integrity": "sha512-nLHIW7TEq3aLrEYWpVaJ1dRgFR+wLDPN8e8FpYAql/bMV2oBEfC37K0gLEGgv9fy66juNShSMV8OkTqzltcG/w==",
      "dev": true,
      "license": "MIT",
      "peerDependencies": {
-        "eslint": ">=7"
+        "eslint": ">=8.40"
      }
    },
    "node_modules/eslint-plugin-vitest-globals": {
--- a/web/package.json
+++ b/web/package.json
@ -111,7 +111,7 @@
    "eslint-plugin-jest": "^28.2.0",
    "eslint-plugin-prettier": "^5.0.1",
    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.8",
+    "eslint-plugin-react-refresh": "^0.4.24",
    "eslint-plugin-vitest-globals": "^1.5.0",
    "fake-indexeddb": "^6.0.0",
    "jest-websocket-mock": "^2.5.0",
--- 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]	9531b2918a	Merge `baf120ccc2` 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]	baf120ccc2	Bump eslint-plugin-react-refresh from 0.4.8 to 0.4.24 in /web Bumps [eslint-plugin-react-refresh](https://github.com/ArnaudBarre/eslint-plugin-react-refresh) from 0.4.8 to 0.4.24. - [Release notes](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/releases) - [Changelog](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/blob/main/CHANGELOG.md) - [Commits](https://github.com/ArnaudBarre/eslint-plugin-react-refresh/compare/v0.4.8...v0.4.24) --- updated-dependencies: - dependency-name: eslint-plugin-react-refresh dependency-version: 0.4.24 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-15 11:06:02 +00:00