Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add infrastructure to be able translate REPL This is based on suggestions from #185 #186

Merged
merged 8 commits into from
Jan 1, 2024
Merged

Add infrastructure to be able translate REPL This is based on suggestions from #185 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
041bbb9
Add infrastructure to be able translate REPL
kant2002 Sep 16, 2023
e4de3cf
Use records instead of dict
kant2002 Sep 19, 2023
6d9f5a1
Додав переклад на українську
kant2002 Sep 19, 2023
68435dc
Add missing translation
kant2002 Sep 19, 2023
9ad54ad
Add translation to Russian
kant2002 Sep 22, 2023
d34c0a2
Fix some typos, move translations to their own file + allows user to …
MangelMaxime Jan 1, 2024
c9fd8f3
Update changelog
MangelMaxime Jan 1, 2024
1359284
Trigger release only on the main branch
MangelMaxime Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Release
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
# Separate build job for JavaScript
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
# Changelog

All notable changes to this project will be documented in this file.

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

## Unreleased

## 4.3.0

### Added

* Add localization support

## 4.2.0

### Fixed
Expand Down
14 changes: 7 additions & 7 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ module Stages =
)
}

let donetRestore =
let dotnetRestore =
stage "Restore .NET dependencies" { run "dotnet restore" }

let npmInstall = stage "NPM install" { run "npm install" }
Expand All @@ -131,7 +131,7 @@ module Stages =
stage "NPM install" {
whenCmd {
name "--local"
description "Build using local pacakges from fable repository"
description "Build using local packages from fable repository"
}

run
Expand Down Expand Up @@ -260,7 +260,7 @@ module Stages =

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

pipeline "BuildApp" {
Stages.clean
Stages.donetRestore
Stages.dotnetRestore
Stages.npmInstall
Stages.npmLink
Stages.copyModules
Expand Down Expand Up @@ -321,14 +321,14 @@ pipeline "Release" {
whenBranch "main"

Stages.clean
Stages.donetRestore
Stages.dotnetRestore
Stages.npmInstall
Stages.copyModules
Stages.buildApp
Stages.updatePreludeREPLVersion


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

pipeline "BuildLib" {
Stages.clean
Stages.donetRestore
Stages.dotnetRestore
Stages.npmInstall
Stages.copyModules

Expand Down
11 changes: 6 additions & 5 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ nuget Feliz prerelease
nuget Feliz.Bulma
nuget Feliz.Bulma.Tooltip
nuget Fable.Browser.Css
nuget Fable.Browser.Dom
nuget Fable.Browser.Event
nuget Fable.Browser.Dom == 2.4.4
nuget Fable.Browser.Event == 1.4.5
nuget Fable.Browser.MediaQueryList
nuget Fable.Browser.Navigator == 2.0.0
Comment on lines +20 to +23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there conflict between dependencies for you to need to lock the versions ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It pulls to latest version and something broke. It some versions mismatch, and i feel that REPL is a bit picky. Also it produce larger diff in lock file. If you don't mind updating deps, I'm fine :) also I can work separately on that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, keep it like that I will have a look when testing your PR.


# REPL Lib

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

github elmish/elmish:v3.x
github fable-compiler/fable-promise:master
github fable-compiler/fable-promise:14eca483d664dce5aebbe50fb92a536a7c1ffe53
github alfonsogarciacaro/Feliz.Engine:main
github alfonsogarciacaro/Feliz.Snabbdom:main
github davedawkins/Feliz.Engine.Bulma:main
github davedawkins/Sutil:main
github davedawkins/Feliz.Engine.Bulma:0df54855ac3464a432cd207412ab66e650a87d77
github davedawkins/Sutil:343bc31867127638a79afede0dcaa97ca56fa264
39 changes: 29 additions & 10 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,39 @@ NUGET
Fable.Browser.Svg (>= 2.3)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Dom (2.14)
Fable.Browser.Blob (>= 1.3)
Fable.Browser.Event (>= 1.5)
Fable.Browser.WebStorage (>= 1.2)
Fable.Core (>= 3.2.8)
Fable.Browser.Dom (2.4.4)
Fable.Browser.Blob (>= 1.1.4)
Fable.Browser.Event (>= 1.4.4)
Fable.Browser.WebStorage (>= 1.0.4)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Event (1.5)
Fable.Browser.Gamepad (>= 1.1)
Fable.Browser.Event (1.4.5)
Fable.Browser.Gamepad (>= 1.0.3)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Gamepad (1.2)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Geolocation (1.2)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.MediaQueryList (1.4)
Fable.Browser.Dom (>= 2.11)
Fable.Browser.Event (>= 1.5)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.MediaStream (3.3)
Fable.Browser.Dom (>= 2.11)
Fable.Browser.Event (>= 1.5)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Navigator (2.0)
Fable.Browser.Gamepad (>= 1.0.3)
Fable.Browser.Geolocation (>= 1.0.4)
Fable.Browser.MediaStream (>= 3.0.4)
Fable.Browser.Worker (>= 1.0.5)
Fable.Core (>= 3.1.5)
FSharp.Core (>= 4.7.2)
Fable.Browser.Svg (2.3)
Fable.Browser.Dom (>= 2.11)
Fable.Core (>= 3.0)
Expand All @@ -37,6 +52,10 @@ NUGET
Fable.Browser.Event (>= 1.5)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Browser.Worker (1.2)
Fable.Browser.Event (>= 1.5)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
Fable.Core (4.0)
Fable.Elmish (4.0.2)
Fable.Core (>= 3.7.1)
Expand Down Expand Up @@ -135,12 +154,12 @@ GITHUB
SourceLink.Create.CommandLine
Unquote
remote: fable-compiler/fable-promise
FULLPROJECT (28ca5a0b62c9fb94fa9ea861eb8abf6cef59e800)
FULLPROJECT (14eca483d664dce5aebbe50fb92a536a7c1ffe53)
remote: alfonsogarciacaro/Feliz.Engine
FULLPROJECT (61152aebd6c0b7878bfc4db05e2e10724b434a3e)
remote: alfonsogarciacaro/Feliz.Snabbdom
FULLPROJECT (7b28ccbceebcc9b66a8cb67aab89b7ae9576dbfb)
remote: davedawkins/Feliz.Engine.Bulma
FULLPROJECT (9504b9d5a43f5c3ef84086815076ebed1948b162)
FULLPROJECT (0df54855ac3464a432cd207412ab66e650a87d77)
remote: davedawkins/Sutil
FULLPROJECT (cba867e22cb7862d64bf363acf81357c1ffc384d)
FULLPROJECT (343bc31867127638a79afede0dcaa97ca56fa264)
1 change: 1 addition & 0 deletions src/App/App.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<Compile Include="..\Standalone\Worker\Shared.fs" />
<Compile Include="Libs\Monaco.fs" />
<Compile Include="Libs/ReactDeviceDetect.fs" />
<Compile Include="Translations.fs" />
<Compile Include="Prelude.fs" />
<Compile Include="Helpers.fs" />
<Compile Include="Editor.fs" />
Expand Down
4 changes: 2 additions & 2 deletions src/App/ConsolePanel.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let renderShowSeparator =
prop.style [
style.justifyContent.center
]
prop.text "Iframe loaded"
prop.text Translations.msg_iframe_loaded
]

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

Html.div [
prop.className "scrollable-panel-header-title"
prop.text "Console"
prop.text Translations.win_header_console
]

Html.div [
Expand Down
Loading