diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-02-08 11:02:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 11:02:30 +0800 |
| commit | a60e8be8d15e90a44f2a746a4e8d81a81e03d2db (patch) | |
| tree | 256934930648471f3eddb1e4dcf2f077aaf95e0c /routers/web/repo/issue_content_history.go | |
| parent | 7b25a010c89835e036f1b0cc5af65249bfd2781b (diff) | |
| download | gitea-a60e8be8d15e90a44f2a746a4e8d81a81e03d2db.tar.gz gitea-a60e8be8d15e90a44f2a746a4e8d81a81e03d2db.zip | |
Refactor i18n, use Locale to provide i18n/translation related functions (#18648)
* remove unnecessary web context data fields, and unify the i18n/translation related functions to `Locale`
* in development, show an error if a translation key is missing
* remove the unnecessary loops `for _, lang := range translation.AllLangs()` for every request, which improves the performance slightly
* use `ctx.Locale.Language()` instead of `ctx.Data["Lang"].(string)`
* add more comments about how the Locale/LangType fields are used
Diffstat (limited to 'routers/web/repo/issue_content_history.go')
| -rw-r--r-- | routers/web/repo/issue_content_history.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 75951ca25b..5b5aced6ec 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -29,7 +29,7 @@ func GetContentHistoryOverview(ctx *context.Context) { return } - lang := ctx.Data["Lang"].(string) + lang := ctx.Locale.Language() editedHistoryCountMap, _ := issuesModel.QueryIssueContentHistoryEditedCountMap(db.DefaultContext, issue.ID) ctx.JSON(http.StatusOK, map[string]interface{}{ "i18n": map[string]interface{}{ @@ -55,17 +55,17 @@ func GetContentHistoryList(ctx *context.Context) { // render history list to HTML for frontend dropdown items: (name, value) // name is HTML of "avatar + userName + userAction + timeSince" // value is historyId - lang := ctx.Data["Lang"].(string) + lang := ctx.Locale.Language() var results []map[string]interface{} for _, item := range items { var actionText string if item.IsDeleted { - actionTextDeleted := i18n.Tr(lang, "repo.issues.content_history.deleted") + actionTextDeleted := ctx.Locale.Tr("repo.issues.content_history.deleted") actionText = "<i data-history-is-deleted='1'>" + actionTextDeleted + "</i>" } else if item.IsFirstCreated { - actionText = i18n.Tr(lang, "repo.issues.content_history.created") + actionText = ctx.Locale.Tr("repo.issues.content_history.created") } else { - actionText = i18n.Tr(lang, "repo.issues.content_history.edited") + actionText = ctx.Locale.Tr("repo.issues.content_history.edited") } timeSinceText := timeutil.TimeSinceUnix(item.EditedUnix, lang) results = append(results, map[string]interface{}{ |