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

fix(Data Import): make warnings translatable (backport #17924) #17930

Merged
merged 3 commits into from
Aug 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2022

This is an automatic backport of pull request #17924 done by Mergify.
Cherry-pick of 63a60c6 has failed:

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

You are currently cherry-picking commit 63a60c6457.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/data_import/importer.py

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 63a60c6)

# Conflicts:
#	frappe/core/doctype/data_import/importer.py
@codecov
Copy link

codecov bot commented Aug 24, 2022

Codecov Report

Merging #17930 (63a60c6) into version-13-hotfix (6d6a67e) will increase coverage by 4.14%.
The diff coverage is 50.11%.

❗ Current head 63a60c6 differs from pull request most recent head 29f7d2c. Consider uploading reports for the commit 29f7d2c to get more accurate results

@@                  Coverage Diff                  @@
##           version-13-hotfix   #17930      +/-   ##
=====================================================
+ Coverage              58.62%   62.76%   +4.14%     
=====================================================
  Files                    770      755      -15     
  Lines                  69116    67840    -1276     
  Branches                6034     5989      -45     
=====================================================
+ Hits                   40517    42581    +2064     
+ Misses                 25123    21785    -3338     
+ Partials                3476     3474       -2     
Flag Coverage Δ
server ?
server-mariadb 66.41% <55.62%> (?)
server-postgres 66.48% <55.62%> (?)

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

@barredterra barredterra removed their assignment Aug 24, 2022
@barredterra
Copy link
Collaborator

Failing test (event streaming) seems to be unrelated

@ankush ankush merged commit 1eb7248 into version-13-hotfix Aug 30, 2022
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-17924 branch August 30, 2022 14:03
frappe-pr-bot pushed a commit that referenced this pull request Sep 6, 2022
# [13.41.0](v13.40.0...v13.41.0) (2022-09-06)

### Bug Fixes

* comma looks like a decimal in report summary widget ([#18014](#18014)) ([#18016](#18016)) ([af2598e](af2598e))
* **Data Import:** make warnings translatable (backport [#17924](#17924)) ([#17930](#17930)) ([1eb7248](1eb7248))
* **oauth:** Send id_token of the authorized user instead of Guest (backport [#17266](#17266)) ([#18007](#18007)) ([415f1f1](415f1f1))

### Features

* add lang to safe globals ([f51780a](f51780a))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.41.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 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.

None yet

3 participants