Archives/telebot
2
0
Fork 0
mirror of https://github.com/tucnak/telebot synced 2024-11-11 01:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

layout: parse default locale from settings

Browse Source
This commit is contained in:
Demian 2020-09-15 13:37:30 +03:00
parent 3e050a95e5
commit e9dd8a775f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/settings.go
View File

@ -16,9 +16,10 @@ type (
Token string Token string
Updates int Updates int
LocalesDir string `json:"locales_dir"` LocalesDir string `json:"locales_dir"`
TokenEnv string `json:"token_env"` DefaultLocale string `json:"default_locale"`
ParseMode string `json:"parse_mode"` TokenEnv string `json:"token_env"`
ParseMode string `json:"parse_mode"`
Webhook *tele.Webhook `json:"webhook"` Webhook *tele.Webhook `json:"webhook"`
LongPoller *tele.LongPoller `json:"long_poller"` LongPoller *tele.LongPoller `json:"long_poller"`
@ -39,6 +40,8 @@ func (lt *Layout) UnmarshalYAML(data []byte) error {
lt.Config = aux.Config lt.Config = aux.Config
if pref := aux.Settings; pref != nil { if pref := aux.Settings; pref != nil {
lt.DefaultLocale = pref.DefaultLocale
lt.pref = &tele.Settings{ lt.pref = &tele.Settings{
URL: pref.URL, URL: pref.URL,
Token: pref.Token, Token: pref.Token,
@ -46,9 +49,6 @@ func (lt *Layout) UnmarshalYAML(data []byte) error {
ParseMode: pref.ParseMode, ParseMode: pref.ParseMode,
} }
if pref.LocalesDir == "" {
aux.Settings.LocalesDir = "locales"
}
if pref.TokenEnv != "" { if pref.TokenEnv != "" {
lt.pref.Token = os.Getenv(pref.TokenEnv) lt.pref.Token = os.Getenv(pref.TokenEnv)
} }
@ -136,6 +136,9 @@ func (lt *Layout) UnmarshalYAML(data []byte) error {
} }
if aux.Locales == nil { if aux.Locales == nil {
if aux.Settings.LocalesDir == "" {
aux.Settings.LocalesDir = "locales"
}
return lt.parseLocales(aux.Settings.LocalesDir) return lt.parseLocales(aux.Settings.LocalesDir)
} }