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

Remove "refer us" feature #18277

Closed
wants to merge 2 commits into from

Conversation

andyjdavis
Copy link
Contributor

@andyjdavis andyjdavis commented Nov 7, 2021

Description:

This is a possible solution for #18232

I have taken "remove this feature" to mean remove the code involved and not simply turn it off.

Rather than trying to revert the commits in the original PR I opted to go through the changes and remove what didn't appear to be required/useful.

Firstly, I did it this way as there are changes made after the initial PR was merged like translations of the "refer us" popup's strings and possibly other changes.

Secondly, some of the changes from the original PR may still be useful. For example in plugins/Feedback/Feedback.php renderViewsAndAddToPage() can still support multiple popups if it needs to do that again.

I am unsure if there is another process for the removal of unused strings from language files.

Let me know if anything about this is incorrect and I will be happy to fix it :)

Review

@andyjdavis andyjdavis changed the title Remove refer us2 Remove "refer us" feature Nov 7, 2021
@Findus23
Copy link
Member

Findus23 commented Nov 7, 2021

I am unsure if there is another process for the removal of unused strings from language files.

Just FYI, if you remove them from en.json, weblate should automatically remove them from all other languages in its next PR

@sgiehl
Copy link
Member

sgiehl commented Nov 7, 2021

Actually it would be better to only adjust them in en.json, as otherwise Weblate might get merge conflicts if there were changes in that file in any language.

@peterhashair
Copy link
Contributor

peterhashair commented Nov 7, 2021

@andyjdavis Thanks for the PR. I merged your changes to my PR if that's ok. Otherwise, there will be conflicts.

@andyjdavis
Copy link
Contributor Author

@peterhashair no problem. Shall I just close this PR?

Actually it would be better to only adjust them in en.json, as otherwise Weblate might get merge conflicts if there were changes in that file in any language.

@sgiehl is it still worth doing this? I assume that would now need to happen in @peterhashair's PR.

@peterhashair
Copy link
Contributor

@andyjdavis sure you can close that PR if that ok, also can I put your name for that issue on the next release :).

@andyjdavis
Copy link
Contributor Author

Closing this PR. I hope it was useful :)

@andyjdavis andyjdavis closed this Nov 8, 2021
@peterhashair
Copy link
Contributor

@andyjdavis it's really helpful, 99.99% using your code, just some tiny updates :), you are on the next release list :)

@sgiehl sgiehl linked an issue Nov 8, 2021 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove "refer us" feature
4 participants