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

Functions adventures #4528

Merged
merged 30 commits into from
Nov 2, 2023
Merged

Functions adventures #4528

merged 30 commits into from
Nov 2, 2023

Conversation

MarleenGilsing
Copy link
Collaborator

Creating function adventures. But I'm not done yet.

@Felienne would you mind taking a look, before I continue next week?

@MarleenGilsing MarleenGilsing marked this pull request as draft September 21, 2023 15:08
@ghost
Copy link

ghost commented Sep 21, 2023

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@Felienne Felienne marked this pull request as ready for review September 28, 2023 19:35
@MarleenGilsing
Copy link
Collaborator Author

I still have to make sure that each adventure has an exercise, that there are {} around the keywords and check if I have used = ask instead of {is} {ask}.

I have made slides (English) for level 12 and 13. Not 14 yet and I haven't put them in the other languages yet.

@Felienne Could you check out the weird test failure?

@MarleenGilsing
Copy link
Collaborator Author

@Felienne I feel like this is ready to go, but I have some errors from the tests. Could you take a look?

@Felienne
Copy link
Member

Felienne commented Nov 2, 2023

I have managed to fix all merge conflicts, only French was too much changed to be salvaged, so French now lacks the new function texts (cc @etienneCharignon, who might want to pick that up when we have merged this? 🙏 )

@etienneCharignon
Copy link
Contributor

If I understand well, this has an impact from level 12 and next. I'm translating level by level and reached the level 6 for now. Will this be waiting for me to reach the level 12 (it might be in 5 weeks), or should I look at something before?

@Felienne
Copy link
Member

Felienne commented Nov 2, 2023

Ok @MarleenGilsing this took about 2 hours to debug haha, but I think I found the issue... in hedy_content.py, you added functions_2 and functions_3 but they don't exist, leading to errors.

@Felienne
Copy link
Member

Felienne commented Nov 2, 2023

If I understand well, this has an impact from level 12 and next. I'm translating level by level and reached the level 6 for now. Will this be waiting for me to reach the level 12 (it might be in 5 weeks), or should I look at something before?

Indeed, this will only be an issue in level 12 and up, once you are there, you should see text in English about functions that does not yet exist in the English text in the *.fr files (but if you use Weblate, it should be clear, if not, let us know!)

@MarleenGilsing
Copy link
Collaborator Author

@Felienne Oh my gosh I'm sorry! I did create functions_2 and 3, but then i placed the content in the already existing adventures like songs and calculator. Guess I forgot to remove them from hedy_content.py.... Thanks for debugging it though!!

Copy link
Contributor

mergify bot commented Nov 2, 2023

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 38d95e9 into main Nov 2, 2023
11 checks passed
@mergify mergify bot deleted the Functions-adventures branch November 2, 2023 17:12
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