Skip to content

Use translations from lib and not from core#37056

Merged
phil-davis merged 2 commits intomasterfrom
bugfix/37040
Mar 3, 2020
Merged

Use translations from lib and not from core#37056
phil-davis merged 2 commits intomasterfrom
bugfix/37040

Conversation

@DeepDiver1975
Copy link
Copy Markdown
Member

@DeepDiver1975 DeepDiver1975 commented Mar 2, 2020

Description

The wrong translation context was used.
And default_language is taken into consideration

Related Issue

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@DeepDiver1975 DeepDiver1975 self-assigned this Mar 2, 2020
@owncloud owncloud deleted a comment from update-docs bot Mar 2, 2020
@phil-davis
Copy link
Copy Markdown
Contributor

@DeepDiver1975 unit test needs looking at.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 2, 2020

Codecov Report

Merging #37056 into master will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #37056   +/-   ##
=========================================
  Coverage     64.75%   64.75%           
  Complexity    19138    19138           
=========================================
  Files          1270     1270           
  Lines         74915    74915           
  Branches       1329     1329           
=========================================
  Hits          48513    48513           
  Misses        26011    26011           
  Partials        391      391           
Flag Coverage Δ Complexity Δ
#javascript 54.17% <ø> (ø) 0.00 <ø> (ø) ⬆️
#phpunit 65.93% <100.00%> (ø) 19138.00 <10.00> (ø) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/DAV/FileCustomPropertiesBackend.php 89.32% <0.00%> (ø) 33.00% <0.00%> (ø%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cb8d8cd...96e7e11. Read the comment docs.

Copy link
Copy Markdown
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unit test change LGTM

@phil-davis phil-davis merged commit b03e61e into master Mar 3, 2020
@delete-merged-branch delete-merged-branch bot deleted the bugfix/37040 branch March 3, 2020 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants