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

Use short form array syntax everywhere #4243

Merged
merged 2 commits into from Jan 15, 2018

Conversation

MrPetovan
Copy link
Collaborator

BECAUSE I CAN!

This is a nearly impactless PR, the only functional change is in util/po2php.php where I had to manually change how we generate arrays in the string.php files.

@tobiasd
Copy link
Collaborator

tobiasd commented Jan 15, 2018 via email

@MrPetovan
Copy link
Collaborator Author

That's where you come in, how do I test it?

@tobiasd
Copy link
Collaborator

tobiasd commented Jan 15, 2018

You can compile the French translation from the messages.po file and see if it still works.

$> php util/po2php.php view/lang/fr/messages.po 
$> php -l view/lang/fr/strings.php

If this does not throw a syntax error, then you can try and load the FR translated interface in Friendica.

@MrPetovan MrPetovan force-pushed the task/switch-to-array-new-style branch from 34566c0 to a896d58 Compare January 15, 2018 15:46
@MrPetovan
Copy link
Collaborator Author

There are no differences between the generated file and the one I changed directly in this PR 🎉

@MrPetovan
Copy link
Collaborator Author

Changing language doesn't work at the moment, but it is unrelated to this PR.

@MrPetovan
Copy link
Collaborator Author

Fixed the language selection, tested it successfully with this PR.

@MrPetovan MrPetovan force-pushed the task/switch-to-array-new-style branch from 7d95598 to 66943ca Compare January 15, 2018 16:39
Hypolite Petovan added 2 commits January 15, 2018 14:07
- Add short form array syntax to po2php.php generation
@MrPetovan MrPetovan force-pushed the task/switch-to-array-new-style branch from 30b00d9 to 99875b1 Compare January 15, 2018 19:07
@MrPetovan
Copy link
Collaborator Author

Can someone please merge this, I've had to rebase it 4 times to fix conflicts since I opened it because @zeroadam keeps deleting files in include!

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

Sorry, I'm currently at reviewing it (I'm now at "include/post_update.php"), but my hand is aching from pressing the page down key (no joke, I'm susceptible for getting a carpal tunnel syndrome, I already had two hand surgeries)

I have to stop for some hours until I can continue.

@MrPetovan
Copy link
Collaborator Author

For once, I did a straightforward PR that doesn’t require manual review, sorry you started doing this.

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

I will always have a look at every code line at PRs - this is my standard. :)

@zeroadam
Copy link

Sorry about that! I will pause any further work until this is merged. Rebasing can be a giant pain!!

@MrPetovan
Copy link
Collaborator Author

Please continue, it’s only blocking me, I’m reluctant to make any new changes before this is merged.

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

@zeroadam if you review it, I could press the magic button. I just want to have a second pair of eyes that looked at the changes.

@zeroadam
Copy link

👍

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

A:

And what had you done this evening?

B:

I reviewed a single pull request.

@annando annando merged commit 26b335e into friendica:develop Jan 15, 2018
@zeroadam
Copy link

@annando hahhah..

I was reviewing, though it was taking quite some time. Saved by the bell!

@MrPetovan
Copy link
Collaborator Author

Thanks!

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

@zeroadam Sorry, I haven't seen that you started it as well.

@annando
Copy link
Collaborator

annando commented Jan 15, 2018

@MrPetovan You owe me one :)

@MrPetovan
Copy link
Collaborator Author

I already reviewed all of @Quix0r formatting PR, and I'll review all of your item changes PR, so I think I'm good! 😄

Sorry for the ordeal though.

@MrPetovan MrPetovan deleted the task/switch-to-array-new-style branch January 15, 2018 22:19
@zeroadam
Copy link

zeroadam commented Jan 15, 2018 via email

@MrPetovan MrPetovan added this to the 3.6 milestone Mar 9, 2018
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.

None yet

4 participants