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.

Sign up for GitHub

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

Jump to bottom

feat: extract from edx-platform #1275

Merged
merged 1 commit into from
Nov 15, 2023
Merged

feat: extract from edx-platform #1275

merged 1 commit into from
Nov 15, 2023

Conversation

shadinaif
Copy link
Contributor

@shadinaif shadinaif commented Sep 26, 2023 •
edited by OmarIthawi
Loading

Changes

  • Add the edx-platform to the python-translations job
  • Support caching in a vein attempt to reduce the edx-platform setup time from 4 minutes to 3 minutes
  • Added multiple preps to ensure base.txt compiles and the edx-platform behaves more normally
  • Split extract translation source files into multiple steps to accommodate for edX Platform multi-file setup

Suggestions

TODO

This contribution is part of the FC-0012 project which is sparked by the Translation Infrastructure update OEP-58.

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Sep 26, 2023
@openedx-webhooks
Copy link

openedx-webhooks commented Sep 26, 2023 •
edited
Loading

Thanks for the pull request, @shadinaif! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@shadinaif shadinaif mentioned this pull request Sep 28, 2023
Closed
2 tasks
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from 6ffe77d to fc0fc10 Compare September 28, 2023 07:08
@shadinaif shadinaif marked this pull request as ready for review September 28, 2023 07:08
@shadinaif
Copy link
Contributor Author

ready for your review @OmarIthawi

@OmarIthawi OmarIthawi marked this pull request as draft September 28, 2023 07:46
OmarIthawi
OmarIthawi previously requested changes Sep 28, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shadinaif. Please check the inline comments, also test this in a fork.

.github/workflows/extract-translation-source-files.yml Outdated Show resolved Hide resolved
.github/workflows/extract-translation-source-files.yml Outdated Show resolved Hide resolved
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from fc0fc10 to 5fe0118 Compare October 12, 2023 10:33
@shadinaif shadinaif mentioned this pull request Oct 16, 2023
Merged
2 tasks
OmarIthawi
OmarIthawi reviewed Oct 23, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good now. Please let me know when it's ready @shadinaif.

@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch 2 times, most recently from 6002859 to 09b8fa5 Compare November 12, 2023 08:03
@shadinaif shadinaif marked this pull request as ready for review November 12, 2023 08:07
@shadinaif shadinaif requested a review from OmarIthawi November 12, 2023 08:07
@shadinaif
Copy link
Contributor Author

this one is ready @OmarIthawi @brian-smith-tcril

OmarIthawi
OmarIthawi requested changes Nov 12, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One change @shadinaif and this is ready.

I noticed that Arabic and Catalan are committed besides the source English translations in the test pull request you posted:

Please address the change and it should be good.

.github/workflows/extract-translation-source-files.yml Outdated Show resolved Hide resolved
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from 09b8fa5 to 1f7881b Compare November 12, 2023 11:02
@shadinaif shadinaif requested a review from OmarIthawi November 12, 2023 11:07
OmarIthawi
OmarIthawi approved these changes Nov 12, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! @shadinaif please remove this leftover comment and it should be ready to merge.

.github/workflows/extract-translation-source-files.yml Outdated Show resolved Hide resolved
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch 2 times, most recently from 62cdf20 to b37ebe0 Compare November 13, 2023 09:07
@shadinaif shadinaif mentioned this pull request Nov 13, 2023
Merged
1 task
OmarIthawi
OmarIthawi reviewed Nov 13, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor comment change

.github/workflows/extract-translation-source-files.yml Outdated Show resolved Hide resolved
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from b37ebe0 to a2eab63 Compare November 13, 2023 12:08
shadinaif
shadinaif commented Nov 13, 2023
View reviewed changes
.github/workflows/extract-translation-source-files.yml Outdated
@@ -214,7 +245,7 @@ jobs:
cd translations/${{ matrix.repo }}
# finds the directory containing the english locale usually located in
# */*/conf/locale/en
EN_DIR=$(find . -type d -regex ".+conf\/locale\/en$")
EN_DIR=$(find . -type d -regex ".+conf\/locale\/en$" | head -n 1)
Copy link
Contributor Author

@shadinaif shadinaif Nov 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OmarIthawi , setting it as draft so I can fix it tomorrow morning. This addition | head -n 1 is causing a problem with other repos like ecommerce
e-commerce problem resolved, was another issue. But we don't want | head -n 1 anyway. If the repository contains more than /conf/locale/en directory; then it must be resolved in that repo and reported as an error here

cc/ @OmarIthawi

Copy link
Contributor Author

@shadinaif shadinaif Nov 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please review now @OmarIthawi . It works fine :) . The script works for edx-platform and other repos. Tested in fork. Also, notice that we don't delete contents of conf/locale anymore

@shadinaif shadinaif marked this pull request as draft November 13, 2023 12:37
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from a2eab63 to 4e77b2b Compare November 14, 2023 08:11
@shadinaif shadinaif mentioned this pull request Nov 14, 2023
Closed
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from 4e77b2b to 3738508 Compare November 14, 2023 09:03
@shadinaif shadinaif requested a review from OmarIthawi November 14, 2023 09:04
@shadinaif shadinaif marked this pull request as ready for review November 14, 2023 09:04
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from 3738508 to 32b59d4 Compare November 14, 2023 11:46
@shadinaif shadinaif force-pushed the shadinaif/FC-0012-OEP-58.edx-platform branch from 32b59d4 to 5a6fb8e Compare November 15, 2023 06:23
OmarIthawi
OmarIthawi approved these changes Nov 15, 2023
View reviewed changes
Copy link
Member

@OmarIthawi OmarIthawi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shadinaif! It seems to be working fine.

I'll merge it now. Please keep an eye on it.

@OmarIthawi OmarIthawi merged commit 658b889 into openedx:main Nov 15, 2023
5 checks passed
@openedx-webhooks
Copy link

@shadinaif 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@OmarIthawi
Copy link
Member

@shadinaif it looks it it's working:

Thanks for making this change!

@shadinaif shadinaif mentioned this pull request Nov 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OmarIthawi OmarIthawi OmarIthawi approved these changes

Assignees
No one assigned
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
Contributions
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shadinaif @openedx-webhooks @OmarIthawi