DEV: Support translated title in desktop/notifications (#14325)
This commit is contained in:
parent
e263b84196
commit
68bb7c5a66
|
@ -153,7 +153,9 @@ function onNotification(data, siteSettings, user) {
|
|||
return;
|
||||
}
|
||||
|
||||
const notificationTitle = I18n.t(i18nKey(data.notification_type), {
|
||||
const notificationTitle =
|
||||
data.translated_title ||
|
||||
I18n.t(i18nKey(data.notification_type), {
|
||||
site_title: siteSettings.title,
|
||||
topic: data.topic_title,
|
||||
username: formatUsername(data.username),
|
||||
|
|
|
@ -75,7 +75,8 @@ class Notification < ActiveRecord::Base
|
|||
DB.exec(<<~SQL)
|
||||
DELETE
|
||||
FROM notifications n
|
||||
WHERE high_priority AND notification_type <> #{types[:chat_mention].to_i}
|
||||
WHERE high_priority
|
||||
AND notification_type NOT IN (#{types[:chat_mention].to_i}, #{types[:chat_message].to_i})
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM posts p
|
||||
|
@ -117,7 +118,8 @@ class Notification < ActiveRecord::Base
|
|||
votes_released: 26,
|
||||
event_reminder: 27,
|
||||
event_invitation: 28,
|
||||
chat_mention: 29
|
||||
chat_mention: 29,
|
||||
chat_message: 30,
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ class PushNotificationPusher
|
|||
def self.push(user, payload)
|
||||
I18n.with_locale(user.effective_locale) do
|
||||
message = {
|
||||
title: I18n.t(
|
||||
title: payload[:translated_title] || I18n.t(
|
||||
"discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
|
||||
site_title: SiteSetting.title,
|
||||
topic: payload[:topic_title],
|
||||
|
|
|
@ -48,6 +48,8 @@ describe Notification do
|
|||
expect(@types[:votes_released]).to eq(26)
|
||||
expect(@types[:event_reminder]).to eq(27)
|
||||
expect(@types[:event_invitation]).to eq(28)
|
||||
expect(@types[:chat_mention]).to eq(29)
|
||||
expect(@types[:chat_message]).to eq(30)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -94,6 +94,9 @@
|
|||
},
|
||||
"chat_mention": {
|
||||
"type": "integer"
|
||||
},
|
||||
"chat_message": {
|
||||
"type": "integer"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
|
|
Loading…
Reference in New Issue