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

[LANGUAGE, FIX] Fix non-en colors in lists and ask #4675

Merged
merged 12 commits into from
Nov 1, 2023
Merged

Conversation

Felienne
Copy link
Member

@Felienne Felienne commented Oct 27, 2023

Description

Allows the use of Dutch (and other langs) names in a list, fixing #3356. This new way of processing numbers to English at runtime also allows for using non-English colors in an ask:

image

This PR:
image

main:
image

Fixes #3356

How to test

I added a test about the list access, for the ask issue, check that the images above work for you also.

Checklist
Done? Check if you have it all in place using this list: (mark with x if done)

  • Contains one of the PR categories in the name
  • Describes changes in the format above
  • Links to an existing issue or discussion
  • Has a "How to test" section

@ghost
Copy link

ghost commented Oct 27, 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 October 27, 2023 10:15
@Felienne Felienne changed the title WIP, will add details later! Dutch color error [LANGUAGE, FIX] Fix non-en colors in lists and aks Oct 27, 2023
@Felienne Felienne changed the title [LANGUAGE, FIX] Fix non-en colors in lists and aks [LANGUAGE, FIX] Fix non-en colors in lists and ask Oct 27, 2023
@Felienne
Copy link
Member Author

Oh no, conflicts 😭

@Felienne
Copy link
Member Author

How do we edit the exact same lines @jpelay?!
image

I will pick these up!

@Felienne Felienne requested a review from jpelay October 31, 2023 20:10
@Felienne Felienne merged commit 0ad485a into main Nov 1, 2023
9 checks passed
@Felienne Felienne deleted the dutch-color-error branch November 1, 2023 07:47
Felienne added a commit that referenced this pull request Nov 14, 2023
Felienne added a commit that referenced this pull request Nov 15, 2023
mergify bot pushed a commit that referenced this pull request Nov 16, 2023
Reverts #4754. This is a redo of #4675, which fixed #3356 but caused #4752.

This has additional commits that also fix #4752.

**Original text from #4675:**

**Description**

Allows the use of Dutch (and other langs) names in a list, fixing  #3356. This new way of processing numbers to English at runtime also allows for using non-English colors in an ask:

<img width="1608" alt="image" src="https://github.com/hedyorg/hedy/assets/1003685/fa373815-47d5-4e68-b50b-d69404082c6f">

This PR:
<img width="1592" alt="image" src="https://github.com/hedyorg/hedy/assets/1003685/07d0f3ee-e8aa-4407-ad5d-0660c651cba8">

main:
<img width="1422" alt="image" src="https://github.com/hedyorg/hedy/assets/1003685/c7a2d2e5-7c33-48a7-9b63-ce9b0182d932">

**Fixes #3356**

**How to test**

I added a test about the list access, for the ask issue, check that the images above work for you also.
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.

[LANGUAGE] Colors in lists in non-English don't work
1 participant