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

Change "Refresh" to "Edit" TOTP #2269

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Change "Refresh" to "Edit" TOTP #2269

merged 1 commit into from
Jul 12, 2023

Conversation

slightlyskepticalpotat
Copy link
Contributor

Closes #1839, just cleaning some of my issues opened long ago

@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2023 •
edited
Loading

Codecov Report

Patch coverage: 66.66% and no project coverage change.

Comparison is base (3f5212f) 47.05% compared to head (44022fd) 47.05%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #2269   +/-   ##
=======================================
  Coverage   47.05%   47.05%           
=======================================
  Files         249      249           
  Lines       13209    13209           
=======================================
  Hits         6215     6215           
  Misses       6994     6994
Impacted Files Coverage Δ
dmoj/urls.py 89.47% <ø> (ø)
judge/views/two_factor.py 39.88% <66.66%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@slightlyskepticalpotat slightlyskepticalpotat marked this pull request as ready for review July 11, 2023 19:26
Xyene
Xyene reviewed Jul 12, 2023
View reviewed changes
Copy link
Member

@Xyene Xyene left a comment

Choose a reason for hiding this comment

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

LGTM, but please edit your commit title to match the formatting of other titles, e.g.

image

Xyene
Xyene approved these changes Jul 12, 2023
View reviewed changes
Copy link
Member

@Xyene Xyene left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Xyene Xyene added this pull request to the merge queue Jul 12, 2023
Merged via the queue into DMOJ:master with commit b698088 Jul 12, 2023
4 checks passed
@quantum5
Copy link
Member

@Xyene why did you merge this? Editing .po files manually like this is fundamentally broken since it just gets out of sync with crowdin and will be wiped out.

@kiritofeng
Copy link
Member

Also isn't https://github.com/DMOJ/online-judge/pull/2269/files#diff-643b1e64ddd6a6bf50ff74bb6a83c23d40faca036dd3f208124aa4ec85c2d888R5511 just wrong anyway...

int-y1
int-y1 reviewed Jul 12, 2023
View reviewed changes
locale/ca/LC_MESSAGES/django.po
@@ -5508,7 +5508,7 @@ msgid "Total:"
msgstr "Total:"

#: templates/submission/list.html:350
msgid "You were disconnected. Refresh to show latest updates."
msgid "You were disconnected. Edit to show latest updates."
Copy link
Contributor

Choose a reason for hiding this comment

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

this change is wrong.
why are you editing the po files manually?

@int-y1
Copy link
Contributor

int-y1 commented Jul 12, 2023

we should merge #2142 soon to cover up these po changes

@quantum5 quantum5 mentioned this pull request Jul 12, 2023
Merged
@quantum5
Copy link
Member

we should merge #2142 soon to cover up these po changes

No, that'll just create a conflict or not do anything. This change is bogus and has been reverted.

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

@int-y1 int-y1 int-y1 left review comments

@Xyene Xyene Xyene approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change "Refresh [TOTP]" to "Change [TOTP]"
6 participants
@slightlyskepticalpotat @codecov-commenter @quantum5 @kiritofeng @int-y1 @Xyene