Merge 27bf314f4dd415f215b7a39a21f12baf036bfdd3 into 097673b845a48e8d7155214e80c2e1bca00ca6b1

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.
2026-05-03 06:50:58 +00:00 · 2025-11-17 11:06:41 +00:00 · 2025-11-14 09:36:46 -06:00 · 2025-11-14 09:23:43 -06:00 · 2025-03-10 11:25:16 +00:00
6 changed files with 6 additions and 3 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/docker/main/requirements-wheels.txt
+++ b/docker/main/requirements-wheels.txt
@ -60,7 +60,7 @@ rapidfuzz==3.12.*
 # HailoRT Wheels
 appdirs==1.4.*
 argcomplete==2.0.*
-contextlib2==0.6.*
+contextlib2==21.6.*
 distlib==0.3.*
 filelock==3.8.*
 future==0.18.*
--- a/web/.gitignore
+++ b/web/.gitignore
@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env
--- 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]	e368c3b421	Merge 27bf314f4dd415f215b7a39a21f12baf036bfdd3 into 097673b845a48e8d7155214e80c2e1bca00ca6b1	2025-11-17 11:06:41 +00:00
GuoQing Liu	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-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]	27bf314f4d	Update contextlib2 requirement from ==0.6.* to ==21.6.* in /docker/main Updates the requirements on [contextlib2](https://github.com/jazzband/contextlib2) to permit the latest version. - [Release notes](https://github.com/jazzband/contextlib2/releases) - [Changelog](https://github.com/jazzband/contextlib2/blob/master/NEWS.rst) - [Commits](https://github.com/jazzband/contextlib2/compare/v0.6.0...21.6.0) --- updated-dependencies: - dependency-name: contextlib2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-10 11:25:16 +00:00