Skip to content

Commit

Permalink
feat(nsis): finnish nsis lang
Browse files Browse the repository at this point in the history
  • Loading branch information
@develar
develar committed May 15, 2017
1 parent c4bb492 commit c88d991
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 24 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"///": "all dependencies for all packages (hoisted)",
"dependencies": {
"7zip-bin": "^2.0.4",
"ajv": "^5.0.1",
"ajv": "^5.1.1",
"ajv-keywords": "^2.0.0",
"archiver": "^1.3.0",
"aws-sdk": "^2.50.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"homepage": "/~https://github.com/electron-userland/electron-builder",
"dependencies": {
"7zip-bin": "^2.0.4",
"ajv": "^5.0.1",
"ajv": "^5.1.1",
"ajv-keywords": "^2.0.0",
"bluebird-lst": "^1.0.2",
"chalk": "^1.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/src/targets/license.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as path from "path"
import { PlatformPackager } from "../platformPackager"

// "el_GR" "lv_LV" "ko_KR" "tr_TR"
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"]
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"]
const langToLangWithRegion = new Map<string, string>()
for (const id of bundledLanguages) {
langToLangWithRegion.set(id.substring(0, id.indexOf("_")), id)
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/src/targets/nsis.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const debugLang = _debug("electron-builder:lang")
const ELECTRON_BUILDER_NS_UUID = "50e065bc-3134-11e6-9bab-38c9862bdaf3"

// noinspection SpellCheckingInspection
const nsisPathPromise = getBinFromBintray("nsis", "3.0.1.12", "9217687d1710ff23f20d17fe4766df7dd4ef492711ece6e6dae4e40e1e580e90")
const nsisPathPromise = getBinFromBintray("nsis", "3.0.1.13", "2921dd404ce9b69679088a6f1409a56dd360da2077fe1019573c0712c9edf057")
// noinspection SpellCheckingInspection
const nsisResourcePathPromise = getBinFromBintray("nsis-resources", "3.0.0", "cde0e77b249e29d74250bf006aa355d3e02b32226e1c6431fb48facae41d8a7e")

Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/templates/nsis/langs.nsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
!insertmacro MUI_LANGUAGE "Swedish"
!insertmacro MUI_LANGUAGE "Norwegian"
#!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
#!insertmacro MUI_LANGUAGE "Finnish"
!insertmacro MUI_LANGUAGE "Finnish"
#!insertmacro MUI_LANGUAGE "Greek"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Portuguese"
Expand Down
2 changes: 1 addition & 1 deletion test/out/mac/__snapshots__/macArchiveTest.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ exports[`invalid target 1`] = `
{
\\"target\\": [
\\"Should be object\\",
\\"Should be equal to one of the allowed values\\",
\\"Should be string\\",
\\"Should be equal to one of the allowed values\\",
\\"Invalid option object\\"
],
\\"target[0]\\": [
Expand Down
1 change: 1 addition & 0 deletions test/src/windows/oneClickInstallerTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ test.ifAll("multi language license", app({
writeFile(path.join(projectDir, "build", "license_en.txt"), "Hi"),
writeFile(path.join(projectDir, "build", "license_ru.txt"), "Привет"),
writeFile(path.join(projectDir, "build", "license_ko.txt"), "Привет"),
writeFile(path.join(projectDir, "build", "license_fi.txt"), "Привет"),
])
},
}))
Expand Down
39 changes: 21 additions & 18 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"

ajv@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.0.1.tgz#5fd1a8f5cc92b371aa86445b1152fd4dec844ac9"
ajv@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.1.tgz#6d9495b78eec4f2930536b2778ea40aa8645647a"
dependencies:
co "^4.6.0"
json-stable-stringify "^1.0.1"
Expand Down Expand Up @@ -972,7 +972,7 @@ default-require-extensions@^1.0.0:
dependencies:
strip-bom "^2.0.0"

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

Expand Down Expand Up @@ -1493,7 +1493,7 @@ home-or-tmp@^2.0.0:
os-homedir "^1.0.0"
os-tmpdir "^1.0.1"

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

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

mkdirp2@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.3.tgz#cc8dd8265f1f06e2d8f5b10b6e52f4e050bed21b"

mkdirp@^0.5.1, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
Expand Down Expand Up @@ -2844,13 +2848,12 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"

req-then@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.5.1.tgz#31c6e0b56f4ddd2acd6de0ba1bcea77b6079dfdf"
req-then@^0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/req-then/-/req-then-0.6.1.tgz#e85af6b939ffcc4b4f145b7e51cae73e8f8052c9"
dependencies:
array-back "^1.0.3"
defer-promise "^1.0.0"
feature-detect-es6 "^1.3.1"
array-back "^1.0.4"
defer-promise "^1.0.1"
lodash.pick "^4.4.0"
typical "^2.6.0"

Expand Down Expand Up @@ -3330,8 +3333,8 @@ tslint@^5.2.0:
tsutils "^1.8.0"

tsutils@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.8.0.tgz#bf8118ed8e80cd5c9fc7d75728c7963d44ed2f52"
version "1.9.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"

tunnel-agent@^0.6.0:
version "0.6.0"
Expand Down Expand Up @@ -3437,13 +3440,13 @@ url@0.10.3:
querystring "0.2.0"

usage-stats@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.9.0.tgz#a763f6116859f769925e75b5f92e4e3b47a374fd"
version "0.9.1"
resolved "https://registry.yarnpkg.com/usage-stats/-/usage-stats-0.9.1.tgz#3b34997dbef1e151f48a118a93a5c595e1d4269a"
dependencies:
array-back "^1.0.4"
home-path "^1.0.3"
mkdirp "^0.5.1"
req-then "^0.5.1"
home-path "^1.0.5"
mkdirp2 "^1.0.2"
req-then "^0.6.1"
typical "^2.6.0"
uuid "^3.0.1"

Expand Down

0 comments on commit c88d991

Please sign in to comment.