-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
fix: check male translation and fall back to generic #6039
fix: check male translation and fall back to generic #6039
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you
@asbiin @codemonkeysoftware What's the hold-up here? StyleCI has a small whitespace issue, but other than that this bugfix looks good to go |
Thank you @codemonkeysoftware ! |
Sorry for stupid question, but how do I go about applying this fix to my installation? I'm on the latest version (v3.7.0) which was released in February - before this fix was was merged. Do I just drop the two changed files into my install directory? |
I'm 3.7.0 too, finding it difficult if I can't create proper relationships. I can exec into the container but have no edit tools in there and no clue how to mod an image. EDIT: What am I missing? |
🎉 This PR is included in version 4.0.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
This pull request has been automatically locked since there |
Right now relationship type strings do not display a male version (eg. instead of "father" it displays parent). This is because the
RelationshipType
'sgetLocalizedName()
code gets the female translation for female relationship types, but the generic translation for male relationship types. To complicate matters, only 13/28 relationship types include a male entry in the translation file.This change has
RelationshipType.getLocalizedName()
return the male translation for the male version and adds the missing male translations for English. Because I don't want this change to break if the other translations don't get updated with the new keys immediately, it also includes a fallback that recognizes Laravel's default return for missing keys (which is the requested key name) and instead returns the generic translations. This fallback can be removed as soon as the male translation entries get added.Fix #5956