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

Fix translation bug on lost password page #9531

Merged
merged 1 commit into from
May 22, 2018

Conversation

remyj38
Copy link
Contributor

@remyj38 remyj38 commented May 20, 2018

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

Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin [email protected]

@codecov
Copy link

codecov bot commented May 20, 2018

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 Files Coverage Δ Complexity Δ
core/Controller/LostController.php 80% <50%> (-0.4%) 33 <0> (+1)
apps/files_trashbin/lib/Trashbin.php 72.7% <0%> (+0.24%) 136% <0%> (ø) ⬇️

@tflidd tflidd added the 3. to review Waiting for reviews label May 20, 2018
@rullzer rullzer added this to the Nextcloud 14 milestone May 22, 2018
Copy link
Member

@ChristophWurst ChristophWurst left a comment

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:master May 22, 2018
@MorrisJobke
Copy link
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
Contributor Author

remyj38 commented May 22, 2018

Done : #9549 and #9548

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants