Skip to content

Use correct L10N files for jsconfig - #7712

Merged
MorrisJobke merged 1 commit into
masterfrom
jsconfig_l10n
Jan 5, 2018
Merged

Use correct L10N files for jsconfig#7712
MorrisJobke merged 1 commit into
masterfrom
jsconfig_l10n

Conversation

@rullzer

Copy link
Copy Markdown
Member

To test:

  1. set lanugage to other than english
  2. open date picket (for example when setting expiration date on a share)

Before: still english
Now: Properly translated

Comment threadcore/Controller/OCJSController.php Outdated
public function __construct($appName,
IRequest $request,
IL10N $l,
IFactory $l,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

mind renaming it to something other than $l its quite confusing, because $l is reserved for IL10N

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Done

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

"Moments when I have DI magic" +1

@codecov

codecovBot commented Jan 5, 2018

Copy link
Copy Markdown

Codecov Report

Merging #7712 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7712 +/- ##
============================================
+ Coverage 51.18% 51.18% +<.01% 
Complexity 24948 24948 ============================================
Files 1605 1605 Lines 94923 94923 Branches 1376 1376 ============================================
+ Hits 48583 48584 +1 + Misses 46340 46339 -1
Impacted FilesCoverage ΔComplexity Δ
lib/private/TemplateLayout.php0% <0%> (ø)46 <0> (ø)⬇️
core/Controller/OCJSController.php0% <0%> (ø)2 <0> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️

Comment threadcore/Controller/OCJSController.php Outdated
public function __construct($appName,
IRequest $request,
IL10N $l,
IFactory $l10Factory,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

*n

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 5, 2018
@MorrisJobke
MorrisJobke merged commit 68e205e into masterJan 5, 2018
@MorrisJobke
MorrisJobke deleted the jsconfig_l10n branch January 5, 2018 14:22
@MorrisJobkeMorrisJobke mentioned this pull request Jan 9, 2018
18 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugregression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@nickvergessen@juliusknorr@MorrisJobke