Skip to content

fix: Notification appName is not translated #965

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

Merged
deepin-bot merged 1 commit into from
Dec 12, 2024
Merged

fix: Notification appName is not translated #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions panels/notification/server/configs/org.deepin.dde.shell.notification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@
"description[zh_CN]": "系统应用列表",
"permissions": "readwrite",
"visibility": "private"
},
"AppNamesMap": {
"value": {"dde-control-center":"org.deepin.dde.control-center"},
"serial": 0,
"flags": [],
"name": "app names map",
"name[zh_CN]": "应用名称映射",
"description": "app names map",
"description[zh_CN]": "应用名称映射",
"permissions": "readwrite",
"visibility": "private"
}
}
}
11 changes: 10 additions & 1 deletion panels/notification/server/notificationmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@

QScopedPointer<DConfig> config(DConfig::create("org.deepin.dde.shell", "org.deepin.dde.shell.notification"));
m_systemApps = config->value("systemApps").toStringList();
// TODO temporary fix for AppNamesMap
m_appNamesMap = config->value("AppNamesMap").toMap();
}

NotificationManager::~NotificationManager()
Expand Down Expand Up @@ -192,13 +194,15 @@
return 0;
}

QString tsAppName = m_setting->appValue(appId, NotificationSetting::AppName).toString();

QString strBody = body;
strBody.replace(QLatin1String("\\\\"), QLatin1String("\\"), Qt::CaseInsensitive);

QString strIcon = appIcon;
if (strIcon.isEmpty())
strIcon = m_setting->appValue(appId, NotificationSetting::AppIcon).toString();
NotifyEntity entity(appName, replacesId, strIcon, summary, strBody, actions, hints, expireTimeout);
NotifyEntity entity(tsAppName, replacesId, strIcon, summary, strBody, actions, hints, expireTimeout);
entity.setAppId(appId);
entity.setProcessedType(NotifyEntity::None);
entity.setReplacesId(replacesId);
Expand Down Expand Up @@ -451,9 +455,14 @@
{
const auto items = m_setting->appItems();
for (const auto &item: items) {
if (item.id == appName || item.appName == appName)

Check warning on line 458 in panels/notification/server/notificationmanager.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Consider using std::find_if algorithm instead of a raw loop.
return item.id;
}

if (m_appNamesMap.contains(appName)) {
return m_appNamesMap.value(appName).toString();
}

return QString();
}

Expand Down
1 change: 1 addition & 0 deletions panels/notification/server/notificationmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ private slots:
qint64 m_lastTimeoutPoint = std::numeric_limits<qint64>::max();
QMultiHash<qint64, NotifyEntity> m_pendingTimeoutEntities;
QStringList m_systemApps;
QMap<QString, QVariant> m_appNamesMap;
};

} // notification
Loading