sync: from linuxdeepin/dde-session-shell #465
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#43
Reviewer's GuideThis PR syncs upstream changes from linuxdeepin/dde-session-shell by adding a new utility to convert dash-separated strings to camelCase, adjusting lockframe event handling to use this utility conditionally, cleaning up plugin build configuration, importing new Spanish translation templates, and updating reuse metadata. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Contributor
Author
deepin pr auto review根据提供的git diff内容，我来分析一下代码变更并提出改进建议：
这些改进建议旨在提高代码质量、性能和可维护性，同时确保代码的安全性和可靠性。 |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- Wrap the new qtifyName function in an existing namespace (e.g. global_util or dss) instead of placing it in the global namespace.
- Consider simplifying the dash-to-camelCase logic by using QString::split/join or a QRegularExpression rather than a manual character loop.
- The ENABLE_DSS_SNIPE guard around sendKeyValue is scattered; consolidating or documenting its purpose could improve readability and maintainability.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Wrap the new qtifyName function in an existing namespace (e.g. global_util or dss) instead of placing it in the global namespace.
- Consider simplifying the dash-to-camelCase logic by using QString::split/join or a QRegularExpression rather than a manual character loop.
- The ENABLE_DSS_SNIPE guard around sendKeyValue is scattered; consolidating or documenting its purpose could improve readability and maintainability.
## Individual Comments
### Comment 1
<location> `translations/dde-session-shell_es_AR.ts:1` </location>
<code_context>
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_AR">
+<context>
+ <name>AuthFace</name>
</code_context>
<issue_to_address>
Consider consolidating identical Spanish translation files into a single base file and using small override files for regional differences.
Consider collapsing all of the identical `<TS … language="es_XX">` files into one base `es` file and then only shipping tiny “override” files for the locales that actually differ. Qt will merge them at runtime if you load them in order.
1. Rename your big `es_AR.ts` into a single full `es.ts`:
```xml
<?xml version="1.0" ?><!DOCTYPE TS>
<TS version="2.1" language="es">
<context>
<name>AuthFace</name>
<message>
<source>Face ID</source>
<translation>Face ID</translation>
</message>
<!-- … all 571 messages … -->
</context>
<!-- … other contexts … -->
</TS>
```
2. Create an *override* file for Argentina only containing the strings that actually change (if there are none yet you can skip it completely):
```xml
<?xml version="1.0" ?><!DOCTYPE TS>
<TS version="2.1" language="es_AR">
<context>
<name>AuthFace</name>
<message>
<source>Face ID</source>
<translation>ID de rostro</translation>
</message>
</context>
<!-- only contexts/messages that differ -->
</TS>
```
3. Load them in your `main.cpp` (or wherever you install translators) in the right order:
```cpp
QTranslator base;
base.load(":/i18n/app_es.qm");
app.installTranslator(&base);
QTranslator regional;
if (QLocale::system().name() == "es_AR") {
regional.load(":/i18n/app_es_AR.qm");
app.installTranslator(®ional);
}
```
This way you maintain **one** full Spanish file and only ship tiny diffs for each region, greatly reducing duplication.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
| @@ -0,0 +1,571 @@ | |||
| <?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_AR"> | |||
There was a problem hiding this comment.
issue (complexity): Consider consolidating identical Spanish translation files into a single base file and using small override files for regional differences.
Consider collapsing all of the identical <TS … language="es_XX"> files into one base es file and then only shipping tiny “override” files for the locales that actually differ. Qt will merge them at runtime if you load them in order.
-
Rename your big
es_AR.tsinto a single fulles.ts:<?xml version="1.0" ?><!DOCTYPE TS> <TS version="2.1" language="es"> <context> <name>AuthFace</name> <message> <source>Face ID</source> <translation>Face ID</translation> </message> <!-- … all 571 messages … --> </context> <!-- … other contexts … --> </TS>
-
Create an override file for Argentina only containing the strings that actually change (if there are none yet you can skip it completely):
<?xml version="1.0" ?><!DOCTYPE TS> <TS version="2.1" language="es_AR"> <context> <name>AuthFace</name> <message> <source>Face ID</source> <translation>ID de rostro</translation> </message> </context> <!-- only contexts/messages that differ --> </TS>
-
Load them in your
main.cpp(or wherever you install translators) in the right order:QTranslator base; base.load(":/i18n/app_es.qm"); app.installTranslator(&base); QTranslator regional; if (QLocale::system().name() == "es_AR") { regional.load(":/i18n/app_es_AR.qm"); app.installTranslator(®ional); }
This way you maintain one full Spanish file and only ship tiny diffs for each region, greatly reducing duplication.
yixinshark
approved these changes
Sep 18, 2025
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: deepin-ci-robot, yixinshark The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Synchronize source files from linuxdeepin/dde-session-shell.
Source-pull-request: linuxdeepin/dde-session-shell#43
Summary by Sourcery
Synchronize upstream changes from linuxdeepin/dde-session-shell by introducing a camelCase conversion helper with conditional use in key event emission, cleaning up CMake plugin entries, adding new Spanish locale translation templates, and updating reuse metadata.
New Features:
Enhancements:
Documentation:
Chores: