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.

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

Fix text strings #3792

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Fix text strings #3792

merged 2 commits into from
Dec 3, 2024
+6 −6

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Sep 14, 2021

Changing text strings to correctly import them into Transifex.
Issue #3776.

Signed-off-by: Valdnet [email protected]

rakekniven
rakekniven requested changes Sep 15, 2021
View reviewed changes
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
mgallien
mgallien requested changes Sep 21, 2021
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

please see my comments

src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 21, 2021

@mgallien I corrected the code. Can you recheck and approve?

mgallien
mgallien approved these changes Sep 21, 2021
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

thanks

allexzander
allexzander suggested changes Sep 21, 2021
View reviewed changes
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
mgallien
mgallien requested changes Sep 21, 2021
View reviewed changes
src/gui/userstatusselectormodel.cpp Outdated Show resolved Hide resolved
@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 21, 2021

@mgallien @allexzander Done. Please check and approve.

@Valdnet Valdnet requested a review from mgallien September 22, 2021 09:03
@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 22, 2021

@mgallien Done 😉.

@rakekniven rakekniven removed their request for review September 22, 2021 09:17
@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 24, 2021

@mgallien @allexzander Please check and approve 😉.

@FlexW FlexW linked an issue Sep 27, 2021 that may be closed by this pull request
Text strings for 2, 3, and 4 #3776
Closed
@Valdnet Valdnet requested a review from rakekniven September 27, 2021 15:53
@allexzander
Copy link
Contributor

@Valdnet Looks good. Please, just squash your 10 commits into 1 before merging, and rebase against master.

@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 27, 2021

Please, just squash your 10 commits into 1 before merging

@allexzander From the GitHub position, I am not permission to squash. Please do it for me if you can. Thank you.

@rakekniven rakekniven removed their request for review September 28, 2021 07:55
@mgallien
Copy link
Collaborator

@Valdnet I did clean history for you
if you plan to keep contributing, please learn how to do it otherwise I am spending more time on your reviews than on doing the work myself

@Valdnet
Copy link
Contributor Author

Valdnet commented Jun 10, 2022

/rebase

@Valdnet Valdnet force-pushed the Valdnet-patch-1 branch 2 times, most recently from 1497a78 to 7aa64e8 Compare June 12, 2022 09:54
@codecov
Copy link

codecov bot commented Jun 12, 2022 •
edited
Loading

Codecov Report

Merging #3792 (2e9e242) into master (277aefc) will increase coverage by 0.14%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3792      +/-   ##
==========================================
+ Coverage   56.42%   56.57%   +0.14%     
==========================================
  Files         138      138              
  Lines       17069    17069              
==========================================
+ Hits         9632     9656      +24     
+ Misses       7437     7413      -24
Impacted Files Coverage Δ
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%) ⬆️

@sonarcloud
Copy link

sonarcloud bot commented Jun 30, 2022

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Aug 15, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@Rello Rello added this to the 3.16.0 milestone Dec 3, 2024
Valdnet and others added 2 commits December 3, 2024 16:29
@Valdnet @mgallien
improve translations of strings with numbers inside
61ccde6 
tell tr that there is a number inside the translated string such that
translators can provide the proper plural forms

Changing text strings to correctly import them into Transifex.
Issue #3776.

Signed-off-by: Valdnet <[email protected]>
@mgallien
convert double numbers to int because we expect them to be real ints
0640eb6 
we give them to APIs expecting int

we compare them to int values

Signed-off-by: Matthieu Gallien <[email protected]>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-3792-0640eb6c31eebdbbec0ce03cf2e177ee2ed6fc14-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.

@mgallien mgallien merged commit a40d93f into master Dec 3, 2024
12 of 14 checks passed
@mgallien mgallien deleted the Valdnet-patch-1 branch December 3, 2024 16:15
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 3, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@Rello Rello modified the milestones: 3.16.0, 3.15.1 Dec 4, 2024
@mgallien
Copy link
Collaborator

mgallien commented Dec 4, 2024

/backport to stable-3.15

@backportbot backportbot bot mentioned this pull request Dec 4, 2024
Merged
@Rello Rello modified the milestones: 3.16.0, 3.15.1 Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rakekniven rakekniven rakekniven requested changes

@claucambra claucambra claucambra approved these changes

@allexzander allexzander allexzander approved these changes

@mgallien mgallien mgallien approved these changes

@FlexW FlexW Awaiting requested review from FlexW

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@mgallien mgallien

Labels
feature: 👅 language l10n and translations
Projects
None yet
Milestone
3.15.1
Development

Successfully merging this pull request may close these issues.

Text strings for 2, 3, and 4
8 participants
@Valdnet @allexzander @mgallien @camilasan @nextcloud-desktop-bot @rakekniven @claucambra @Rello