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

Allow more space for translated strings #431

Merged
merged 5 commits into from
Nov 18, 2016
Merged

Conversation

pvint
Copy link
Contributor

@pvint pvint commented Nov 18, 2016

Improvements for issue #397

@mauser mauser merged commit 74d6ca9 into hydrogen-music:master Nov 18, 2016
@mauser
Copy link
Member

mauser commented Nov 18, 2016

Thanks a lot, merged!

@pvint
Copy link
Contributor Author

pvint commented Nov 18, 2016

My pleasure. ))

@pvint pvint deleted the i18n_397 branch November 18, 2016 23:39
@trebmuh
Copy link
Member

trebmuh commented Nov 19, 2016

@trebmuh
Copy link
Member

trebmuh commented Nov 19, 2016

Just to be sure, is it normal/expected that this commit contains some stuffs related to raptor? I really don't know about it but it sounds suspicious to me so I wanted to get your eyes on it @pvint and @mauser . (Sorry for the noise if so.)

@pvint
Copy link
Contributor Author

pvint commented Nov 19, 2016

@trebmuh The raptor stuff was just stuff I accidentally pushed to this branch and then subsequently removed, so no worries. Good to bring it up though. :)

@trebmuh
Copy link
Member

trebmuh commented Nov 19, 2016

@pvint: ok thanks. I was finding it strange when looking at the patch from this PR ( https://patch-diff.githubusercontent.com/raw/hydrogen-music/hydrogen/pull/431.patch ) that the line +FIND_HELPER(RAPTOR raptor2 raptor.h raptor) was added in PATCH 1/3 but not removed after by PATCH 2/3. I still find it strange that said, but I trust you!

Thanks for answering that quick!

@pvint
Copy link
Contributor Author

pvint commented Nov 19, 2016

Wow, I knew that was confusing, but the patch REALLY makes it look like other files were changed!

I see what happened now though - those changes are changes that have been pulled since I last updated this branch, but I also had the changes in this branch. (speaking of confusing, I think that statement is confusing!). Summary: Those changes for raptor were added to hydrogen/master a while ago in separate pulls. I'm getting better at keeping my branches clean, but I still could improve ;)

I think this will make it more clear than my explanation :) :
https://github.com/hydrogen-music/hydrogen/pull/431/files

Cheers!
Paul

@trebmuh
Copy link
Member

trebmuh commented Nov 19, 2016

Thanks you very much for your explanation. Despite of the confusingness, I think I've got it now ! Thanks to this, I now know that I need to look at the files changed rather that the .patch for a better understanding :)

You have been really great and kind here in teaching me so. Kudos to you !

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.

3 participants