Skip to content

Commit 5040b54

Browse files
authored
Merge pull request #186 from kant2002/kant/translation-preparation
Add infrastructure to be able translate REPL This is based on suggestions from #185
2 parents cac14fb + 1359284 commit 5040b54

22 files changed

+573
-165
lines changed

.github/workflows/release.yml

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Release
33
on:
44
push:
55
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
86

97
jobs:
108
# Separate build job for JavaScript

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
# Changelog
2+
23
All notable changes to this project will be documented in this file.
34

45
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
56
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
67

78
## Unreleased
89

10+
## 4.3.0
11+
12+
### Added
13+
14+
* Add localization support
15+
916
## 4.2.0
1017

1118
### Fixed

build.fsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ module Stages =
122122
)
123123
}
124124

125-
let donetRestore =
125+
let dotnetRestore =
126126
stage "Restore .NET dependencies" { run "dotnet restore" }
127127

128128
let npmInstall = stage "NPM install" { run "npm install" }
@@ -131,7 +131,7 @@ module Stages =
131131
stage "NPM install" {
132132
whenCmd {
133133
name "--local"
134-
description "Build using local pacakges from fable repository"
134+
description "Build using local packages from fable repository"
135135
}
136136

137137
run
@@ -260,7 +260,7 @@ module Stages =
260260

261261
pipeline "WatchApp" {
262262
Stages.clean
263-
Stages.donetRestore
263+
Stages.dotnetRestore
264264
Stages.npmInstall
265265
// We don't need to call unlink because npm install always reset
266266
// the dependencies so they are not linked anymore and will be linked
@@ -278,7 +278,7 @@ pipeline "WatchApp" {
278278

279279
pipeline "BuildApp" {
280280
Stages.clean
281-
Stages.donetRestore
281+
Stages.dotnetRestore
282282
Stages.npmInstall
283283
Stages.npmLink
284284
Stages.copyModules
@@ -321,14 +321,14 @@ pipeline "Release" {
321321
whenBranch "main"
322322

323323
Stages.clean
324-
Stages.donetRestore
324+
Stages.dotnetRestore
325325
Stages.npmInstall
326326
Stages.copyModules
327327
Stages.buildApp
328328
Stages.updatePreludeREPLVersion
329329

330330

331-
// When releasing locall we use the gh-pages CLI tool
331+
// When releasing local we use the gh-pages CLI tool
332332
// When releasing on CI we use the corresponding Github Action
333333
stage "Push to gh-pages (local)" {
334334
whenNot {
@@ -343,7 +343,7 @@ pipeline "Release" {
343343

344344
pipeline "BuildLib" {
345345
Stages.clean
346-
Stages.donetRestore
346+
Stages.dotnetRestore
347347
Stages.npmInstall
348348
Stages.copyModules
349349

paket.dependencies

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ nuget Feliz prerelease
1717
nuget Feliz.Bulma
1818
nuget Feliz.Bulma.Tooltip
1919
nuget Fable.Browser.Css
20-
nuget Fable.Browser.Dom
21-
nuget Fable.Browser.Event
20+
nuget Fable.Browser.Dom == 2.4.4
21+
nuget Fable.Browser.Event == 1.4.5
2222
nuget Fable.Browser.MediaQueryList
23+
nuget Fable.Browser.Navigator == 2.0.0
2324

2425
# REPL Lib
2526

@@ -32,8 +33,8 @@ nuget Fable.Browser.MediaQueryList
3233
#github fulma/Fulma:1e763d852112307370675a0cf692415a53d1993f#
3334

3435
github elmish/elmish:v3.x
35-
github fable-compiler/fable-promise:master
36+
github fable-compiler/fable-promise:14eca483d664dce5aebbe50fb92a536a7c1ffe53
3637
github alfonsogarciacaro/Feliz.Engine:main
3738
github alfonsogarciacaro/Feliz.Snabbdom:main
38-
github davedawkins/Feliz.Engine.Bulma:main
39-
github davedawkins/Sutil:main
39+
github davedawkins/Feliz.Engine.Bulma:0df54855ac3464a432cd207412ab66e650a87d77
40+
github davedawkins/Sutil:343bc31867127638a79afede0dcaa97ca56fa264

paket.lock

+29-10
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,39 @@ NUGET
1111
Fable.Browser.Svg (>= 2.3)
1212
Fable.Core (>= 3.0)
1313
FSharp.Core (>= 4.7.2)
14-
Fable.Browser.Dom (2.14)
15-
Fable.Browser.Blob (>= 1.3)
16-
Fable.Browser.Event (>= 1.5)
17-
Fable.Browser.WebStorage (>= 1.2)
18-
Fable.Core (>= 3.2.8)
14+
Fable.Browser.Dom (2.4.4)
15+
Fable.Browser.Blob (>= 1.1.4)
16+
Fable.Browser.Event (>= 1.4.4)
17+
Fable.Browser.WebStorage (>= 1.0.4)
18+
Fable.Core (>= 3.0)
1919
FSharp.Core (>= 4.7.2)
20-
Fable.Browser.Event (1.5)
21-
Fable.Browser.Gamepad (>= 1.1)
20+
Fable.Browser.Event (1.4.5)
21+
Fable.Browser.Gamepad (>= 1.0.3)
2222
Fable.Core (>= 3.0)
2323
FSharp.Core (>= 4.7.2)
2424
Fable.Browser.Gamepad (1.2)
2525
Fable.Core (>= 3.0)
2626
FSharp.Core (>= 4.7.2)
27+
Fable.Browser.Geolocation (1.2)
28+
Fable.Core (>= 3.0)
29+
FSharp.Core (>= 4.7.2)
2730
Fable.Browser.MediaQueryList (1.4)
2831
Fable.Browser.Dom (>= 2.11)
2932
Fable.Browser.Event (>= 1.5)
3033
Fable.Core (>= 3.0)
3134
FSharp.Core (>= 4.7.2)
35+
Fable.Browser.MediaStream (3.3)
36+
Fable.Browser.Dom (>= 2.11)
37+
Fable.Browser.Event (>= 1.5)
38+
Fable.Core (>= 3.0)
39+
FSharp.Core (>= 4.7.2)
40+
Fable.Browser.Navigator (2.0)
41+
Fable.Browser.Gamepad (>= 1.0.3)
42+
Fable.Browser.Geolocation (>= 1.0.4)
43+
Fable.Browser.MediaStream (>= 3.0.4)
44+
Fable.Browser.Worker (>= 1.0.5)
45+
Fable.Core (>= 3.1.5)
46+
FSharp.Core (>= 4.7.2)
3247
Fable.Browser.Svg (2.3)
3348
Fable.Browser.Dom (>= 2.11)
3449
Fable.Core (>= 3.0)
@@ -37,6 +52,10 @@ NUGET
3752
Fable.Browser.Event (>= 1.5)
3853
Fable.Core (>= 3.0)
3954
FSharp.Core (>= 4.7.2)
55+
Fable.Browser.Worker (1.2)
56+
Fable.Browser.Event (>= 1.5)
57+
Fable.Core (>= 3.0)
58+
FSharp.Core (>= 4.7.2)
4059
Fable.Core (4.0)
4160
Fable.Elmish (4.0.2)
4261
Fable.Core (>= 3.7.1)
@@ -135,12 +154,12 @@ GITHUB
135154
SourceLink.Create.CommandLine
136155
Unquote
137156
remote: fable-compiler/fable-promise
138-
FULLPROJECT (28ca5a0b62c9fb94fa9ea861eb8abf6cef59e800)
157+
FULLPROJECT (14eca483d664dce5aebbe50fb92a536a7c1ffe53)
139158
remote: alfonsogarciacaro/Feliz.Engine
140159
FULLPROJECT (61152aebd6c0b7878bfc4db05e2e10724b434a3e)
141160
remote: alfonsogarciacaro/Feliz.Snabbdom
142161
FULLPROJECT (7b28ccbceebcc9b66a8cb67aab89b7ae9576dbfb)
143162
remote: davedawkins/Feliz.Engine.Bulma
144-
FULLPROJECT (9504b9d5a43f5c3ef84086815076ebed1948b162)
163+
FULLPROJECT (0df54855ac3464a432cd207412ab66e650a87d77)
145164
remote: davedawkins/Sutil
146-
FULLPROJECT (cba867e22cb7862d64bf363acf81357c1ffc384d)
165+
FULLPROJECT (343bc31867127638a79afede0dcaa97ca56fa264)

src/App/App.fsproj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Compile Include="..\Standalone\Worker\Shared.fs" />
99
<Compile Include="Libs\Monaco.fs" />
1010
<Compile Include="Libs/ReactDeviceDetect.fs" />
11+
<Compile Include="Translations.fs" />
1112
<Compile Include="Prelude.fs" />
1213
<Compile Include="Helpers.fs" />
1314
<Compile Include="Editor.fs" />

src/App/ConsolePanel.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ let renderShowSeparator =
5252
prop.style [
5353
style.justifyContent.center
5454
]
55-
prop.text "Iframe loaded"
55+
prop.text Translations.msg_iframe_loaded
5656
]
5757

5858
let renderBody (isExpanded : bool) (logs : Log list) (setConsoleEnd : HTMLElement -> unit) onContainerScroll =
@@ -134,7 +134,7 @@ let consolePanel =
134134

135135
Html.div [
136136
prop.className "scrollable-panel-header-title"
137-
prop.text "Console"
137+
prop.text Translations.win_header_console
138138
]
139139

140140
Html.div [

0 commit comments

Comments
 (0)