Skip to content

Commit c88d991

Browse files
develardevelar
committed
feat(nsis): finnish nsis lang
1 parent c4bb492 commit c88d991

File tree

8 files changed

+28
-24
lines changed

8 files changed

+28
-24
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"///": "all dependencies for all packages (hoisted)",
2929
"dependencies": {
3030
"7zip-bin": "^2.0.4",
31-
"ajv": "^5.0.1",
31+
"ajv": "^5.1.1",
3232
"ajv-keywords": "^2.0.0",
3333
"archiver": "^1.3.0",
3434
"aws-sdk": "^2.50.0",

‎packages/electron-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"homepage": "https://github.com/electron-userland/electron-builder",
4646
"dependencies": {
4747
"7zip-bin": "^2.0.4",
48-
"ajv": "^5.0.1",
48+
"ajv": "^5.1.1",
4949
"ajv-keywords": "^2.0.0",
5050
"bluebird-lst": "^1.0.2",
5151
"chalk": "^1.1.3",

‎packages/electron-builder/src/targets/license.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as path from "path"
22
import { PlatformPackager } from "../platformPackager"
33

44
// "el_GR" "lv_LV" "ko_KR" "tr_TR"
5-
export const bundledLanguages = ["en_US", "de_DE", "fr_FR", "es_ES", "zh_CN", "zh_TW", "ja_JP", "it_IT", "nl_NL", "ru_RU", "pl_PL", "uk_UA", "cs_CZ", "sv_SE", "nb_NO", "da_DK", "pt_PT", "hu_HU", "ko_KR"]
5+
export const bundledLanguages = ["en_US", "de_DE", "fr_FR", "es_ES", "zh_CN", "zh_TW", "ja_JP", "it_IT", "nl_NL", "ru_RU", "pl_PL", "uk_UA", "cs_CZ", "sv_SE", "nb_NO", "da_DK", "pt_PT", "hu_HU", "ko_KR", "fi_FI"]
66
const langToLangWithRegion = new Map<string, string>()
77
for (const id of bundledLanguages) {
88
langToLangWithRegion.set(id.substring(0, id.indexOf("_")), id)

‎packages/electron-builder/src/targets/nsis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const debugLang = _debug("electron-builder:lang")
2424
const ELECTRON_BUILDER_NS_UUID = "50e065bc-3134-11e6-9bab-38c9862bdaf3"
2525

2626
// noinspection SpellCheckingInspection
27-
const nsisPathPromise = getBinFromBintray("nsis", "3.0.1.12", "9217687d1710ff23f20d17fe4766df7dd4ef492711ece6e6dae4e40e1e580e90")
27+
const nsisPathPromise = getBinFromBintray("nsis", "3.0.1.13", "2921dd404ce9b69679088a6f1409a56dd360da2077fe1019573c0712c9edf057")
2828
// noinspection SpellCheckingInspection
2929
const nsisResourcePathPromise = getBinFromBintray("nsis-resources", "3.0.0", "cde0e77b249e29d74250bf006aa355d3e02b32226e1c6431fb48facae41d8a7e")
3030

‎packages/electron-builder/templates/nsis/langs.nsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!insertmacro MUI_LANGUAGE "Swedish"
1414
!insertmacro MUI_LANGUAGE "Norwegian"
1515
#!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
16-
#!insertmacro MUI_LANGUAGE "Finnish"
16+
!insertmacro MUI_LANGUAGE "Finnish"
1717
#!insertmacro MUI_LANGUAGE "Greek"
1818
!insertmacro MUI_LANGUAGE "Russian"
1919
!insertmacro MUI_LANGUAGE "Portuguese"

‎test/out/mac/__snapshots__/macArchiveTest.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ exports[`invalid target 1`] = `
77
{
88
\\"target\\": [
99
\\"Should be object\\",
10-
\\"Should be equal to one of the allowed values\\",
1110
\\"Should be string\\",
11+
\\"Should be equal to one of the allowed values\\",
1212
\\"Invalid option object\\"
1313
],
1414
\\"target[0]\\": [

‎test/src/windows/oneClickInstallerTest.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ test.ifAll("multi language license", app({
3737
writeFile(path.join(projectDir, "build", "license_en.txt"), "Hi"),
3838
writeFile(path.join(projectDir, "build", "license_ru.txt"), "Привет"),
3939
writeFile(path.join(projectDir, "build", "license_ko.txt"), "Привет"),
40+
writeFile(path.join(projectDir, "build", "license_fi.txt"), "Привет"),
4041
])
4142
},
4243
}))

‎yarn.lock

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ ajv@^4.9.1:
9797
co "^4.6.0"
9898
json-stable-stringify "^1.0.1"
9999

100-
ajv@^5.0.1:
101-
version "5.0.1"
102-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.0.1.tgz#5fd1a8f5cc92b371aa86445b1152fd4dec844ac9"
100+
ajv@^5.1.1:
101+
version "5.1.1"
102+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.1.tgz#6d9495b78eec4f2930536b2778ea40aa8645647a"
103103
dependencies:
104104
co "^4.6.0"
105105
json-stable-stringify "^1.0.1"
@@ -972,7 +972,7 @@ default-require-extensions@^1.0.0:
972972
dependencies:
973973
strip-bom "^2.0.0"
974974

975-
defer-promise@^1.0.0:
975+
defer-promise@^1.0.1:
976976
version "1.0.1"
977977
resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.1.tgz#1ca6ffeddbcef1715dd7aae25c7616f9ae22932f"
978978

@@ -1493,7 +1493,7 @@ home-or-tmp@^2.0.0:
14931493
os-homedir "^1.0.0"
14941494
os-tmpdir "^1.0.1"
14951495

1496-
home-path@^1.0.3:
1496+
home-path@^1.0.3, home-path@^1.0.5:
14971497
version "1.0.5"
14981498
resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.5.tgz#788b29815b12d53bacf575648476e6f9041d133f"
14991499

@@ -2338,6 +2338,10 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
23382338
version "1.2.0"
23392339
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
23402340

2341+
mkdirp2@^1.0.2:
2342+
version "1.0.3"
2343+
resolved "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.3.tgz#cc8dd8265f1f06e2d8f5b10b6e52f4e050bed21b"
2344+
23412345
mkdirp@^0.5.1, mkdirp@~0.5.1:
23422346
version "0.5.1"
23432347
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -2844,13 +2848,12 @@ repeating@^2.0.0:
28442848
dependencies:
28452849
is-finite "^1.0.0"
28462850

2847-
req-then@^0.5.1:
2848-
version "0.5.1"
2849-
resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.5.1.tgz#31c6e0b56f4ddd2acd6de0ba1bcea77b6079dfdf"
2851+
req-then@^0.6.1:
2852+
version "0.6.1"
2853+
resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.6.1.tgz#e85af6b939ffcc4b4f145b7e51cae73e8f8052c9"
28502854
dependencies:
2851-
array-back "^1.0.3"
2852-
defer-promise "^1.0.0"
2853-
feature-detect-es6 "^1.3.1"
2855+
array-back "^1.0.4"
2856+
defer-promise "^1.0.1"
28542857
lodash.pick "^4.4.0"
28552858
typical "^2.6.0"
28562859

@@ -3330,8 +3333,8 @@ tslint@^5.2.0:
33303333
tsutils "^1.8.0"
33313334

33323335
tsutils@^1.8.0:
3333-
version "1.8.0"
3334-
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.8.0.tgz#bf8118ed8e80cd5c9fc7d75728c7963d44ed2f52"
3336+
version "1.9.1"
3337+
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
33353338

33363339
tunnel-agent@^0.6.0:
33373340
version "0.6.0"
@@ -3437,13 +3440,13 @@ url@0.10.3:
34373440
querystring "0.2.0"
34383441

34393442
usage-stats@^0.9.0:
3440-
version "0.9.0"
3441-
resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.9.0.tgz#a763f6116859f769925e75b5f92e4e3b47a374fd"
3443+
version "0.9.1"
3444+
resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.9.1.tgz#3b34997dbef1e151f48a118a93a5c595e1d4269a"
34423445
dependencies:
34433446
array-back "^1.0.4"
3444-
home-path "^1.0.3"
3445-
mkdirp "^0.5.1"
3446-
req-then "^0.5.1"
3447+
home-path "^1.0.5"
3448+
mkdirp2 "^1.0.2"
3449+
req-then "^0.6.1"
34473450
typical "^2.6.0"
34483451
uuid "^3.0.1"
34493452

0 commit comments

Comments
 (0)