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

(dev/core#4409) Fix failure to fall back to site default language, if configured #26785

Merged
merged 3 commits into from
Jul 11, 2023

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Fix failure to fall back to site default language, if configured

This addresses scenario 6 here
#26232 (comment)

Before

When a site default language translation is configured it is used in some sceanrios but not others - the detailed description at
#26232 (comment) is the best way to understand this

After

A translaiton for the site default language is always used, if configured.

Technical Details

This addresses a gap identified in the previous PR. I have put it against the rc as the previous PR hit that branch & it feels less confusing if this does too. It is also low risk of having impact outside the specific scenario

I'm still looking at the point re styling

Comments

@totten can you take a look - note that for testing this extension https://github.com/eileenmcnaughton/send_message_action is helpful - it adds a send_workflow action where you can see how the offline contribution receipt or invoice would display
image

@civibot
Copy link

civibot bot commented Jul 11, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the 5.64 label Jul 11, 2023
@totten
Copy link
Member

totten commented Jul 11, 2023

@eileenmcnaughton I've pushed up the changes so that the UI reflects the behavior of this patch.

Before:

Screenshot from 2023-07-10 20-58-10

After:

Screenshot from 2023-07-10 20-57-46

i.e. If there is a translation in the default locale (CRM.config.lcMessages), then it replaces the Standard row. (More literally - the "Standard" is made 'invisible', and the default-locale is made 'primary'.)

@totten totten changed the title Fix failure to fall back to site default language, if configured (dev/core#4409) Fix failure to fall back to site default language, if configured Jul 11, 2023
@eileenmcnaughton
Copy link
Contributor Author

Thanks @totten this works!

One thing that is a bit confusing is that when you view the 'original' it is the non-reserved message template (rather than the site default language). You also can't get rid of a translation once created.

I don't think these are show-stopping. My feeling is we could go with this per your changes at this stage & when other sites adopt it they are likely to have suggestions which could lead to further improvements

@totten
Copy link
Member

totten commented Jul 11, 2023

We chatted a bit on MM. Agreed that there's been decent coverage on the PHP side and that the UI is OK (but could be further improved).

@totten totten merged commit 7ff2443 into civicrm:5.64 Jul 11, 2023
@totten totten deleted the trans_locale branch July 11, 2023 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants