The Unified and Autonomous Development Platform
wip: i18n support
Robin Shen33882dd5d9d2
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex c638a6ec5c..4f496e8fe2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -14,7 +14,7 @@ import io.onedev.server.model.User;public enum MergeStrategy {- CREATE_MERGE_COMMIT("Add all commits from source branch to target branch with a merge commit.") {+ CREATE_MERGE_COMMIT("Add all commits from source branch to target branch with a merge commit") {@Overridepublic ObjectId merge(PullRequest request, String commitMessage) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.javaindex 83dfb5e94f..7d003da173 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java@@ -1,6 +1,9 @@package io.onedev.server.web.component.pullrequest.assignment;import io.onedev.server.web.page.base.BasePage;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -32,7 +35,7 @@ public abstract class AssigneeChoice extends SelectToActChoice<User> {protected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Add assignee...");+ getSettings().setPlaceholder(_T("Add assignee..."));getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex e3ac29a576..b9d19f969e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -4,29 +4,29 @@<div class="d-flex mb-4"><form wicket:id="query" class="clearable-wrapper flex-grow-1"><div class="input-group">- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query/order pull requests">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"><span class="input-group-append">- <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon"><wicket:svg href="magnify" class="icon"></wicket:svg></button></span></div></form>- <a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>+ <a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-3"><wicket:svg href="plus" class="icon"/></a></div><div class="operations mb-5"><a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4 mb-2 text-nowrap d-inline-block">- <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries+ <wicket:svg href="eye" class="icon"></wicket:svg> <wicket:t>Show Saved Queries</wicket:t></a><a wicket:id="saveQuery" class="save-query text-gray mr-4 mb-2 text-nowrap d-inline-block">- <wicket:svg href="save" class="icon"></wicket:svg> Save Query+ <wicket:svg href="save" class="icon"></wicket:svg> <wicket:t>Save Query</wicket:t></a><a wicket:id="filter" class="filter text-gray d-inline-block mb-2 mr-4">- <wicket:svg href="filter" class="icon"></wicket:svg> Filters+ <wicket:svg href="filter" class="icon"></wicket:svg> <wicket:t>Filter</wicket:t></a><a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 text-nowrap d-inline-block">- <wicket:svg href="sort" class="icon"></wicket:svg> Order By+ <wicket:svg href="sort" class="icon"></wicket:svg> <wicket:t>Order By</wicket:t></a><a wicket:id="operations" class="operations text-gray mr-4 mb-2 d-inline-block text-nowrap">- <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations+ <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> <wicket:t>Operations</wicket:t></a><span wicket:id="extraActions"></span><span wicket:id="count" class="float-right text-gray"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 005207868f..fc3486ad5f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -2,8 +2,10 @@ package io.onedev.server.web.component.pullrequest.list;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.merge;+import static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.Iterator;@@ -172,7 +174,7 @@ public abstract class PullRequestListPanel extends Panel {error(e.getMessage());return null;} else {- info("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and open");+ info(_T("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and open"));parsedQuery = new PullRequestQuery(new FuzzyCriteria(queryString));}}@@ -244,9 +246,9 @@ public abstract class PullRequestListPanel extends Panel {if (!isEnabled())tag.append("class", "disabled", " ");if (!querySubmitted)- tag.put("title", "Query not submitted");+ tag.put("data-tippy-content", _T("Query not submitted"));else if (queryModel.getObject() == null)- tag.put("title", "Can not save malformed query");+ tag.put("data-tippy-content", _T("Can not save malformed query"));}@Override@@ -267,7 +269,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Watch/Unwatch Selected Pull Requests";+ return _T("Watch/Unwatch Selected Pull Requests");}@Override@@ -292,7 +294,7 @@ public abstract class PullRequestListPanel extends Panel {.map(it->it.getObject()).collect(toList());getWatchManager().setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);selectionColumn.getSelections().clear();- Session.get().success("Watch status changed");+ Session.get().success(_T("Watch status changed"));}};}@@ -309,7 +311,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "Please select pull requests to watch/unwatch");+ tag.put("data-tippy-content", _T("Please select pull requests to watch/unwatch"));}}@@ -324,7 +326,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Discard Selected Pull Requests";+ return _T("Discard Selected Pull Requests");}@Override@@ -339,7 +341,7 @@ public abstract class PullRequestListPanel extends Panel {for (IModel<PullRequest> each : selectionColumn.getSelections()) {PullRequest request = each.getObject();if (!request.isOpen()) {- errorMessage = "Pull request #" + request.getNumber() + " already closed";+ errorMessage = MessageFormat.format(_T("Pull request #{0} already closed"), request.getNumber());break;}}@@ -360,7 +362,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected String getConfirmMessage() {- return "Type <code>yes</code> below to discard selected pull requests";+ return _T("Type <code>yes</code> below to discard selected pull requests");}@Override@@ -385,7 +387,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "Please select pull requests to discard");+ tag.put("data-tippy-content", _T("Please select pull requests to discard"));}}@@ -398,7 +400,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Delete Selected Pull Requests";+ return _T("Delete Selected Pull Requests");}@Override@@ -424,7 +426,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected String getConfirmMessage() {- return "Type <code>yes</code> below to delete selected pull requests";+ return _T("Type <code>yes</code> below to delete selected pull requests");}@Override@@ -448,7 +450,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "Please select pull requests to delete");+ tag.put("data-tippy-content", _T("Please select pull requests to delete"));}}@@ -463,7 +465,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Watch/Unwatch All Queried Pull Requests";+ return _T("Watch/Unwatch All Queried Pull Requests");}@Override@@ -488,7 +490,7 @@ public abstract class PullRequestListPanel extends Panel {for (@SuppressWarnings("unchecked") var it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )requests.add(it.next());getWatchManager().setWatchStatus(SecurityUtils.getAuthUser(), requests, watchStatus);- Session.get().success("Watch status changed");+ Session.get().success(_T("Watch status changed"));}};@@ -506,7 +508,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No pull requests to watch/unwatch");+ tag.put("data-tippy-content", _T("No pull requests to watch/unwatch"));}}};@@ -520,7 +522,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Discard All Queried Pull Requests";+ return _T("Discard All Queried Pull Requests");}@Override@@ -536,7 +538,7 @@ public abstract class PullRequestListPanel extends Panel {for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); ) {PullRequest request = it.next();if (!request.isOpen()) {- errorMessage = "Pull request #" + request.getNumber() + " already closed";+ errorMessage = MessageFormat.format(_T("Pull request #{0} already closed"), request.getNumber());break;}}@@ -558,7 +560,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected String getConfirmMessage() {- return "Type <code>yes</code> below to discard all queried pull requests";+ return _T("Type <code>yes</code> below to discard all queried pull requests");}@Override@@ -583,7 +585,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No pull requests to discard");+ tag.put("data-tippy-content", _T("No pull requests to discard"));}}@@ -596,7 +598,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Delete All Queried Pull Requests";+ return _T("Delete All Queried Pull Requests");}@Override@@ -624,7 +626,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected String getConfirmMessage() {- return "Type <code>yes</code> below to delete all queried pull requests";+ return _T("Type <code>yes</code> below to delete all queried pull requests");}@Override@@ -648,7 +650,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No pull requests to delete");+ tag.put("data-tippy-content", _T("No pull requests to delete"));}}@@ -662,7 +664,7 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getLabel() {- return "Set All Queried Pull Requests as Read";+ return _T("Set All Queried Pull Requests as Read");}@Override@@ -681,7 +683,7 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No pull requests to set as read");+ tag.put("data-tippy-content", _T("No pull requests to set as read"));}}@@ -806,6 +808,7 @@ public abstract class PullRequestListPanel extends Panel {}});+ queryInput.add(AttributeAppender.append("placeholder", _T("Query/order pull requests")));Form<?> queryForm = new Form<Void>("query");queryForm.add(queryInput);@@ -819,6 +822,7 @@ public abstract class PullRequestListPanel extends Panel {}});+ queryInput.add(AttributeAppender.append("data-tippy-content", _T("Query")));add(queryForm);if (getProject() == null) {@@ -839,7 +843,7 @@ public abstract class PullRequestListPanel extends Panel {}) {@Overrideprotected String getTitle() {- return "Select Project";+ return _T("Select Project");}@Override@@ -850,10 +854,10 @@ public abstract class PullRequestListPanel extends Panel {}.add(AttributeAppender.append("class", "no-current"));}- });+ }.add(AttributeAppender.append("data-tippy-content", _T("Open new pull request"))));} else {add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,- NewPullRequestPage.paramsOf(getProject())));+ NewPullRequestPage.paramsOf(getProject())).add(AttributeAppender.append("data-tippy-content", _T("Open new pull request"))));}body = new WebMarkupContainer("body");add(body.setOutputMarkupId(true));@@ -1004,9 +1008,9 @@ public abstract class PullRequestListPanel extends Panel {@Overridepublic String getObject() {if (dataProvider.size() > 1)- return "found " + dataProvider.size() + " pull requests";+ return MessageFormat.format(_T("found {0} pull requests"), dataProvider.size());else- return "found 1 pull request";+ return _T("found 1 pull request");}}) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.javaindex 2be52c4137..cae8404b95 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java@@ -9,6 +9,9 @@ import io.onedev.server.model.User;import io.onedev.server.web.component.select2.SelectToActChoice;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;import io.onedev.server.web.page.base.BasePage;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -32,7 +35,7 @@ public abstract class ReviewerChoice extends SelectToActChoice<User> {protected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Add reviewer...");+ getSettings().setPlaceholder(_T("Add reviewer..."));getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_zh.utf8.properties b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_zh.utf8.propertiesnew file mode 100644index 0000000000..9cdd2d70ed--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_zh.utf8.properties@@ -0,0 +1,7 @@+noMatches=没有找到匹配项+inputTooShortSingular=请再输入1个字符+inputTooShortPlural=请再输入{number}个字符+selectionTooBigSingular=你只能选择1项+selectionTooBigPlural=你只能选择{limit}项+loadMore=加载更多结果...+searching=搜索中...diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 7bd1dfd9b2..3d74a920dc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -3,12 +3,14 @@ package io.onedev.server.web.page.base;import static io.onedev.server.web.behavior.ChangeObserver.filterObservables;import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.MOUNT_PATH;import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.STAGE_INITIATE;+import static io.onedev.server.web.translation.Translation._T;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.File;import java.io.Serializable;import java.time.ZoneId;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;import java.util.List;import java.util.Locale;@@ -200,19 +202,25 @@ public abstract class BasePage extends WebPage {response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));- String jsonOfRemoveAutosaveKeys;- try {- jsonOfRemoveAutosaveKeys = OneDev.getInstance(ObjectMapper.class).writeValueAsString(getRemoveAutosaveKeys());- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ var translations = new HashMap<String, String>();+ translations.put("{0}m", _T("{0}m"));+ translations.put("{0}h", _T("{0}h"));+ translations.put("{0}d", _T("{0}d"));+ translations.put("{0}s", _T("{0}s"));+getSession().setMetaData(REMOVE_AUTOSAVE_KEYS, null);- response.render(OnDomReadyHeaderItem.forScript(- String.format("onedev.server.onDomReady('%s', '%s', %s, %s);",++ try {+ response.render(OnDomReadyHeaderItem.forScript(+ String.format("onedev.server.onDomReady('%s', '%s', %s, %s, %s);",String.valueOf(OneDev.getInstance().getBootDate().getTime()),SpriteImage.getVersionedHref(IconScope.class, null),popStateBehavior.getCallbackFunction(explicit("data")).toString(),- jsonOfRemoveAutosaveKeys)));+ OneDev.getInstance(ObjectMapper.class).writeValueAsString(getRemoveAutosaveKeys()),+ OneDev.getInstance(ObjectMapper.class).writeValueAsString(translations))));+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }response.render(OnLoadHeaderItem.forScript("onedev.server.onWindowLoad();"));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 995d91995b..98b594b5b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -832,27 +832,30 @@ onedev.server = {},formatBriefDuration(seconds) {+ var translations = onedev.server.translations;var intervals = [];var days = Math.floor(seconds/86400);if (days != 0)- intervals.push(days + "d");+ intervals.push(translations["{0}d"].replace("{0}", days));seconds = seconds%86400;var hours = Math.floor(seconds/3600);if (hours != 0)- intervals.push(hours + "h");+ intervals.push(translations["{0}h"].replace("{0}", hours));seconds = seconds%3600;var minutes = Math.floor(seconds/60);if (minutes != 0)- intervals.push(minutes + "m");+ intervals.push(translations["{0}m"].replace("{0}", minutes));seconds = seconds%60;if (seconds != 0)- intervals.push(seconds + "s");+ intervals.push(translations["{0}s"].replace("{0}", seconds));if (intervals.length != 0)return intervals.join(" ");else- return "0s";+ return translations["{0}s"].replace("{0}", "0");},- onDomReady: function(bootTimestamp, icons, popStateCallback, removeAutosaveKeys) {+ onDomReady: function(bootTimestamp, icons, popStateCallback, removeAutosaveKeys, translations) {+ onedev.server.translations = translations;+onedev.server.bootTimestamp = bootTimestamp;onedev.server.icons = icons;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex 2824e4189a..4e338a2f15 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -35,6 +35,9 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import javax.annotation.Nullable;++import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;import java.util.ArrayList;@@ -257,12 +260,12 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "<span class='text-nowrap'>Pull Requests</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-nowrap'>" + _T("Pull Requests") + "</span>").setEscapeModelStrings(false);}@Overrideprotected String getPageTitle() {- return "Pull Requests - " + getProject().getPath();+ return _T("Pull Requests") + " - " + getProject().getPath();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.htmlindex 2629b995dd..cb90cb485f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html@@ -3,17 +3,17 @@<div class="revision-compare mb-5"><div class="base revision card"><div class="card-body">- <div class="title">Target</div>+ <div class="title"><wicket:t>Target</wicket:t></div><div wicket:id="target" class="selector"></div><a wicket:id="targetCommitLink" class="message"><span wicket:id="message"></span></a></div></div><div class="swap">- <a wicket:id="swap" class="btn btn-primary btn-icon" title="Swap"><wicket:svg href="swap" class="icon"></wicket:svg></a>+ <a wicket:id="swap" class="btn btn-primary btn-icon"><wicket:svg href="swap" class="icon"></wicket:svg></a></div><div class="compare revision card"><div class="card-body">- <div class="title">Source</div>+ <div class="title"><wicket:t>Source</wicket:t></div><div wicket:id="source" class="selector"></div><a wicket:id="sourceCommitLink" class="message"><span wicket:id="message"></span></a></div>@@ -37,29 +37,29 @@<wicket:fragment wicket:id="sameBranchFrag"><div class="alert alert-notice alert-light-warning shadow mb-5"><div class="summary">- <span>Please select different branches</span>+ <span><wicket:t>Please select different branches</wicket:t></span></div></div></wicket:fragment><wicket:fragment wicket:id="mergedFrag"><div class="alert alert-notice alert-light-success shadow mb-5"><div class="summary">- Branch <a wicket:id="targetBranch"></a> is up to date with all commits from <a wicket:id="sourceBranch"></a>.- Try <a wicket:id="swapBranches">swap source and target</a> for the comparison.+ <wicket:t>Branch <a wicket:id="targetBranch"></a> is up to date with all commits from <a wicket:id="sourceBranch"></a>.+ Try <a wicket:id="swapBranches">swap source and target</a> for the comparison.</wicket:t></div></div></wicket:fragment><wicket:fragment wicket:id="unrelatedHistoryFrag"><div class="alert alert-notice alert-light-warning shadow mb-5"><div class="summary">- <span>History of target branch and source branch is unrelated</span>+ <span><wicket:t>History of target branch and source branch is unrelated</wicket:t></span></div></div></wicket:fragment><wicket:fragment wicket:id="branchNotSpecifiedFrag"><div class="alert alert-notice alert-light-warning shadow mb-5"><div class="summary">- <span>Please select branches to create pull request</span>+ <span><wicket:t>Please select branches to create pull request</wicket:t></span></div></div></wicket:fragment>@@ -68,17 +68,17 @@<div class="card-body"><form wicket:id="form" class="leave-confirm"><div class="form-group">- <label>Title <span class="text-danger"></span></label>- <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">+ <label><wicket:t>Title</wicket:t> <span class="text-danger"></span></label>+ <input wicket:id="title" type="text" class="form-control"><div wicket:id="titleFeedback"></div></div><div class="form-group">- <label>Description</label>+ <label><wicket:t>Description</wicket:t></label><div wicket:id="description"></div><div wicket:id="descriptionFeedback"></div></div><div class="form-group merge-strategy">- <label>Merge Strategy</label>+ <label><wicket:t>Merge Strategy</wicket:t></label><div wicket:id="mergeStrategy"><select wicket:id="select" class="form-control custom-select"></select><div wicket:id="help" class="form-text text-muted"></div>@@ -86,16 +86,16 @@</div></div><div class="form-group">- <label>Reviewers</label>+ <label><wicket:t>Reviewers</wicket:t></label><div wicket:id="reviewers"></div>- <div class="text-muted form-text">Pull request can only be merged after getting approvals from all reviewers</div>+ <div class="text-muted form-text"><wicket:t>Pull request can only be merged after getting approvals from all reviewers</wicket:t></div></div><div class="form-group">- <label>Assignees <a wicket:id="assignToMe" class="ml-2 font-weight-normal font-size-sm">assign to me</a></label>+ <label><wicket:t>Assignees</wicket:t> <a wicket:id="assignToMe" class="ml-2 font-weight-normal font-size-sm"><wicket:t>assign to me</wicket:t></a></label><div wicket:id="assignees"></div>- <div class="text-muted form-text">Assignees have code write permission and will be responsible for merging the pull request</div>+ <div class="text-muted form-text"><wicket:t>Assignees have code write permission and will be responsible for merging the pull request</wicket:t></div></div>- <button wicket:id="send" type="submit" class="btn btn-primary">Send Pull Request</button>+ <button wicket:id="send" type="submit" class="btn btn-primary"><wicket:t>Send Pull Request</wicket:t></button></form></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 1d616b1f73..6b082f9d17 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.pullrequests.create;import static io.onedev.server.search.commit.Revision.Type.COMMIT;import static io.onedev.server.web.translation.Translation._T;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;@@ -34,6 +35,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Button;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.IChoiceRenderer;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;@@ -110,6 +112,7 @@ import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.simple.security.LoginPage;+import io.onedev.server.web.util.TextUtils;public class NewPullRequestPage extends ProjectPage implements RevisionAnnotationSupport {@@ -373,7 +376,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatiosetResponsePage(NewPullRequestPage.class, params);}- });+ }.add(AttributeAppender.append("data-tippy-content", Model.of(_T("Swap")))));Fragment fragment;PullRequest request = getPullRequest();@@ -394,7 +397,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatioif (getPullRequest() != null) {List<Tab> tabs = new ArrayList<>();- tabs.add(new AjaxActionTab(Model.of("Commits")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Commits"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -406,7 +409,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio});- tabs.add(new AjaxActionTab(Model.of("File Changes")) {+ tabs.add(new AjaxActionTab(Model.of(_T("File Changes"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -586,7 +589,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Overridepublic String getObject() {- return "pull request #" + getPullRequest().getNumber();+ return MessageFormat.format(_T("pull request #{0}"), getPullRequest().getNumber());}}));@@ -653,7 +656,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatioProjectAndBranch source = getPullRequest().getSource();if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())|| !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {- getSession().warn("Either target branch or source branch has new commits just now, please re-check.");+ getSession().warn(_T("Either target branch or source branch has new commits just now, please re-check."));setResponsePage(NewPullRequestPage.class, paramsOf(getProject(), target, source));} else {getPullRequest().setSource(source);@@ -688,6 +691,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio}});+ titleInput.add(AttributeAppender.append("placeholder", Model.of(_T("Input title here"))));titleInput.add(new ReferenceInputBehavior() {@Override@@ -832,9 +836,27 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio};- List<MergeStrategy> mergeStrategies = Arrays.asList(MergeStrategy.values());+ var mergeStrategies = Arrays.asList(MergeStrategy.values());+ var renderer = new IChoiceRenderer<MergeStrategy>() {++ @Override+ public Object getDisplayValue(MergeStrategy object) {+ return _T(TextUtils.getDisplayValue(object));+ }++ @Override+ public String getIdValue(MergeStrategy object, int index) {+ return object.name();+ }++ @Override+ public MergeStrategy getObject(String id, IModel<? extends List<? extends MergeStrategy>> choices) {+ return MergeStrategy.fromString(id);+ }++ };DropDownChoice<MergeStrategy> mergeStrategyDropdown =- new DropDownChoice<MergeStrategy>("select", mergeStrategyModel, mergeStrategies);+ new DropDownChoice<MergeStrategy>("select", mergeStrategyModel, mergeStrategies, renderer);mergeStrategyDropdown.add(new OnChangeAjaxBehavior() {@@ -849,7 +871,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatiocontainer.add(mergeStrategyDropdown);- container.add(new Label("help", getPullRequest().getMergeStrategy().getDescription()));+ container.add(new Label("help", _T(getPullRequest().getMergeStrategy().getDescription())));container.add(new AjaxLazyLoadPanel("status") {diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex c58cc33ee5..99bcad1a4a 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -167,7 +167,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Artifacts", "构件");m.put("Artifacts to Retrieve", "要检索的构件");m.put("Ascending", "升序");+ m.put("Assignees", "分配给");m.put("Assignees Issue Field", "受让人工单字段");+ m.put("Assignees have code write permission and will be responsible for merging the pull request",+ "分配人员具有代码写入权限,并负责合并合并请求");m.put("Asymmetric", "非对称");m.put("At least one choice need to be specified", "至少需要指定一个选项");m.put("At least one email address should be configured, please add a new one first", "至少应配置一个电子邮件地址,请先添加一个新地址");@@ -255,6 +258,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Branch \"{0}\" already exists, please choose a different name", "分支 \"{0}\" 已存在,请选择不同的名称");m.put("Branch \"{0}\" created", "分支 \"{0}\" 已创建");m.put("Branch \"{0}\" deleted", "分支 \"{0}\" 已删除");+ m.put("Branch <a wicket:id=\"targetBranch\"></a> is up to date with all commits from <a wicket:id=\"sourceBranch\"></a>. Try <a wicket:id=\"swapBranches\">swap source and target</a> for the comparison.",+ "分支 <a wicket:id=\"targetBranch\"></a> 与 <a wicket:id=\"sourceBranch\"></a> 的所有提交一致。尝试 <a wicket:id=\"swapBranches\">交换源和目标</a> 进行比较。");m.put("Branch Choice Bean", "分支选择Bean");m.put("Branch Name", "分支名称");m.put("Branch Protection", "分支保护");@@ -551,11 +556,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Delete All", "删除所有");m.put("Delete All Queried Memberships", "删除所有查询的成员");m.put("Delete All Queried Projects", "删除所有查询的项目");+ m.put("Delete All Queried Pull Requests", "删除所有查询的合并请求");m.put("Delete All Queried Users", "删除所有查询的用户");m.put("Delete Selected", "删除选中的");m.put("Delete Selected Comments", "删除选中的评论");m.put("Delete Selected Memberships", "删除选定的成员");m.put("Delete Selected Projects", "删除选中的项目");+ m.put("Delete Selected Pull Requests", "删除选定的合并请求");m.put("Delete Selected Users", "删除选定的用户");m.put("Delete Source Branch After Merge", "合并后删除源分支");m.put("Delete dashboard", "删除仪表板");@@ -601,6 +608,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Disabling accounts will reset password, clear access tokens, and remove all references from other entities except for past activities. Type <code>yes</code> to confirm","禁用账户将重置密码,清除访问令牌,并从其他实体中删除除过去活动外的所有引用。输入 <code>yes</code> 确认");m.put("Discard", "丢弃");+ m.put("Discard All Queried Pull Requests", "放弃所有查询的合并请求");+ m.put("Discard Selected Pull Requests", "放弃选定的合并请求");m.put("Discarded", "已丢弃");m.put("Discarded pull request \"{0}\" ({1})", "放弃合并请求 \"{0}\"({1})");m.put("Discord", "Discord");@@ -642,6 +651,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Due Date", "截止日期");m.put("Due Date Issue Field", "截止日期工单字段");m.put("Duplicate authorizations found: {0}", "找到重复的授权:{0}");+ m.put("Durations", "持续时间");m.put("ESLint Report", "ESLint 报告");m.put("Edit", "编辑");m.put("Edit Avatar", "编辑头像");@@ -661,6 +671,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Editable Issue Links", "可编辑的工单链接");m.put("Edited by {0} {1}", "由 {0} 于 {1} 编辑");m.put("Editor", "编辑器");+ m.put("Either target branch or source branch has new commits just now, please re-check.", "目标分支或源分支有新的提交,请重新检查。");m.put("Email Address", "邮箱地址");m.put("Email Addresses", "电子邮件地址");m.put("Email Templates", "邮件模板");@@ -805,6 +816,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Force", "强制");m.put("Forgot Password?", "忘记密码?");m.put("Forks Of", "分叉");+ m.put("Frequencies", "频率");m.put("From Directory", "从目录");m.put("From States", "从状态");m.put("From {0}", "从 {0}");@@ -913,6 +925,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Hide saved queries", "隐藏保存的查询");m.put("High", "高");m.put("History", "历史");+ m.put("History of target branch and source branch is unrelated", "目标分支和源分支的历史记录不相关");m.put("Host name or ip address of remote machine to run commands via SSH", "远程机器的名称或 IP 地址,用于通过 SSH 运行命令");m.put("Hours Per Day", "每天小时数");m.put("Html Report", "HTML 报告");@@ -1183,6 +1196,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Mail service", "邮件服务");m.put("Mail service not configured", "邮件服务未配置");m.put("Malformed email address", "格式错误的电子邮件地址");+ m.put("Malformed query", "查询语法错误");m.put("Manage Job", "管理任务");m.put("Manager DN", "管理员DN");m.put("Manager Password", "管理员密码");@@ -1331,6 +1345,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No parent", "无父级");m.put("No properties defined", "未定义属性");m.put("No proxy", "无代理");+ m.put("No pull requests to delete", "没有要删除的合并请求");+ m.put("No pull requests to discard", "没有要放弃的合并请求");+ m.put("No pull requests to set as read", "没有要设置为已读的合并请求");+ m.put("No pull requests to watch/unwatch", "没有要监视/取消监视的合并请求");m.put("No required services", "无所需服务");m.put("No secret config", "无秘密配置");m.put("No services defined", "未定义服务");@@ -1386,6 +1404,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"OneDev 需要 git 命令行来管理仓库。最低要求版本为 2.11.1。另外,如果要在构建任务中检索 LFS 文件,请确保安装了 git-lfs");m.put("Only projects manageable by access token owner can be authorized", "只有受访问令牌所有者管理的项目才能被授权");m.put("Open", "打开");+ m.put("Open new pull request", "创建新的合并请求");m.put("OpenID", "OpenID");m.put("OpenID client identification will be assigned by your OpenID provider when registering this OneDev instance as client application","OpenID 客户端标识将在注册此 OneDev 实例作为客户端应用程序时由您的 OpenID 提供商分配");@@ -1703,6 +1722,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Performance", "性能");m.put("Performance Setting", "性能设置");m.put("Performance Settings", "性能设置");+ m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and open",+ "执行模糊查询。使用 '~' 包围搜索文本以添加更多条件,例如:~text to search~ and open");m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ author(robin)","执行模糊查询。使用 '~' 包围搜索文本以添加更多条件,例如:~text to search~ author(robin)");m.put("Permanent link", "永久链接");@@ -1719,10 +1740,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Please input one of your recovery codes saved when enable two-factor authentication","请输入在启用两阶段验证时保存的恢复代码");m.put("Please login to perform this operation", "请登录才能执行此操作");+ m.put("Please select branches to create pull request", "请选择分支创建合并请求");m.put("Please select comments to delete", "请选择要删除的评论");m.put("Please select comments to set resolved", "请选择要设置为已解决的评论");m.put("Please select comments to set unresolved", "请选择要设置为未解决的评论");+ m.put("Please select different branches", "请选择不同的分支");m.put("Please select memberships to delete", "请选择要删除的成员");+ m.put("Please select pull requests to delete", "请选择要删除的合并请求");+ m.put("Please select pull requests to discard", "请选择要放弃的合并请求");+ m.put("Please select pull requests to watch/unwatch", "请选择要监视/取消监视的合并请求");m.put("Please select query watches to delete", "请选择要删除的查询订阅");m.put("Please select revision to create tag from", "请选择要从中创建标签的版本");m.put("Please select users to disable", "请选择要禁用的用户");@@ -1807,14 +1833,17 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Pull Request Markdown Report", "合并请求 Markdown 报告");m.put("Pull Request Notification", "合并请求通知");m.put("Pull Request Notification Unsubscribed", "合并请求通知退订");+ m.put("Pull Request Statistics", "合并请求统计");m.put("Pull Requests", "合并请求");m.put("Pull docker image as OCI layout via crane. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor","此步骤需要由服务器 docker 执行器、远程 docker 执行器或 Kubernetes 执行器执行");m.put("Pull from Remote", "从远程拉取");m.put("Pull request", "合并请求");+ m.put("Pull request #{0} already closed", "合并请求 #{0} 已关闭");m.put("Pull request administrative permission inside a project, including batch operations over multiple pull requests","在项目中对多个合并请求进行批量操作的权限");m.put("Pull request and code review", "合并请求和代码评审");+ m.put("Pull request can only be merged after getting approvals from all reviewers", "合并请求只能在获得所有审查人员的批准后合并");m.put("Pull request discard", "合并请求丢弃");m.put("Pull request duration statistics", "合并请求持续时间统计");m.put("Pull request frequency statistics", "合并请求频率统计");@@ -1828,6 +1857,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Pull request open or update", "合并请求打开或更新");m.put("Pull request query watch only affects new pull requests. To manage watch status of existing pull requests in batch, filter pull requests by watch status in pull requests page, and then take appropriate action","合并请求查询订阅仅影响新合并请求。要批量管理现有合并请求的订阅状态,请在合并请求页面中按订阅状态过滤合并请求,然后采取适当行动");+ m.put("Pull request statistics is an enterprise feature. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",+ "合并请求统计是企业版功能。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");m.put("Push Image", "推送镜像");m.put("Push docker image from OCI layout via crane. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor","此步骤需要由服务器 docker 执行器、远程 docker 执行器或 Kubernetes 执行器执行");@@ -1841,13 +1872,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Query not submitted", "查询未提交");m.put("Query param", "查询参数");m.put("Query/order projects", "查询/排序项目");+ m.put("Query/order pull requests", "查询/排序合并请求");m.put("Quick Search", "快速搜索");m.put("Quote", "引用");m.put("RESTful API", "RESTful API");m.put("Read", "读取");m.put("Read body", "读取正文");m.put("Readiness Check Command", "准备检查命令");- m.put("Rebase source branch commits", "重定基源分支提交");+ m.put("Rebase source branch commits", "Rebase 源分支上的提交");m.put("Receive Posted Email", "接收已发布邮件");m.put("Receivers", "接收者");m.put("Recovery code", "恢复代码");@@ -1993,6 +2025,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Select Branch to Cherry Pick to", "选择分支进行 cherry-pick");m.put("Select Branch to Revert on", "选择分支进行 revert");m.put("Select Existing", "选择已有");+ m.put("Select Project", "选择项目");m.put("Select iteration to schedule issues into", "选择迭代调度问题");m.put("Select organization to import from. Leave empty to import from repositories under current account","选择要从中导入的组织。留空以从当前帐户下的存储库导入");@@ -2003,6 +2036,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"选择在数据库自动备份失败、集群节点不可达等事件时发送警报邮件的用户");m.put("Select workspace to import from", "选择要从中导入的工作区");m.put("Send Notifications", "发送通知");+ m.put("Send Pull Request", "发送合并请求");m.put("Send notification", "发送通知");m.put("SendGrid", "SendGrid");m.put("Sendgrid Webhook Setting", "SendGrid Webhook 设置");@@ -2035,6 +2069,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Set All Queried As Root Projects", "设置所有查询的项目为根项目");m.put("Set All Queried Comments as Resolved", "设置所有选中的评论为已解决");m.put("Set All Queried Comments as Unresolved", "设置所有选中的评论为未解决");+ m.put("Set All Queried Pull Requests as Read", "设置所有查询的合并请求为已读");m.put("Set As Primary", "设置为主要");m.put("Set Build Description", "设置构建描述");m.put("Set Build Version", "设置构建版本");@@ -2441,7 +2476,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Split", "拆分");m.put("Split view", "分割视图");m.put("SpotBugs Report", "SpotBugs 报告");- m.put("Squash source branch commits", "压缩源分支提交");+ m.put("Squash source branch commits", "Squash 源分支上的提交");m.put("Ssh", "SSH");m.put("Ssh Key", "SSH 密钥");m.put("Ssh Setting", "SSH 设置");@@ -2458,6 +2493,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("State of other issue is transited to", "其他工单的状态转换为");m.put("States", "状态");m.put("Statistics", "统计");+ m.put("Stats", "统计");m.put("Stats Group", "统计组");m.put("Step", "步骤");m.put("Step Template", "步骤模板");@@ -2579,6 +2615,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("This property is imported from {0}", "此属性是从 {0} 导入的");m.put("This report will be displayed in pull request overview page if build is triggered by pull request","如果构建由合并请求触发,此报告将显示在合并请求概览页面中");+ m.put("This shows average duration of merged pull requests over time", "此图表显示合并请求的平均持续时间");+ m.put("This shows number of open and merged pull requests over time", "此图表显示打开和合并的合并请求的数量");m.put("This step can only be executed by a docker aware executor", "此步骤只能由支持 Docker 的执行器执行");m.put("This step can only be executed by a docker aware executor. It runs under <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a>","此步骤只能由支持 Docker 的执行器执行。它在 <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>任务工作空间</a> 下运行");@@ -2644,8 +2682,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Type <code>yes</code> below to confirm deleting all queried users", "在下方输入 <code>yes</code> 确认删除所有查询的用户");m.put("Type <code>yes</code> below to confirm deleting selected users", "在下方输入 <code>yes</code> 确认删除选定的用户");m.put("Type <code>yes</code> below to delete all queried memberships", "在下方输入 <code>yes</code> 删除所有查询的成员");+ m.put("Type <code>yes</code> below to delete all queried pull requests", "在下方输入 <code>yes</code> 以删除所有查询的合并请求");m.put("Type <code>yes</code> below to delete selected comments", "在下方输入 <code>yes</code> 以删除选中的评论");m.put("Type <code>yes</code> below to delete selected memberships", "在下方输入 <code>yes</code> 删除选定的成员");+ m.put("Type <code>yes</code> below to delete selected pull requests", "在下方输入 <code>yes</code> 以删除选定的合并请求");+ m.put("Type <code>yes</code> below to discard all queried pull requests", "在下方输入 <code>yes</code> 以放弃所有查询的合并请求");+ m.put("Type <code>yes</code> below to discard selected pull requests", "在下方输入 <code>yes</code> 以放弃选定的合并请求");m.put("Type password here", "在此输入密码");m.put("Type to filter", "过滤");m.put("URL", "URL");@@ -2754,6 +2796,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Waiting", "等待");m.put("Watch", "观察");m.put("Watch Status", "订阅状态");+ m.put("Watch status changed", "监视状态已更改");+ m.put("Watch/Unwatch All Queried Pull Requests", "监视/取消监视所有查询的合并请求");+ m.put("Watch/Unwatch Selected Pull Requests", "监视/取消监视选定的合并请求");m.put("Web Hook", "Web Hook");m.put("Web Hooks", "Web Hooks");m.put("Web Hooks Bean", "Web Hooks Bean");@@ -2852,6 +2897,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("[Reset Password] Please Reset Your OneDev Password", "[重置密码] 请重置您的 OneDev 密码");m.put("access [{0}]", "访问 [{0}]");m.put("artifacts", "制品");+ m.put("assign to me", "分配给我");m.put("branches", "分支");m.put("builds", "构建");m.put("choose a color for this state", "选择一个颜色");@@ -2865,13 +2911,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("descending", "降序");m.put("disabled", "禁用");m.put("does not have any value of", "没有下列任何值");+ m.put("duration", "持续时间");m.put("exclude", "排除");m.put("false", "假");m.put("found 1 comment", "找到 1 条评论");m.put("found 1 project", "找到 1 个项目");+ m.put("found 1 pull request", "找到 1 个合并请求");m.put("found 1 user", "找到 1 个用户");m.put("found {0} comments", "找到 {0} 条评论");m.put("found {0} projects", "找到 {0} 个项目");+ m.put("found {0} pull requests", "找到 {0} 个合并请求");m.put("found {0} users", "找到 {0} 个用户");m.put("has any value of", "具有下列任何值");m.put("ineffective", "无效");@@ -2884,6 +2933,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("may not be empty", "不能为空");m.put("md.heading", "标题");m.put("md.image", "图片");+ m.put("merged", "已合并");m.put("month.Apr", "四月");m.put("month.Aug", "八月");m.put("month.Dec", "十二月");@@ -2898,10 +2948,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("month.Sep", "九月");m.put("new field", "新字段");m.put("on file {0}", "在文件 {0} 上");+ m.put("opened", "已创建");m.put("outdated", "过时");m.put("packages", "包");m.put("personal", "个人");m.put("pipeline", "流水线");+ m.put("pull request #{0}", "合并请求 #{0}");m.put("pull requests", "合并请求");m.put("reports", "报告");m.put("root", "根");@@ -2913,6 +2965,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("submit", "提交");m.put("tags", "标签");m.put("true", "真");+ m.put("w%02d", "第 %d 周");m.put("week.Fri", "周五");m.put("week.Mon", "周一");m.put("week.Sat", "周六");@@ -2920,6 +2973,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("week.Thu", "周四");m.put("week.Tue", "周二");m.put("week.Wed", "周三");+ m.put("{0} Month(s)", "{0} 个月");m.put("{0} activities on {1}", "{1} 有 {0} 个活动");m.put("{0} ahead", "{0} 领先");m.put("{0} behind", "{0} 落后");@@ -2932,9 +2986,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{0} inaccessible activities", "{0} 个无权查看的活动");m.put("{0} reviewed", "{0} 已审查");m.put("{0} tags", "{0} 个标签");+ m.put("{0}d", "{0} 天");+ m.put("{0}h", "{0} 小时");+ m.put("{0}m", "{0} 分钟");+ m.put("{0}s", "{0} 秒");m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");+ m.put("Add assignee...", "添加分配人员...");+ m.put("Add reviewer...", "添加审查人员...");+ m.put("Swap", "交换");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");@@ -2985,6 +3046,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("issue", "工单");m.put("code commit", "代码提交");m.put("pull request and code review", "合并请求和代码评审");+ m.put("Filter pull requests", "过滤合并请求");+ m.put("Filter issues", "过滤工单");+ m.put("Filter issues", "过滤工单");+ m.put("Add all commits from source branch to target branch with a merge commit", "将源分支的所有提交添加到目标分支,并创建合并提交");+ m.put("Only create merge commit if target branch can not be fast-forwarded to source branch", "仅当目标分支不能 fast-forward 到源分支时才创建合并提交");+ m.put("Squash all commits from source branch into a single commit in target branch", "将源分支的所有提交压缩成一个提交,并添加到目标分支");+ m.put("Rebase all commits from source branch onto target branch", "将源分支的所有提交 Rebase 到目标分支");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.javaindex 72f9a338be..684c34892b 100644--- a/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java+++ b/server-core/src/main/java/io/onedev/server/web/util/StatsGroup.java@@ -6,6 +6,9 @@ import org.apache.commons.lang3.tuple.Pair;import javax.annotation.Nullable;import javax.persistence.criteria.Path;++import static io.onedev.server.web.translation.Translation._T;+import java.time.LocalDate;import java.time.temporal.WeekFields;import java.util.*;@@ -41,7 +44,7 @@ public enum StatsGroup {public String toString(int groupValue) {var localDate = LocalDate.ofEpochDay(groupValue);var weekFields = WeekFields.of(Locale.getDefault());- return String.format("w%02d", localDate.get(weekFields.weekOfWeekBasedYear()));+ return String.format(_T("w%02d"), localDate.get(weekFields.weekOfWeekBasedYear()));}@Overridediff --git a/server-ee b/server-eeindex 999e87481e..7863974a7d 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 999e87481e1f9d7e3092f433d42026f970f00572+Subproject commit 7863974a7d2a86909d3ce7d24edf29926622a58f