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: do not mark custom field as translatable by default #25285

Merged

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Mar 7, 2024

This is a special feature that should only be enabled explicitly. In DocField, it's already disabled by default.

This is a special feature that should be enabled explicitly. In DocField, it's already disabled by default.
@barredterra barredterra requested review from a team and ankush and removed request for a team March 7, 2024 16:38
@barredterra barredterra added backport version-14-hotfix backport to version 14 backport version-15-hotfix Backport the PR to v15 labels Mar 7, 2024
@barredterra
Copy link
Collaborator Author

All failing tests seem to be unrelated

@ankush
Copy link
Member

ankush commented Mar 10, 2024

@Mergifyio update

Copy link
Contributor

mergify bot commented Mar 10, 2024

update

✅ Branch has been successfully updated

@ankush
Copy link
Member

ankush commented Mar 10, 2024

tests fixed here: #25296

@barredterra barredterra merged commit eecb31e into frappe:develop Mar 11, 2024
24 checks passed
@barredterra barredterra deleted the custom-field-translatable-default branch March 11, 2024 10:39
ankush pushed a commit that referenced this pull request Mar 11, 2024
…5285) (#25329)

* fix: do not mark custom field as translatable by default

This is a special feature that should be enabled explicitly. In DocField, it's already disabled by default.

(cherry picked from commit b26dcdc)

# Conflicts:
#	frappe/custom/doctype/custom_field/custom_field.json

* chore: resolve conflicts

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Mar 12, 2024
## [14.67.1](v14.67.0...v14.67.1) (2024-03-12)

### Bug Fixes

* Add `is_virtual` in bootstrap schema ([cbc4640](cbc4640))
* **auto_email_report:** check if column (docfield) parent is a child table ([#25335](#25335)) ([#25341](#25341)) ([3f0c823](3f0c823))
* commit regardless of framework's transaction_writes count ([#25322](#25322)) ([#25327](#25327)) ([0ee8e30](0ee8e30))
* delete doctype cache before starting migration ([2c1e615](2c1e615))
* Delete EPS logs before deleting user (backport [#25248](#25248)) ([#25249](#25249)) ([0dee65c](0dee65c))
* do not mark custom field as translatable by default (backport [#25285](#25285)) ([#25329](#25329)) ([c46b7ff](c46b7ff))
* explicit optional ([71af71a](71af71a))
* ignore route history and access log from link check ([5344c8e](5344c8e))
* mac shortcuts ([ec9164f](ec9164f))
* missing timeline timestamp for comments ([294a0a3](294a0a3)), closes [/github.com//pull/24884/files#r1519195726](https://github.com//github.com/frappe/frappe/pull/24884/files/issues/r1519195726)
* **ModuleDef:** Add list view filter options to app_name Select ([253e9a0](253e9a0))
* Private images in PDFs from background jobs ([#24980](#24980)) ([7d4eaa6](7d4eaa6))
* rollback invalid customize form changes (backport [#25198](#25198)) ([#25339](#25339)) ([e833e09](e833e09))
* show "Shift" symbol istead of text ([41759ff](41759ff))
* Skip virtual doctypes in link field checks ([#24759](#24759)) ([#25332](#25332)) ([3fe2372](3fe2372))
* **uninstall:** don't allow uninstalling an app if we have other apps dependent on it ([8d04076](8d04076))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 backport version-15-hotfix Backport the PR to v15
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants