Merge branch 'master' into ADG-9565

annguyen0 · Jan 29, 2025 · ef92c2e · ef92c2e
2 parents a4364ff + 91270d0
commit ef92c2e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,15 +9,29 @@ The format is based on [*Keep a Changelog*](https://keepachangelog.com/en/1.0.0/
 <!--
 ## [v0.108.0] – TBA
 
-## [v0.107.56] - 2025-01-10 (APPROX.)
+## [v0.107.57] - 2025-02-10 (APPROX.)
 
-See also the [v0.107.56 GitHub milestone][ms-v0.107.56].
+See also the [v0.107.57 GitHub milestone][ms-v0.107.57].
 
-[ms-v0.107.56]: https://github.com/AdguardTeam/AdGuardHome/milestone/91?closed=1
+[ms-v0.107.57]: https://github.com/AdguardTeam/AdGuardHome/milestone/92?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
+### Fixed
+
+- The formatting of large numbers in the upstream table and query log ([#7590]).
+
+[#7590]: https://github.com/AdguardTeam/AdGuardHome/issues/7590
+
+<!--
+NOTE: Add new changes ABOVE THIS COMMENT.
+-->
+
+## [v0.107.56] - 2025-01-23
+
+See also the [v0.107.56 GitHub milestone][ms-v0.107.56].
+
 ### Security
 
 - Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.23.5][go-1.23.5].
@@ -32,21 +46,15 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
-- The formatting of large numbers in the upstream table and query log ([#7590]).
-
 - Request count link in the clients table ([#7513]).
 
 - The formatting of large numbers on the dashboard ([#7329]).
 
-[#7513]: https://github.com/AdguardTeam/AdGuardHome/issues/7513
 [#7329]: https://github.com/AdguardTeam/AdGuardHome/issues/7329
-[#7590]: https://github.com/AdguardTeam/AdGuardHome/issues/7329
+[#7513]: https://github.com/AdguardTeam/AdGuardHome/issues/7513
 
 [go-1.23.5]: https://groups.google.com/g/golang-announce/c/sSaUhLA-2SI
-
-<!--
-NOTE: Add new changes ABOVE THIS COMMENT.
--->
+[ms-v0.107.56]: https://github.com/AdguardTeam/AdGuardHome/milestone/91?closed=1
 
 ## [v0.107.55] - 2024-12-11
 
@@ -2988,11 +2996,12 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 [ms-v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/milestone/28?closed=1
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.56...HEAD
-[v0.107.55]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.55...v0.107.56
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.57...HEAD
+[v0.107.57]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.56...v0.107.57
 -->
 
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.55...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.56...HEAD
+[v0.107.56]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.55...v0.107.56
 [v0.107.55]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.54...v0.107.55
 [v0.107.54]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.53...v0.107.54
 [v0.107.53]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.52...v0.107.53

diff --git a/client/src/components/Dashboard/index.tsx b/client/src/components/Dashboard/index.tsx
@@ -154,7 +154,7 @@ const Dashboard = ({
                         }}
                         disabled={processingProtection}>
                         {protectionDisabledDuration
-                            ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
+                            ? `${t('enable_protection_timer', { time: getRemaningTimeText(protectionDisabledDuration) })}`
                             : getProtectionBtnText(protectionEnabled)}
                     </button>