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

working on three dialog translation #680

Merged
merged 12 commits into from Oct 28, 2023

Conversation

AlexVCS
Copy link
Contributor

@AlexVCS AlexVCS commented Oct 13, 2023

Issue number

#629

Please check the following

  • [✅ ] Do the tests still pass? (see Run the Tests)
  • Is the code formatted properly? (see Linting (Formatting))
  • For New Features:
    • Have tests been added to cover any new features or fixes?
    • Has the documentation been updated accordingly?

Please describe additional details for testing this change

I want to look at what I've added but am not sure where to access it. I'll have to find out where it lives and check that it works as intended.

src/translations/es.json Outdated Show resolved Hide resolved
@itsalaidbacklife itsalaidbacklife added hacktoberfest This issue welcomes contributions for Hacktoberfest. frontend Requires changes to the frontend (vue) client labels Oct 13, 2023
@AlexVCS AlexVCS marked this pull request as ready for review October 18, 2023 23:37
@AlexVCS
Copy link
Contributor Author

AlexVCS commented Oct 23, 2023

Any feedback on this? I'm not sure why the e2e install isn't working correctly

@itsalaidbacklife
Copy link
Contributor

Any feedback on this? I'm not sure why the e2e install isn't working correctly

It looks like cypress is failing to parse the json in the en.json file, likely due to a syntax error

@AlexVCS
Copy link
Contributor Author

AlexVCS commented Oct 23, 2023

Do I need to rebase? I keep getting this when I try to push the right changes and I pulled in the latest changes I think:

! [rejected] ThreeDialog-translation -> ThreeDialog-translation (non-fast-forward)
error: failed to push some refs to 'https://github.com/AlexVCS/cuttle.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@AlexVCS
Copy link
Contributor Author

AlexVCS commented Oct 23, 2023

My branches say up to date when I do
git pull https://github.com/cuttle-cards/cuttle.git main

@itsalaidbacklife
Copy link
Contributor

@AlexVCS that indicates that you need to git pull. It's possible that your previous pull was rejected due to local changes that aren't pushed yet. So you could try resolving this with git pull --rebase before pushing.

If you're unable to pull with a rebase, we can hash out the details of the git error in discord

Copy link
Contributor

@itsalaidbacklife itsalaidbacklife left a comment

Choose a reason for hiding this comment

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

Nice work. Thanks for your contribution!

@itsalaidbacklife itsalaidbacklife merged commit 88b7529 into cuttle-cards:main Oct 28, 2023
9 checks passed
@itsalaidbacklife itsalaidbacklife added the internationalization Translation of content into multiple languages label Nov 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend Requires changes to the frontend (vue) client hacktoberfest This issue welcomes contributions for Hacktoberfest. internationalization Translation of content into multiple languages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature]: Apply translation/localization to all text in the ThreeDialog
3 participants