Skip to content

use an en-dash for the userstatus panel #4671

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 30, 2022
Merged

use an en-dash for the userstatus panel #4671

merged 1 commit into from
Jun 30, 2022

Conversation

szaimen
Copy link
Contributor

@szaimen szaimen commented Jun 24, 2022

Just noticed in #4624

Signed-off-by: szaimen szaimen@e.mail.de

claucambra
claucambra approved these changes Jun 24, 2022
View reviewed changes
Copy link
Contributor

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Looks good!

@szaimen

This comment was marked as resolved.

Sign in to view
@codecov
Copy link

codecov bot commented Jun 24, 2022 •
edited
Loading

Codecov Report

Merging #4671 (d81d3b1) into master (277aefc) will increase coverage by 0.16%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4671      +/-   ##
==========================================
+ Coverage   56.42%   56.59%   +0.16%     
==========================================
  Files         138      138              
  Lines       17069    17069              
==========================================
+ Hits         9632     9660      +28     
+ Misses       7437     7409      -28
Impacted Files Coverage Δ
src/libsync/propagatedownload.cpp 65.33% <0.00%> (+0.14%) ⬆️
src/libsync/discovery.cpp 84.86% <0.00%> (+0.29%) ⬆️
src/libsync/syncengine.cpp 85.74% <0.00%> (+0.54%) ⬆️
src/libsync/vfs/cfapi/cfapiwrapper.cpp 77.34% <0.00%> (+1.92%) ⬆️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 86.46% <0.00%> (+2.62%) ⬆️
src/libsync/vfs/cfapi/hydrationjob.cpp 56.45% <0.00%> (+3.76%) ⬆️

@szaimen

This comment was marked as resolved.

Sign in to view
@szaimen
Copy link
Contributor Author

szaimen commented Jun 27, 2022

Please merge if the change is fine :)

@szaimen szaimen force-pushed the enh/noid/use-em-dash branch from cc76ca4 to 0d90eae Compare June 27, 2022 16:43
@szaimen szaimen requested a review from claucambra June 28, 2022 10:02
jancborchardt
jancborchardt requested changes Jun 28, 2022
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment •
edited
Loading

Choose a reason for hiding this comment

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

We do not use em dashes anywhere, but en. :) –
So either we should use that, or maybe even the nicer middle dot which we often use: ·

@szaimen szaimen changed the title use an em-dash for the userstatus panel use an en-dash for the userstatus panel Jun 28, 2022
@szaimen
Copy link
Contributor Author

szaimen commented Jun 28, 2022 •
edited
Loading

We do not use em dashes anywhere, but en. :) –

Sorry I confused the name of them. The en dash is already applied in this PR :)

@szaimen szaimen requested a review from jancborchardt June 28, 2022 10:58
@jancborchardt
Copy link
Member

@szaimen I did copy it earlier to check but it didn't seem like it was, it was actually an em dash?

@szaimen
Copy link
Contributor Author

szaimen commented Jun 28, 2022

We do not use em dashes anywhere, but en. :) –

Hm... Isn't this an en dash? Can you paste an en dash here? I will use it here then...

@jancborchardt
Copy link
Member

Yes, as pasted above: –

@szaimen szaimen force-pushed the enh/noid/use-em-dash branch from d4a2d65 to 45d24bc Compare June 28, 2022 21:09
@szaimen
Copy link
Contributor Author

szaimen commented Jun 28, 2022

All right! should be the correct one now. Please have a look again :)

@szaimen
Copy link
Contributor Author

szaimen commented Jun 29, 2022

@jancborchardt please have a look again :)

jancborchardt
jancborchardt approved these changes Jun 30, 2022
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Nice – very! :D

@szaimen
Copy link
Contributor Author

szaimen commented Jun 30, 2022

Thanks! :)

@szaimen
Copy link
Contributor Author

szaimen commented Jun 30, 2022

@claucambra @mgallien what is needed for merging this? :)

@szaimen @claucambra
use an en-dash for the userstatus panel
d81d3b1 
Signed-off-by: szaimen <szaimen@e.mail.de>
@claucambra claucambra force-pushed the enh/noid/use-em-dash branch from 45d24bc to d81d3b1 Compare June 30, 2022 12:34
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-4671-d81d3b188a8e95fce076d82360ac573bf71dc66b-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@szaimen szaimen merged commit 5546523 into master Jun 30, 2022
@szaimen szaimen deleted the enh/noid/use-em-dash branch June 30, 2022 13:36
@mgallien mgallien added this to the 3.6.0 milestone Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jancborchardt jancborchardt jancborchardt approved these changes

@claucambra claucambra claucambra approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.6.0
Development

Successfully merging this pull request may close these issues.
5 participants
@szaimen @jancborchardt @nextcloud-desktop-bot @claucambra @mgallien