dzcode-io / dzcode.io

Website & mobile app for Algerian open-source community
https://dzcode.io
MIT License
114 stars 41 forks source link

Feat/automatic extraction and compilation with formatjs #390

Closed abderrahmaneMustapha closed 2 years ago

abderrahmaneMustapha commented 2 years ago

Description

automatic extraction of messages and compilation with formatjs, combined with react int, and react intl translation manager without overwriting the existing translated file.

Type of change

omdxp commented 2 years ago

@abderrahmaneMustapha there are some checks that didn't pass

abderrahmaneMustapha commented 2 years ago

@ZibanPirate & @Omar-Belghaouti i can not understand why the checks is failing here ??

omdxp commented 2 years ago

@abderrahmaneMustapha is this branch up-to-date with main? You can also check the logs for the testing

ZibanPirate commented 2 years ago

hey @abderrahmaneMustapha , the tests were failing because of recent changes we merged to main, i fixed it in #397 and rebased feat/localization.

Now you have to rebase your branch feat/automatic-extraction-and-compilation-with-formatjs on feat/localization, to do that:

  1. delete feat/localization and checkout to it again (because it's rebased)

    git branch -D feat/localization
    git checkout feat/localization
  2. checkout to your branch and rebase on feat/localization :

    git checkout feat/automatic-extraction-and-compilation-with-formatjs
    git rebase feat/localization
  3. you will see a conflict in the file web/src/localization/index.tsx, just:

    • Go to that file
    • Click on "Accept Current Changes"
    • Save the file
    • Stage the file, by going to the "Git tab" of VSCode and clicking the + beside the file name
    • finally run git rebase --continue
  4. force push your changes:

    git push -f

once this is done, we will review the changes in the PR, there are some comments i wanna add

abderrahmaneMustapha commented 2 years ago

@ZibanPirate @Omar-Belghaouti , @dzcode-io/members ready for reviews , i also fixed the the failing test in the faq page test because of the missing int provider.