fix: remove locale region set

remove locale region set

Log:

Author: dengbo11

langselector1/exported_methods_auto.go

@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -26,6 +25,7 @@ import (
 	notifications "github.com/linuxdeepin/go-dbus-factory/session/org.freedesktop.notifications"
 	lastore "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.lastore1"
 	localehelper "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.localehelper1"
+
 	gio "github.com/linuxdeepin/go-gir/gio-2.0"
 	"github.com/linuxdeepin/go-lib/dbusutil"
 	. "github.com/linuxdeepin/go-lib/gettext"
@@ -45,10 +45,9 @@ const (
 
 var (
 	// for locale-helper
-	_                    = Tr("Authentication is required to switch language")
-	localeConfigFile     = filepath.Join(basedir.GetUserHomeDir(), userLocaleConfigFile)
-	localeConfigFileTmp  = filepath.Join(basedir.GetUserHomeDir(), userLocaleConfigFileTmp)
-	localeRegionSections = []string{"LC_CTYPE", "LC_NUMERIC", "LC_MONETARY", "LC_TIME", "LC_PAPER", "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT"}
+	_                   = Tr("Authentication is required to switch language")
+	localeConfigFile    = filepath.Join(basedir.GetUserHomeDir(), userLocaleConfigFile)
+	localeConfigFileTmp = filepath.Join(basedir.GetUserHomeDir(), userLocaleConfigFileTmp)
 )
 
 const (
@@ -69,23 +68,22 @@ var (
 	// Error: not found the file
 	//
 	// 错误：没有此文件
-	ErrFileNotExist = fmt.Errorf("File not exist")
+	ErrFileNotExist = fmt.Errorf("file not exist")
 	// Error: not found the locale
 	//
 	// 错误：无效的 Locale
-	ErrLocaleNotFound = fmt.Errorf("Locale not found")
+	ErrLocaleNotFound = fmt.Errorf("locale not found")
 	// Error: changing locale failure
 	//
 	// 错误：修改 locale 失败
-	ErrLocaleChangeFailed = fmt.Errorf("Changing locale failed")
+	ErrLocaleChangeFailed = fmt.Errorf("changing locale failed")
 )
 
 var (
 	//save old language notifycation data
 	notifyTxtStartWithInstall string
 	notifyTxtStart            string
 	notifyTxtDone             string
-	notifyTxtRegionSetDone    string
 )
 
 //go:generate dbusutil-gen -type LangSelector locale.go
@@ -141,7 +139,6 @@ func initNotifyTxt() {
 	notifyTxtStartWithInstall = Tr("Changing system language and installing the required language packages, please wait...")
 	notifyTxtStart = Tr("Changing system language, please wait...")
 	notifyTxtDone = Tr("System language changed, please log out and then log in")
-	notifyTxtRegionSetDone = Tr("System region changed, please log out and then log in")
 }
 
 func newLangSelector(service *dbusutil.Service) (*LangSelector, error) {
@@ -308,32 +305,7 @@ func writeUserLocale(locale string) error {
 
 func writeLocaleEnvFile(locale, originFilename string, destFilename string) error {
 	var content = generateLocaleEnvFile(locale, originFilename)
-	return ioutil.WriteFile(destFilename, content, 0644)
-}
-
-func writeLocaleRegionsEnvFile(locale string, originFilename string, destFilename string) error {
-	var (
-		localeRegionFound bool
-		infos, _          = readEnvFile(originFilename)
-		buf               bytes.Buffer
-	)
-
-	for _, info := range infos {
-		if strv.Strv(localeRegionSections).Contains(info.key) {
-			localeRegionFound = true
-			info.value = locale
-		}
-
-		buf.WriteString(fmt.Sprintf("%s=%s\n", info.key, info.value))
-	}
-
-	if !localeRegionFound {
-		for _, format := range localeRegionSections {
-			buf.WriteString(fmt.Sprintf("%s=%s\n", format, locale))
-		}
-	}
-
-	return ioutil.WriteFile(destFilename, buf.Bytes(), 0644)
+	return os.WriteFile(destFilename, content, 0644)
 }
 
 func generateLocaleEnvFile(locale, filename string) []byte {
@@ -383,7 +355,7 @@ func getLocaleFromFile(filename string) (string, error) {
 }
 
 func readEnvFile(file string) (envInfos, error) {
-	content, err := ioutil.ReadFile(file)
+	content, err := os.ReadFile(file)
 	if err != nil {
 		return nil, err
 	}
@@ -673,107 +645,3 @@ func (lang *LangSelector) deleteLocale(locale string) error {
 	}
 	return nil
 }
-
-func getCurrentLocaleRegion(path string) (string, error) {
-	var currentLocaleRegion string
-
-	infos, err := readEnvFile(path)
-	if err != nil {
-		return currentLocaleRegion, err
-	}
-
-	for _, info := range infos {
-		if strv.Strv(localeRegionSections).Contains(info.key) {
-			currentLocaleRegion = info.value
-			break
-		}
-	}
-
-	return currentLocaleRegion, nil
-}
-
-// 获取当前用户的locale region, 如果没有设置过，使用系统的locale region
-func (lang *LangSelector) getLocaleRegion() (string, error) {
-	l, err := getCurrentLocaleRegion(localeConfigFile)
-	if err != nil {
-		logger.Warning("failed to get current locale region", err)
-		return lang.CurrentLocale, nil
-	}
-
-	return l, nil
-}
-
-// 根据用户选择的区域(locale)去设置对应的LC_*环境变量
-func (lang *LangSelector) setLocaleRegion(locale string) {
-	currentRegion, err := lang.getLocaleRegion()
-	if err != nil {
-		logger.Warning("failed to get locale region", err)
-		return
-	}
-
-	if currentRegion == locale {
-		logger.Debugf("the same locale Region %v, not need to set", locale)
-		return
-	}
-
-	lang.PropsMu.Lock()
-	lang.setPropLocaleState(LocaleStateChanging)
-	lang.PropsMu.Unlock()
-
-	networkEnabled, err := isNetworkEnable()
-	if err != nil {
-		logger.Warning(err)
-	}
-
-	// check locale language pkg installed
-	pkg, err := lang.getInstallLangSupportPackages(locale)
-	if err != nil {
-		logger.Debug("failed to get language support packages", err)
-	}
-
-	// only language support packages not installed and network enabled should install
-	isInstalled := len(pkg) != 0
-
-	if !isInstalled {
-		if networkEnabled {
-			sendNotify(localeIconStart, "", notifyTxtStartWithInstall)
-		} else {
-			sendNotify(localeIconStart, "", notifyTxtStart)
-		}
-
-		// generate locale
-		err = lang.generateLocale(locale)
-		if err != nil {
-			logger.Warning("failed to generate locale:", err)
-			sendNotify(localeIconFailed, "",
-				Tr("Failed to change locale region, please try later"))
-			lang.PropsMu.Lock()
-			lang.setPropLocaleState(LocaleStateChanged)
-			lang.PropsMu.Unlock()
-			return
-		} else {
-			logger.Debug("generate locale success")
-		}
-	}
-
-	// install language support packages
-	if !isInstalled && networkEnabled {
-		err = lang.installLangSupportPackages(locale)
-		if err != nil {
-			logger.Warning("failed to install packages:", err)
-		} else {
-			logger.Debug("install packages success")
-		}
-	}
-
-	err = writeLocaleRegionsEnvFile(locale, localeConfigFile, localeConfigFileTmp)
-	if err != nil {
-		logger.Warning("failed to write user locale formats:", err)
-	}
-
-	sendNotify(localeIconFinished, "", notifyTxtRegionSetDone)
-
-	lang.PropsMu.Lock()
-	lang.setPropLocaleState(LocaleStateChanged)
-	lang.PropsMu.Unlock()
-}

langselector1/locale.go

@@ -110,26 +110,3 @@ func (lang *LangSelector) DeleteLocale(locale string) *dbus.Error {
 	err := lang.deleteLocale(locale)
 	return dbusutil.ToError(err)
 }
-
-func (lang *LangSelector) GetLocaleRegion() (region string, busErr *dbus.Error) {
-	lang.service.DelayAutoQuit()
-
-	localeRegion, err := lang.getLocaleRegion()
-	if err != nil {
-		return "", dbusutil.ToError(err)
-	}
-
-	return localeRegion, nil
-}
-
-func (lang *LangSelector) SetLocaleRegion(locale string) *dbus.Error {
-	lang.service.DelayAutoQuit()
-
-	if !lang.isSupportedLocale(locale) {
-		return dbusutil.ToError(fmt.Errorf("invalid locale: %v", locale))
-	}
-
-	logger.Debugf("setLocaleRegion %q", locale)
-	go lang.setLocaleRegion(locale)
-	return nil
-}

langselector1/locale_ifc.go

@@ -14,15 +14,6 @@ import (
 func Test_GenerateLocaleEnvFile(t *testing.T) {
 	example := `LANG=en_US.UTF-8
 LANGUAGE=en_US
-LC_CTYPE="zh_CN.UTF-8"
-LC_NUMERIC="zh_CN.UTF-8"
-LC_MONETARY="zh_CN.UTF-8"
-LC_TIME="zh_CN.UTF-8"
-LC_PAPER="zh_CN.UTF-8"
-LC_NAME="zh_CN.UTF-8"
-LC_ADDRESS="zh_CN.UTF-8"
-LC_TELEPHONE="zh_CN.UTF-8"
-LC_MEASUREMENT="zh_CN.UTF-8"
 `
 	assert.Equal(t, string(generateLocaleEnvFile("en_US.UTF-8",
 		"testdata/pam_environment")), example)
@@ -41,13 +32,3 @@ func Test_WriteUserLocale(t *testing.T) {
 	assert.Nil(t, writeLocaleEnvFile("zh_CN.UTF-8", "testdata/pam_environment", "testdata/pam"))
 	os.RemoveAll("testdata/pam")
 }
-
-func Test_WriteLocaleRegionsEnvFile(t *testing.T) {
-	assert.Nil(t, writeLocaleRegionsEnvFile("zh_CN.UTF-8", "testdata/pam_environment", "testdata/pam"))
-	os.RemoveAll("testdata/pam")
-}
-
-func Test_getCurrentLocaleRegione(t *testing.T) {
-	_, err := getCurrentLocaleRegion("testdata/pam_environment")
-	assert.NoError(t, err)
-}

langselector1/locale_test.go

@@ -1,12 +1,3 @@
 LANG=zh_CN.UTF-8
 LANGUAGE=zh_CN
-LC_CTYPE="zh_CN.UTF-8"
-LC_NUMERIC="zh_CN.UTF-8"
-LC_MONETARY="zh_CN.UTF-8"
-LC_TIME="zh_CN.UTF-8"
-LC_PAPER="zh_CN.UTF-8"
-LC_NAME="zh_CN.UTF-8"
-LC_ADDRESS="zh_CN.UTF-8"
-LC_TELEPHONE="zh_CN.UTF-8"
-LC_MEASUREMENT="zh_CN.UTF-8"