public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n: rename locale to regionalFormat (#106585)

Browse Source 
* locale -> regionalFormat, mirroring #102233

* set up regionalFormat to replace locale entirely

* replace locale with regionalFormat

* update reportInteraction arguments
This commit is contained in:
Luminessa Starlight
2025-06-16 21:53:55 +02:00
committed by GitHub
parent c00caa2fb2
commit 09e8484bac
19 changed files with 103 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/preference/prefimpl/pref.go
+6 -6
View File
@@ -72,8 +72,8 @@ func (s *Service) GetWithDefaults(ctx context.Context, query *pref.GetPreference
res.JSONData.Language = p.JSONData.Language
}
if p.JSONData.Locale != "" {
res.JSONData.Locale = p.JSONData.Locale
if p.JSONData.RegionalFormat != "" {
res.JSONData.RegionalFormat = p.JSONData.RegionalFormat
}
if p.JSONData.QueryHistory.HomeTab != "" {
@@ -192,11 +192,11 @@ func (s *Service) Patch(ctx context.Context, cmd *pref.PatchPreferenceCommand) e
preference.JSONData.Language = *cmd.Language
}
if cmd.Locale != nil {
if cmd.RegionalFormat != nil {
if preference.JSONData == nil {
preference.JSONData = &pref.PreferenceJSONData{}
}
preference.JSONData.Locale = *cmd.Locale
preference.JSONData.RegionalFormat = *cmd.RegionalFormat
}
if cmd.Navbar != nil && cmd.Navbar.BookmarkUrls != nil {
@@ -296,8 +296,8 @@ func parseCookiePreferences(prefs []pref.CookieType) (map[string]struct{}, error
func preferenceData(cmd *pref.SavePreferenceCommand) (*pref.PreferenceJSONData, error) {
jsonData := &pref.PreferenceJSONData{
Language: cmd.Language,
Locale: cmd.Locale,
Language: cmd.Language,
RegionalFormat: cmd.RegionalFormat,
}
if cmd.Navbar != nil {
jsonData.Navbar = *cmd.Navbar