Skip to content

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

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

Merged
merged 6 commits into from
Nov 6, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1625f0c
Fixed locales (translations) not being detected with default config
cmaglie Oct 7, 2024
58a08f1
Fixed integration test
cmaglie Oct 7, 2024
9d9afb8
Apply i18n settings only if specified
cmaglie Oct 15, 2024
317b3de
Fixed settings.GetLocale()
cmaglie Nov 6, 2024
a6e3276
Do not print directly to stdout if locale-detection fails (windows)
cmaglie Nov 6, 2024
01e72e3
Give LANG env var priority (windows)
cmaglie Nov 6, 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
Prev Previous commit
Next Next commit
Fixed integration test
  • Loading branch information
@cmaglie
cmaglie committed Nov 6, 2024
commit 58a08f1a39be9bbc7bccf74367a29339f132b707
16 changes: 8 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
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy