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

Adding better translation for ThankYou page tpl for recurring messaging #25068

Merged
merged 1 commit into from Nov 30, 2022

Conversation

shaneonabike
Copy link
Contributor

Overview

This is the merge request related to the Translation Issue #80

Before

Strings on recurring membership payments were coming out half translated such as Cette adhésion sera renouvelée automatiquement tous les year.

After

Now is translates the strings properly if the interval is only 1. It's a quick fix until we come up something better longterm.

@civibot
Copy link

civibot bot commented Nov 28, 2022

(Standard links)

@civibot civibot bot added the master label Nov 28, 2022
@eileenmcnaughton
Copy link
Contributor

Looks good to me - @mlutfy

@eileenmcnaughton
Copy link
Contributor

@shaneonabike now you need to rebase I think - I always start rebasing by doing

git pull --rebase origin master

and end with

git push -f myrepo mybranch

In between I either git rebase -i origin/master or sometimes just git reset origin/master & then re-do the git add -p + git commit stages

@shaneonabike
Copy link
Contributor Author

@eileenmcnaughton thanks for tips they worked! Let me know if there are any other changes prior to the merge (sorry for the mess).

@eileenmcnaughton eileenmcnaughton merged commit 80e3a0a into civicrm:master Nov 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants