Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change wording in chronometer #4910

Merged
merged 2 commits into from
Sep 24, 2022
Merged

Change wording in chronometer #4910

merged 2 commits into from
Sep 24, 2022

Conversation

yubiuser
Copy link
Member

What does this PR aim to accomplish?:

Brought up on discourse: https://discourse.pi-hole.net/t/pi-hole-says-it-is-blocking-80-of-ads-but-isnt/57870/11?u=yubiuser

Chronometer talks about "Ads" but not all domains lead to ads. This PR simply changed three lines

"Ads today" => "Blocked %"
"Blocked" => "Last Blckd"
"Top Advert" => "Top Blckd"


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

@yubiuser yubiuser added PR: Approval Required Open Pull Request, needs approval Feature Request: Discourse Implements a Feature Request from Discourse labels Sep 14, 2022
@yubiuser yubiuser requested a review from a team September 14, 2022 07:04
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-says-it-is-blocking-80-of-ads-but-isnt/57870/12

@PromoFaux
Copy link
Member

I'm not 100% sold on the abbreviation of blocked to blckd - but I wont block (lol) this if anyone else wants to approve

@yubiuser
Copy link
Member Author

I'm happy to take suggestions, but it should fit in the confined space.

Signed-off-by: Christian König <ckoenig@posteo.de>
@jfb-pihole
Copy link
Sponsor Member

How about the following - I prefer to have the word "block" in the description, and even if it has no tense that's still OK with me.

Last block
Top block

As for "Blocked %", the number presented has the percent symbol trailing, so I think this could be simply "Blocked"

Something to consider - in our API we also use "echo ">top-ads >quit" | nc localhost 4711" We should probably clean that up to match.

@yubiuser
Copy link
Member Author

Something to consider - in our API we also use "echo ">top-ads >quit" | nc localhost 4711" We should probably clean that up to match.

Everything will be better with v6 ;-)

Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux PromoFaux merged commit 9463c3c into development Sep 24, 2022
@PromoFaux PromoFaux deleted the chrono/no_ads branch September 24, 2022 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Request: Discourse Implements a Feature Request from Discourse PR: Approval Required Open Pull Request, needs approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants