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: german translations #17663

Merged
merged 2 commits into from
Aug 9, 2022
Merged

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Jul 28, 2022

  • Clarify string in Link Selector to avoid confusion with other meanings of "Set"

  • Add context for "Check" type filter

  • Fix translations of "Set" and "Not Set" for filter context.

    Context-specific translation doesn't seem to work right now. Therefore, I checked for other usages and changed the translations without context.

    Bildschirmfoto 2022-07-28 um 21 14 13

For ERPNext users to see updated translations, frappe/erpnext#31732 needs to get merged as well.

@barredterra barredterra requested review from a team and shariquerik and removed request for a team July 28, 2022 19:13
@ankush
Copy link
Member

ankush commented Aug 2, 2022

@barredterra can you refresh branch

@barredterra barredterra requested a review from ankush August 4, 2022 14:52
@codecov
Copy link

codecov bot commented Aug 4, 2022

Codecov Report

Merging #17663 (b05a3f2) into develop (f6210e7) will increase coverage by 0.98%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #17663      +/-   ##
===========================================
+ Coverage    56.73%   57.72%   +0.98%     
===========================================
  Files          750      759       +9     
  Lines        67905    68612     +707     
  Branches      5806     5971     +165     
===========================================
+ Hits         38527    39606    +1079     
+ Misses       25738    25588     -150     
+ Partials      3640     3418     -222     
Flag Coverage Δ
server 61.77% <ø> (-1.95%) ⬇️
ui-tests 50.74% <100.00%> (+6.37%) ⬆️

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

@ankush
Copy link
Member

ankush commented Aug 9, 2022

why is this test consistently failing 🙄 doesn't even seem to be related.

seulement is french, so probably some test is leaking state.

Screenshot 2022-08-09 at 3 05 48 PM

@ankush
Copy link
Member

ankush commented Aug 9, 2022

test_link_search_in_foreign_language is leaking state 🥲

#17768

@ankush ankush merged commit 769abcf into frappe:develop Aug 9, 2022
@ankush ankush added the backport version-14-hotfix backport to version 14 label Aug 9, 2022
mergify bot pushed a commit that referenced this pull request Aug 9, 2022
(cherry picked from commit 769abcf)
ankush pushed a commit that referenced this pull request Aug 9, 2022
(cherry picked from commit 769abcf)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
@barredterra barredterra deleted the german-filter-translations branch August 9, 2022 23:32
frappe-pr-bot pushed a commit that referenced this pull request Aug 11, 2022
# [14.1.0](v14.0.2...v14.1.0) (2022-08-11)

### Bug Fixes

* add_user_permission with applicale_for arg set not updating in user permission ([804ce72](804ce72))
* assume parentfield to be set and valid ([e28674b](e28674b))
* check permlevel only if > 0 ([63f2cf5](63f2cf5))
* consistent fieldnames and keep port alongside server field ([c4f1619](c4f1619))
* **db:** Log mogrified queries ([ba1cdf8](ba1cdf8))
* dont init child doc ([94b760c](94b760c))
* dont pass doc to tooltip formatter on reportview ([d049c87](d049c87))
* german translations ([#17663](#17663)) ([#17771](#17771)) ([fd3eaa6](fd3eaa6))
* get correct doc when checking child table permission ([9b89dc6](9b89dc6))
* handle permlevel ([06ebd95](06ebd95))
* ignore built assets in translation ([53357e2](53357e2))
* ignore forms without docs in realtime events ([afc060f](afc060f))
* init only existing single doctypes ([75b6a33](75b6a33))
* limit allowed attributes for lazy images ([#17775](#17775)) ([1311564](1311564))
* **patch:** update multi step webform's Section Break fields to Page Break ([#17797](#17797)) ([#17798](#17798)) ([b3dc4c0](b3dc4c0))
* raise ImplicitCommitError instead of bare exception ([e2c6497](e2c6497))
* reverse logic for failing permission check ([7891674](7891674))
* **sanitize-html:** allow all data-* attrs ([9b94479](9b94479))
* send all messages on boot instead of scanning ([d61b7e8](d61b7e8))
* update append_to misleading message in email account ([#17718](#17718)) ([#17796](#17796)) ([cd86462](cd86462))
* **ux:** email domain doctype ([48c4a8d](48c4a8d))
* Webform Misc Fix (backport [#17642](#17642)) ([#17746](#17746)) ([86f9fbc](86f9fbc))

### Features

* JS extractor and custom JS parser ([fed4ae9](fed4ae9))
* **minor:** add connection link to email accounts in email domain ([821549d](821549d))
* **minor:** fetch attachment_limit from get_max_file_size api ([5190a49](5190a49))
* modified parser for frappe JS translate syntax ([0e87d21](0e87d21))
* Multilanguage sites: language selector only will show "enabled" languages and language default always will be System default ([#17745](#17745)) ([e5b8a47](e5b8a47))
* use AST to extract translation sources ([e02a73f](e02a73f))

### Performance Improvements

* reduce DB calls made in `get_fetch_values` ([#17671](#17671)) ([#17739](#17739)) ([dc19f69](dc19f69))

### Reverts

* Remove emoji from doctype ([c102124](c102124))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 4, 2022
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.

2 participants