Skip to content

Commit 91addfe

Browse files
committed
fix(nsis): set locale id for legalTrademarks
Closes #672
1 parent b739f42 commit 91addfe

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

docs/Options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ See [NSIS target notes](https://github.com/electron-userland/electron-builder/wi
142142
| 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.
143143
| 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).
144144
| 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).
145-
| 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).
145+
| 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).
146146

147147
<a name="LinuxBuildOptions"></a>
148148
### `.build.linux`

src/metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ export interface NsisOptions {
430430
readonly script?: string | null
431431

432432
/*
433-
* Hex LCID, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396).
433+
* LCID Dec, defaults to `1033`(`English - United States`, see https://msdn.microsoft.com/en-au/goglobal/bb964664.aspx?f=255&MSPPError=-2147217396).
434434
*/
435435
readonly language?: string | null
436436
}

src/targets/nsis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default class NsisTarget extends Target {
127127
`/LANG=${localeId} FileDescription "${appInfo.description}"`,
128128
`/LANG=${localeId} FileVersion "${appInfo.buildVersion}"`,
129129
]
130-
use(this.packager.platformSpecificBuildOptions.legalTrademarks, it => versionKey.push(`LegalTrademarks "${it}"`))
130+
use(this.packager.platformSpecificBuildOptions.legalTrademarks, it => versionKey.push(`/LANG=${localeId} LegalTrademarks "${it}"`))
131131

132132
const commands: any = {
133133
OutFile: `"${installerPath}"`,

test/src/nsisTest.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ test.ifNotCiOsx("boring", app({
112112
nsis: {
113113
oneClick: false,
114114
language: "1031",
115-
}
115+
},
116+
win: {
117+
legalTrademarks: "My Trademark"
118+
},
116119
}
117120
}
118121
}, {signed: true}))

test/src/winPackagerTest.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ test.ifDevOrWinCi("beta version", app({
3333
targets: Platform.WINDOWS.createTarget(["squirrel", "nsis"]),
3434
devMetadata: <any>{
3535
version: "3.0.0-beta.2",
36-
build: {
37-
win: {
38-
legalTrademarks: "My Trademark"
39-
},
40-
},
4136
}
4237
}))
4338

0 commit comments

Comments
 (0)