fix: desktop menu actions shows English instead of locale language #1261
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
任务栏右键菜单,应用自己的 action 未显示成当前用户的系统语言对应的文案 PMS: BUG-333955 Log:
deepin pr auto review我对这段代码进行了仔细审查，以下是我的分析和改进建议： 1. 语法逻辑问题：
改进建议：
2. 代码质量问题：
改进建议：
示例改进： QString AMAppItem::getLocaleOrDefaultValue(const QStringMap &value, const QString &preferredLocale, const QString &fallbackKey)
{
Q_ASSERT_X(!value.isEmpty(), "getLocaleOrDefaultValue", "Value map cannot be empty");
Q_ASSERT_X(!fallbackKey.isEmpty(), "getLocaleOrDefaultValue", "Fallback key cannot be empty");
if (value.contains(preferredLocale)) {
return value.value(preferredLocale);
}
// 处理带区域设置的locale（如zh_CN）
if (preferredLocale.contains('_')) {
QString baseLocale = preferredLocale.split('_').first();
if (value.contains(baseLocale)) {
return value.value(baseLocale);
}
}
return value.value(fallbackKey);
}3. 代码性能问题：
改进建议：
4. 代码安全问题：
改进建议：
示例改进： QString AMAppItem::getLocaleOrDefaultValue(const QStringMap &value, const QString &preferredLocale, const QString &fallbackKey)
{
// 参数验证
if (value.isEmpty() || fallbackKey.isEmpty()) {
return QString();
}
// 检查首选locale是否存在
if (value.contains(preferredLocale)) {
return value.value(preferredLocale);
}
// 安全地处理带区域设置的locale
if (!preferredLocale.isEmpty() && preferredLocale.contains('_')) {
QStringList localeParts = preferredLocale.split('_', Qt::SkipEmptyParts);
if (!localeParts.isEmpty()) {
QString baseLocale = localeParts.first();
if (value.contains(baseLocale)) {
return value.value(baseLocale);
}
}
}
// 返回fallback值
return value.value(fallbackKey);
}5. 其他建议
这些改进将有助于提高代码的可维护性、可读性和健壮性。 |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideEnhance locale resolution for desktop menu actions and application icons by refactoring utility logic, updating method parameters, and simplifying lookups to ensure UI labels match the user’s current language settings. Class diagram for updated AMAppItem locale resolution methodsclassDiagram
class AMAppItem {
+void setOnDesktop(bool on)
-QString getLocaleOrDefaultValue(const QStringMap &value, const QString &localeCode, const QString &fallbackKey)
-void updateActions(const QStringList &actions, const PropMap &actionName)
}
AMAppItem --|> Application
AMAppItem --|> AppItem
Flow diagram for locale-based action name resolutionflowchart TD
A["User triggers desktop menu action"] --> B["updateActions() called"]
B --> C["getLocaleOrDefaultValue() called with locale code"]
C --> D{Does value contain localeCode?}
D -- Yes --> E["Return value for localeCode"]
D -- No --> F{Does localeCode contain '_'?}
F -- Yes --> G["Extract prefix and check value for prefix"]
G -- Found --> H["Return value for prefix"]
G -- Not found --> I["Return fallback value"]
F -- No --> I["Return fallback value"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
18202781743
approved these changes
Sep 22, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, BLumia 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
3 participants
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.
任务栏右键菜单,应用自己的 action 未显示成当前用户的系统语言对应的文案
Summary by Sourcery
Update AMAppItem localization logic to ensure desktop menu actions and icons display in the current user's locale
Bug Fixes:
Enhancements: