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

Data files: removed usage of $GLOBALS and manual inclusions #6912

Merged
merged 15 commits into from Jan 9, 2015
Merged

Conversation

mnapoli
Copy link
Contributor

@mnapoli mnapoli commented Jan 1, 2015

This PR is based on #6909 which explains the commit history and the big diff.

I've moved data files related to internationalization into the new Intl component (introduced in #6909) just like in Symfony's Intl component.

Previously, those data files were manually included, and $GLOBALS was used. Now it's been replaced with classes.

capture d ecran 2015-01-01 a 13 27 14

@mnapoli mnapoli added the c: Platform For Matomo platform changes that aren't impacting any of our APIs but improve the core itself. label Jan 1, 2015
@mnapoli mnapoli self-assigned this Jan 1, 2015
@mnapoli mnapoli added this to the Piwik 2.11.0 milestone Jan 1, 2015
@mnapoli
Copy link
Contributor Author

mnapoli commented Jan 5, 2015

All good for review and merge after #6909 is merged!

@mnapoli
Copy link
Contributor Author

mnapoli commented Jan 5, 2015

The tests pass on Travis but on 5.3.3 the sh script ends with a segfault :/ I have no idea what's going on, everything seems fine (tests are all OK)

@mattab
Copy link
Member

mattab commented Jan 5, 2015

needs to be rebased, Looks good to me!

@mnapoli mnapoli force-pushed the intl-data branch 2 times, most recently from 4eac34f to 187fa36 Compare January 8, 2015 00:53
@mnapoli
Copy link
Contributor Author

mnapoli commented Jan 8, 2015

Please review the last commit (de53c1b306): it solved the eternal "MySQL server has gone away" (at least here). If OK, then it's good to be merged.

mattab pushed a commit that referenced this pull request Jan 9, 2015
Data files: removed usage of $GLOBALS and manual inclusions
@mattab mattab merged commit b5ebc90 into master Jan 9, 2015
@mattab
Copy link
Member

mattab commented Jan 9, 2015

👍

@mnapoli mnapoli deleted the intl-data branch January 9, 2015 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Platform For Matomo platform changes that aren't impacting any of our APIs but improve the core itself.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants