diff --git a/env/fonts.lua b/env/fonts.lua index ad8e989e..b252b7a7 100644 --- a/env/fonts.lua +++ b/env/fonts.lua @@ -6,15 +6,7 @@ else end function pfUI.environment:UpdateFonts() - -- load config if available - if pfUI_config and pfUI_config.global.force_region == "1" then - -- force locale based fonts - if GetLocale() == "zhCN" then - pfUI.font_default = "Fonts\\FZXHLJW.TTF" - pfUI.font_combat = "Fonts\\FZXHLJW.TTF" - pfUI.font_square = "Fonts\\FZXHLJW.TTF" - end - elseif pfUI_config and pfUI_config.global.font_default then + if pfUI_config and pfUI_config.global.font_default then pfUI.font_default = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_default .. ".ttf" pfUI.font_combat = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_combat .. ".ttf" pfUI.font_square = "Interface\\AddOns\\pfUI\\fonts\\" .. pfUI_config.global.font_square .. ".ttf" @@ -24,6 +16,15 @@ function pfUI.environment:UpdateFonts() pfUI.font_combat = "Interface\\AddOns\\pfUI\\fonts\\diediedie.ttf" end + -- force locale based fonts + if pfUI_config and pfUI_config.global.force_region == "1" then + if GetLocale() == "zhCN" then + pfUI.font_default = "Fonts\\FZXHLJW.TTF" + pfUI.font_combat = "Fonts\\FZXHLJW.TTF" + pfUI.font_square = "Fonts\\FZXHLJW.TTF" + end + end + STANDARD_TEXT_FONT = pfUI.font_default; UNIT_NAME_FONT = pfUI.font_default; DAMAGE_TEXT_FONT = pfUI.font_combat;