From 91addfe4f382059a60fbbd60c2de5aa55d0c42b6 Mon Sep 17 00:00:00 2001 From: develar <develar@gmail.com> Date: Tue, 30 Aug 2016 08:28:21 +0200 Subject: [PATCH] fix(nsis): set locale id for legalTrademarks Closes #672 --- docs/Options.md | 2 +- src/metadata.ts | 2 +- src/targets/nsis.ts | 2 +- test/src/nsisTest.ts | 5 ++++- test/src/winPackagerTest.ts | 5 ----- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/Options.md b/docs/Options.md index add1d8a3d4a..625ae43c233 100644 --- a/docs/Options.md +++ b/docs/Options.md @@ -142,7 +142,7 @@ See [NSIS target notes](https://github.com/electron-userland/electron-builder/wi | installerHeaderIcon | <a name="NsisOptions-installerHeaderIcon"></a>*one-click installer only.* The path to header icon (above the progress bar), relative to the project directory. Defaults to `build/installerHeaderIcon.ico` or application icon. | include | <a name="NsisOptions-include"></a>The path to NSIS include script to customize installer. Defaults to `build/installer.nsh`. See [Custom NSIS script](https://github.com/electron-userland/electron-builder/wiki/NSIS#custom-nsis-script). | script | <a name="NsisOptions-script"></a>The path to NSIS script to customize installer. Defaults to `build/installer.nsi`. See [Custom NSIS script](https://github.com/electron-userland/electron-builder/wiki/NSIS#custom-nsis-script). -| language | <a name="NsisOptions-language"></a>* Hex LCID, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396). +| language | <a name="NsisOptions-language"></a>* LCID Dec, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396). <a name="LinuxBuildOptions"></a> ### `.build.linux` diff --git a/src/metadata.ts b/src/metadata.ts index dd8f9086317..d64ea9ce963 100755 --- a/src/metadata.ts +++ b/src/metadata.ts @@ -430,7 +430,7 @@ export interface NsisOptions { readonly script?: string | null /* - * Hex LCID, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396). + * LCID Dec, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396). */ readonly language?: string | null } diff --git a/src/targets/nsis.ts b/src/targets/nsis.ts index 4ae8a1a8833..a561135382c 100644 --- a/src/targets/nsis.ts +++ b/src/targets/nsis.ts @@ -127,7 +127,7 @@ export default class NsisTarget extends Target { `/LANG=${localeId} FileDescription "${appInfo.description}"`, `/LANG=${localeId} FileVersion "${appInfo.buildVersion}"`, ] - use(this.packager.platformSpecificBuildOptions.legalTrademarks, it => versionKey.push(`LegalTrademarks "${it}"`)) + use(this.packager.platformSpecificBuildOptions.legalTrademarks, it => versionKey.push(`/LANG=${localeId} LegalTrademarks "${it}"`)) const commands: any = { OutFile: `"${installerPath}"`, diff --git a/test/src/nsisTest.ts b/test/src/nsisTest.ts index b1bd274cc5f..c7cc0c179c2 100644 --- a/test/src/nsisTest.ts +++ b/test/src/nsisTest.ts @@ -112,7 +112,10 @@ test.ifNotCiOsx("boring", app({ nsis: { oneClick: false, language: "1031", - } + }, + win: { + legalTrademarks: "My Trademark" + }, } } }, {signed: true})) diff --git a/test/src/winPackagerTest.ts b/test/src/winPackagerTest.ts index 2cf1ea13fdd..3c21a768f10 100755 --- a/test/src/winPackagerTest.ts +++ b/test/src/winPackagerTest.ts @@ -33,11 +33,6 @@ test.ifDevOrWinCi("beta version", app({ targets: Platform.WINDOWS.createTarget(["squirrel", "nsis"]), devMetadata: <any>{ version: "3.0.0-beta.2", - build: { - win: { - legalTrademarks: "My Trademark" - }, - }, } }))