fix: 调整蓝牙文件传输通知的文案

调整蓝牙文件传输文件,适配新的通知UI

Log: 调整蓝牙文件传输通知的文案
PMS: BUG-299605
Influence: notify

Author: fly602

Makefile

@@ -132,7 +132,7 @@ pot:
 update-po:
 	for po in misc/po/*.po; do \
 		echo "Updating $$po..."; \
-		msgmerge --update "$$po" misc/po/dde-daemon.pot; \
+		msgmerge --update --no-fuzzy-matching "$$po" misc/po/dde-daemon.pot; \
 	done
 
 clean-po:

bluetooth1/obex_agent.go

@@ -38,11 +38,11 @@ var receiveBaseDir = userdir.Get(userdir.Download)
 type cancelReason uint32
 
 const (
-	_ cancelReason = iota
-	CancelReasonExpired // The notification expired.
-	CancelReasonDismiss // The notification was dismissed by the user.
-	CancelReasonManual // The notification was closed by a call to CloseNotification.
-	CancelReasonUndefined // Undefined/reserved reasons.
+	_                     cancelReason = iota
+	CancelReasonExpired                // The notification expired.
+	CancelReasonDismiss                // The notification was dismissed by the user.
+	CancelReasonManual                 // The notification was closed by a call to CloseNotification.
+	CancelReasonUndefined              // Undefined/reserved reasons.
 )
 
 func (c cancelReason) String() string {
@@ -217,8 +217,8 @@ func (a *obexAgent) isSessionAccepted(transfer *transferObj) (bool, error) {
 
 		accepted, err := a.requestReceive(transfer.deviceName, transfer.oriFilename)
 		if err != nil || !accepted {
-            return false, err
-        }
+			return false, err
+		}
 
 		a.acceptedSessionsMu.Lock()
 		if _, recheck := a.acceptedSessions[transfer.sessionPath]; !recheck {
@@ -239,7 +239,7 @@ func (a *obexAgent) isSessionAccepted(transfer *transferObj) (bool, error) {
 	a.receiveChMu.Unlock()
 
 	if ch != nil {
-		<- ch
+		<-ch
 	}
 
 	a.receiveProgress(transfer)
@@ -327,9 +327,9 @@ func (a *obexAgent) receiveProgress(transfer *transferObj) {
 
 		a.receiveChMu.Lock()
 		select {
-			case a.receiveCh <- struct{}{}:
-    		default:
-    	}
+		case a.receiveCh <- struct{}{}:
+		default:
+		}
 		a.receiveChMu.Unlock()
 
 		// 避免下个传输还没开始就被清空，导致需要重新询问，故加上一秒的延迟
@@ -349,7 +349,7 @@ func (a *obexAgent) receiveProgress(transfer *transferObj) {
 
 	var progress uint64 = math.MaxUint64
 	err = transfer.Transferred().ConnectChanged(func(hasValue bool, value uint64) {
-		if !hasValue || value == 0{
+		if !hasValue || value == 0 {
 			return
 		}
 
@@ -437,14 +437,17 @@ func (a *obexAgent) notifyProgress(notify notifications.Notifications, replaceID
 	var err error
 	if progress != 100 {
 		actions = []string{"cancel", gettext.Tr("Cancel")}
-		hints := map[string]dbus.Variant{"suppress-sound": dbus.MakeVariant(true)}
+		hints := map[string]dbus.Variant{
+			"suppress-sound":              dbus.MakeVariant(true),
+			"x-deepin-ShowInNotifyCenter": dbus.MakeVariant(false),
+		}
 
 		notifyID, err = notify.Notify(0,
 			gettext.Tr("dde-control-center"),
 			replaceID,
 			notifyIconBluetoothConnected,
-			fmt.Sprintf(gettext.Tr("Receiving %[1]q from %[2]q"), filename, device),
 			fmt.Sprintf("%d%%", progress),
+			fmt.Sprintf(gettext.Tr("Receiving %[1]q"), filename),
 			actions,
 			hints,
 			receiveFileNeverTimeout)
@@ -569,8 +572,8 @@ func (a *obexAgent) requestReceive(deviceName, filename string) (bool, error) {
 		}
 
 		select {
-			case a.cancelCh <- cancelReason(reason):
-			default:
+		case a.cancelCh <- cancelReason(reason):
+		default:
 		}
 	})
 	if err != nil {

misc/po/ady.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-13 09:49+0800\n"
+"POT-Creation-Date: 2026-02-03 14:27+0800\n"
 "PO-Revision-Date: 2020-05-29 07:18+0000\n"
 "Language-Team: Adyghe (https://app.transifex.com/linuxdeepin/teams/3617/"
 "ady/)\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Username must be between 3 and 32 characters"
 msgstr ""
 
-#: ../../accounts1/manager.go:570
+#: ../../accounts1/manager.go:571
 #, c-format
 msgid "User \"%s\" existed before and its data is synced"
 msgstr ""
@@ -70,20 +70,20 @@ msgstr ""
 msgid "Audio Server changed, please log out and then log in"
 msgstr ""
 
-#: ../../audio1/audio.go:343 ../../audio1/audio_events.go:707
-#: ../../bluetooth1/obex_agent.go:395 ../../bluetooth1/obex_agent.go:410
-#: ../../bluetooth1/obex_agent.go:437 ../../bluetooth1/obex_agent.go:474
-#: ../../bluetooth1/obex_agent.go:529 ../../bluetooth1/utils_notify.go:77
+#: ../../audio1/audio.go:343 ../../audio1/audio_events.go:719
+#: ../../bluetooth1/obex_agent.go:443 ../../bluetooth1/obex_agent.go:458
+#: ../../bluetooth1/obex_agent.go:485 ../../bluetooth1/obex_agent.go:530
+#: ../../bluetooth1/obex_agent.go:609 ../../bluetooth1/utils_notify.go:77
 #: ../../bluetooth1/utils_notify.go:143
 msgid "dde-control-center"
 msgstr ""
 
-#: ../../audio1/audio_events.go:701
+#: ../../audio1/audio_events.go:713
 #, c-format
 msgid "%s had been disabled"
 msgstr ""
 
-#: ../../audio1/audio_events.go:702
+#: ../../audio1/audio_events.go:714
 msgid "Open"
 msgstr ""
 
@@ -147,57 +147,57 @@ msgstr ""
 msgid "Message notification"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:391 ../../bluetooth1/utils_notify.go:130
+#: ../../bluetooth1/obex_agent.go:439 ../../bluetooth1/utils_notify.go:130
 msgid "Cancel"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:398
-msgid "Receiving %[1]q from %[2]q"
+#: ../../bluetooth1/obex_agent.go:447
+msgid "Receiving %[1]q"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:407
+#: ../../bluetooth1/obex_agent.go:455
 msgid "View"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:413
+#: ../../bluetooth1/obex_agent.go:461
 msgid "You have received files from %q successfully"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:414
+#: ../../bluetooth1/obex_agent.go:462
 msgid "Done"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:429 ../../bluetooth1/obex_agent.go:532
+#: ../../bluetooth1/obex_agent.go:477 ../../bluetooth1/obex_agent.go:612
 msgid "Stop Receiving Files"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:431
+#: ../../bluetooth1/obex_agent.go:479
 msgid "You have cancelled the file transfer"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:433
+#: ../../bluetooth1/obex_agent.go:481
 #: ../../system/bluetooth1/utils_notify.go:63
 #: ../../system/bluetooth1/utils_notify.go:72
 msgid "Bluetooth connection failed"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:472
+#: ../../bluetooth1/obex_agent.go:527
 msgid "Decline"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:472
+#: ../../bluetooth1/obex_agent.go:527
 msgid "Receive"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:477
+#: ../../bluetooth1/obex_agent.go:533
 msgid "Bluetooth File Transfer"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:478
+#: ../../bluetooth1/obex_agent.go:534
 msgid "%q wants to send files to you. Receive?"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:533
+#: ../../bluetooth1/obex_agent.go:613
 msgid "Receiving %q timed out"
 msgstr ""
 

misc/po/af.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-13 09:49+0800\n"
+"POT-Creation-Date: 2026-02-03 14:27+0800\n"
 "PO-Revision-Date: 2020-05-29 07:18+0000\n"
 "Last-Translator: deepiner, 2021\n"
 "Language-Team: Afrikaans (https://app.transifex.com/linuxdeepin/teams/3617/"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "Username must be between 3 and 32 characters"
 msgstr ""
 
-#: ../../accounts1/manager.go:570
+#: ../../accounts1/manager.go:571
 #, c-format
 msgid "User \"%s\" existed before and its data is synced"
 msgstr ""
@@ -75,20 +75,20 @@ msgstr ""
 msgid "Audio Server changed, please log out and then log in"
 msgstr ""
 
-#: ../../audio1/audio.go:343 ../../audio1/audio_events.go:707
-#: ../../bluetooth1/obex_agent.go:395 ../../bluetooth1/obex_agent.go:410
-#: ../../bluetooth1/obex_agent.go:437 ../../bluetooth1/obex_agent.go:474
-#: ../../bluetooth1/obex_agent.go:529 ../../bluetooth1/utils_notify.go:77
+#: ../../audio1/audio.go:343 ../../audio1/audio_events.go:719
+#: ../../bluetooth1/obex_agent.go:443 ../../bluetooth1/obex_agent.go:458
+#: ../../bluetooth1/obex_agent.go:485 ../../bluetooth1/obex_agent.go:530
+#: ../../bluetooth1/obex_agent.go:609 ../../bluetooth1/utils_notify.go:77
 #: ../../bluetooth1/utils_notify.go:143
 msgid "dde-control-center"
 msgstr ""
 
-#: ../../audio1/audio_events.go:701
+#: ../../audio1/audio_events.go:713
 #, c-format
 msgid "%s had been disabled"
 msgstr ""
 
-#: ../../audio1/audio_events.go:702
+#: ../../audio1/audio_events.go:714
 msgid "Open"
 msgstr "Oop"
 
@@ -152,57 +152,57 @@ msgstr "Boodskap toegang"
 msgid "Message notification"
 msgstr "Boodskap kennisgewing"
 
-#: ../../bluetooth1/obex_agent.go:391 ../../bluetooth1/utils_notify.go:130
+#: ../../bluetooth1/obex_agent.go:439 ../../bluetooth1/utils_notify.go:130
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../../bluetooth1/obex_agent.go:398
-msgid "Receiving %[1]q from %[2]q"
+#: ../../bluetooth1/obex_agent.go:447
+msgid "Receiving %[1]q"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:407
+#: ../../bluetooth1/obex_agent.go:455
 msgid "View"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:413
+#: ../../bluetooth1/obex_agent.go:461
 msgid "You have received files from %q successfully"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:414
+#: ../../bluetooth1/obex_agent.go:462
 msgid "Done"
 msgstr "Gedoen"
 
-#: ../../bluetooth1/obex_agent.go:429 ../../bluetooth1/obex_agent.go:532
+#: ../../bluetooth1/obex_agent.go:477 ../../bluetooth1/obex_agent.go:612
 msgid "Stop Receiving Files"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:431
+#: ../../bluetooth1/obex_agent.go:479
 msgid "You have cancelled the file transfer"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:433
+#: ../../bluetooth1/obex_agent.go:481
 #: ../../system/bluetooth1/utils_notify.go:63
 #: ../../system/bluetooth1/utils_notify.go:72
 msgid "Bluetooth connection failed"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:472
+#: ../../bluetooth1/obex_agent.go:527
 msgid "Decline"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:472
+#: ../../bluetooth1/obex_agent.go:527
 msgid "Receive"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:477
+#: ../../bluetooth1/obex_agent.go:533
 msgid "Bluetooth File Transfer"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:478
+#: ../../bluetooth1/obex_agent.go:534
 msgid "%q wants to send files to you. Receive?"
 msgstr ""
 
-#: ../../bluetooth1/obex_agent.go:533
+#: ../../bluetooth1/obex_agent.go:613
 msgid "Receiving %q timed out"
 msgstr ""