Skip to content

[stable18] Fix languages empty array - #20877

Merged
rullzer merged 1 commit into
stable18from
backport/20719/stable18
May 12, 2020
Merged

[stable18] Fix languages empty array#20877
rullzer merged 1 commit into
stable18from
backport/20719/stable18

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented May 8, 2020•
edited
Loading

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #20719

@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 18.0.5 milestone May 8, 2020
@skjnldsv

skjnldsv commented May 8, 2020

Copy link
Copy Markdown
Member

@GretaD please check what is missing from the original pr.
There was some conflicts

@skjnldsvskjnldsv added the 2. developing Work in progress label May 9, 2020
@GretaD
GretaDforce-pushed the backport/20719/stable18 branch from e02b53f to a661f65CompareMay 11, 2020 10:44
@GretaDGretaD added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 11, 2020
@skjnldsv

skjnldsv commented May 11, 2020

Copy link
Copy Markdown
Member
1) OCA\Provisioning_API\Tests\Controller\UsersControllerTest::testGetUserDataAsAdmin
136 | Error: Call to undefined method PHPUnit\Framework\MockObject\Builder\InvocationMocker::willRreturn()
137 | 138 | /drone/src/apps/provisioning_api/tests/Controller/UsersControllerTest.php:963
139

ChristophWurst
ChristophWurst reviewed May 11, 2020
View reviewed changes
Comment threadapps/provisioning_api/tests/Controller/UsersControllerTest.php Outdated
->expects($this->once())
->method('getSystemValue')
->with('force_language', 'de')
->willRreturn('de');

@ChristophWurstChristophWurstMay 11, 2020

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.

rrrrrrrrrrrrrrrr

@GretaDGretaDMay 11, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wrong, its rr not rrrrrrrrrrrrrrrr, thats because i like Russian accent

@GretaD
Fix languages empty array
d833827
Signed-off-by: GretaD <gretadoci@gmail.com>
@GretaD
GretaDforce-pushed the backport/20719/stable18 branch from a661f65 to d833827CompareMay 11, 2020 13:04
@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 May 11, 2020
@rullzer
rullzer merged commit 3142054 into stable18May 12, 2020
@rullzer
rullzer deleted the backport/20719/stable18 branch May 12, 2020 11:41
@rullzerrullzer mentioned this pull request May 21, 2020
Merged
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@georgehrkegeorgehrkegeorgehrke approved these changes
@blizzzblizzzAwaiting requested review from blizzz
@GretaDGretaDAwaiting requested review from GretaD
@rullzerrullzerAwaiting requested review from rullzer
@skjnldsvskjnldsvAwaiting requested review from skjnldsv

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: language/translations (l10n/i18n)Localization and translation mattersfeature: users and groups

Projects

None yet

Milestone

Nextcloud 18.0.5

Development

Successfully merging this pull request may close these issues.

6 participants

@skjnldsv@MorrisJobke@georgehrke@ChristophWurst@GretaD@rullzer