From b2acd22f58857676911de5a401fec10c3e0942d2 Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Mon, 29 Mar 2021 17:36:51 +0800
Subject: [PATCH] improve package gi18n

---
 i18n/gi18n/gi18n.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/i18n/gi18n/gi18n.go b/i18n/gi18n/gi18n.go
index c3665ad72..b0a85400b 100644
--- a/i18n/gi18n/gi18n.go
+++ b/i18n/gi18n/gi18n.go
@@ -7,45 +7,40 @@
 // Package gi18n implements internationalization and localization.
 package gi18n
 
-var (
-	// defaultManager is the default i18n instance for package functions.
-	defaultManager = Instance()
-)
-
 // SetPath sets the directory path storing i18n files.
 func SetPath(path string) error {
-	return defaultManager.SetPath(path)
+	return Instance().SetPath(path)
 }
 
 // SetLanguage sets the language for translator.
 func SetLanguage(language string) {
-	defaultManager.SetLanguage(language)
+	Instance().SetLanguage(language)
 }
 
 // SetDelimiters sets the delimiters for translator.
 func SetDelimiters(left, right string) {
-	defaultManager.SetDelimiters(left, right)
+	Instance().SetDelimiters(left, right)
 }
 
 // T is alias of Translate for convenience.
 func T(content string, language ...string) string {
-	return defaultManager.T(content, language...)
+	return Instance().T(content, language...)
 }
 
 // Tf is alias of TranslateFormat for convenience.
 func Tf(format string, values ...interface{}) string {
-	return defaultManager.TranslateFormat(format, values...)
+	return Instance().TranslateFormat(format, values...)
 }
 
 // Tfl is alias of TranslateFormatLang for convenience.
 func Tfl(language string, format string, values ...interface{}) string {
-	return defaultManager.TranslateFormatLang(language, format, values...)
+	return Instance().TranslateFormatLang(language, format, values...)
 }
 
 // TranslateFormat translates, formats and returns the <format> with configured language
 // and given <values>.
 func TranslateFormat(format string, values ...interface{}) string {
-	return defaultManager.TranslateFormat(format, values...)
+	return Instance().TranslateFormat(format, values...)
 }
 
 // TranslateFormatLang translates, formats and returns the <format> with configured language
@@ -53,17 +48,17 @@ func TranslateFormat(format string, values ...interface{}) string {
 // configured language. If <language> is given empty string, it uses the default configured
 // language for the translation.
 func TranslateFormatLang(language string, format string, values ...interface{}) string {
-	return defaultManager.TranslateFormatLang(language, format, values...)
+	return Instance().TranslateFormatLang(language, format, values...)
 }
 
 // Translate translates <content> with configured language and returns the translated content.
 // The parameter <language> specifies custom translation language ignoring configured language.
 func Translate(content string, language ...string) string {
-	return defaultManager.Translate(content, language...)
+	return Instance().Translate(content, language...)
 }
 
 // GetValue retrieves and returns the configured content for given key and specified language.
 // It returns an empty string if not found.
 func GetContent(key string, language ...string) string {
-	return defaultManager.GetContent(key, language...)
+	return Instance().GetContent(key, language...)
 }