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

Use correct L10N files for jsconfig #7712

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Use correct L10N files for jsconfig #7712

merged 1 commit into from
Jan 5, 2018

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Jan 5, 2018

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

@@ -62,7 +62,7 @@ class OCJSController extends Controller {
*/
public function __construct($appName,
IRequest $request,
IL10N $l,
IFactory $l,
Copy link
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
Member Author

Choose a reason for hiding this comment

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

Done

Copy link
Member

@nickvergessen nickvergessen left a comment

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
Copy link

codecov bot commented Jan 5, 2018

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 Files Coverage Δ Complexity Δ
lib/private/TemplateLayout.php 0% <0%> (ø) 46 <0> (ø) ⬇️
core/Controller/OCJSController.php 0% <0%> (ø) 2 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️

@@ -62,7 +62,7 @@ class OCJSController extends Controller {
*/
public function __construct($appName,
IRequest $request,
IL10N $l,
IFactory $l10Factory,
Copy link
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>
@MorrisJobke MorrisJobke 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 master Jan 5, 2018
@MorrisJobke MorrisJobke deleted the jsconfig_l10n branch January 5, 2018 14:22
@MorrisJobke MorrisJobke mentioned this pull request Jan 9, 2018
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants