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

Sort locales according to their names #18211

Merged
merged 2 commits into from
Jan 8, 2022
Merged

Sort locales according to their names #18211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3343dd
Sort locales according to their names
delvh Jan 8, 2022
905fdb7
Fix documentation and sort case insensitive
delvh Jan 8, 2022
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
10 changes: 9 additions & 1 deletion modules/translation/translation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
package translation

import (
"sort"
"strings"

"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/options"
"code.gitea.io/gitea/modules/setting"
Expand All @@ -31,7 +34,7 @@ var (
supportedTags []language.Tag
)

// AllLangs returns all supported langauages
// AllLangs returns all supported languages sorted by name
func AllLangs() []LangType {
return allLangs
}
Expand Down Expand Up @@ -72,6 +75,11 @@ func InitLocales() {
for i, v := range langs {
allLangs = append(allLangs, LangType{v, names[i]})
}

// Sort languages case insensitive according to their name - needed for the user settings
sort.Slice(allLangs, func(i, j int) bool {
return strings.ToLower(allLangs[i].Name) < strings.ToLower(allLangs[j].Name)
})
}

// Match matches accept languages
Expand Down