docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
'description': >
The blocklist of clients: IP addresses, CIDRs, or client IDs. | <mask> 'items':
<mask> 'type': 'string'
<mask> 'type': 'array'
<mask> 'disallowed_clients':
<mask> 'description': 'Blocklist of clients.'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'type': 'array'
<mask> 'blocked_hosts':
<mask> 'description': 'Blocklist of hosts.'
</s> Pull request: all: allow clientid in access settings
Updates #2624.
Updates #3162.
Squashed commit of the following:
commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:41:33 2021 +0300
all: imp types, names
commit ebd4ec26636853d0d58c4e331e6a78feede20813
Merge: 239eb721 16e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:14:33 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 239eb7215abc47e99a0300a0f4cf56002689b1a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:13:10 2021 +0300
all: fix client blocking check
commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13
Merge: 9935f2a3 9d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 13:12:28 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 29 11:26:51 2021 +0300
client: show block button for client id
commit ed786a6a74a081cd89e9d67df3537a4fadd54831
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:56:23 2021 +0300
client: imp i18n
commit 4fed21c68473ad408960c08a7d87624cabce1911
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:34:09 2021 +0300
all: imp i18n, docs
commit 55e65c0d6b939560c53dcb834a4557eb3853d194
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 13:34:01 2021 +0300
all: fix cache, imp code, docs, tests
commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 24 19:27:12 2021 +0300
all: allow clientid in access settings </s> remove 'description': 'Blocklist of hosts.'
</s> add 'description': 'The blocklist of hosts.' </s> remove 'description': 'Allowlist of clients.'
</s> add 'description': >
The allowlist of clients: IP addresses, CIDRs, or client IDs. </s> remove The rule due to which the client is disallowed. If disallowed is
set to true, and this string is empty, then the client IP is
disallowed by the "allowed IP list", that is it is not included in
the allowed list.
</s> add The rule due to which the client is allowed or blocked. </s> remove // disallowedClients are the IP addresses of clients in the blocklist.
disallowedClients *aghstrings.Set
</s> add blockedHostsEng *urlfilter.DNSEngine </s> remove // allowedClients are the IP addresses of clients in the allowlist.
allowedClients *aghstrings.Set
</s> add allowedClientIDs *aghstrings.Set
blockedClientIDs *aghstrings.Set | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e | openapi/openapi.yaml |
'description': 'The blocklist of hosts.' | <mask> 'items':
<mask> 'type': 'string'
<mask> 'type': 'array'
<mask> 'blocked_hosts':
<mask> 'description': 'Blocklist of hosts.'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'type': 'array'
<mask> 'type': 'object'
<mask> 'ClientsFindEntry':
</s> Pull request: all: allow clientid in access settings
Updates #2624.
Updates #3162.
Squashed commit of the following:
commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:41:33 2021 +0300
all: imp types, names
commit ebd4ec26636853d0d58c4e331e6a78feede20813
Merge: 239eb721 16e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:14:33 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 239eb7215abc47e99a0300a0f4cf56002689b1a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:13:10 2021 +0300
all: fix client blocking check
commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13
Merge: 9935f2a3 9d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 13:12:28 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 29 11:26:51 2021 +0300
client: show block button for client id
commit ed786a6a74a081cd89e9d67df3537a4fadd54831
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:56:23 2021 +0300
client: imp i18n
commit 4fed21c68473ad408960c08a7d87624cabce1911
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:34:09 2021 +0300
all: imp i18n, docs
commit 55e65c0d6b939560c53dcb834a4557eb3853d194
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 13:34:01 2021 +0300
all: fix cache, imp code, docs, tests
commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 24 19:27:12 2021 +0300
all: allow clientid in access settings </s> remove 'description': 'Blocklist of clients.'
</s> add 'description': >
The blocklist of clients: IP addresses, CIDRs, or client IDs. </s> remove 'description': 'Allowlist of clients.'
</s> add 'description': >
The allowlist of clients: IP addresses, CIDRs, or client IDs. </s> remove The rule due to which the client is disallowed. If disallowed is
set to true, and this string is empty, then the client IP is
disallowed by the "allowed IP list", that is it is not included in
the allowed list.
</s> add The rule due to which the client is allowed or blocked. </s> remove // disallowedClients are the IP addresses of clients in the blocklist.
disallowedClients *aghstrings.Set
</s> add blockedHostsEng *urlfilter.DNSEngine </s> remove // allowedClients are the IP addresses of clients in the allowlist.
allowedClients *aghstrings.Set
</s> add allowedClientIDs *aghstrings.Set
blockedClientIDs *aghstrings.Set | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e08a64ebe4919579275130e5a0c2e3f7c7ff070e | openapi/openapi.yaml |
{"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^"}}, | <mask> // client/src/helpers/constants.js
<mask> // client/src/components/ui/Icons.js
<mask> var serviceRulesArray = []svc{
<mask> {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
<mask> {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^"}},
<mask> {"twitter", []string{"||twitter.com^", "||t.co^", "||twimg.com^"}},
<mask> {"youtube", []string{"||youtube.com^", "||ytimg.com^", "||youtu.be^", "||googlevideo.com^", "||youtubei.googleapis.com^"}},
<mask> {"messenger", []string{"||fb.com^", "||facebook.com^"}},
<mask> {"twitch", []string{"||twitch.tv^", "||ttvnw.net^"}},
<mask> {"netflix", []string{"||nflxext.com^", "||netflix.com^"}},
</s> Update blocked_services.go Facebook, Messenger, and Instagram Rules </s> remove {"instagram", []string{"||instagram.com^"}},
</s> add {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}}, </s> remove {"messenger", []string{"||fb.com^", "||facebook.com^"}},
</s> add {"messenger", []string{"||fb.com^", "||facebook.com^", "||messenger.com^"}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e0be4e8801307bebce9e19057a1a8e6fb1a658c7 | home/blocked_services.go |
{"messenger", []string{"||fb.com^", "||facebook.com^", "||messenger.com^"}}, | <mask> {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
<mask> {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^"}},
<mask> {"twitter", []string{"||twitter.com^", "||t.co^", "||twimg.com^"}},
<mask> {"youtube", []string{"||youtube.com^", "||ytimg.com^", "||youtu.be^", "||googlevideo.com^", "||youtubei.googleapis.com^"}},
<mask> {"messenger", []string{"||fb.com^", "||facebook.com^"}},
<mask> {"twitch", []string{"||twitch.tv^", "||ttvnw.net^"}},
<mask> {"netflix", []string{"||nflxext.com^", "||netflix.com^"}},
<mask> {"instagram", []string{"||instagram.com^"}},
<mask> {"snapchat", []string{"||snapchat.com^", "||sc-cdn.net^"}},
<mask> {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^"}},
</s> Update blocked_services.go Facebook, Messenger, and Instagram Rules </s> remove {"instagram", []string{"||instagram.com^"}},
</s> add {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}}, </s> remove {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^"}},
</s> add {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^"}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e0be4e8801307bebce9e19057a1a8e6fb1a658c7 | home/blocked_services.go |
{"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}}, | <mask> {"youtube", []string{"||youtube.com^", "||ytimg.com^", "||youtu.be^", "||googlevideo.com^", "||youtubei.googleapis.com^"}},
<mask> {"messenger", []string{"||fb.com^", "||facebook.com^"}},
<mask> {"twitch", []string{"||twitch.tv^", "||ttvnw.net^"}},
<mask> {"netflix", []string{"||nflxext.com^", "||netflix.com^"}},
<mask> {"instagram", []string{"||instagram.com^"}},
<mask> {"snapchat", []string{"||snapchat.com^", "||sc-cdn.net^"}},
<mask> {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^"}},
<mask> {"ok", []string{"||ok.ru^"}},
<mask> {"skype", []string{"||skype.com^"}},
<mask> {"vk", []string{"||vk.com^"}},
</s> Update blocked_services.go Facebook, Messenger, and Instagram Rules </s> remove {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^"}},
</s> add {"facebook", []string{"||facebook.com^", "||facebook.net^", "||fbcdn.net^", "||fb.me^", "||fb.com^", "||fbsbx.com^"}}, </s> remove {"messenger", []string{"||fb.com^", "||facebook.com^"}},
</s> add {"messenger", []string{"||fb.com^", "||facebook.com^", "||messenger.com^"}}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e0be4e8801307bebce9e19057a1a8e6fb1a658c7 | home/blocked_services.go |
"@babel/runtime": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz",
"integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==",
"requires": {
"regenerator-runtime": "^0.12.0"
},
"dependencies": {
"regenerator-runtime": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
}
}
}, | <mask> "dev": true
<mask> },
<mask> "@babel/template": {
<mask> "version": "7.0.0-beta.44",
<mask> "resolved": "http://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
<mask> "integrity": "sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==",
<mask> "dev": true,
<mask> "requires": {
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"create-react-context": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
"integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
"requires": {
"fbjs": "^0.8.0",
"gud": "^1.0.0"
}
}, | <mask> "safe-buffer": "^5.0.1",
<mask> "sha.js": "^2.4.8"
<mask> }
<mask> },
<mask> "cross-spawn": {
<mask> "version": "5.1.0",
<mask> "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
<mask> "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "ansi-regex": {
<mask> "version": "2.1.1",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "aproba": {
<mask> "version": "1.2.0",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "balanced-match": {
<mask> "version": "1.0.0",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "brace-expansion": {
<mask> "version": "1.1.11",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "brace-expansion": {
<mask> "version": "1.1.11",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "balanced-match": "^1.0.0",
<mask> "concat-map": "0.0.1"
<mask> }
<mask> },
<mask> "chownr": {
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "code-point-at": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "concat-map": {
<mask> "version": "0.0.1",
<mask> "bundled": true,
<mask> "dev": true
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "concat-map": {
<mask> "version": "0.0.1",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "console-control-strings": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "console-control-strings": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "core-util-is": {
<mask> "version": "1.0.2",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "inherits": {
<mask> "version": "2.0.3",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "ini": {
<mask> "version": "1.3.5",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "is-fullwidth-code-point": {
<mask> "version": "1.0.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "number-is-nan": "^1.0.0"
<mask> }
<mask> },
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "minimatch": {
<mask> "version": "3.0.4",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "brace-expansion": "^1.1.7"
<mask> }
<mask> },
<mask> "minimist": {
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "minimist": {
<mask> "version": "0.0.8",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "minipass": {
<mask> "version": "2.2.4",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "version": "2.2.4",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "safe-buffer": "^5.1.1",
<mask> "yallist": "^3.0.0"
<mask> }
<mask> },
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "version": "0.5.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "minimist": "0.0.8"
<mask> }
<mask> },
<mask> "ms": {
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "number-is-nan": {
<mask> "version": "1.0.1",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "object-assign": {
<mask> "version": "4.1.1",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "wrappy": "1"
<mask> }
<mask> },
<mask> "os-homedir": {
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "safe-buffer": {
<mask> "version": "5.1.1",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "safer-buffer": {
<mask> "version": "2.1.2",
<mask> "bundled": true,
<mask> "dev": true,
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "version": "1.0.2",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "code-point-at": "^1.0.0",
<mask> "is-fullwidth-code-point": "^1.0.0",
<mask> "strip-ansi": "^3.0.0"
<mask> }
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"optional": true, | <mask> "version": "3.0.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "requires": {
<mask> "ansi-regex": "^2.0.0"
<mask> }
<mask> },
<mask> "strip-json-comments": {
<mask> "version": "2.0.1",
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "wrappy": {
<mask> "version": "1.0.2",
<mask> "bundled": true,
<mask> "dev": true
<mask> },
<mask> "yallist": {
<mask> "version": "3.0.2",
<mask> "bundled": true,
<mask> "dev": true
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"dev": true,
"optional": true | <mask> },
<mask> "yallist": {
<mask> "version": "3.0.2",
<mask> "bundled": true,
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "function-bind": {
<mask> "version": "1.1.1",
</s> Translate dashboard to Vietnamese with i18n </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true </s> remove "dev": true
</s> add "dev": true,
"optional": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"gud": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
"integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
}, | <mask> "dev": true
<mask> },
<mask> "handle-thing": {
<mask> "version": "1.2.5",
<mask> "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
<mask> "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"html-parse-stringify2": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz",
"integrity": "sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=",
"requires": {
"void-elements": "^2.0.1"
}
}, | <mask> "uglify-js": "3.4.x"
<mask> }
<mask> },
<mask> "html-tags": {
<mask> "version": "2.0.0",
<mask> "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
<mask> "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"i18next": {
"version": "12.0.0",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.0.0.tgz",
"integrity": "sha512-Zy/nFpmBZxgmi6k9HkHbf+MwvAwiY5BDzNjNfvyLPKyalc2YBwwZtblESDlTKLDO8XSv23qYRY2uZcADDlRSjQ=="
}, | <mask> "dev": true
<mask> },
<mask> "iconv-lite": {
<mask> "version": "0.4.24",
<mask> "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
<mask> "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
<mask> "requires": {
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"void-elements": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
}, | <mask> "indexof": "0.0.1"
<mask> }
<mask> },
<mask> "walker": {
<mask> "version": "1.0.7",
<mask> "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
<mask> "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
<mask> "dev": true,
<mask> "requires": {
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package-lock.json |
"lint": "eslint frontend/",
"start": "react-scripts start" | <mask> "scripts": {
<mask> "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
<mask> "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
<mask> "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
<mask> "lint": "eslint frontend/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.49.1",
<mask> "axios": "^0.18.0",
<mask> "classnames": "^2.2.6",
</s> Translate dashboard to Vietnamese with i18n </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package.json |
"i18next": "^12.0.0",
"i18next-browser-languagedetector": "^2.2.3", | <mask> "classnames": "^2.2.6",
<mask> "date-fns": "^1.29.0",
<mask> "file-saver": "^1.3.8",
<mask> "lodash": "^4.17.10",
<mask> "nanoid": "^1.2.3",
<mask> "prop-types": "^15.6.1",
<mask> "react": "^16.4.0",
</s> Translate dashboard to Vietnamese with i18n </s> remove "lint": "eslint frontend/"
</s> add "lint": "eslint frontend/",
"start": "react-scripts start" </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package.json |
"react-i18next": "^8.1.1", | <mask> "react": "^16.4.0",
<mask> "react-click-outside": "^3.0.1",
<mask> "react-dom": "^16.4.0",
<mask> "react-modal": "^3.4.5",
<mask> "react-redux": "^5.0.7",
<mask> "react-redux-loading-bar": "^4.0.7",
<mask> "react-router-dom": "^4.2.2",
<mask> "react-table": "^6.8.6",
<mask> "react-transition-group": "^2.4.0",
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/package.json |
import { withNamespaces, Trans } from 'react-i18next'; | <mask> import PropTypes from 'prop-types';
<mask> import map from 'lodash/map';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Cell from '../ui/Cell';
<mask> import Popover from '../ui/Popover';
<mask>
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
Header: <Trans>Requests count</Trans>, | <mask> </div>
<mask> );
<mask> },
<mask> }, {
<mask> Header: 'Requests count',
<mask> accessor: 'domain',
<mask> maxWidth: 190,
<mask> Cell: ({ value }) => {
<mask> const {
<mask> blockedFiltering,
</s> Translate dashboard to Vietnamese with i18n </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove const { dashboard } = this.props;
</s> add const { dashboard, t } = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
const { t } = this.props; | <mask> }];
<mask>
<mask> render() {
<mask> return (
<mask> <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topBlockedDomains, (value, prop) => (
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
<Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask> }];
<mask>
<mask> render() {
<mask> return (
<mask> <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topBlockedDomains, (value, prop) => (
<mask> { ip: prop, domain: value }
<mask> ))}
<mask> columns={this.columns}
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
noDataText={ t('No domains found') } | <mask> { ip: prop, domain: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText="No domains found"
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
</s> Translate dashboard to Vietnamese with i18n </s> remove noDataText="No domains found"
</s> add noDataText={ t('No domains found') } </s> remove noDataText="No clients found"
</s> add noDataText={ t('No clients found') } </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
t: PropTypes.func, | <mask> replacedSafebrowsing: PropTypes.number.isRequired,
<mask> replacedParental: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(BlockedDomains);
</s> Translate dashboard to Vietnamese with i18n </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
export default withNamespaces()(BlockedDomains); | <mask> replacedParental: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default BlockedDomains;
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/BlockedDomains.js |
import { Trans, withNamespaces } from 'react-i18next'; | <mask> import React, { Component } from 'react';
<mask> import ReactTable from 'react-table';
<mask> import PropTypes from 'prop-types';
<mask> import map from 'lodash/map';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Cell from '../ui/Cell';
<mask>
<mask> import { getPercent } from '../../helpers/helpers';
<mask> import { STATUS_COLORS } from '../../helpers/constants';
</s> Translate dashboard to Vietnamese with i18n </s> remove
</s> add import { Trans } from 'react-i18next'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
Header: <Trans>Requests count</Trans>, | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
<mask> }, {
<mask> Header: 'Requests count',
<mask> accessor: 'count',
<mask> Cell: ({ value }) => {
<mask> const percent = getPercent(this.props.dnsQueries, value);
<mask> const percentColor = this.getPercentColor(percent);
<mask>
</s> Translate dashboard to Vietnamese with i18n </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
const { t } = this.props; | <mask>
<mask> render() {
<mask> return (
<mask> <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topClients, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
<Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask> }];
<mask>
<mask> render() {
<mask> return (
<mask> <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topClients, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
noDataText={ t('No clients found') } | <mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText="No clients found"
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> </Card>
<mask> );
</s> Translate dashboard to Vietnamese with i18n </s> remove noDataText="No domains found"
</s> add noDataText={ t('No domains found') } </s> remove noDataText="No domains found"
</s> add noDataText={ t('No domains found') } </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
t: PropTypes.func, | <mask> topClients: PropTypes.object.isRequired,
<mask> dnsQueries: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Clients);
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
export default withNamespaces()(Clients); | <mask> dnsQueries: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default Clients;
</s> Translate dashboard to Vietnamese with i18n </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Clients.js |
import { Trans, withNamespaces } from 'react-i18next'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Tooltip from '../ui/Tooltip';
<mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}> | <mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = props => (
<mask> <Card title="General statistics" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<mask> <table className="table card-table">
<mask> <tbody>
<mask> <tr>
<mask> <td>
<mask> DNS Queries
</s> Translate dashboard to Vietnamese with i18n </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> | <mask> <table className="table card-table">
<mask> <tbody>
<mask> <tr>
<mask> <td>
<mask> DNS Queries
<mask> <Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.dnsQueries}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</s> add <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> </s> remove Enforced safe search
<Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
</s> add <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> </s> remove Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove <Card title="General statistics" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
</s> add <Card title={ props.t('General statistics') } subtitle={ props.t('for the last 24 hours') } bodyType="card-table" refresh={props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> Blocked by <a href="#filters">Filters</a>
<mask> <Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.blockedFiltering}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</s> add <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove Enforced safe search
<Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
</s> add <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> </s> remove Average processing time
<Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
</s> add <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> Blocked malware/phishing
<mask> <Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedSafebrowsing}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove Enforced safe search
<Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
</s> add <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> </s> remove Average processing time
<Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
</s> add <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> Blocked adult websites
<mask> <Tooltip text="A number of adult websites blocked" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedParental}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</s> add <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> </s> remove Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> </s> remove Enforced safe search
<Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
</s> add <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> </s> remove Average processing time
<Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
</s> add <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> Enforced safe search
<mask> <Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.replacedSafesearch}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</s> add <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> </s> remove Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> </s> remove Average processing time
<Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
</s> add <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
<Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | <mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> Average processing time
<mask> <Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {props.avgProcessingTime}
<mask> </span>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</s> add <Trans>Blocked malware/phishing</Trans>
<Tooltip text={ props.t('A number of DNS requests blocked by the AdGuard browsing security module') } type={tooltipType} /> </s> remove Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a>
<Tooltip text={ props.t('A number of DNS requests blocked by adblock filters and hosts blocklists') } type={tooltipType} /> </s> remove Enforced safe search
<Tooltip text="A number of DNS requests to search engines for which Safe Search was enforced" type={tooltipType} />
</s> add <Trans>Enforced safe search</Trans>
<Tooltip text={ props.t('A number of DNS requests to search engines for which Safe Search was enforced') } type={tooltipType} /> </s> remove DNS Queries
<Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</s> add <Trans>DNS Queries</Trans>
<Tooltip text={ props.t('A number of DNS quieries processed for the last 24 hours') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
t: PropTypes.func, | <mask> replacedSafesearch: PropTypes.number.isRequired,
<mask> avgProcessingTime: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Counters);
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
export default withNamespaces()(Counters); | <mask> avgProcessingTime: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default Counters;
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Counters.js |
import { withNamespaces, Trans } from 'react-i18next'; | <mask> import ReactTable from 'react-table';
<mask> import PropTypes from 'prop-types';
<mask> import map from 'lodash/map';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Cell from '../ui/Cell';
<mask> import Popover from '../ui/Popover';
<mask>
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
Header: <Trans>Requests count</Trans>, | <mask> </div>
<mask> );
<mask> },
<mask> }, {
<mask> Header: 'Requests count',
<mask> accessor: 'count',
<mask> maxWidth: 190,
<mask> Cell: ({ value }) => {
<mask> const percent = getPercent(this.props.dnsQueries, value);
<mask> const percentColor = this.getPercentColor(percent);
</s> Translate dashboard to Vietnamese with i18n </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove Header: 'Requests count',
</s> add Header: <Trans>Requests count</Trans>, </s> remove const { dashboard } = this.props;
</s> add const { dashboard, t } = this.props; </s> remove {buttonText} protection
</s> add <Trans>{buttonText} protection</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
const { t } = this.props; | <mask>
<mask> render() {
<mask> return (
<mask> <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topQueriedDomains, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
<Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | <mask> }];
<mask>
<mask> render() {
<mask> return (
<mask> <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
<mask> <ReactTable
<mask> data={map(this.props.topQueriedDomains, (value, prop) => (
<mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
</s> Translate dashboard to Vietnamese with i18n </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top blocked domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
noDataText={ t('No domains found') } | <mask> { ip: prop, count: value }
<mask> ))}
<mask> columns={this.columns}
<mask> showPagination={false}
<mask> noDataText="No domains found"
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
</s> Translate dashboard to Vietnamese with i18n </s> remove noDataText="No domains found"
</s> add noDataText={ t('No domains found') } </s> remove noDataText="No clients found"
</s> add noDataText={ t('No clients found') } </s> remove <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top clients') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> </s> remove <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={this.props.refreshButton}>
</s> add <Card title={ t('Top queried domains') } subtitle={ t('for the last 24 hours') } bodyType="card-table" refresh={this.props.refreshButton}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
t: PropTypes.func, | <mask> dnsQueries: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(QueriedDomains);
</s> Translate dashboard to Vietnamese with i18n </s> remove export default QueriedDomains;
</s> add export default withNamespaces()(QueriedDomains); </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
export default withNamespaces()(QueriedDomains); | <mask> dnsQueries: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> };
<mask>
<mask> export default QueriedDomains;
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Clients;
</s> add export default withNamespaces()(Clients); </s> remove export default BlockedDomains;
</s> add export default withNamespaces()(BlockedDomains); </s> remove export default Counters;
</s> add export default withNamespaces()(Counters); | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/QueriedDomains.js |
import { Trans } from 'react-i18next'; | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Line from '../ui/Line';
<mask>
<mask> import { getPercent } from '../../helpers/helpers';
<mask> import { STATUS_COLORS } from '../../helpers/constants';
</s> Translate dashboard to Vietnamese with i18n </s> remove
</s> add import { Trans } from 'react-i18next'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Statistics.js |
<Trans>DNS Queries</Trans> | <mask> <div className="card-value card-value-stats text-blue">
<mask> {dnsQueries}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> DNS Queries
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={queriesData} color={STATUS_COLORS.blue}/>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> </s> remove Blocked adult websites
</s> add <Trans>Blocked adult websites</Trans> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Statistics.js |
<Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> | <mask> <div className="card-value card-value-percent text-red">
<mask> {getPercent(dnsQueries, blockedFiltering)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> Blocked by <a href="#filters">Filters</a>
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={filteringData} color={STATUS_COLORS.red}/>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> </s> remove Blocked adult websites
</s> add <Trans>Blocked adult websites</Trans> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove Report an issue
</s> add <Trans>Report an issue</Trans> </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer">Homepage</a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Statistics.js |
<Trans>Blocked malware/phishing</Trans> | <mask> <div className="card-value card-value-percent text-green">
<mask> {getPercent(dnsQueries, replacedSafebrowsing)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> Blocked malware/phishing
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={safebrowsingData} color={STATUS_COLORS.green}/>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked adult websites
</s> add <Trans>Blocked adult websites</Trans> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Statistics.js |
<Trans>Blocked adult websites</Trans> | <mask> <div className="card-value card-value-percent text-yellow">
<mask> {getPercent(dnsQueries, replacedParental)}
<mask> </div>
<mask> <div className="card-title-stats">
<mask> Blocked adult websites
<mask> </div>
<mask> </div>
<mask> <div className="card-chart-bg">
<mask> <Line data={parentalData} color={STATUS_COLORS.yellow}/>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/Statistics.js |
import { Trans, withNamespaces } from 'react-i18next'; | <mask> import PropTypes from 'prop-types';
<mask> import 'whatwg-fetch';
<mask>
<mask> import Statistics from './Statistics';
<mask> import Counters from './Counters';
<mask> import Clients from './Clients';
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
<Trans>{buttonText} protection</Trans> | <mask> const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
<mask>
<mask> return (
<mask> <button type="button" className={`btn btn-sm mr-2 ${buttonClass}`} onClick={() => this.props.toggleProtection(protectionEnabled)}>
<mask> {buttonText} protection
<mask> </button>
<mask> );
<mask> }
<mask>
<mask> render() {
</s> Translate dashboard to Vietnamese with i18n </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>; </s> remove <PageTitle title="Dashboard">
</s> add <PageTitle title={ t('Dashboard') }> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
const { dashboard, t } = this.props; | <mask> );
<mask> }
<mask>
<mask> render() {
<mask> const { dashboard } = this.props;
<mask> const dashboardProcessing =
<mask> dashboard.processing ||
<mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
</s> Translate dashboard to Vietnamese with i18n </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>; </s> remove {buttonText} protection
</s> add <Trans>{buttonText} protection</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>; | <mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Dashboard">
</s> Translate dashboard to Vietnamese with i18n </s> remove <PageTitle title="Dashboard">
</s> add <PageTitle title={ t('Dashboard') }> </s> remove {buttonText} protection
</s> add <Trans>{buttonText} protection</Trans> </s> remove const { dashboard } = this.props;
</s> add const { dashboard, t } = this.props; </s> remove Report an issue
</s> add <Trans>Report an issue</Trans> </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer">Homepage</a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
<PageTitle title={ t('Dashboard') }> | <mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Dashboard">
<mask> <div className="page-title__actions">
<mask> {this.getToggleFilteringButton()}
<mask> {refreshFullButton}
<mask> </div>
<mask> </PageTitle>
</s> Translate dashboard to Vietnamese with i18n </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>Refresh statistics</Trans></button>; </s> remove {buttonText} protection
</s> add <Trans>{buttonText} protection</Trans> </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> </s> remove Report an issue
</s> add <Trans>Report an issue</Trans> </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer">Homepage</a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
t: PropTypes.func, | <mask> dashboard: PropTypes.object,
<mask> isCoreRunning: PropTypes.bool,
<mask> getFiltering: PropTypes.func,
<mask> toggleProtection: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Dashboard);
</s> Translate dashboard to Vietnamese with i18n </s> remove export default Dashboard;
</s> add export default withNamespaces()(Dashboard); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
export default withNamespaces()(Dashboard); | <mask> getFiltering: PropTypes.func,
<mask> toggleProtection: PropTypes.func,
<mask> };
<mask>
<mask> export default Dashboard;
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Dashboard/index.js |
import { Trans } from 'react-i18next'; | <mask> import { NavLink } from 'react-router-dom';
<mask> import PropTypes from 'prop-types';
<mask> import enhanceWithClickOutside from 'react-click-outside';
<mask> import classnames from 'classnames';
<mask>
<mask> import { REPOSITORY } from '../../helpers/constants';
<mask>
<mask> class Menu extends Component {
<mask> handleClickOutside = () => {
<mask> this.props.closeMenu();
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>Back</Trans> | <mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row">
<mask> <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
<mask> <div className="nav-link nav-link--back">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
<mask> Back
<mask> </div>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> Translate dashboard to Vietnamese with i18n </s> remove Filters
</s> add <Trans>Filters</Trans> </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove Dashboard
</s> add <Trans>Dashboard</Trans> </s> remove Settings
</s> add <Trans>Settings</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>Dashboard</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
<mask> Dashboard
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
</s> Translate dashboard to Vietnamese with i18n </s> remove Settings
</s> add <Trans>Settings</Trans> </s> remove Filters
</s> add <Trans>Filters</Trans> </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove Back
</s> add <Trans>Back</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>Settings</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<mask> Settings
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> Translate dashboard to Vietnamese with i18n </s> remove Dashboard
</s> add <Trans>Dashboard</Trans> </s> remove Filters
</s> add <Trans>Filters</Trans> </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove Back
</s> add <Trans>Back</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>Filters</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
<mask> Filters
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> Translate dashboard to Vietnamese with i18n </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove Back
</s> add <Trans>Back</Trans> </s> remove Settings
</s> add <Trans>Settings</Trans> </s> remove Dashboard
</s> add <Trans>Dashboard</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>Query Log</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
<mask> Query Log
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <a href={`${REPOSITORY.URL}/wiki`} className="nav-link" target="_blank" rel="noopener noreferrer">
<mask> <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> Translate dashboard to Vietnamese with i18n </s> remove Filters
</s> add <Trans>Filters</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> </s> remove Back
</s> add <Trans>Back</Trans> </s> remove Settings
</s> add <Trans>Settings</Trans> </s> remove Dashboard
</s> add <Trans>Dashboard</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
<Trans>FAQ</Trans> | <mask> </li>
<mask> <li className="nav-item">
<mask> <a href={`${REPOSITORY.URL}/wiki`} className="nav-link" target="_blank" rel="noopener noreferrer">
<mask> <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
<mask> FAQ
<mask> </a>
<mask> </li>
<mask> </ul>
<mask> </div>
<mask> </Fragment>
</s> Translate dashboard to Vietnamese with i18n </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove Filters
</s> add <Trans>Filters</Trans> </s> remove Back
</s> add <Trans>Back</Trans> </s> remove Settings
</s> add <Trans>Settings</Trans> </s> remove Dashboard
</s> add <Trans>Dashboard</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Menu.js |
import { Trans } from 'react-i18next'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> export default function Version(props) {
<mask> const { dnsVersion, dnsAddress, dnsPort } = props;
<mask> return (
</s> Translate dashboard to Vietnamese with i18n </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Version.js |
<Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> | <mask> const { dnsVersion, dnsAddress, dnsPort } = props;
<mask> return (
<mask> <div className="nav-version">
<mask> <div className="nav-version__text">
<mask> version: <span className="nav-version__value">{dnsVersion}</span>
<mask> </div>
<mask> <div className="nav-version__text">
<mask> address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
<mask> </div>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> </s> remove Blocked adult websites
</s> add <Trans>Blocked adult websites</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Version.js |
<Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> | <mask> <div className="nav-version__text">
<mask> version: <span className="nav-version__value">{dnsVersion}</span>
<mask> </div>
<mask> <div className="nav-version__text">
<mask> address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
<mask> </div>
<mask> </div>
<mask> );
<mask> }
<mask>
</s> Translate dashboard to Vietnamese with i18n </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> </s> remove Blocked adult websites
</s> add <Trans>Blocked adult websites</Trans> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/Version.js |
import { Trans } from 'react-i18next'; | <mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask>
<mask> import Menu from './Menu';
<mask> import Version from './Version';
<mask> import logo from './logo.svg';
<mask> import './Header.css';
<mask>
</s> Translate dashboard to Vietnamese with i18n </s> remove
</s> add import { Trans } from 'react-i18next'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/index.js |
<Trans>{dashboard.protectionEnabled ? 'ON' : 'OFF'}</Trans> | <mask> <img src={logo} alt="" className="header-brand-img" />
<mask> </Link>
<mask> {!dashboard.proccessing && dashboard.isCoreRunning &&
<mask> <span className={badgeClass}>
<mask> {dashboard.protectionEnabled ? 'ON' : 'OFF'}
<mask> </span>
<mask> }
<mask> </div>
<mask> </div>
<mask> <Menu
</s> Translate dashboard to Vietnamese with i18n </s> remove address: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span>
</s> add <Trans>address</Trans>: <span className="nav-version__value">{dnsAddress}:{dnsPort}</span> </s> remove version: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span> </s> remove {buttonText} protection
</s> add <Trans>{buttonText} protection</Trans> </s> remove Blocked adult websites
<Tooltip text="A number of adult websites blocked" type={tooltipType} />
</s> add <Trans>Blocked adult websites</Trans>
<Tooltip text={ props.t('A number of adult websites blocked') } type={tooltipType} /> </s> remove Average processing time
<Tooltip text="Average time in milliseconds on processing a DNS request" type={tooltipType} />
</s> add <Trans>Average processing time</Trans>
<Tooltip text={ props.t('Average time in milliseconds on processing a DNS request') } type={tooltipType} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/Header/index.js |
import { Trans } from 'react-i18next'; | <mask> import React, { Component } from 'react';
<mask> import { REPOSITORY } from '../../helpers/constants';
<mask>
<mask> class Footer extends Component {
<mask> getYear = () => {
<mask> const today = new Date();
<mask> return today.getFullYear();
</s> Translate dashboard to Vietnamese with i18n </s> remove
</s> add import { Trans } from 'react-i18next'; | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/ui/Footer.js |
<a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a> | <mask> </div>
<mask> <div className="col-auto">
<mask> <ul className="list-inline text-center mb-0">
<mask> <li className="list-inline-item">
<mask> <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer">Homepage</a>
<mask> </li>
<mask> </ul>
<mask> </div>
<mask> <div className="col-auto">
<mask> <a href={`${REPOSITORY.URL}/issues/new`} className="btn btn-outline-primary btn-sm" target="_blank" rel="noopener noreferrer">
</s> Translate dashboard to Vietnamese with i18n </s> remove Report an issue
</s> add <Trans>Report an issue</Trans> </s> remove FAQ
</s> add <Trans>FAQ</Trans> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove Query Log
</s> add <Trans>Query Log</Trans> </s> remove <PageTitle title="Dashboard">
</s> add <PageTitle title={ t('Dashboard') }> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/ui/Footer.js |
<Trans>Report an issue</Trans> | <mask> </ul>
<mask> </div>
<mask> <div className="col-auto">
<mask> <a href={`${REPOSITORY.URL}/issues/new`} className="btn btn-outline-primary btn-sm" target="_blank" rel="noopener noreferrer">
<mask> Report an issue
<mask> </a>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
</s> Translate dashboard to Vietnamese with i18n </s> remove <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer">Homepage</a>
</s> add <a href={REPOSITORY.URL} target="_blank" rel="noopener noreferrer"><Trans>Homepage</Trans></a> </s> remove Blocked by <a href="#filters">Filters</a>
</s> add <Trans>Blocked by</Trans> <a href="#filters"><Trans>Filters</Trans></a> </s> remove FAQ
</s> add <Trans>FAQ</Trans> </s> remove DNS Queries
</s> add <Trans>DNS Queries</Trans> </s> remove Blocked malware/phishing
</s> add <Trans>Blocked malware/phishing</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/components/ui/Footer.js |
import './i18n'; | <mask> import App from './containers/App';
<mask> import configureStore from './configureStore';
<mask> import reducers from './reducers';
<mask>
<mask> const store = configureStore(reducers, {}); // set initial state
<mask> ReactDOM.render(
<mask> <Provider store={store}>
<mask> <App />
</s> Translate dashboard to Vietnamese with i18n | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e1069f6bd169d4bf41d6227bf2e6777d8515ccfb | client/src/index.js |
"interval_6_hour": "6 hours", | <mask> "encryption_key_source_path": "Set a private key file",
<mask> "encryption_key_source_content": "Paste the private key contents",
<mask> "stats_params": "Statistics configuration",
<mask> "config_successfully_saved": "Configuration successfully saved",
<mask> "interval_24_hour": "24 hours",
<mask> "interval_days": "{{count}} day",
<mask> "interval_days_plural": "{{count}} days",
<mask> "domain": "Domain",
<mask> "punycode": "Punycode",
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove // RotationIvl is the interval for log rotation, in days. After that
// period, the old log file will be renamed, NOT deleted, so the actual
// log retention time is twice the interval.
RotationIvl uint32
</s> add // RotationIvl is the interval for log rotation. After that period, the
// old log file will be renamed, NOT deleted, so the actual log
// retention time is twice the interval. The value must be one of:
//
// 6 * time.Hour
// 24 * time.Hour
// 7 * 24 * time.Hour
// 30 * 24 * time.Hour
// 90 * 24 * time.Hour
//
RotationIvl time.Duration </s> remove l.conf.RotationIvl = 1
</s> add l.conf.RotationIvl = 24 * time.Hour </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogFileEnabled bool `yaml:"querylog_file_enabled"` // if true, query log will be written to a file
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk
AnonymizeClientIP bool `yaml:"anonymize_client_ip"` // anonymize clients' IP addresses in logs and stats
</s> add QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogFileEnabled bool `yaml:"querylog_file_enabled"` // if true, query log will be written to a file
// QueryLogInterval is the interval for query log's files rotation.
QueryLogInterval Duration `yaml:"querylog_interval"`
QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk
AnonymizeClientIP bool `yaml:"anonymize_client_ip"` // anonymize clients' IP addresses in logs and stats </s> remove Enabled bool `json:"enabled"`
Interval uint32 `json:"interval"`
AnonymizeClientIP bool `json:"anonymize_client_ip"`
</s> add Enabled bool `json:"enabled"`
// Use float64 here to support fractional numbers and not mess the API
// users by changing the units.
Interval float64 `json:"interval"`
AnonymizeClientIP bool `json:"anonymize_client_ip"` </s> remove return -1
</s> add return time.Time{}, err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/__locales/en.json |
import { CheckboxField, renderRadioField, toFloatNumber } from '../../../helpers/form'; | <mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
<mask> import '../FormButton.css';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalTitle = (interval, t) => {
switch (interval) {
case 0.25:
return t('interval_6_hour');
case 1:
return t('interval_24_hour');
default:
return t('interval_days', { count: interval });
}
}; </s> remove return (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
);
});
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); </s> remove conf.RotationIvl = d.Interval
</s> add conf.RotationIvl = ivl | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/components/Settings/LogsConfig/Form.js |
const getIntervalTitle = (interval, t) => {
switch (interval) {
case 0.25:
return t('interval_6_hour');
case 1:
return t('interval_24_hour');
default:
return t('interval_days', { count: interval });
}
}; | <mask> import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
<mask> import '../FormButton.css';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
<mask> name="interval"
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toFloatNumber } from '../../../helpers/form'; </s> remove return (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
);
});
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); </s> remove func checkInterval(days uint32) bool {
return days == 1 || days == 7 || days == 30 || days == 90
</s> add func checkInterval(ivl time.Duration) (ok bool) {
// The constants for possible values of query log's rotation interval.
const (
quarterDay = 6 * time.Hour
day = 24 * time.Hour
week = day * 7
month = day * 30
threeMonths = day * 90
)
return ivl == quarterDay || ivl == day || ivl == week || ivl == month || ivl == threeMonths | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/components/Settings/LogsConfig/Form.js |
const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); | <mask>
<mask> const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
<mask> name="interval"
<mask> type="radio"
<mask> component={renderRadioField}
<mask> value={interval}
<mask> placeholder={title}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> />
<mask> );
<mask> });
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, submitting, invalid, processing, processingClear, handleClear, t,
<mask> } = props;
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalTitle = (interval, t) => {
switch (interval) {
case 0.25:
return t('interval_6_hour');
case 1:
return t('interval_24_hour');
default:
return t('interval_days', { count: interval });
}
}; </s> remove import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toFloatNumber } from '../../../helpers/form'; </s> remove RotationIvl: 1,
</s> add RotationIvl: 24 * time.Hour, </s> remove const currentSchemaVersion = 11
</s> add const currentSchemaVersion = 12 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/components/Settings/LogsConfig/Form.js |
{getIntervalFields(processing, t, toFloatNumber)} | <mask> <Trans>query_log_retention</Trans>
<mask> </label>
<mask> <div className="form__group form__group--settings">
<mask> <div className="custom-controls-stacked">
<mask> {getIntervalFields(processing, t, toNumber)}
<mask> </div>
<mask> </div>
<mask> <div className="mt-5">
<mask> <button
<mask> type="submit"
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove return (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
);
});
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); </s> remove val := readJSONValue(string(buf), `"T":"`)
</s> add val := readJSONValue(string(buf[:r]), `"T":"`) </s> remove return -1
</s> add return time.Time{}, err </s> remove return -1
</s> add return time.Time{}, err </s> remove buf = buf[:r]
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/components/Settings/LogsConfig/Form.js |
export const QUERY_LOG_INTERVALS_DAYS = [0.25, 1, 7, 30, 90]; | <mask> export const NOT_FILTERED = 'NotFiltered';
<mask>
<mask> export const STATS_INTERVALS_DAYS = [0, 1, 7, 30, 90];
<mask>
<mask> export const QUERY_LOG_INTERVALS_DAYS = [1, 7, 30, 90];
<mask>
<mask> export const FILTERS_INTERVALS_HOURS = [0, 1, 12, 24, 72, 168];
<mask>
<mask> // Note that translation strings contain these modes (blocking_mode_CONSTANT)
<mask> // i.e. blocking_mode_default, blocking_mode_null_ip
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove const currentSchemaVersion = 11
</s> add const currentSchemaVersion = 12 </s> remove RotationIvl: 1,
</s> add RotationIvl: 24 * time.Hour, </s> remove RotationIvl: 1,
</s> add RotationIvl: 24 * time.Hour, </s> remove return (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
);
});
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/helpers/constants.js |
/**
* @param value {string}
* @returns {*|number}
*/
export const toFloatNumber = (value) => value && parseFloat(value, 10);
| <mask> */
<mask> export const toNumber = (value) => value && parseInt(value, 10);
<mask>
<mask> /**
<mask> * @param value {string}
<mask> * @returns {boolean}
<mask> */
<mask> export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
<mask> || R_UNIX_ABSOLUTE_PATH.test(value);
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove export const QUERY_LOG_INTERVALS_DAYS = [1, 7, 30, 90];
</s> add export const QUERY_LOG_INTERVALS_DAYS = [0.25, 1, 7, 30, 90]; </s> remove return (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={title}
normalize={toNumber}
disabled={processing}
/>
);
});
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => (
<Field
key={interval}
name="interval"
type="radio"
component={renderRadioField}
value={interval}
placeholder={getIntervalTitle(interval, t)}
normalize={toNumber}
disabled={processing}
/>
)); </s> remove const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalTitle = (interval, t) => {
switch (interval) {
case 0.25:
return t('interval_6_hour');
case 1:
return t('interval_24_hour');
default:
return t('interval_days', { count: interval });
}
}; </s> remove import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toFloatNumber } from '../../../helpers/form'; </s> remove func checkInterval(days uint32) bool {
return days == 1 || days == 7 || days == 30 || days == 90
</s> add func checkInterval(ivl time.Duration) (ok bool) {
// The constants for possible values of query log's rotation interval.
const (
quarterDay = 6 * time.Hour
day = 24 * time.Hour
week = day * 7
month = day * 30
threeMonths = day * 90
)
return ivl == quarterDay || ivl == day || ivl == week || ivl == month || ivl == threeMonths | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | client/src/helpers/form.js |
"time" | <mask> "net"
<mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
</s> Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504.
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format </s> remove 'type': 'integer'
'description': 'Time period to keep data (1 | 7 | 30 | 90)'
</s> add 'description': >
Time period for query log rotation.
'type': 'number'
'enum':
- 0.25
- 1
- 7
- 30
- 90 </s> remove RotationIvl: config.DNS.QueryLogInterval,
</s> add RotationIvl: config.DNS.QueryLogInterval.Duration, </s> remove RotationIvl: 1,
</s> add RotationIvl: 24 * time.Hour, </s> remove func checkInterval(days uint32) bool {
return days == 1 || days == 7 || days == 30 || days == 90
</s> add func checkInterval(ivl time.Duration) (ok bool) {
// The constants for possible values of query log's rotation interval.
const (
quarterDay = 6 * time.Hour
day = 24 * time.Hour
week = day * 7
month = day * 30
threeMonths = day * 90
)
return ivl == quarterDay || ivl == day || ivl == week || ivl == month || ivl == threeMonths | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e113b276e7db134f99f9f920c4c410467a698c92 | internal/home/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.