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

[pull] l2d from carpentries:main #52

Merged
43 commits merged into from
Dec 21, 2023
Merged

[pull] l2d from carpentries:main #52

43 commits merged into from
Dec 21, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 12, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Dec 12, 2023
There was a problem with the testing which reveals a bit of a fragile
relationship between the translations and the rest of the varnish data.
Likely the translations need to be set during the build time and kept as
a permanent fixutre.
zkamvar and others added 6 commits December 13, 2023 06:27
One of the problems that lead me to 7d9cc2c
was the fact that a test for `build_lesson()` was failing in the
situation where we removed the instructor notes page from the source and
rebuilt it using the instructor note aggregator function without the
`build_lesson()` context.

When `this_lesson()` was called, it clobbered the `$translation` items
and then we got an error in that test because the translation for the
title was not available.

I will reiterate that this problem is almost non-existent because none
of the HTML generating functions are exported nor are they called
directly by users, but it still bothers me. In fact, it would be a good
idea to centralise the translation to a single function and always
assume that the global data will always exist. This would help avoid
confusing errors in the language of the lesson (as opposed to the
language of the user).
ensure country codes; small refactor of translation strings
@milanmlft milanmlft enabled auto-merge (squash) December 14, 2023 09:41
@pull pull bot added the merge-conflict Resolve conflicts manually label Dec 14, 2023
auto-merge was automatically disabled December 14, 2023 16:49

Head branch was pushed to by a user without write access

@milanmlft milanmlft enabled auto-merge (squash) December 14, 2023 17:18
 - translation pair of success/failure tests moved into
   `expect_set_translate()` function in helper-translate.R
 - expect_false(identical()) changed to
   expect_failure(expect_setequal()) to produce more informative error
   messages when they occur
auto-merge was automatically disabled December 15, 2023 19:29

Head branch was pushed to by a user without write access

@milanmlft milanmlft closed this pull request by merging all changes into LearnToDiscover:l2d in da2ad38 Dec 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants