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: make operator in link filters translatable #20884

Merged
merged 1 commit into from
May 3, 2023

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented May 3, 2023

Translate operators such as "in", "not in", "descendents of", etc. in link field filters.

Translations already exist for the unscrubbed version, therefore we unscrub before translating.

@barredterra barredterra requested review from a team, phot0n and marination and removed request for a team May 3, 2023 14:57
@barredterra barredterra changed the title fix: translate operator in link filters fix: make operator in link filters translatable May 3, 2023
@phot0n phot0n merged commit a254a25 into frappe:develop May 3, 2023
14 of 15 checks passed
@phot0n
Copy link
Contributor

phot0n commented May 3, 2023

The unscrubbed filters will start looking a bit indistinguishable isn't it? since they will have similar casing. we could just enable normal translations?

edit: actually doesnt look that bad

Screenshot from 2023-05-04 03-21-44

still i feel like they should be in lower case?

@barredterra barredterra deleted the translate-operator branch May 3, 2023 22:23
@barredterra
Copy link
Collaborator Author

@phot0n I have no strong opinions on that. I only unscrubbed in order to reuse existing translations from list filters. We can just as well add these translations for german.

@phot0n
Copy link
Contributor

phot0n commented May 5, 2023

I've removed the unscrubbing in 4418aa3

feel free to add translations for those :)

phot0n pushed a commit that referenced this pull request May 5, 2023
…0911)

* fix: translate operator in link filters

(cherry picked from commit 7892a8b)

* chore: remove unscrubbing while displaying link field filters

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
phot0n pushed a commit that referenced this pull request May 9, 2023
…0910)

* fix: translate operator in link filters

(cherry picked from commit 7892a8b)

# Conflicts:
#	frappe/public/js/frappe/form/controls/link.js

* chore: remove unscrubbing while displaying link field filters

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request May 9, 2023
## [13.56.2](v13.56.1...v13.56.2) (2023-05-09)

### Bug Fixes

* ensure that `get_last_email` returns the most recent email ([#20711](#20711)) ([d416159](d416159))
* make operator in link filters translatable (backport [#20884](#20884)) ([#20910](#20910)) ([688a2b4](688a2b4))
* merge conflict ([64d5c8f](64d5c8f))
* translate lowercase operators to german ([#20912](#20912)) ([#20915](#20915)) ([598bdaf](598bdaf))
* use smaller font only if the report doesnt have a standard print format (backport [#20878](#20878)) ([#20946](#20946)) ([8b0c1f8](8b0c1f8))
frappe-pr-bot pushed a commit that referenced this pull request May 9, 2023
# [14.36.0](v14.35.0...v14.36.0) (2023-05-09)

### Bug Fixes

* ensure that `get_last_email` returns the most recent email (backport [#20711](#20711)) ([624f96b](624f96b))
* escape html from listview row title ([56bec1d](56bec1d))
* escape html from workspace title ([e68fc43](e68fc43))
* ignore virtual doctypes during data export ([#20891](#20891)) ([#20899](#20899)) ([d6bfaae](d6bfaae))
* make operator in link filters translatable (backport [#20884](#20884)) ([#20911](#20911)) ([1ec3bad](1ec3bad))
* message.py executing script ([#20887](#20887)) ([#20897](#20897)) ([1bcf5d4](1bcf5d4))
* **multi-pdf:** change response type to pdf ([997559c](997559c))
* **oauth:** add exp to idToken ([#20694](#20694)) ([#20903](#20903)) ([1a8e671](1a8e671))
* reload communication before re-save ([#20914](#20914)) ([#20921](#20921)) ([37a8ec0](37a8ec0))
* set default letterhead and print format ([a5a6965](a5a6965))
* strip comma, space from recipients before sending email for auto repeat ([#20940](#20940)) ([#20945](#20945)) ([042a1d2](042a1d2))
* translate lowercase operators to german ([#20912](#20912)) ([#20916](#20916)) ([c47b146](c47b146))
* type hints for get_address_display ([#20923](#20923)) ([#20924](#20924)) ([15df963](15df963))
* use smaller font only if the report doesnt have a standard print format ([#20878](#20878)) ([#20947](#20947)) ([35165d0](35165d0))

### Features

* helper method for address display ([#20900](#20900)) ([#20901](#20901)) ([f914770](f914770))
* telemetry using posthog (backport [#20825](#20825)) ([#20934](#20934)) ([bbe29ee](bbe29ee))

### Performance Improvements

* get all file data at once when downloading private file ([#20902](#20902)) ([e106594](e106594))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 20, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants