Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

feat!: remove Transifex calls for OEP-58 | FC-0012 #820

Conversation

hopewise
Copy link
Contributor

Breaking change!

This change breaks the Jenkins transifex integration which has been deprecated in favor of the new GitHub Transifex App integration as part of OEP-58.

Changes

  • Removes all direct use of tx pull and tx push commands from the micro-frontend in favor
    of the atlas pull command.
  • Remove source and language translations from the repositories, hence no .json files will be committed into the repos.
  • src/i18n/index.js should export and empty array so the make pull_translations override it with the dynamic list of languages.
  • Remove the experimental OPENEDX_ATLAS_PULL flag to make atlas pull the default.
  • Remove all Transifex related Makefile targets and other files.

Test results

  • Verify that make pull_translations works as expected.
make pull_translations test results
# I've run the following commands:
$ make requirements
$ make pull_translations
$ git diff

# Output of the commmands:

make pull_translations
rm -rf src/i18n/messages
mkdir src/i18n/messages
cd src/i18n/messages \
      && atlas pull \
               translations/frontend-component-header/src/i18n/messages:frontend-component-header  \
               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
               translations/paragon/src/i18n/messages:paragon \
               translations/frontend-app-payment/src/i18n/messages:frontend-app-payment
Pulling translation files
 - directory: translations/frontend-component-header/src/i18n/messages:frontend-component-header translations/frontend-component-footer/src/i18n/messages:frontend-component-footer translations/paragon/src/i18n/messages:paragon translations/frontend-app-payment/src/i18n/messages:frontend-app-payment
 - repository: openedx/openedx-translations
 - branch: main
 - filter: Not Specified
 - expand-glob: Not Specified
Creating a temporary Git repository to pull translations into "./translations_TEMP"...
^[Done.
Setting git sparse-checkout rules...
Done.
Pulling translation files from the repository...
remote: Enumerating objects: 40, done.
remote: Counting objects: 100% (40/40), done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 40 (delta 29), reused 25 (delta 18), pack-reused 0
Receiving objects: 100% (40/40), 32.41 KiB | 535.00 KiB/s, done.
Resolving deltas: 100% (29/29), done.
Your branch is up to date with 'origin/main'.
Done.
Copying translations from "./translations_TEMP/translations/frontend-component-header/src/i18n/messages" to "./frontend-component-header"...
Done.
Copying translations from "./translations_TEMP/translations/frontend-component-footer/src/i18n/messages" to "./frontend-component-footer"...
Done.
Copying translations from "./translations_TEMP/translations/paragon/src/i18n/messages" to "./paragon"...
Done.
Copying translations from "./translations_TEMP/translations/frontend-app-payment/src/i18n/messages" to "./frontend-app-payment"...
Done.
Removing temporary directory...
Done.

Translations pulled successfully!
./node_modules/.bin/intl-imports.js frontend-component-header frontend-component-footer paragon frontend-app-payment

Merge timeline

This should only be merged after Translation Infrastructure update OEP-58 is fully implemented.

The timing announcement will be shared by @brian-smith-tcril on #translations-project-fc-0012 Open edX Slack channel.

Keep this pull request as a draft to prevent accidental merge.

Pre-merge checklist

References

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

Up-to-date project overview and details are available in the Approach Memo and Technical Discovery: Translations Infrastructure Implementation document.

Join the conversation on Open edX Slack #translations-project-fc-0012.

Check the links above for full information about the overall project.

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

openedx-webhooks commented Oct 21, 2023

Thanks for the pull request, @hopewise! 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.

@mphilbrick211 mphilbrick211 added the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Oct 23, 2023
@e0d e0d removed the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Oct 24, 2023
@itsjeyd itsjeyd added the blocked by other work PR cannot be finished until other work is complete label Nov 2, 2023
@itsjeyd itsjeyd removed the blocked by other work PR cannot be finished until other work is complete label Feb 23, 2024
@hopewise hopewise marked this pull request as ready for review March 14, 2024 07:11
@hopewise hopewise requested a review from a team as a code owner March 14, 2024 07:11
@OmarIthawi OmarIthawi force-pushed the samir/frontend-app-payment branch from 3a96fed to 4a1cc50 Compare March 17, 2024 14:34
Copy link
Contributor

@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.

@itsjeyd @timmc-edx @brian-smith-tcril this one is ready for merge and 2U is ready for merging.

@OmarIthawi OmarIthawi force-pushed the samir/frontend-app-payment branch from 4a1cc50 to 71cfc7c Compare March 17, 2024 15:34
@OmarIthawi
Copy link
Contributor

@brian-smith-tcril @spencertiberi the CI failure is a post-test issue.

Please check the link below and let me know how it can be fixed:

https://github.com/openedx/frontend-app-payment/actions/runs/8316512467/job/22756054443?pr=820#step:11:1

@brian-smith-tcril
Copy link
Contributor

brian-smith-tcril commented Mar 19, 2024

@OmarIthawi #859 should fix it, I'll push to get that merged and then this can be rebased

@brian-smith-tcril
Copy link
Contributor

@openedx/revenue-squad @spencertiberi this cannot be merged until a code owner approves it.

@itsjeyd
Copy link

itsjeyd commented Mar 22, 2024

For future reference, changes from #859 (now closed) were added to this PR.

So all that's left to get this PR over the finish line is code owner approval ⬆️ and a rebase.

Moving to Ready for merge and marking as waiting on author.

@itsjeyd itsjeyd added the waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. label Mar 22, 2024
@OmarIthawi OmarIthawi force-pushed the samir/frontend-app-payment branch from 8d33a0c to d5a4f4e Compare March 22, 2024 16:00
@OmarIthawi
Copy link
Contributor

@itsjeyd rebased with thanks!

@OmarIthawi OmarIthawi removed the waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. label Mar 22, 2024
Copy link
Contributor

@julianajlk julianajlk left a comment

Choose a reason for hiding this comment

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

FYI edx-internal changes to use atlas for the payment MFE has been done in https://github.com/edx/edx-internal/pull/10408

Copy link
Contributor

@julianajlk julianajlk left a comment

Choose a reason for hiding this comment

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

Is there a reason package-lock.json is being modified with this work?

@brian-smith-tcril
Copy link
Contributor

@OmarIthawi package-lock.json has been changed here without package.json being changed, do you know what happened there?

@OmarIthawi OmarIthawi force-pushed the samir/frontend-app-payment branch from d5a4f4e to cb71314 Compare March 26, 2024 18:36
@OmarIthawi
Copy link
Contributor

That wasn't intentional @brian-smith-tcril. I'll fix.

@OmarIthawi
Copy link
Contributor

@brian-smith-tcril @julianajlk the package-lock.json changes were cherry picked from #859. I don't fully understand the reason but it indeed fixed the build fail.

I've removed the commit and the build failed again, now I've cherry-picked the commit from #859 and it's working again.

Please let me know if you're comfortable with merging the pull request as-is or I should wait for a fully review on #859 and then rebase?

@julianajlk
Copy link
Contributor

@brian-smith-tcril @julianajlk the package-lock.json changes were cherry picked from #859. I don't fully understand the reason but it indeed fixed the build fail.

I've removed the commit and the build failed again, now I've cherry-picked the commit from #859 and it's working again.

Please let me know if you're comfortable with merging the pull request as-is or I should wait for a fully review on #859 and then rebase?

FYI @brian-smith-tcril has fixed the issue on #862 and you should be able to rebase and get this PR green

@OmarIthawi OmarIthawi force-pushed the samir/frontend-app-payment branch 2 times, most recently from 5084633 to 96c539b Compare March 27, 2024 09:24
@OmarIthawi
Copy link
Contributor

Thanks @julianajlk @brian-smith-tcril this one should be rebased and ready for merge.

@brian-smith-tcril brian-smith-tcril merged commit 54a8d04 into openedx-unsupported:master Mar 27, 2024
5 checks passed
@openedx-webhooks
Copy link

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants