fix(region): 补充部分翻译 (#20730)

yunionio · Jul 7, 2024 · 3b5f8df · 3b5f8df
1 parent 28e3224
commit 3b5f8df
Show file tree

Hide file tree

Showing 9 changed files with 4,636 additions and 4,208 deletions.
diff --git a/locales/locales.go b/locales/locales.go
diff --git a/locales/zh-CN/messages.gotext.json b/locales/zh-CN/messages.gotext.json
diff --git a/pkg/apigateway/handler/misc.go b/pkg/apigateway/handler/misc.go
@@ -460,7 +460,7 @@ func (mh *MiscHandler) getDownloadsHandler(ctx context.Context, w http.ResponseW
 	params := appctx.AppContextParams(ctx)
 	template, ok := params["<template_id>"]
 	if !ok || len(template) == 0 {
-		httperrors.InvalidInputError(ctx, w, "template_id")
+		httperrors.MissingParameterError(ctx, w, "template_id")
 		return
 	}
 

diff --git a/pkg/apihelper/apihelper.go b/pkg/apihelper/apihelper.go
@@ -34,8 +34,6 @@ import (
 )
 
 const (
-	ErrSync = errors.Error("sync error")
-
 	MinSyncIntervalSeconds  = 10
 	MinRunDelayMilliseconds = 100
 )
@@ -170,7 +168,7 @@ func (h *APIHelper) doSync(ctx context.Context) (changed bool, err error) {
 		if err != nil {
 			log.Errorf("unable to EventNotify: %s", err)
 		}
-		return false, errors.Wrap(ErrSync, "incorrect")
+		return false, errors.Errorf("sync error")
 	}
 	changed = r.Changed
 	return changed, nil

diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go
@@ -441,7 +441,7 @@ func (app *Application) defaultHandle(w http.ResponseWriter, r *http.Request, ri
 		}
 	} else if !isCors {
 		ctx := appctx.WithRequestLang(context.TODO(), r)
-		httperrors.NotFoundError(ctx, w, "Handler not found")
+		httperrors.NotFoundError(ctx, w, "Handler %s not found", "/"+strings.Join(segs, "/"))
 	}
 	return nil, nil
 }

diff --git a/pkg/cloudcommon/db/history_data_clean.go b/pkg/cloudcommon/db/history_data_clean.go
@@ -42,7 +42,7 @@ func historyDataCleanHandler(ctx context.Context, w http.ResponseWriter, r *http
 	}
 	input, err := appsrv.FetchJSON(r)
 	if err != nil {
-		httperrors.InputParameterError(ctx, w, "FetchJSON")
+		httperrors.InputParameterError(ctx, w, "invalid input json")
 		return
 	}
 	date := time.Now().AddDate(0, -1, 0)

diff --git a/pkg/compute/hostdrivers/jdcloud.go b/pkg/compute/hostdrivers/jdcloud.go
@@ -48,7 +48,7 @@ func (self *SJDcloudHostDriver) GetProvider() string {
 // ValidateResetDisk 仅可用状态的云硬盘支持恢复
 // 卸载硬盘需要停止云主机
 func (self *SJDcloudHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, input *api.DiskResetInput) (*api.DiskResetInput, error) {
-	return nil, httperrors.NewNotSupportedError("not supported")
+	return nil, httperrors.NewNotSupportedError("not supported resize disk")
 }
 
 // ValidateDiskSize

diff --git a/pkg/compute/hostdrivers/qcloud.go b/pkg/compute/hostdrivers/qcloud.go
@@ -74,7 +74,7 @@ func (self *SQcloudHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb
 func (self *SQcloudHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, input *api.DiskResetInput) (*api.DiskResetInput, error) {
 	for _, guest := range guests {
 		if !utils.IsInStringArray(guest.Status, []string{api.VM_RUNNING, api.VM_READY}) {
-			return nil, httperrors.NewBadGatewayError("Qcloud reset disk required guest status is running or read")
+			return nil, httperrors.NewBadGatewayError("Qcloud reset disk required guest status is running or ready")
 		}
 	}
 	return input, nil

diff --git a/pkg/compute/hostdrivers/volcengine.go b/pkg/compute/hostdrivers/volcengine.go
@@ -70,7 +70,7 @@ func (self *SVolcengineHostDriver) ValidateDiskSize(storage *models.SStorage, si
 func (self *SVolcengineHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, input *api.DiskResetInput) (*api.DiskResetInput, error) {
 	for _, guest := range guests {
 		if !utils.IsInStringArray(guest.Status, []string{api.VM_RUNNING, api.VM_READY}) {
-			return nil, httperrors.NewBadGatewayError("Volcengine reset disk required guest status is running or read")
+			return nil, httperrors.NewBadGatewayError("Volcengine reset disk required guest status is running or ready")
 		}
 	}
 	return input, nil