Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Comments

fix: check len(item) before replace "\\n" with "\n" (backport #35571)#35665

Merged
akhilnarang merged 2 commits intoversion-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-35571
Jan 5, 2026
Merged

fix: check len(item) before replace "\\n" with "\n" (backport #35571)#35665
akhilnarang merged 2 commits intoversion-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-35571

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2026

This is an updated version of PR #33855.
It fixes an issue where incorrectly formatted CSV translation rows caused incomplete translations, as reported in #35518.

backport version-15-hotfix
backport version-16-beta


This is an automatic backport of pull request #35571 done by Mergify.

(cherry picked from commit b578597)

# Conflicts:
#	frappe/translate.py
@mergify mergify bot added the conflicts label Jan 5, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 5, 2026

Cherry-pick of b578597 has failed:

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

You are currently cherry-picking commit b5785972d1.
  (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/translate.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@akhilnarang akhilnarang enabled auto-merge (squash) January 5, 2026 13:30
@akhilnarang akhilnarang merged commit a9cfae6 into version-15-hotfix Jan 5, 2026
16 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-15-hotfix/pr-35571 branch January 5, 2026 13:46
frappe-pr-bot pushed a commit that referenced this pull request Jan 6, 2026
# [15.95.0](v15.94.1...v15.95.0) (2026-01-06)

### Bug Fixes

* add boolean labels for filter display in print/pdf ([35ae63f](35ae63f))
* add compatibility shim for old `frappe.pulse.utils` imports ([82168fd](82168fd))
* check len(item) before replace "\\n" with "\n" (backport [#35571](#35571)) ([#35665](#35665)) ([a9cfae6](a9cfae6))
* correct boolean label handling for filter display ([d366b13](d366b13))
* **data import:** consider fieldname if label is null for col_build ([e2cc64f](e2cc64f))
* description of the permission types ([#35599](#35599)) ([952a61b](952a61b))
* **desk:** guard owner/modified_by access in update_user_info ([#35581](#35581)) ([#35582](#35582)) ([a117b2b](a117b2b)), closes [#35557](#35557)
* Fetch user info for owner, modified_by and versions ([#35557](#35557)) ([#35558](#35558)) ([d5575f0](d5575f0))
* fix merge conflicts ([95ec208](95ec208))
* handle precision correctly when decimal string is empty ([#35526](#35526)) ([218d6d6](218d6d6))
* handle string input for bulk_capture events ([d2b84bf](d2b84bf))
* invalid import ([01c550e](01c550e))
* is_enabled is not updated on system settings change ([7eaa22f](7eaa22f))
* **kanban:** ensure that we don't try to access [0] of an empty list ([#35680](#35680)) ([#35682](#35682)) ([95bcc4a](95bcc4a))
* Log errors for bulk action update ([#35563](#35563)) ([6cf4284](6cf4284))
* **login:** don't let button text stuck at "Verifying" if you get rate limited ([#35671](#35671)) ([#35678](#35678)) ([a24f79b](a24f79b)), closes [#35402](#35402)
* **oauth2:** introspect_token requires `token` ([#35647](#35647)) ([#35668](#35668)) ([d06c428](d06c428))
* **postgres:** add pg compatible query for copying comm_date from comm to comm_link ([#35488](#35488)) ([8cef157](8cef157))
* **postgres:** drop_index_if_exists uses DROP INDEX IF EXISTS ([#35636](#35636)) ([7ba317f](7ba317f))
* preserve old behaviour ([55b5173](55b5173))
* prevent adding of grid rows on tab press when cannot_add_rows is set ([#35570](#35570)) ([a43d3b8](a43d3b8))
* prevent empty filter export in query report ([#35357](#35357)) ([#35403](#35403)) ([10b8222](10b8222))
* Remove DNT based check ([#35588](#35588)) ([#35591](#35591)) ([f94f28a](f94f28a))
* remove filter to maintain previous behaviour ([#35626](#35626)) ([#35629](#35629)) ([3325871](3325871))
* resolve merge conflicts ([#35609](#35609)) ([1fccdbf](1fccdbf))
* **setup_wizard:** don't update all users ([#35679](#35679)) ([#35691](#35691)) ([62d7985](62d7985)), closes [#33360](#33360)
* skip non-html object types (backport [#24524](#24524)) ([#35632](#35632)) ([ed8b735](ed8b735))
* Tree Report buttons state not matching initial_depth ([#34505](#34505)) ([#35435](#35435)) ([587ad14](587ad14))
* update datetime import for timezone compatibility ([cacb9c6](cacb9c6))
* update get_applied_filters to handle boolean labels correctly ([#35614](#35614)) ([cd36d52](cd36d52))
* use reportview get_count for client get_count ([#35657](#35657)) ([#35694](#35694)) ([6cdb7b6](6cdb7b6))

### Features

* add test cases ([6c7d669](6c7d669))
* import custom DocType Links on app install/migrate ([#34516](#34516)) ([#35612](#35612)) ([ab5c05d](ab5c05d))
* override custom report print format from report settings (backport [#35445](#35445)) ([#35603](#35603)) ([a1b01e6](a1b01e6)), closes [#35606](#35606)
* whitelist capture methods for client side events ([30f59b5](30f59b5))

### Performance Improvements

* Reduce memory usage of exif stripping ([#35566](#35566)) ([#35568](#35568)) ([79715a7](79715a7))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.95.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 Jan 21, 2026
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.

3 participants