Skip to content
This repository was archived by the owner on Jun 15, 2024. It is now read-only.

Commit d91b83a

Browse files
committed
feat(update): Supplementary update 11fd584c3943369cfe467e20b2df58f44f27034a
1 parent 6ef5e47 commit d91b83a

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## 这是一个什么项目?
88

9-
这是一个把github desktop翻译成中文的项目, 当前翻译版本[here](https://github.com/gouzil/github-desktop-zh/tree/releases/3.0.1-test7)
9+
这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.0.2](https://github.com/gouzil/github-desktop-zh/tree/release-3.0.2)
1010

1111
## 部分截图
1212

app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"productName": "GitHub Desktop",
44
"bundleID": "com.github.GitHubClient",
55
"companyName": "GitHub, Inc.",
6-
"version": "3.0.1-beta1",
6+
"version": "3.0.2",
77
"main": "./main.js",
88
"repository": {
99
"type": "git",
@@ -26,7 +26,7 @@
2626
"codemirror-mode-elixir": "^1.1.2",
2727
"compare-versions": "^3.6.0",
2828
"deep-equal": "^1.0.1",
29-
"desktop-notifications": "^0.2.0",
29+
"desktop-notifications": "^0.2.2",
3030
"desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
3131
"dexie": "^2.0.0",
3232
"dompurify": "^2.3.3",

app/src/main-process/app-window.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ import * as path from 'path'
2121
import windowStateKeeper from 'electron-window-state'
2222
import * as ipcMain from './ipc-main'
2323
import * as ipcWebContents from './ipc-webcontents'
24-
import { installNotificationCallback } from './notifications'
24+
import {
25+
installNotificationCallback,
26+
terminateDesktopNotifications,
27+
} from './notifications'
2528

2629
export class AppWindow {
2730
private window: Electron.BrowserWindow
@@ -107,6 +110,7 @@ export class AppWindow {
107110
}
108111
nativeTheme.removeAllListeners()
109112
autoUpdater.removeAllListeners()
113+
terminateDesktopNotifications()
110114
})
111115

112116
if (__WIN32__) {

app/src/main-process/notifications.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
initializeNotifications,
33
onNotificationEvent,
4+
terminateNotifications,
45
} from 'desktop-notifications'
56
import { BrowserWindow } from 'electron'
67
import { findToastActivatorClsid } from '../lib/find-toast-activator-clsid'
@@ -35,6 +36,10 @@ export function initializeDesktopNotifications() {
3536
initializeNotifications({ toastActivatorClsid: windowsToastActivatorClsid })
3637
}
3738

39+
export function terminateDesktopNotifications() {
40+
terminateNotifications()
41+
}
42+
3843
export function installNotificationCallback(window: BrowserWindow) {
3944
onNotificationEvent<DesktopAliveEvent>((event, id, userInfo) => {
4045
ipcWebContents.send(

app/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,10 @@ delegates@^1.0.0:
363363
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
364364
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
365365

366-
desktop-notifications@^0.2.0:
367-
version "0.2.0"
368-
resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.0.tgz#8ec6d732671d42e9aa4dac4523a2a57806c9e210"
369-
integrity sha512-6puOHRkSHmH1HpQDftFtpJU+ko7gw1vtSlf2LViJX+sY2N+9pVuYO85HjTlpktHDSVKvDnFGhPVAoZmjXIvo/Q==
366+
desktop-notifications@^0.2.2:
367+
version "0.2.2"
368+
resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.2.tgz#197a32ee504a894ad074793dab285681c533e5ac"
369+
integrity sha512-XMnxdWV6ZfiCzLZNC00n6h30Jt3z8yv21FAPBt/kK6hANI0PaoYWsRKEYya0zMUAX/9lrh429R5OtRGOKWZQSw==
370370
dependencies:
371371
node-addon-api "^5.0.0"
372372
prebuild-install "^7.0.1"

changelog.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"releases": {
3+
"3.0.2": [
4+
"[Fixed] Fix crash launching the app on macOS High Sierra - #14712",
5+
"[Fixed] Terminate all GitHub Desktop processes on Windows when the app is closed - #14733. Thanks @tsvetilian-ty!"
6+
],
37
"3.0.1-beta1": [
48
"[Added] Add support for PyCharm Community Edition on Windows - #14411. Thanks @tsvetilian-ty!",
59
"[Added] Add support for highlighting .mjs/.cjs/.mts/.cts files as JavaScript/TypeScript - #14481. Thanks @j-f1!",

0 commit comments

Comments
 (0)