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

changes: consolidate action names #10135

Merged
merged 2 commits into from
Oct 12, 2023
Merged

changes: consolidate action names #10135

merged 2 commits into from
Oct 12, 2023

Conversation

nijel
Copy link
Member

@nijel nijel commented Oct 10, 2023

Proposed changes

Consistently use noun + verb past.

Fixes #9824

Checklist

  • Lint and unit tests pass locally with my changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added documentation to describe my feature.
  • I have squashed my commits into logic units.
  • I have described the changes in the commit messages.

Other information

@nijel nijel added this to the 5.1 milestone Oct 10, 2023
@nijel nijel force-pushed the change-event branch 2 times, most recently from 46808bb to 0b56a27 Compare October 11, 2023 07:38
@nijel nijel mentioned this pull request Oct 11, 2023
2 tasks
@urbalazs
Copy link
Contributor

I prefer these changes:

  • Repository was reset -> Repository reset
  • Repository was merged -> Repository merged
  • Repository was rebase -> Repository rebased
  • New string added -> String added
  • New language added -> Language added
  • New language requested -> Language requested
  • Trasnlation replaced file by upload -> Translation replaced by file upload

I am not sure about the last one. Please note there is a typo in Trasnlation

@nijel
Copy link
Member Author

nijel commented Oct 11, 2023

@urbalazs Thanks for the feedback, I've applied your suggestions.

# Using pgettext to differentiate from the plural
# Translators: Name of event in the history
(
ACTION_NEW_STRING,
pgettext_lazy("Name of event in the history", "New string to translate"),
pgettext_lazy("Name of event in the history", "String added"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

There are two String added after changing New string added to String added. It is needed to distinguish these two events.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point, I think it's time to drop this event. Tracked separately at #10153

@nijel nijel marked this pull request as draft October 11, 2023 13:05
@nijel nijel marked this pull request as ready for review October 11, 2023 13:05
@nijel nijel force-pushed the change-event branch 2 times, most recently from 72c106a to 90d0bf8 Compare October 12, 2023 12:57
@nijel nijel enabled auto-merge (rebase) October 12, 2023 12:57
It was really doing just aggregation which can now be handled in the
notification subsystem. Notification now triggers on ACTION_NEW_UNIT and
is doing digests for users who had instant notification up to now.

Fixes WeblateOrg#10153
Consistently use noun + verb past.

Fixes WeblateOrg#9824
@codecov
Copy link

codecov bot commented Oct 12, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.04%. Comparing base (18f9c91) to head (aa9a75a).
Report is 6052 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #10135      +/-   ##
==========================================
+ Coverage   90.86%   91.04%   +0.18%     
==========================================
  Files         537      529       -8     
  Lines       55661    55507     -154     
  Branches     8832     8798      -34     
==========================================
- Hits        50576    50536      -40     
+ Misses       3536     3417     -119     
- Partials     1549     1554       +5     
Files with missing lines Coverage Δ
...ccounts/migrations/0002_new_string_notification.py 100.00% <100.00%> (ø)
weblate/accounts/notifications.py 95.91% <100.00%> (+0.01%) ⬆️
weblate/accounts/tests/test_notifications.py 100.00% <100.00%> (ø)
weblate/api/tests.py 100.00% <100.00%> (ø)
...blate/trans/migrations/0006_alter_change_action.py 100.00% <100.00%> (ø)
...blate/trans/migrations/0007_alter_change_action.py 100.00% <100.00%> (ø)
weblate/trans/models/change.py 79.94% <100.00%> (-0.37%) ⬇️
weblate/trans/models/component.py 80.17% <ø> (-0.03%) ⬇️
weblate/trans/models/translation.py 87.02% <ø> (-0.24%) ⬇️
weblate/trans/templatetags/translations.py 88.97% <100.00%> (+0.16%) ⬆️
... and 2 more

... and 18 files with indirect coverage changes

@nijel nijel merged commit 3d628cb into WeblateOrg:main Oct 12, 2023
28 of 29 checks passed
@nijel nijel deleted the change-event branch October 12, 2023 18:31
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.

Inconsistent history event names
4 participants