fix: translation won't load if locale code isn't 100% matched#1137
Merged
Conversation
修复地区代码不完全匹配时,翻译不会被加载的问题. Log:
deepin pr auto review关键摘要:
是否建议立即修改:
|
Reviewer's GuideRefactors translation loading in DAppletLoaderPrivate::loadTranslation to use QTranslator::load with QLocale overload for flexible locale matching, replacing manual file path checks and enhancing logging. Sequence Diagram for Updated Translation Loading in DAppletLoaderPrivatesequenceDiagram
participant DLP as DAppletLoaderPrivate
participant QL as QLocale
participant QT as QTranslator
participant APP as qApp
DLP->>QT: new QTranslator(qApp)
DLP->>QL: system()
QL-->>DLP: systemLocale
DLP->>QT: load(systemLocale, pluginId, "_", pluginTranslationDir)
alt Load Successful
QT-->>DLP: true
DLP->>DLP: Store translator in m_pluginTranslators
DLP->>APP: installTranslator(translator)
DLP->>DLP: Log success (using translator.filePath())
else Load Failed
QT-->>DLP: false
DLP->>DLP: Log failure (with QLocale::system().uiLanguages())
DLP->>QT: deleteLater()
end
Class Diagram: DAppletLoaderPrivate and Updated Translation HandlingclassDiagram
class DAppletLoaderPrivate {
-m_pluginTranslators: QMap<QString, QTranslator*>
+loadTranslation(const DPluginMetaData &pluginData): void
}
class QTranslator {
+load(const QLocale &locale, const QString &filename, const QString &prefix, const QString &directory, const QString &suffix): bool
+filePath(): const QString &
+deleteLater(): void
}
class QLocale {
+system(): QLocale
+uiLanguages(): QStringList
}
class DPluginMetaData {
+pluginDir(): QString
+pluginId(): QString
}
class qApp {
+installTranslator(QTranslator*): void
}
DAppletLoaderPrivate "1" o-- "*" QTranslator : stores
DAppletLoaderPrivate ..> QTranslator : uses
DAppletLoaderPrivate ..> QLocale : uses
DAppletLoaderPrivate ..> DPluginMetaData : uses
DAppletLoaderPrivate ..> qApp : uses
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey @BLumia - I've reviewed your changes and they look great!
Here's what I looked at during the review
- 🟢 General issues: all looks good
- 🟢 Security: all looks good
- 🟢 Testing: all looks good
- 🟢 Complexity: all looks good
- 🟢 Documentation: all looks good
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
robertkill
approved these changes
May 30, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: BLumia, robertkill 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 |
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
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.
修复地区代码不完全匹配时,翻译不会被加载的问题.
Summary by Sourcery
Use QTranslator::load to load plugin translations with locale-based lookup and fallback instead of requiring exact locale code match
Bug Fixes: