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

Update en.json #12136

Merged
merged 9 commits into from Oct 9, 2017
Merged

Update en.json #12136

merged 9 commits into from Oct 9, 2017

Conversation

iMarkus
Copy link
Contributor

@iMarkus iMarkus commented Oct 2, 2017

You can't access this resource as it requires an 'admin' access for the website id = 1. --> correct
You can't access this resource as it requires an 'view' access for the website id = 1. --> incorrect

Please issue pull request against the 3.x-dev branch only.

Piwik 2 is in LTS mode. This means we do not accept any pull request for 2.x except critical security bugs and major data loss bugs.

If you need to create a pull request for 2.x, then please also create the pull request against the 3.x-dev so we can merge both.

Happy hacking!

You can't access this resource as it requires an 'admin' access for the website id = 1. -->  correct
You can't access this resource as it requires an 'view' access for the website id = 1. -->     incorrect
@sgiehl sgiehl added c: i18n For issues around internationalisation and localisation. Needs Review PRs that need a code review labels Oct 2, 2017
@mattab mattab added this to the 3.2.0 milestone Oct 2, 2017
@mattab
Copy link
Member

mattab commented Oct 2, 2017

Thanks for the PR @iMarkus

LGTM 👍

@sgiehl
Copy link
Member

sgiehl commented Oct 2, 2017

This text occurs in various test files and needs to be updated there as well.

@mattab mattab modified the milestones: 3.2.0, 3.3.0 Oct 6, 2017
@mattab mattab added the Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. label Oct 6, 2017
@sgiehl
Copy link
Member

sgiehl commented Oct 8, 2017

@iMarkus are you able to update the PR?

@iMarkus
Copy link
Contributor Author

iMarkus commented Oct 9, 2017

@sgiehl sorry, what do you mean with update?

@sgiehl
Copy link
Member

sgiehl commented Oct 9, 2017 via email

@iMarkus
Copy link
Contributor Author

iMarkus commented Oct 9, 2017

Done

@sgiehl
Copy link
Member

sgiehl commented Oct 9, 2017

@iMarkus seems you accidentally added line endings to those files. I've pushed a commit to your branch to remove them. Let's see if tests passes now

@sgiehl sgiehl merged commit bd4053d into matomo-org:3.x-dev Oct 9, 2017
@iMarkus
Copy link
Contributor Author

iMarkus commented Oct 9, 2017

@sgiehl I did the edit in firefox browser and just deleted the 'an'. Wondering why line endings appeared.

@iMarkus iMarkus deleted the patch-1 branch October 9, 2017 11:58
@sgiehl
Copy link
Member

sgiehl commented Oct 9, 2017

Github seems to do that "automatically" in online editor. Wasn't able to remove them their either.

@mattab mattab added this to the Backlog (Help wanted) milestone Dec 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: i18n For issues around internationalisation and localisation. Needs Review PRs that need a code review Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants