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

Ticket/13844 Better FAQ language files #3613

Merged
merged 9 commits into from May 29, 2015

Conversation

nickvergessen
Copy link
Contributor

https://tracker.phpbb.com/browse/PHPBB3-13844

Todo:

  • Remove "help" related code from language loading
  • Failing tests
  • Add tests for help manager

@CHItA
Copy link
Member

CHItA commented May 16, 2015

I cannot reproduce this one, also the language related changes should have kept full BC

@Nicofuma
Copy link
Member

And there isn't any error on travis too...
I'll have a look tomorrow or monday if you still think there is an issue somewhere

$lang = array();
}

$lang = array(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your problem is caused by this. phpBB language files use array_merge($lang, array(.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

arg, thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, can you tell me your nickname on area51 and phpbb.com?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CHItA

@nickvergessen
Copy link
Contributor Author

Patch is done aswell

@nickvergessen
Copy link
Contributor Author

I did not remove the help_* language files. I think we should keep them, and for now do changes in both files, to allow translators to easier copy their fixes over. So we can remove them, after we published the first round of update-diffs for 3.2

*
*/

class phpbb_language_test extends phpbb_test_case
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rename the test

@nickvergessen
Copy link
Contributor Author

Done

@Nicofuma Nicofuma merged commit 077051f into phpbb:master May 29, 2015
Nicofuma pushed a commit that referenced this pull request May 29, 2015
Ticket/13844 Better FAQ language files
@nickvergessen nickvergessen deleted the ticket/13844 branch May 29, 2015 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants