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

[stable12] Improve text: 'you have now' -> 'you now have' #6464

Merged
merged 2 commits into from Nov 10, 2017

Conversation

@leonklingele-work

leonklingele-work commented Sep 12, 2017

No description provided.

Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
@leonklingele-work

This comment has been minimized.

Show comment
Hide comment
@leonklingele-work

leonklingele-work commented Sep 12, 2017

This backports #6417

@MorrisJobke fyi

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Sep 12, 2017

Codecov Report

Merging #6464 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #6464      +/-   ##
==============================================
+ Coverage       53.77%   53.77%   +<.01%     
  Complexity      22526    22526              
==============================================
  Files            1383     1383              
  Lines           86496    86496              
  Branches         1328     1328              
==============================================
+ Hits            46510    46513       +3     
+ Misses          39986    39983       -3
Impacted Files Coverage Δ Complexity Δ
settings/Mailer/NewUserMailHelper.php 75.71% <100%> (ø) 8 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
lib/private/Security/CertificateManager.php 91.08% <0%> (-1%) 39% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (ø) ⬇️
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️

codecov bot commented Sep 12, 2017

Codecov Report

Merging #6464 into stable12 will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable12    #6464      +/-   ##
==============================================
+ Coverage       53.77%   53.77%   +<.01%     
  Complexity      22526    22526              
==============================================
  Files            1383     1383              
  Lines           86496    86496              
  Branches         1328     1328              
==============================================
+ Hits            46510    46513       +3     
+ Misses          39986    39983       -3
Impacted Files Coverage Δ Complexity Δ
settings/Mailer/NewUserMailHelper.php 75.71% <100%> (ø) 8 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
lib/private/Security/CertificateManager.php 91.08% <0%> (-1%) 39% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (ø) ⬇️
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️

@LukasReschke LukasReschke added this to the Nextcloud 12.0.4 milestone Sep 12, 2017

@MorrisJobke MorrisJobke changed the title from Improve text: 'you have now' -> 'you now have' to [stable12] Improve text: 'you have now' -> 'you now have' Sep 13, 2017

@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Sep 13, 2017

Member

Blocked until #6417 (comment) is in.

Member

MorrisJobke commented Sep 13, 2017

Blocked until #6417 (comment) is in.

Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Nov 9, 2017

Member

Blocked until #6417 (comment) is in.

Fixed in #7117

Member

MorrisJobke commented Nov 9, 2017

Blocked until #6417 (comment) is in.

Fixed in #7117

@blizzz

blizzz approved these changes Nov 10, 2017

@blizzz blizzz merged commit 14986e0 into stable12 Nov 10, 2017

1 check failed

continuous-integration/drone/pr the build failed
Details

@blizzz blizzz deleted the proper-english-nowhave-backport-stable12 branch Nov 10, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment