Skip to content

Fix translation bug on lost password page - #9531

Merged
MorrisJobke merged 1 commit into
nextcloud:masterfrom
remyj38:master
May 22, 2018
Merged

Fix translation bug on lost password page#9531
MorrisJobke merged 1 commit into
nextcloud:masterfrom
remyj38:master

Conversation

@remyj38

Copy link
Copy Markdown
Contributor

During resetting user's password, the controller return the untranslated message (from basic exception) instead of the hint message (translated).

Fixnextcloud/password_policy#26

Signed-off-by: Rémy Jacquin remy@remyj.fr

Fixnextcloud/password_policy#26
Signed-off-by: Rémy Jacquin <remy@remyj.fr>
@codecov

codecovBot commented May 20, 2018

Copy link
Copy Markdown

Codecov Report

Merging #9531 into master will increase coverage by <.01%.
The diff coverage is 50%.

@@ Coverage Diff @@## master #9531 +/- ##
============================================
+ Coverage 51.69% 51.69% +<.01% - Complexity 25744 25745 +1 
============================================
Files 1643 1643 Lines 96506 96508 +2 Branches 1393 1393 ============================================
+ Hits 49888 49890 +2 
Misses 46618 46618
Impacted FilesCoverage ΔComplexity Δ
core/Controller/LostController.php80% <50%> (-0.4%)33 <0> (+1)
apps/files_trashbin/lib/Trashbin.php72.7% <0%> (+0.24%)136% <0%> (ø)⬇️

@tfliddtflidd added the 3. to review Waiting for reviews label May 20, 2018
@rullzerrullzer added this to the Nextcloud 14 milestone May 22, 2018

@ChristophWurstChristophWurst 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.

Nice!

@MorrisJobke
MorrisJobke merged commit 245d20f into nextcloud:masterMay 22, 2018
@MorrisJobke

Copy link
Copy Markdown
Member

@remyj38 Thanks for your contribution :) 👍 Do you mind to create two branches based on stable13 and stable12, cherry pick the commit from this PR and open two pull requests to those branches to backport the fixes in here?

Thanks in advance :)

@remyj38

Copy link
Copy Markdown
ContributorAuthor

Done : #9549 and #9548

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@remyj38@MorrisJobke@rullzer@ChristophWurst@tflidd