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 half-translated GUI strings on Windows #7490

Merged
merged 6 commits into from
Nov 22, 2024
Merged

Fix half-translated GUI strings on Windows #7490

merged 6 commits into from
Nov 22, 2024

Conversation

claucambra
Copy link
Collaborator

No description provided.

@claucambra claucambra added this to the 3.14.5 milestone Nov 11, 2024
@claucambra claucambra self-assigned this Nov 11, 2024
@claucambra
Copy link
Collaborator Author

/backport to stable-3.14

@Rello Rello modified the milestones: 3.14.5, 3.15.0 Nov 11, 2024
@mgallien
Copy link
Collaborator

I am testing it.
Before this PR on 3.14.3
image
I included also Kate build on top of Qt6 and ki18n KDE Frameworks 6

mgallien
mgallien requested changes Nov 15, 2024
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.

result with the PR
image
that makes it all in French
seems like something is now worse

@claucambra
Copy link
Collaborator Author

result with the PR image that makes it all in French seems like something is now worse

I have reverted to using QLocale::uiLanguages but, this time, only the first language

Could you try again?

@claucambra claucambra requested a review from mgallien November 17, 2024 15:13
mgallien
mgallien requested changes Nov 18, 2024
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.

@claucambra does not build
can you have a look ?

@claucambra claucambra force-pushed the bugfix/win-locale-lang branch 2 times, most recently from 59ee7b8 to d3bd846 Compare November 20, 2024 02:38
@claucambra
Copy link
Collaborator Author

@claucambra does not build can you have a look ?

Sorry, pushed too quickly

Fixed it

@claucambra claucambra requested a review from mgallien November 20, 2024 02:39
@mgallien mgallien force-pushed the bugfix/win-locale-lang branch from d3bd846 to 826afc4 Compare November 20, 2024 16:10
mgallien
mgallien requested changes Nov 20, 2024
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.

@claucambra still not compiling
you may want to check again

@mgallien mgallien force-pushed the bugfix/win-locale-lang branch 3 times, most recently from c294abb to bf735f3 Compare November 22, 2024 09:37
claucambra and others added 6 commits November 22, 2024 11:14
@claucambra @mgallien
Remove unneeded workaround for dash separated language strings
884f800 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Only grab system language from QLocale::system
befc8bf 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
Use first uiLanguage as lang
81bd390 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@mgallien
add include QLocale to fix compilation issue
62e1f43 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
use CI images including Qt6.7 that is now required
f6ea58f 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
we require Qt 6.7 release to build
0ec73cb 
we use new API from Qt6.7

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/win-locale-lang branch from bf735f3 to 0ec73cb Compare November 22, 2024 10:14
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7490-0ec73cb88561d8c1d4de88d45871677297a4a1cd-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.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
12 New Code Smells (required ≤ 0)
D Security Rating on New Code (required ≥ A)
E Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@mgallien mgallien merged commit 5a96352 into master Nov 22, 2024
12 of 16 checks passed
@mgallien mgallien deleted the bugfix/win-locale-lang branch November 22, 2024 11:00
@backportbot backportbot bot mentioned this pull request Nov 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien requested changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.15.0
Development

Successfully merging this pull request may close these issues.
4 participants
@claucambra @mgallien @nextcloud-desktop-bot @Rello