Merge pull request #8892 from yousong/bugfix/yousong-i18n

Bugfix/yousong i18n
This commit is contained in:
Zexi Li
2020-11-22 10:59:55 +08:00
committed by GitHub
3 changed files with 2834 additions and 2438 deletions
+2831 -2435
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -658,13 +658,13 @@
{
"id": "Model not found error: cannot find %q with id/name %q",
"message": "Model not found error: cannot find %q with id/name %q",
"translation": "无法通过名称或Id找到%q所指定的资源",
"translation": "无法通过名称或ID找到%q(%q)",
"position": "pkg/cloudcommon/validators/errors.go:157:17"
},
{
"id": "Model not found error: cannot find %q with id/name %q: %s",
"message": "Model not found error: cannot find %q with id/name %q: %s",
"translation": "无法通过名称或Id找到%q所指定的资源:%s",
"translation": "无法通过名称或ID找到%q(%q):%s",
"position": "pkg/cloudcommon/validators/errors.go:157:17"
},
{
+1 -1
View File
@@ -1344,7 +1344,7 @@ func (self *SElasticcache) GetAdminAccount() (*SElasticcacheAccount, error) {
}
}
return nil, httperrors.NewNotFoundError(fmt.Sprintf("no admin account found for elastic cache %s", self.Id))
return nil, httperrors.NewNotFoundError("no admin account found for elastic cache %s", self.Id)
}
func (self *SElasticcache) StartResetPasswordTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {