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

Jump to bottom

Fixed locales (translations) not being detected with default config #2724

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fixed locales (translations) not being detected with default config #2724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba6901
Fixed locales (translations) not being detected with default config
cmaglie Oct 7, 2024
40a4c90
Fixed integration test
cmaglie Oct 7, 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
1 change: 0 additions & 1 deletion commands/service_settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func TestGetAll(t *testing.T) {
"user": `+defaultUserDir.GetEncodedValue()+`
},
"library": {},
"locale": "en",
"logging": {
"format": "text",
"level": "info"
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/configuration/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func SetDefaults(settings *Settings) {
setKeyTypeSchema("network.user_agent_ext", "")

// locale
setDefaultValueAndKeyTypeSchema("locale", "en")
setKeyTypeSchema("locale", "")
}

// InjectEnvVars change settings based on the environment variables values
Expand Down
29 changes: 21 additions & 8 deletions internal/integrationtest/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,25 +882,25 @@ build.unk: 123
t.Cleanup(func() { unkwnownConfig.Remove() })

// Run "config get" with a configuration containing an unknown key
out, _, err := cli.Run("config", "get", "locale", "--config-file", unkwnownConfig.String())
out, _, err := cli.Run("config", "get", "daemon.port", "--config-file", unkwnownConfig.String())
require.NoError(t, err)
require.Equal(t, "en", strings.TrimSpace(string(out)))
require.Equal(t, `"50051"`, strings.TrimSpace(string(out)))

// Run "config get" with a configuration containing an invalid key
// Run "config get" with a configuration containing an invalid value
invalidConfig := paths.New(filepath.Join(tmp, "invalid.yaml"))
invalidConfig.WriteFile([]byte(`locale: 123`))
invalidConfig.WriteFile([]byte(`daemon.port: 123`))
t.Cleanup(func() { invalidConfig.Remove() })
out, _, err = cli.Run("config", "get", "locale", "--config-file", invalidConfig.String())
out, _, err = cli.Run("config", "get", "daemon.port", "--config-file", invalidConfig.String())
require.NoError(t, err)
require.Equal(t, "en", strings.TrimSpace(string(out)))
require.Equal(t, `"50051"`, strings.TrimSpace(string(out)))

// Run "config get" with a configuration containing a null array
nullArrayConfig := paths.New(filepath.Join(tmp, "null_array.yaml"))
nullArrayConfig.WriteFile([]byte(`board_manager.additional_urls:`))
t.Cleanup(func() { nullArrayConfig.Remove() })
out, _, err = cli.Run("config", "get", "locale", "--config-file", invalidConfig.String())
out, _, err = cli.Run("config", "get", "daemon.port", "--config-file", nullArrayConfig.String())
require.NoError(t, err)
require.Equal(t, "en", strings.TrimSpace(string(out)))
require.Equal(t, `"50051"`, strings.TrimSpace(string(out)))
}

func TestConfigViaEnvVars(t *testing.T) {
Expand Down Expand Up @@ -931,3 +931,16 @@ func TestConfigViaEnvVars(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "20\n\n", string(out))
}

func TestI18N(t *testing.T) {
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
defer env.CleanUp()

out, _, err := cli.RunWithCustomEnv(map[string]string{"LANG": "it"})
require.NoError(t, err)
require.Contains(t, string(out), "Comandi disponibili")

out, _, err = cli.RunWithCustomEnv(map[string]string{"LANG": "en"})
require.NoError(t, err)
require.Contains(t, string(out), "Available Commands")
}
Loading