CatAClock/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-04-25 04:57:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

feat(build): uniform ini parsing (#7429)

Browse source 
- Use the existing ini parser for the `lint-locale` and `lint-locale-usage` tooling.
- This discovered that the previous ini parser was not correctly parsing certain types of string, specifically those with `;` as it's seen as a comment. It now properly 'unescapes' that and is not seen as a comment break.
- Discovered-by: @fogti

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7429
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
This commit is contained in:
Gusted 2025-04-03 08:27:02 +00:00 • committed by Gusted
parent 4ab40ed6af
commit ba5b157f7e
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/lint-locale/lint-locale_test.go
View file

@ -60,7 +60,7 @@ func TestLocalizationPolicy(t *testing.T) {
t.Run("Escaped HTML characters", func(t *testing.T) { t.Run("Escaped HTML characters", func(t *testing.T) {
assert.Empty(t, checkLocaleContent([]byte("activity.git_stats_push_to_branch = `إلى %s و\"`"))) assert.Empty(t, checkLocaleContent([]byte("activity.git_stats_push_to_branch = `إلى %s و\"`")))
assert.Equal(t, []string{"key: و\x1b[31m&nbsp\x1b[0m\x1b[32m\u00a0\x1b[0m"}, checkLocaleContent([]byte(`key = و&nbsp;`))) assert.Equal(t, []string{"key: و\x1b[31m&nbsp;\x1b[0m\x1b[32m\u00a0\x1b[0m"}, checkLocaleContent([]byte(`key = و&nbsp;`)))
}) })
} }

11
modules/translation/localeiter/utils.go
View file

@ -10,17 +10,12 @@ import (
"encoding/json" //nolint:depguard "encoding/json" //nolint:depguard
"fmt" "fmt"
"gopkg.in/ini.v1" //nolint:depguard "forgejo.org/modules/setting"
) )
func IterateMessagesContent(localeContent []byte, onMsgid func(string, string) error) error { func IterateMessagesContent(localeContent []byte, onMsgid func(string, string) error) error {
// Same configuration as Forgejo uses. cfg, err := setting.NewConfigProviderForLocale(localeContent)
cfg := ini.Empty(ini.LoadOptions{ if err != nil {
IgnoreContinuation: true,
})
cfg.NameMapper = ini.SnackCase
if err := cfg.Append(localeContent); err != nil {
return err return err
} }