Skip to content

Commit 8e6b477

Browse files
authored
multi_lang for confirmation tip; fix silent installation (#1063)
- 为卸载旧版本的提示语添加了多语言支持 - 修复静默安装的问题,使用 /S 可以执行静默安装
1 parent fda8a10 commit 8e6b477

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

output/install.nsi

+22-14
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ LangString LNKFORAPPFOLDER ${LANG_TRADCHINESE} "【小狼毫】程序文件夾"
7777
LangString LNKFORUPDATER ${LANG_TRADCHINESE} "【小狼毫】檢查新版本"
7878
LangString LNKFORSETUP ${LANG_TRADCHINESE} "【小狼毫】安裝選項"
7979
LangString LNKFORUNINSTALL ${LANG_TRADCHINESE} "卸載小狼毫"
80+
LangString CONFIRMATION ${LANG_TRADCHINESE} "安裝前,我打盤先卸載舊版本的小狼毫。$\n$\n按下「確定」移除舊版本,按下「取消」放棄本次安裝。"
8081

8182
!insertmacro MUI_LANGUAGE "SimpChinese"
8283
LangString DISPLAYNAME ${LANG_SIMPCHINESE} "小狼毫输入法"
@@ -91,20 +92,23 @@ LangString LNKFORAPPFOLDER ${LANG_SIMPCHINESE} "【小狼毫】程序文件夹"
9192
LangString LNKFORUPDATER ${LANG_SIMPCHINESE} "【小狼毫】检查新版本"
9293
LangString LNKFORSETUP ${LANG_SIMPCHINESE} "【小狼毫】安装选项"
9394
LangString LNKFORUNINSTALL ${LANG_SIMPCHINESE} "卸载小狼毫"
95+
LangString CONFIRMATION ${LANG_SIMPCHINESE} '安装前,请先卸载旧版本的小狼毫。$\n$\n点击 "确定" 移除旧版本,或点击 "取消" 放弃本次安装。'
9496

9597
!insertmacro MUI_LANGUAGE "English"
9698
LangString DISPLAYNAME ${LANG_ENGLISH} "Weasel"
97-
LangString LNKFORMANUAL ${LANG_ENGLISH} "[Weasel] Manual"
98-
LangString LNKFORSETTING ${LANG_ENGLISH} "[Weasel] Settings"
99-
LangString LNKFORDICT ${LANG_ENGLISH} "[Weasel] Dictionary Manager"
100-
LangString LNKFORSYNC ${LANG_ENGLISH} "[Weasel] Sync User Profile"
101-
LangString LNKFORDEPLOY ${LANG_ENGLISH} "[Weasel] Deploy"
99+
LangString LNKFORMANUAL ${LANG_ENGLISH} "Weasel Manual"
100+
LangString LNKFORSETTING ${LANG_ENGLISH} "Weasel Settings"
101+
LangString LNKFORDICT ${LANG_ENGLISH} "Weasel Dictionary Manager"
102+
LangString LNKFORSYNC ${LANG_ENGLISH} "Weasel Sync User Profile"
103+
LangString LNKFORDEPLOY ${LANG_ENGLISH} "Weasel Deploy"
102104
LangString LNKFORSERVER ${LANG_ENGLISH} "Weasel Server"
103-
LangString LNKFORUSERFOLDER ${LANG_ENGLISH} "[Weasel] User Folder"
104-
LangString LNKFORAPPFOLDER ${LANG_ENGLISH} "[Weasel] App Folder"
105-
LangString LNKFORUPDATER ${LANG_ENGLISH} "[Weasel] Check for Updates"
106-
LangString LNKFORSETUP ${LANG_ENGLISH} "[Weasel] Installation Preference"
105+
LangString LNKFORUSERFOLDER ${LANG_ENGLISH} "Weasel User Folder"
106+
LangString LNKFORAPPFOLDER ${LANG_ENGLISH} "Weasel App Folder"
107+
LangString LNKFORUPDATER ${LANG_ENGLISH} "Weasel Check for Updates"
108+
LangString LNKFORSETUP ${LANG_ENGLISH} "Weasel Installation Preference"
107109
LangString LNKFORUNINSTALL ${LANG_ENGLISH} "Uninstall Weasel"
110+
LangString CONFIRMATION ${LANG_ENGLISH} "Before installation, please uninstall the old version of Weasel.$\n$\nPress 'OK' to remove the old version, or 'Cancel' to abort installation."
111+
108112
;--------------------------------
109113

110114
Function .onInit
@@ -115,9 +119,7 @@ Function .onInit
115119

116120
StrCpy $0 "Upgrade"
117121
IfSilent uninst 0
118-
MessageBox MB_OKCANCEL|MB_ICONINFORMATION \
119-
"安裝前,我打盤先卸載舊版本的小狼毫。$\n$\n按下「確定」移除舊版本,按下「取消」放棄本次安裝。" \
120-
IDOK uninst
122+
MessageBox MB_OKCANCEL|MB_ICONINFORMATION "$(CONFIRMATION)" IDOK uninst
121123
Abort
122124

123125
uninst:
@@ -208,7 +210,7 @@ program_files:
208210
SetOutPath $INSTDIR
209211

210212
; test /T flag for zh_TW locale
211-
StrCpy $R2 "/i"
213+
StrCpy $R2 "/i"
212214
${GetParameters} $R0
213215
ClearErrors
214216
${GetOptions} $R0 "/S" $R1
@@ -232,7 +234,13 @@ program_files:
232234
WriteUninstaller "$INSTDIR\uninstall.exe"
233235

234236
; run as user...
235-
ExecWait "$INSTDIR\WeaselDeployer.exe /install"
237+
IfSilent +2
238+
ExecWait "$INSTDIR\WeaselDeployer.exe /install"
239+
Goto deploy_done
240+
241+
ExecWait "$INSTDIR\WeaselDeployer.exe /deploy"
242+
deploy_done:
243+
; ...
236244

237245
; Write autorun key
238246
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "WeaselServer" "$INSTDIR\WeaselServer.exe"

0 commit comments

Comments
 (0)