a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Flatten out the Errors map in the phrase files.

This commit is contained in:
Azareal 2018-09-27 20:29:16 +10:00
parent e9a9441e93
commit 59497de8dc
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/phrases.go
View File

@ -46,7 +46,7 @@ type LanguagePack struct {
UserAgents map[string]string
OperatingSystems map[string]string
HumanLanguages map[string]string
Errors map[string]map[string]string // map[category]map[name]value
Errors map[string]string
NoticePhrases map[string]string
PageTitles map[string]string
TmplPhrases map[string]string
@ -205,12 +205,12 @@ func GetHumanLangPhrase(name string) (string, bool) {
}
// TODO: Does comma ok work with multi-dimensional maps?
func GetErrorPhrase(category string, name string) string {
res, ok := currentLangPack.Load().(*LanguagePack).Errors[category][name]
func GetErrorPhrase(name string) (string, bool) {
res, ok := currentLangPack.Load().(*LanguagePack).Errors[name]
if !ok {
return getPhrasePlaceholder("error", name)
return getPhrasePlaceholder("error", name), false
}
return res
return res, true
}
func GetNoticePhrase(name string) string {

2
langs/english.json
View File

@ -70,8 +70,6 @@
},
"Errors": {
"NoPerms": {
}
},
"PageTitles": {