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

Add Russian and Ukrainian as active languages #45

Closed
wants to merge 8 commits into from
Closed

Add Russian and Ukrainian as active languages #45

wants to merge 8 commits into from

Conversation

Darkboy17
Copy link
Contributor

This PR closes/references issue #14.

How has this been tested?

I have fixed the issue as requested by adding the two languages, "Russian" and "Ukranian" to the Active language list.

Please take a look at the screenshot of the newly added languages.

activelanguages

To ensure if the languages can be translated, please have a look at the screenshot where I have selected "Russian" as underlined.

lang_sel_russian

Now to confirm, when I visit the link http://127.0.0.1:8000/orga/event/, it takes me to a page as shown in the screenshot below, which successfully translated the language to Russian.

page_russian_translated

Now, let us test for the language "Ukranian" by similarly following the above steps.
Selecting "Ukranian" as shown in the screenshot below

lang_sel_ukr

Similarly, when I visit http://127.0.0.1:8000/orga/event/, I get the page in Ukranian as shown in the screenshot below.

page_ukr_translated

Checklist

  • I have manually tested the functionality to cover my changes.
  • I have strictly followed the contribution guidelines and best practices.

@mariobehling mariobehling changed the title Issue #14 fixed Add Russian and Ukrainian as active languages Feb 18, 2024
@mariobehling
Copy link
Member

Please test if the languages show up as an option for forms and provide a screenshot.

Screenshot from 2024-02-18 04-13-20

@Darkboy17
Copy link
Contributor Author

Okay, I will do that and revert back soon.

@Darkboy17
Copy link
Contributor Author

Please test if the languages show up as an option for forms and provide a screenshot.

Screenshot from 2024-02-18 04-13-20

Here's a screenshot from my machine to confirm that the languages do show up as options in the form.

languages_in_forms

"public_code": "zh",
},
"ru": {
"name": _("Russian"),
"natural_name": "Russian",
Copy link
Member

Choose a reason for hiding this comment

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

That is not the natural name, it should be русский язык and similar for Ukraine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have made the necessary changes as requested. Please check and revert back.

src/pretalx/settings.py Outdated Show resolved Hide resolved
@norbusan
Copy link
Member

Also, in surprised that they're are commits of me in the branch, but I guess GitHub can figure that out.

Copy link
Member

@norbusan norbusan left a comment

Choose a reason for hiding this comment

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

Can you please make a pull request based on the current development branch that does NOT contain all the unrelated changes?
90% of the changes in this PR are unrelated, and I am loss reading all this

@Darkboy17
Copy link
Contributor Author

Darkboy17 commented Feb 20, 2024

Can you please make a pull request based on the current development branch that does NOT contain all the unrelated changes? 90% of the changes in this PR are unrelated, and I am loss reading all this

Your talking about this issue here, right?

I'm a bit confused too. After making the changes you requested, I proceeded working on the third issue #19. I committed from VSCode as I usually did for the other issues. But, after creating a PR, I don't know why it's showing here.

Please advise.

@norbusan
Copy link
Member

There are so many issues, here, I really ask you to start over again and be a bit more careful:

  • the last two commits are for a different issue (Add button link to view or edit speaker profile #17)
  • the last two issues fail becasue tinymce is not installed, please check the above CI errors yourself!
  • there are unrelated changes that I don't know why they are there, at least in the github output

I suggest:

  • clean up your git branchs, branch from current development, and add only the relevant commits from this branch (use git cherry-pick)
  • create two new PRs from the respective new branches (copy the explanation from this branch to the new one, since it had all the screenshots etc, just click edit and copy the text)
  • after the new PRs are opened, close this one with a comment referencing the new ones.

Thanks

@Darkboy17 Darkboy17 closed this Feb 20, 2024
@Darkboy17
Copy link
Contributor Author

Hello Norbusan. I have started over again by creating two new PRs. In total, I have worked on three issues till now, one has been verified and merged.

Please review the two new PRs as referenced below :

issue #49 and issue #50.

Thank You for your suggestions.

@Darkboy17
Copy link
Contributor Author

Darkboy17 commented Feb 20, 2024

Hello, Norbusan. Most of the tests that failed were due to "tinymce" library not being found. This happened because, the newly added library which exists in my local machine specifically in the project folder does not exist in the fork I created on github. I need to add this library to my fork.

How do yo think I should approach this because the PR #49 requires much more work than the other PRs I have created.

I'm new to this, so please guide and advise.

@Darkboy17
Copy link
Contributor Author

Darkboy17 commented Feb 21, 2024

Hello, Norbusan. After countless hours of figuring out using your advice, by cherry-picking commits and then pushing them to their relevant branches, the past commits keep appearing on my new branches, preventing me from creating new PRs.

Please revert asap as this is hindering me from moving forward.

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.

3 participants