8000 refactor: accurate translation caching (backport #18595) by mergify[bot] · Pull Request #18598 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

refactor: accurate translation caching (backport #18595) #18598

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

Merged
merged 4 commits into from
Oct 28, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Oct 27, 2022

This is an automatic backport of pull request #18595 done by Mergify.
Cherry-pick of 3ddac5f has failed:

On branch mergify/bp/version-13-hotfix/pr-18595
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 3ddac5fe92.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/core/doctype/translation/translation.py
	modified:   frappe/tests/test_search.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/__init__.py
	both modified:   frappe/core/doctype/translation/test_translation.py
	both modified:   frappe/tests/utils.py
	both modified:   frappe/translate.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team and phot0n and removed request for a team October 27, 2022 10:58
@mergify mergify bot added the conflicts label Oct 27, 2022
@mergify mergify bot assigned ankush Oct 27, 2022
@ankush ankush removed the conflicts label Oct 27, 2022
@codecov
Copy link
codecov bot commented Oct 27, 2022

Codecov Report

Merging #18598 (3ddac5f) into version-13-hotfix (e8af6b2) will increase coverage by 0.20%.
The diff coverage is 67.55%.

❗ Current head 3ddac5f differs from pull request most recent head a128d22. Consider uploading reports for the commit a128d22 to get more accurate results

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-13-hotfix   #18598      +/-   ##
=====================================================
+ Coverage              62.88%   63.09%   +0.20%     
=====================================================
  Files                    755      747       -8     
  Lines                  67911    67256     -655     
  Branches                5987     5996       +9     
=====================================================
- Hits                   42705    42434     -271     
+ Misses                 21779    21360     -419     
- Partials                3427     3462      +35     
Flag Coverage Δ
server-mariadb 67.19% <72.26%> (+0.77%) ⬆️
server-postgres 67.19% <68.97%> (+0.68%) ⬆️
server-ui 31.22% <33.13%> (-0.68%) ⬇️
ui-tests 50.28% <46.95%> (-0.60%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

ankush and others added 4 commits October 28, 2022 12:46
* refactor: rename poorly named functions

* refactor: getting translation from apps

- use generator
- use sane name for cache key
- avoid manual handling of frappe.local state just use cache() interface

(cherry picked from commit 3ddac5f)

# Conflicts:
#	frappe/__init__.py
#	frappe/core/doctype/translation/test_translation.py
#	frappe/tests/utils.py
#	frappe/translate.py
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-18595 branch from 5e31bb5 to a128d22 Compare October 28, 2022 07:21
@ankush ankush merged commit 30125b9 into version-13-hotfix Oct 28, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-18595 branch October 28, 2022 08:11
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.43.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@ankush ankush restored the mergify/bp/version-13-hotfix/pr-18595 branch November 3, 2022 09:16
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-18595 branch November 3, 2022 09:16
ankush added a commit that referenced this pull request Nov 3, 2022
ankush added a commit that referenced this pull request Nov 3, 2022
mergify bot pushed a commit that referenced this pull request Nov 3, 2022
frappe-pr-bot pushed a commit that referenced this pull request Nov 8, 2022
## [13.43.2](v13.43.1...v13.43.2) (2022-11-08)

### Bug Fixes

* don't translate default argument ([#18760](#18760)) ([8038ed7](8038ed7))
* module 'frappe' has no attribute 'build' ([#18761](#18761)) ([a867d56](a867d56))
* not able to click checkbox in file grid view ([ad85843](ad85843))
* send all messages on boot instead of scanning ([#18764](#18764)) ([640724d](640724d))
* show 0 for empty currency, float, & duration fields in list view ([2290fb8](2290fb8))
* translations (backport [#18765](#18765)) ([#18781](#18781)) ([ca631ba](ca631ba))

### Performance Improvements

* ensure cache works for `non_standard_user_types` when empty ([#18744](#18744)) ([708ee35](708ee35))

### Reverts

* Revert "refactor: accurate translation caching (backport #18595) (#18598)" (#18741) ([e4d12f0](e4d12f0)), closes [#18595](#18595) [#18598](#18598) [#18741](#18741)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0