Skip to content

/ ghostery-extension

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

Jump to bottom

Subscriber Panel Fixes for GH-1251 and GH-1360 #188

Merged
merged 4 commits into from Sep 13, 2018
Merged

Subscriber Panel Fixes for GH-1251 and GH-1360 #188

merged 4 commits into from Sep 13, 2018

Conversation

@zarembsky
Copy link
Contributor

@zarembsky zarembsky commented Sep 11, 2018

  • [x ] Have you followed the guidelines in CONTRIBUTING.md?
  • [ x] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • [x ] Have you added an explanation of what your changes do?
  • [ x] Does your submission pass tests?
  • [x ] Did you lint your code prior to submission?
@zarembsky
Fixes for GH-1251 and GH-1360
Loading status checks…
49f6705
@zarembsky zarembsky requested a review from ghostery/ghostery as a code owner Sep 11, 2018
@christophertino
Merge branch 'develop' into feature/SubscriberFixes
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
4dcaab3
@IAmThePan
IAmThePan suggested changes Sep 12, 2018
View changes
_locales/en/messages.json Outdated
@@ -2003,7 +2003,7 @@
"message": "Specialized offers are timely, relevant, and exclusive for our users"
},
"hub_rewards_closer": {
"message": "You can turn on Ghostery Rewards in the extension or through custom setup."
"message": "You can turn on Ghostery Rewards in the extension through custom setup."

This comment has been minimized.

Sign in to view
@IAmThePan

IAmThePan Sep 12, 2018
Contributor

This is the wrong string. Please revert to the old string.
You are missing an "or"
_locales/en/messages.json Outdated
@@ -1755,7 +1755,7 @@
"message": "No trackers blocked"
},
"hub_setup_blocking_text_everything": {
"message": "Block Everything"
"message": "Block Everyting"

This comment has been minimized.

Sign in to view
@IAmThePan

IAmThePan Sep 12, 2018
Contributor

This is the wrong string. Revert to the old copy here.
Everything is spelled wrong
_locales/en/messages.json Outdated
@@ -1958,7 +1958,7 @@
"message": "Mobile Privacy Browser"
},
"hub_products_main_promo_description": {
"message": "Browse ad- and tracker-free on the go with our updated and enhanced mobile browser. Now equipped with a private search engine!"
"message": "Browse ad-and tracker free on the go with our updated and enhanced mobile browser. Now equipped with a private search engine!"

This comment has been minimized.

Sign in to view
@IAmThePan

IAmThePan Sep 12, 2018
Contributor

This is the wrong string. Please revert to the old string.
The dashes are incorrect.
app/panel/components/Header.jsx Show resolved Hide resolved
_locales/en/messages.json Outdated
@@ -2346,7 +2346,7 @@
"days": {
"content": "$1",
"example": "info@ghostery.com"

This comment has been minimized.

Sign in to view
@IAmThePan

IAmThePan Sep 12, 2018
Contributor

The example: info@ghostery.com is not an accurate example. Remove it, or make a more realistic example.
Also, do you need to do anything with day vs days for when number-of-days == 1?
@christophertino
christophertino requested changes Sep 13, 2018
View changes
app/panel/utils/utils.js Outdated
@@ -234,3 +234,120 @@ export function setTheme(doc, themeName, theme) {
document.head.appendChild(themeStyle);
}
}
/**

This comment has been minimized.

Sign in to view
@christophertino

christophertino Sep 13, 2018
Member

@zarembsky let's remove this dynamic resizing code and revert back to what we had previously. I want to hold the translation providers accountable for delivering language strings that fit our character count, rather than trying to adapt our layouts to fit what they throw at us.
@zarembsky
Requested changes.
Loading status checks…
e8a09e9
@christophertino
christophertino approved these changes Sep 13, 2018
View changes
@christophertino
Merge branch 'develop' into feature/SubscriberFixes
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
a0f00c9
@IAmThePan
IAmThePan approved these changes Sep 13, 2018
View changes
@christophertino christophertino merged commit bf4ffad into develop Sep 13, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@christophertino christophertino deleted the feature/SubscriberFixes branch Sep 13, 2018
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Subscriber Panel Fixes for GH-1251 and GH-1360 (#188)
ae8d324 
* Fixes for GH-1251 and GH-1360

* Requested changes.
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Subscriber Panel Fixes for GH-1251 and GH-1360 (#188)
2ae6728 
* Fixes for GH-1251 and GH-1360

* Requested changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IAmThePan IAmThePan

@christophertino christophertino

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@zarembsky @IAmThePan @christophertino