The Unified and Autonomous Development Platform
wip: i18n support
Robin Shenf9263f6870be
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.htmlindex b87344de4d..2db62ac5dc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="issue-authorization-list"><div class="alert alert-light alert-notice mb-5">- Specify additional users able to access this confidential issue besides those granted via role.- Users mentioned in the issue will be authorized automatically+ <wicket:t>Specify additional users able to access this confidential issue besides those granted via role.+ Users mentioned in the issue will be authorized automatically</wicket:t></div><div class="head d-flex flex-wrap"><div class="clearable-wrapper mr-3 mb-4">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.javaindex ed85fcc2b3..2a866eabba 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java@@ -2,7 +2,9 @@ package io.onedev.server.web.component.issue.authorizations;import static io.onedev.server.model.IssueAuthorization.PROP_ISSUE;import static io.onedev.server.model.IssueAuthorization.PROP_USER;+import static io.onedev.server.web.translation.Translation._T;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.Iterator;import java.util.List;@@ -130,7 +132,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {protected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Authorize user...");+ getSettings().setPlaceholder(_T("Authorize user..."));getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup");@@ -143,7 +145,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {authorization.setUser(OneDev.getInstance(UserManager.class).load(selection.getId()));OneDev.getInstance(IssueAuthorizationManager.class).createOrUpdate(authorization);target.add(authorizationsTable);- Session.get().success("User authorized");+ Session.get().success(_T("User authorized"));}@Override@@ -163,7 +165,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {List<IColumn<IssueAuthorization, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<IssueAuthorization, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<IssueAuthorization, Void>(Model.of(_T("Name"))) {@Overridepublic void populateItem(Item<ICellPopulator<IssueAuthorization>> cellItem, String componentId,@@ -191,7 +193,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {public void onClick(AjaxRequestTarget target) {IssueAuthorization authorization = rowModel.getObject();OneDev.getInstance(IssueAuthorizationManager.class).delete(authorization);- Session.get().success("User '" + authorization.getUser().getDisplayName() + "' unauthorized");+ Session.get().success(MessageFormat.format(_T("User \"{0}\" unauthorized"), authorization.getUser().getDisplayName()));target.add(authorizationsTable);}@@ -201,8 +203,7 @@ public abstract class IssueAuthorizationsPanel extends Panel {super.updateAjaxAttributes(attributes);IssueAuthorization authorization = rowModel.getObject();- String message = "Do you really want to unauthorize user '"- + authorization.getUser().getDisplayName() + "'?";+ String message = MessageFormat.format(_T("Do you really want to unauthorize user \"{0}\"?"), authorization.getUser().getDisplayName());attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.javaindex abaf326810..7a5795c8e2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.choice;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -30,7 +32,7 @@ public abstract class IssueAddChoice extends SelectToActChoice<Issue> {}protected String getPlaceholder() {- return "Add Issue...";+ return _T("Add Issue...");}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.htmlindex 8814557376..20c5ebb883 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html@@ -15,7 +15,7 @@<span wicket:id="title" class="mr-2"></span><span wicket:id="confidential" t:data-tippy-content="Confidential" class="text-warning mr-2"><wicket:svg href="incognito" class="icon icon-lg"/></span><a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2"><wicket:svg href="copy" class="icon"></wicket:svg></a>- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-2"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-2" t:data-tippy-content="Edit issue title"><wicket:svg href="edit" class="icon"></wicket:svg></a><span wicket:id="progress" class="d-flex align-items-center mr-2"></span></wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javaindex e5019a00bd..422a288194 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java@@ -146,7 +146,7 @@ public abstract class IssueEditableTitlePanel extends Panel {setVisible(SecurityUtils.canModifyIssue(getIssue()));}- }.add(new AttributeAppender("data-tippy-content", Model.of(_T("Edit issue title")))));+ });titleViewer.add(new CopyToClipboardLink("copy",Model.of(getIssue().getTitle() + " (" + getIssue().getReference().toString(getProject()) + ")")));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.javaindex 5f512427d4..e99ce7e636 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java@@ -19,6 +19,8 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import static io.onedev.server.web.translation.Translation._T;+import java.util.*;public abstract class TransitionMenuLink extends MenuLink {@@ -56,7 +58,7 @@ public abstract class TransitionMenuLink extends MenuLink {if (!manualTransitionsModel.getObject().isEmpty()) {return super.newContent(id, dropdown);} else {- return new Label(id, "<div class='px-3 py-2'><i>No applicable transitions or no permission to transit</i></div>")+ return new Label(id, "<div class='px-3 py-2'><i>" + _T("No applicable transitions or no permission to transit") + "</i></div>").setEscapeModelStrings(false);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 85b026afa2..e925c05682 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -12,7 +12,7 @@</div><wicket:enclosure child="confidential"><div class="confidential d-flex align-items-center justify-content-between">- <div class="font-weight-bolder mr-3">Confidential</div>+ <div class="font-weight-bolder mr-3"><wicket:t>Confidential</wicket:t></div><div class="switch switch-sm switch-primary"><label><input wicket:id="confidential" type="checkbox">@@ -21,7 +21,7 @@</div></wicket:enclosure><div wicket:id="iterations" class="iterations">- <div class="head">Iterations</div>+ <div class="head"><wicket:t>Iterations</wicket:t></div><ul class="body list-unstyled mb-0"><li wicket:id="iterations" class="bg-light rounded p-3"><div class="d-flex">@@ -40,12 +40,12 @@</div><div wicket:id="votes" class="votes"><div class="head">- Issue Votes (<span wicket:id="count"></span>)+ <wicket:t>Issue Votes</wicket:t> (<span wicket:id="count"></span>)</div><div class="body"><wicket:enclosure child="voters"><div class="voters">- <span wicket:id="voters" class="mr-2 mb-3 d-inline-block"><a wicket:id="voter" class="avatar"></a></span> <a wicket:id="more">and more</a>+ <span wicket:id="voters" class="mr-2 mb-3 d-inline-block"><a wicket:id="voter" class="avatar"></a></span> <a wicket:id="more"><wicket:t>and more</wicket:t></a></div></wicket:enclosure><a wicket:id="vote" class="btn btn-outline-secondary btn-sm vote"><wicket:svg href="thumb-up" class="icon mr-2"></wicket:svg> <span wicket:id="label"></span></a>@@ -53,7 +53,7 @@</div><div wicket:id="watches" class="watches"></div><div wicket:id="externalParticipants" class="external-participants">- <div class="head">External Participants</div>+ <div class="head"><wicket:t>External Participants</wicket:t></div><ul class="body list-unstyled mb-0"><li wicket:id="externalParticipants" class="pb-2"><div class="d-flex">@@ -63,14 +63,14 @@</li><span class="form-text font-size-sm text-muted"><wicket:svg href="bulb" class="icon"></wicket:svg>- External participants do not have accounts and involve in the issue via email+ <wicket:t>External participants do not have accounts and involve in the issue via email</wicket:t></span></ul></div><div wicket:id="reference"></div><wicket:enclosure child="delete"><div>- <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>+ <a wicket:id="delete" class="delete btn btn-light-danger"><wicket:t>Delete</wicket:t></a></div></wicket:enclosure></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 4f1dacaf24..5fe4176432 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -3,7 +3,9 @@ package io.onedev.server.web.component.issue.side;import static io.onedev.server.security.SecurityUtils.canAccessIssue;import static io.onedev.server.security.SecurityUtils.canManageIssues;import static io.onedev.server.util.EmailAddressUtils.describe;+import static io.onedev.server.web.translation.Translation._T;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -304,8 +306,7 @@ public abstract class IssueSidePanel extends Panel {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);if (!getIssue().isNew()) {- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "- + "remove the issue from iteration '" + item.getModelObject().getName() + "'?"));+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(MessageFormat.format(_T("Do you really want to remove the issue from iteration \"{0}\"?"), item.getModelObject().getName())));}}@@ -350,7 +351,7 @@ public abstract class IssueSidePanel extends Panel {protected void onInitialize() {super.onInitialize();- getSettings().setPlaceholder("Add to iteration...");+ getSettings().setPlaceholder(_T("Add to iteration..."));getSettings().setFormatResult("onedev.server.iterationChoiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.iterationChoiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.iterationChoiceFormatter.escapeMarkup");@@ -492,11 +493,11 @@ public abstract class IssueSidePanel extends Panel {protected String load() {if (SecurityUtils.getAuthUser() != null) {if (getVote(SecurityUtils.getAuthUser()) != null)- return "Unvote";+ return _T("Unvote");else- return "Vote";+ return _T("Vote");} else {- return "Login to vote";+ return _T("Login to vote");}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.javaindex c30749c8c5..7d8b1d4d6a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.statestats;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Map;import java.util.stream.Collectors;@@ -55,7 +57,7 @@ public abstract class StateStatsBar extends GenericPanel<Map<String, Integer>> {}.setEscapeModelStrings(false));- add(AttributeAppender.append("title", "No issues in iteration"));+ add(AttributeAppender.append("data-tippy-content", _T("No issues in iteration")));}setOutputMarkupId(true);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.htmlindex e7e8702ffc..e2a51ae1b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.html@@ -9,8 +9,8 @@<div wicket:id="comment"></div></div><div class="modal-footer">- <button wicket:id="ok" class="btn btn-primary">Ok</button>- <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>+ <button wicket:id="ok" class="btn btn-primary"><wicket:t>Ok</wicket:t></button>+ <button wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></button></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex 5feee66e92..d0463563ae 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -30,7 +30,11 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;import javax.annotation.Nullable;++import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;+import java.text.MessageFormat;import java.util.Collection;import java.util.List;import java.util.Map;@@ -62,7 +66,7 @@ public abstract class TransitionOptionPanel extends Panel implements InputContexadd(form);- var title = String.format("Issue Transition (%s -> %s)", getIssue().getState(), getToState());+ var title = MessageFormat.format(_T("Issue Transition ({0} -> {1})"), getIssue().getState(), getToState());form.add(new Label("title", title));Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(getIssue().getProject(),@@ -85,7 +89,7 @@ public abstract class TransitionOptionPanel extends Panel implements InputContex@Overrideprotected List<Behavior> getInputBehaviors() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ return Lists.newArrayList(AttributeModifier.replace("placeholder", _T("Leave a comment")));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.htmlindex ace47c83c7..b56564e0c6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html@@ -1,6 +1,6 @@<wicket:panel><div class="alert alert-notice alert-light-warning shadow">- Issue workflow changed, <a wicket:id="reconcile" class="link-primary">reconciliation</a> needs to be performed- to make data consistent. You may do this after making all necessary changes+ <wicket:t>Issue workflow changed, <a wicket:id="reconcile" class="link-primary">reconciliation</a> needs to be performed+ to make data consistent. You may do this after making all necessary changes</wicket:t></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.javaindex 721abf0ccf..7c113cc853 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.workflowreconcile;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.event.IEvent;@@ -52,7 +54,7 @@ public abstract class WorkflowChangeAlertPanel extends Panel {});} else {- add(new Label("reconcile", "reconciliation (need administrator permission)") {+ add(new Label("reconcile", _T("reconciliation (need administrator permission)")) {@Overrideprotected void onComponentTag(ComponentTag tag) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.htmlindex 0566eb7ba7..c34332f8b5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html@@ -3,17 +3,17 @@<wicket:fragment wicket:id="fixStatesFrag"><form wicket:id="form" class="fix-states leave-confirm"><div class="modal-header">- <h5 id="modal-title" class="modal-title">Fix Undefined States</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>Fix Undefined States</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body"><div class="alert alert-notice alert-light-warning">- Please resolve undefined states below. Note that if you select to delete an undefined state,- all issues with that state will be deleted+ <wicket:t>Please resolve undefined states below. Note that if you select to delete an undefined state,+ all issues with that state will be deleted</wicket:t></div><table class="table table-condensed"><thead>- <tr><th>Undefined</th><th>Change To</th></tr>+ <tr><th><wicket:t>Undefined</wicket:t></th><th><wicket:t>Change To</wicket:t></th></tr></thead><tbody><tr wicket:id="rows">@@ -29,23 +29,23 @@</div><div class="modal-footer"><input wicket:id="fix" type="submit" class="dirty-aware btn btn-primary" t:value="Fix">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:fragment><wicket:fragment wicket:id="fixFieldsFrag"><form wicket:id="form" class="fix-fields leave-confirm"><div class="modal-header">- <h5 id="modal-title" class="modal-title">Fix Undefined Fields</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>Fix Undefined Fields</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body"><div class="alert alert-notice alert-light-warning">- Please resolve undefined fields below+ <wicket:t>Please resolve undefined fields below</wicket:t></div><table class="table table-condensed"><thead>- <tr><th>Field Name</th><th>Resolution</th></tr>+ <tr><th><wicket:t>Field Name</wicket:t></th><th><wicket:t>Resolution</wicket:t></th></tr></thead><tbody><tr wicket:id="rows">@@ -61,23 +61,23 @@</div><div class="modal-footer"><input wicket:id="fix" type="submit" class="dirty-aware btn btn-primary" t:value="Fix">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:fragment><wicket:fragment wicket:id="fixFieldValuesFrag"><form wicket:id="form" class="fix-field-values leave-confirm"><div class="modal-header">- <h5 id="modal-title" class="modal-title">Fix Undefined Field Values</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>Fix Undefined Field Values</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body"><div class="alert alert-notice alert-light-warning">- Please resolve undefined field values below+ <wicket:t>Please resolve undefined field values below</wicket:t></div><table class="table table-condensed"><thead>- <tr><th>Field Name</th><th>Field Value</th><th>Resolution</th></tr>+ <tr><th><wicket:t>Field Name</wicket:t></th><th><wicket:t>Field Value</wicket:t></th><th><wicket:t>Resolution</wicket:t></th></tr></thead><tbody><tr wicket:id="rows">@@ -96,7 +96,7 @@</div><div class="modal-footer"><input wicket:id="fix" type="submit" class="dirty-aware btn btn-primary" t:value="Fix">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.javaindex bd280c0374..04f109200e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.workflowreconcile;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Collection;import java.util.HashMap;import java.util.HashSet;@@ -128,7 +130,7 @@ public abstract class WorkflowReconcilePanel extends Panel {super.updateAjaxAttributes(attributes);attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());attributes.getAjaxCallListeners().add(new SelfDisableListener());- attributes.getAjaxCallListeners().add(new ChangeTextListener("Fixing..."));+ attributes.getAjaxCallListeners().add(new ChangeTextListener(_T("Fixing...")));}@Override@@ -152,7 +154,7 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overridepublic Component getLoadingComponent(String markupId) {- return newLoadingComponent(markupId, "Checking state...");+ return newLoadingComponent(markupId, _T("Checking state..."));}};@@ -217,7 +219,7 @@ public abstract class WorkflowReconcilePanel extends Panel {super.updateAjaxAttributes(attributes);attributes.getAjaxCallListeners().add(new DisableGlobalAjaxIndicatorListener());attributes.getAjaxCallListeners().add(new SelfDisableListener());- attributes.getAjaxCallListeners().add(new ChangeTextListener("Fixing..."));+ attributes.getAjaxCallListeners().add(new ChangeTextListener(_T("Fixing...")));}@Override@@ -241,7 +243,7 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overridepublic Component getLoadingComponent(String markupId) {- return newLoadingComponent(markupId, "Checking fields...");+ return newLoadingComponent(markupId, _T("Checking fields..."));}};@@ -350,14 +352,14 @@ public abstract class WorkflowReconcilePanel extends Panel {@Overridepublic Component getLoadingComponent(String markupId) {- return newLoadingComponent(markupId, "Checking field values...");+ return newLoadingComponent(markupId, _T("Checking field values..."));}};}private Component checkStateAndFieldOrdinals(String markupId) {- return new Label(markupId, "Checking state and field ordinals...") {+ return new Label(markupId, _T("Checking state and field ordinals...")) {private AbstractPostAjaxBehavior behavior;@@ -374,7 +376,7 @@ public abstract class WorkflowReconcilePanel extends Panel {GlobalIssueSetting issueSetting = settingManager.getIssueSetting();issueSetting.setReconciled(true);settingManager.saveIssueSetting(issueSetting);- Session.get().success("Workflow reconciliation completed");+ Session.get().success(_T("Workflow reconciliation completed"));onCompleted(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.javaindex 198b17dc57..403b5e6224 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationStatusLabel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.iteration;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -17,7 +19,7 @@ public class IterationStatusLabel extends Label {@Overrideprotected String load() {- return iterationModel.getObject().getStatusName();+ return _T(iterationModel.getObject().getStatusName());}});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.htmlindex e50dd7c485..e04de1034e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.html@@ -4,7 +4,7 @@<div wicket:id="feedback" class="mt-3 m-1"></div><div wicket:id="confirm" class="d-flex justify-content-between mt-3 m-1"><input wicket:id="save" type="submit" class="dirty-aware btn btn-sm btn-primary mr-4" t:value="Save">- <a wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-sm btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.htmlindex 6d5dd63421..99170499e4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><form wicket:id="form" class="field-spec-edit input-spec-edit leave-confirm"><div class="modal-header">- <h5 id="modal-title" class="modal-title">Issue Field</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>Issue Field</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">@@ -9,7 +9,7 @@</div><div class="modal-footer"><input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" t:value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.htmlindex fdfa816ea2..ba123578ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html@@ -1,10 +1,10 @@<wicket:extend><div class="issue-fields"><div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can+ <wicket:svg href="bulb" class="icon"/> <wicket:t>Define all custom issue fields here. Each project candecide to use all or a subset of these fields via its issue transition setting.<b class="text-warning">NOTE: </b> Newly defined fields by default only appear in new issues.- Batch edit existing issues from issue list page if you want them to have these new fields+ Batch edit existing issues from issue list page if you want them to have these new fields</wicket:t></div><a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="Add custom field"><wicket:svg href="plus" class="icon"></wicket:svg></a><table wicket:id="issueFields" class="table table-hover"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.javaindex 4668fc4088..0fa7282019 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java@@ -36,6 +36,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -103,7 +105,7 @@ public class IssueFieldListPage extends IssueSettingPage {});- columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of(_T("Name"))) {@Overridepublic void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {@@ -111,12 +113,12 @@ public class IssueFieldListPage extends IssueSettingPage {}});- columns.add(new AbstractColumn<FieldSpec, Void>(Model.of("Type")) {+ columns.add(new AbstractColumn<FieldSpec, Void>(Model.of(_T("Type"))) {@Overridepublic void populateItem(Item<ICellPopulator<FieldSpec>> cellItem, String componentId, IModel<FieldSpec> rowModel) {FieldSpec field = rowModel.getObject();- cellItem.add(new Label(componentId, EditableUtils.getDisplayName(field.getClass())));+ cellItem.add(new Label(componentId, _T(EditableUtils.getDisplayName(field.getClass()))));}});@@ -157,7 +159,7 @@ public class IssueFieldListPage extends IssueSettingPage {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this field?"));+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(_T("Do you really want to delete this field?")));}@Override@@ -216,7 +218,7 @@ public class IssueFieldListPage extends IssueSettingPage {@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Issue Custom Fields");+ return new Label(componentId, _T("Issue Custom Fields"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.htmlindex 4509e59821..e9a7a6fbfc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html@@ -5,7 +5,7 @@<div class="card-body"><form wicket:id="form" class="leave-confirm"><div wicket:id="newIssue"></div>- <button type="submit" class="btn btn-primary dirty-aware">Save</button>+ <button type="submit" class="btn btn-primary dirty-aware"><wicket:t>Save</wicket:t></button></form></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex a92f28e6f6..310c3c033f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.create;+import static io.onedev.server.web.translation.Translation._T;+import java.util.List;import javax.annotation.Nullable;@@ -46,7 +48,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {super(params);if (!getProject().isIssueManagement())- throw new ExplicitException("Issue management not enabled in this project");+ throw new ExplicitException(_T("Issue management not enabled in this project"));User currentUser = getLoginUser();if (currentUser == null)@@ -139,7 +141,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "<span class='text-nowrap'>Create Issue</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-nowrap'>" + _T("Create Issue") + "</span>").setEscapeModelStrings(false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex 0ce66d4a70..1a8b693543 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -16,7 +16,7 @@</div><wicket:fragment wicket:id="projectTitleFrag"><span class="d-flex align-items-center">- <a wicket:id="issues">Issues</a>+ <a wicket:id="issues"><wicket:t>Issues</wicket:t></a><span class="dot"></span><span wicket:id="issueNumber"></span></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 33239ce896..d91462e473 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.issues.detail;import static io.onedev.server.web.translation.Translation._T;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -93,12 +94,12 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputtry {issueNumber = Long.valueOf(issueNumberString);} catch (NumberFormatException e) {- throw new ValidationException("Invalid issue number: " + issueNumberString);+ throw new ValidationException(MessageFormat.format(_T("Invalid issue number: {0}"), issueNumberString));}Issue issue = getIssueManager().find(getProject(), issueNumber);if (issue == null) {- throw new EntityNotFoundException("Unable to find issue #" + issueNumber + " in project " + getProject());+ throw new EntityNotFoundException(MessageFormat.format(_T("Unable to find issue #{0} in project {1}"), issueNumber, getProject()));} else {OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);if (!issue.getProject().equals(getProject()))@@ -292,7 +293,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overridepublic void onClick() {getIssueManager().delete(getIssue());- Session.get().success("Issue #" + getIssue().getNumber() + " deleted");+ Session.get().success(MessageFormat.format(_T("Issue #{0} deleted"), getIssue().getNumber()));String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(Issue.class);if (redirectUrlAfterDelete != null)@@ -301,7 +302,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements InputsetResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));}- }.add(new ConfirmClickModifier("Do you really want to delete this issue?"));+ }.add(new ConfirmClickModifier(_T("Do you really want to delete this issue?")));}};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 b23254849e..aecfbf742d 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@@ -30,8 +30,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {"<a wicket:id=\"author\" class=\"name link-gray\"></a> 于 <span wicket:id=\"date\"></span> 提交");m.put("<a wicket:id=\"author\" class=\"name link-gray\"></a> committed with <a wicket:id=\"committer\" class=\"name link-gray\"></a> <span wicket:id=\"date\"></span>","<a wicket:id=\"author\" class=\"name link-gray\"></a> 于 <span wicket:id=\"date\"></span> 由 <a wicket:id=\"committer\" class=\"name link-gray\"></a> 提交");- m.put("<a wicket:id=\"user\" class=\"link-gray\"></a> <span wicket:id=\"activity\"></span> <span wicket:id=\"date\"></span>",- "<a wicket:id=\"user\" class=\"link-gray\"></a> 于 <span wicket:id=\"date\"></span><span wicket:id=\"activity\"></span>");m.put("<a wicket:id=\"verifyRecoveryCode\">Verify by recovery code</a> if you can not access your TOTP authenticator","<a wicket:id=\"verifyRecoveryCode\">通过恢复代码验证</a>(如果您无法访问 TOTP 认证器)");m.put("<b class='text-danger'>NOTE: </b> This requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",@@ -51,9 +49,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("<span class='keycap'>Tab</span> or <span class='keycap'>Enter</span> to complete.","按 <span class='keycap'>Tab</span> 或 <span class='keycap'>Enter</span> 完成。");m.put("<span class='keycap'>Tab</span> to complete.", "按 <span class='keycap'>Tab</span> 完成。");- m.put("<span wicket:id=\"name\"></span> <span wicket:id=\"description\"></span> <span wicket:id=\"age\"></span>",- "<span wicket:id=\"name\"></span> 于 <span wicket:id=\"age\"></span><span wicket:id=\"description\"></span>");- m.put("<span wicket:id=\"name\"></span> commented <span wicket:id=\"age\"></span>", "<span wicket:id=\"name\"></span> 于 <span wicket:id=\"age\"></span>评论");m.put("<span wicket:id=\"submitterName\" class=\"user\"></span> opened <span wicket:id=\"submitDate\"></span>","<span wicket:id=\"submitterName\" class=\"user\"></span> 于 <span wicket:id=\"submitDate\"></span> 创建");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java pattern</a> is expected here",@@ -94,6 +89,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Add GPG key", "添加 GPG 密钥");m.put("Add GPG keys here to verify commits/tags signed by this user", "在此添加 GPG 密钥以验证此用户的代码提交/标签签名");m.put("Add GPG keys here to verify commits/tags signed by you", "在此添加 GPG 密钥以验证由您签名的提交/标签");+ m.put("Add Issue...", "添加工单...");m.put("Add Issues to Iteration", "将工单添加到迭代");m.put("Add New", "添加");m.put("Add New Email Address", "添加新电子邮件地址");@@ -136,6 +132,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Add reviewer...", "添加审查人员...");m.put("Add to batch to commit with other suggestions later", "稍后与其他建议一起提交");m.put("Add to group...", "添加到组...");+ m.put("Add to iteration...", "添加到迭代...");m.put("Add value", "添加值");m.put("Add {0}", "添加 {0}");m.put("Added commit \"{0}\" (<i class='text-danger'>missing in repository</i>)", "代码提交 \"{0}\"(<i class='text-danger'>仓库中不存在</i>)");@@ -263,7 +260,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Author date", "作者日期");m.put("Authored By", "作者");m.put("Authorization", "授权");- m.put("Authorizations", "授权项");+ m.put("Authorizations", "授权");+ m.put("Authorize user...", "授权用户...");m.put("Authorized Projects", "已授权项目");m.put("Authorized Roles", "已授权角色");m.put("Auto Merge", "自动合并");@@ -424,6 +422,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Change", "更改");m.put("Change Detection Excludes", "变更检测排除项");m.put("Change My Password", "更改我的密码");+ m.put("Change To", "更改到");m.put("Change already merged", "更改已合并");m.put("Change not updated yet", "更改尚未更新");m.put("Change to another field", "更改为其他字段");@@ -603,6 +602,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Create Child Project", "创建子项目");m.put("Create Child Projects", "创建子项目");m.put("Create Group", "创建组");+ m.put("Create Issue", "创建工单");m.put("Create New", "新建");m.put("Create New File", "创建新文件");m.put("Create Project", "创建项目");@@ -666,6 +666,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Default merge strategy", "默认合并策略");m.put("Default role affects default permissions granted to everyone in the system. The actual default permissions will be <b class='text-warning'>all permissions</b> contained in default roles of this project and all its parent projects","默认角色影响系统中所有用户获得的默认权限。实际的默认权限将是该项目及其所有父项目中的默认角色所包含的<b class='text-warning'>所有权限</b>");+ m.put("Define all custom issue fields here. Each project can decide to use all or a subset of these fields via its issue transition setting. <b class=\"text-warning\">NOTE: </b> Newly defined fields by default only appear in new issues. Batch edit existing issues from issue list page if you want them to have these new fields",+ "在此处定义所有自定义工单字段。每个项目可以通过其工单状态设置决定使用所有或这些字段的一个子集。<b class=\"text-warning\">注意:</b> 默认情况下,新定义的字段仅出现在新工单中。如果您希望这些新字段出现在现有工单中,请从工单列表页面批量编辑这些工单");m.put("Delay for the first retry in seconds. Delay of subsequent retries will be calculated using an exponential back-off based on this value","首次重试的延迟时间(秒)。后续重试的延迟时间将基于该值进行指数退避计算");m.put("Delete", "删除");@@ -764,14 +766,18 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Do you really want to delete this code comment and all its replies?", "您真的要删除此代码评论及其所有回复吗?");m.put("Do you really want to delete this code comment?", "您真的要删除此代码评论吗?");m.put("Do you really want to delete this email address?", "您真的要删除这个电子邮件地址吗?");+ m.put("Do you really want to delete this field?", "您真的要删除这个字段吗?");+ m.put("Do you really want to delete this issue?", "您真的要删除这个工单吗?");m.put("Do you really want to delete this privilege?", "确定要删除此权限吗?");m.put("Do you really want to delete this pull request?", "确定要删除此合并请求吗?");m.put("Do you really want to delete this reply?", "您真的要删除此回复吗?");m.put("Do you really want to discard batched suggestions?", "您真的要丢弃批量建议吗?");m.put("Do you really want to enable this account?", "您真的要启用此账户吗?");m.put("Do you really want to remove password of this user?", "您真的要删除此用户的密码吗?");+ m.put("Do you really want to remove the issue from iteration \"{0}\"?", "您真的要从迭代 \"{0}\" 中移除这个工单吗?");m.put("Do you really want to remove this account?", "您确定要删除此账户吗?");m.put("Do you really want to remove this link?", "您确定要删除此链接吗?");+ m.put("Do you really want to unauthorize user \"{0}\"?", "您真的要取消用户 \"{0}\" 的授权吗?");m.put("Docker Executable", "Docker 可执行文件");m.put("Docker Image", "Docker 镜像");m.put("Docker Sock Path", "Docker Sock 路径");@@ -918,6 +924,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Export as OCI layout", "导出为 OCI 布局");m.put("External Auth Source", "外部认证源");m.put("External Issue Transformers", "外部工单转换");+ m.put("External Participants", "外部参与者");+ m.put("External participants do not have accounts and involve in the issue via email", "外部参与者没有账户,通过电子邮件参与工单");m.put("Fail Threshold", "失败阈值");m.put("Fail build if there are vulnerabilities with or severer than specified severity level","如果存在或严重性高于指定严重性级别的漏洞,则失败构建");@@ -926,8 +934,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Failed", "失败");m.put("Field Bean", "字段 Bean");m.put("Field Instance", "字段实例");+ m.put("Field Name", "字段名称");m.put("Field Spec", "字段规范");m.put("Field Specs", "字段规范");+ m.put("Field Value", "字段值");m.put("Fields", "字段");m.put("Fields & Links", "字段和链接");m.put("Fields And Links Bean", "字段和链接 Bean");@@ -966,6 +976,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("First applicable executor", "第一个适用的执行器");m.put("Fix", "修复");m.put("Fix Type", "修复类型");+ m.put("Fix Undefined Field Values", "修复未定义的字段值");+ m.put("Fix Undefined Fields", "修复未定义的字段");+ m.put("Fix Undefined States", "修复未定义的状态");m.put("Fixing Builds", "修复构建");m.put("Fixing Commits", "修复提交");m.put("Float", "浮点数");@@ -1196,6 +1209,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Invalid credentials", "无效的凭据");m.put("Invalid date range, expecting \"yyyy-MM-dd to yyyy-MM-dd\"", "无效的日期范围,期望 \"yyyy-MM-dd to yyyy-MM-dd\"");m.put("Invalid email address: {0}", "无效的电子邮件地址: {0}");+ m.put("Invalid issue number: {0}", "无效的工单编号: {0}");m.put("Invalid pull request number: {0}", "无效的合并请求编号:{0}");m.put("Invalid request path", "无效的请求路径");m.put("Invalid selection, click for details", "无效的选择,点击查看详情");@@ -1208,11 +1222,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Invite Users", "邀请用户");m.put("Is Site Admin", "是否为站点管理员");m.put("Issue", "工单");+ m.put("Issue #{0} deleted", "工单 #{0} 已删除");m.put("Issue Close States", "工单关闭状态");m.put("Issue Creation Setting", "工单创建设置");m.put("Issue Creation Settings", "工单创建设置");+ m.put("Issue Custom Fields", "自定义工单字段");m.put("Issue Description", "工单描述");m.put("Issue Details", "工单详情");+ m.put("Issue Field", "工单字段");m.put("Issue Field Mapping", "工单字段映射");m.put("Issue Field Mappings", "工单字段映射");m.put("Issue Field Set", "工单字段集");@@ -1240,13 +1257,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Issue Tag Mapping", "工单标签映射");m.put("Issue Tag Mappings", "工单标签映射");m.put("Issue Template", "工单模板");+ m.put("Issue Transition ({0} -> {1})", "工单状态转换 ({0} -> {1})");m.put("Issue Type Mapping", "工单类型映射");m.put("Issue Type Mappings", "工单类型映射");+ m.put("Issue Votes", "工单投票");m.put("Issue administrative permission inside a project, including batch operations over multiple issues","工单管理权限,包括对多个工单的批量操作");m.put("Issue already linked", "工单已链接");m.put("Issue in state", "工单状态");m.put("Issue list", "工单列表");+ m.put("Issue management not enabled in this project", "工单管理未启用此项目");m.put("Issue not exist or access denied", "工单不存在或访问被拒绝");m.put("Issue number", "工单编号");m.put("Issue query watch only affects new issues. To manage watch status of existing issues in batch, filter issues by watch status in issues page, and then take appropriate action",@@ -1256,6 +1276,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Issue state trend statistics", "工单状态趋势统计");m.put("Issue 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("Issue workflow changed, <a wicket:id=\"reconcile\" class=\"link-primary\">reconciliation</a> needs to be performed to make data consistent. You may do this after making all necessary changes",+ "工单工作流已更改,需要执行 <a wicket:id=\"reconcile\" class=\"link-primary\">一致性检查</a> 以使数据一致。您可以在完成所有必要更改后执行此操作");m.put("Issues", "工单");m.put("Issues copied", "工单已复制");m.put("Issues moved", "工单已移动");@@ -1371,6 +1393,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Login name or email address", "登录名或电子邮件地址");m.put("Login to comment", "登录以评论");m.put("Login to comment on selection", "登录以在选择上添加注释");+ m.put("Login to vote", "登录以投票");m.put("Logo for Dark Mode", "暗黑模式下的Logo");m.put("Logo for Light Mode", "亮色模式下的Logo");m.put("Long-live refresh token of above account which will be used to generate access token to access Gmail. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to generate refresh token. Note that whenever client id, client secret, or account name is changed, refresh token should be re-generated",@@ -1513,6 +1536,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No activity for some time", "无活动一段时间");m.put("No aggregation", "无聚合");m.put("No any", "无任何");+ m.put("No applicable transitions or no permission to transit", "没有适用的转换或没有权限转换");m.put("No branch to cherry-pick to", "没有分支可以 cherry-pick");m.put("No branch to revert on", "没有分支可以 revert");m.put("No branches Found", "未找到分支");@@ -1539,6 +1563,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No ignored licenses", "无忽略的许可证");m.put("No image attachments", "没有图片附件");m.put("No imports defined", "无导入");+ m.put("No issues in iteration", "迭代中没有工单");m.put("No issues to copy", "没有工单可复制");m.put("No issues to delete", "没有工单可删除");m.put("No issues to edit", "没有工单可编辑");@@ -1979,6 +2004,10 @@ 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 resolve undefined field values below", "请解决以下未定义的字段值");+ m.put("Please resolve undefined fields below", "请解决以下未定义的字段");+ m.put("Please resolve undefined states below. Note that if you select to delete an undefined state, all issues with that state will be deleted",+ "请解决以下未定义的状态。请注意,如果您选择删除未定义的状态,所有具有该状态的工单都将被删除");m.put("Please select branches to create pull request", "请选择分支创建合并请求");m.put("Please select comments to delete", "请选择要删除的评论");m.put("Please select comments to set resolved", "请选择要设置为已解决的评论");@@ -2237,6 +2266,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Required Services", "所需服务");m.put("Resend Verification Email", "重新发送验证电子邮件");m.put("Resend invitation", "重新发送邀请");+ m.put("Resolution", "解决");m.put("Resolved", "已解决");m.put("Resolved comment on file \"{0}\" in project \"{1}\"", "将项目 \"{1}\" 的文件 \"{0}\" 上的评论标记为已解决");m.put("Resource Settings", "资源设置");@@ -2587,6 +2617,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Specify absolute path to the kubectl utility, for instance: <i>/usr/bin/kubectl</i>. If left empty, OneDev will try to find the utility from system path","指定 kubectl 工具的绝对路径,例如:<i>/usr/bin/kubectl</i>。如果留空,OneDev 将尝试从系统路径中查找该工具");m.put("Specify account name to login to Gmail to send/receive email", "指定用于登录 Gmail 发送/接收电子邮件的账户名");+ m.put("Specify additional users able to access this confidential issue besides those granted via role. Users mentioned in the issue will be authorized automatically",+ "指定额外用户可以访问此机密工单,除了通过角色授予的用户。提及在工单中的用户将自动被授权");m.put("Specify agents applicable for this executor", "指定适用于此执行器的代理");m.put("Specify allowed <a href='https://spdx.org/licenses/' target='_blank'>spdx license identifiers</a> <span class='text-warning'>separated by comma</span>","指定允许的 <a href='https://spdx.org/licenses/' target='_blank'>SPDX 许可证标识符</a> <span class='text-warning'>以逗号分隔</span>");@@ -3037,6 +3069,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Toggle navigation", "切换导航");m.put("Toggle work log", "切换工作日志");m.put("Too many commits to load", "加载的提交太多");+ m.put("Too many commits, displaying recent {0}", "提交太多,显示最近的 {0}");m.put("Toomanyrequests", "请求过多");m.put("Top", "顶部");m.put("Topo", "拓扑");@@ -3098,11 +3131,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Unable to create protected tag", "无法创建受保护的标签");m.put("Unable to diff as some line is too long.", "无法比较,因为某些行太长");m.put("Unable to diff as the file is too large.", "无法比较,因为文件太大");+ m.put("Unable to find issue #{0} in project {1}", "在项目 {1} 中找不到工单 #{0}");m.put("Unable to find pull request #{0} in project {1}", "在项目 {1} 中找不到合并请求 #{0}");m.put("Unable to notify user as mail service is not configured", "无法通知用户,因为邮件服务未配置");m.put("Unable to send verification email as mail service is not configured yet", "无法发送验证电子邮件,因为邮件服务未配置");m.put("Unauthorize this user", "取消此用户的授权");m.put("Unauthorized", "未授权");+ m.put("Undefined", "未定义");m.put("Undefined Field Resolution", "未定义字段解析");m.put("Undefined Field Value Resolution", "未定义字段值解析");m.put("Undefined State Resolution", "未定义状态解析");@@ -3121,6 +3156,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Unsupported", "不支持");m.put("Unverified", "未验证");m.put("Unverified email address is <b>NOT</b> applicable for above functionalities", "未验证的电子邮件地址不适用于上述功能");+ m.put("Unvote", "取消投票");m.put("Unwatched. Click to watch", "未关注。点击关注");m.put("Update", "更新");m.put("Update Dependencies via Renovate", "通过 Renovate 更新依赖");@@ -3167,6 +3203,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Use triggers to run the job automatically under certain conditions", "使用触发器在特定条件下自动运行任务");m.put("Use value of specified parameter/secret", "使用指定参数/密钥的值");m.put("User", "用户");+ m.put("User \"{0}\" unauthorized", "用户 \"{0}\" 已取消授权");m.put("User Authorization Bean", "用户授权 Bean");m.put("User Authorizations Bean", "用户授权 Bean");m.put("User Email Attribute", "用户电子邮件属性");@@ -3181,6 +3218,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("User SSH Key Attribute", "用户 SSH 密钥属性");m.put("User Search Bases", "用户搜索基础");m.put("User Search Filter", "用户搜索过滤器");+ m.put("User authorized", "用户已授权");m.put("User avatar will be requested by appending a hash to this url", "用户头像将通过在此 URL 后附加哈希值来请求");m.put("User can sign up if this option is enabled", "如果启用此选项,用户可以注册");m.put("User disabled", "用户已禁用");@@ -3208,6 +3246,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Viewer", "查看者");m.put("Volume Mount", "卷挂载");m.put("Volume Mounts", "卷挂载");+ m.put("Vote", "投票");m.put("Votes", "投票");m.put("Waiting", "等待");m.put("Waiting for approvals", "等待审批");@@ -3323,32 +3362,25 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("[Reset Password] Please Reset Your OneDev Password", "[重置密码] 请重置您的 OneDev 密码");m.put("access [{0}]", "访问 [{0}]");m.put("add another order", "添加另一个排序");- m.put("added commits", "添加提交");m.put("after specified date", "在指定日期之后");m.put("and more", "更多");m.put("artifacts", "制品");m.put("assign to me", "分配给我");- m.put("assigned to \"{0}\"", "分配给 \"{0}\"");m.put("authored by", "作者是");m.put("base", "基准");m.put("before specified date", "在指定日期之前");m.put("branch the build commit is merged into", "构建提交合并到的分支");m.put("branch the job is running against", "任务运行的分支");m.put("branches", "分支");- m.put("build commit updated", "构建提交更新");m.put("builds", "构建");- m.put("check failed", "检查失败");m.put("choose a color for this state", "选择一个颜色");m.put("cmd-k to show command palette", "cmd-k 显示命令面板");- m.put("comment edited", "评论编辑");- m.put("commented", "评论");m.put("commit message contains", "提交信息包含");m.put("committed by", "提交者是");m.put("common", "公共");m.put("common ancestor", "共同祖先");m.put("container-image", "容器镜像");m.put("copy", "复制");- m.put("created code comment", "创建代码评论");m.put("ctrl-k to show command palette", "ctrl-k 显示命令面板");m.put("curl Command Line", "curl 命令行");m.put("curl Path", "curl 路径");@@ -3394,7 +3426,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("may not be empty", "不能为空");m.put("md:heading", "标题");m.put("md:image", "图片");- m.put("merge preview updated", "合并预览更新");m.put("merged", "已合并");m.put("month:Apr", "四月");m.put("month:Aug", "八月");@@ -3418,14 +3449,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("pipeline", "流水线");m.put("project of the running job", "任务运行的项目");m.put("pull request #{0}", "合并请求 #{0}");- m.put("pull request deleted", "合并请求删除");m.put("pull requests", "合并请求");- m.put("pull requests deleted", "合并请求删除");- m.put("removed reviewer \"{0}\"", "移除审查者 \"{0}\"");- m.put("replied code comment", "回复代码评论");+ m.put("reconciliation (need administrator permission)", "一致性检查(需要管理员权限)");m.put("reports", "报告");- m.put("requested review from {0}", "请求审查者 \"{0}\"");- m.put("resolved code comment", "解决代码评论");m.put("root", "根");m.put("run job", "运行任务");m.put("search in this revision will be accurate after indexed", "索引完成后,在当前版本中的搜索将更准确");@@ -3436,11 +3462,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("tag the job is running against", "任务运行的标签");m.put("tags", "标签");m.put("time aggregation link", "时间聚合链接");- m.put("touched", "触摸");m.put("touching specified path", "涉及指定路径");m.put("true", "真");- m.put("unassigned from \"{0}\"", "取消分配给 \"{0}\"");- m.put("unresolved code comment", "将代码评论标记为未解决");m.put("value needs to be enclosed in brackets", "值需要用括号包围");m.put("value needs to be enclosed in parenthesis", "值需要用括号包围");m.put("value should be quoted", "值应该用引号包围");@@ -3475,41 +3498,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("added \"{0}\" {1}", "添加了 \"{0}\" {1}");- m.put("added to iteration \"{0}\"", "添加到迭代 \"{0}\"");- m.put("approved", "已批准");- m.put("batch edited", "批量编辑");- m.put("changed confidential", "更改机密性");- m.put("changed description", "更改描述");- m.put("changed fields", "更改字段");- m.put("changed iterations", "更改迭代");- m.put("changed merge strategy", "更改合并策略");- m.put("changed own estimated time", "更改自己的预估时间");- m.put("changed own spent time", "更改自己的已用时间");- m.put("changed state to '{0}'", "更改状态为 '{0}'");- m.put("changed target branch", "更改目标分支");- m.put("changed title", "更改标题");- m.put("changed total estimated time", "更改总预估时间");- m.put("changed total spent time", "更改总已用时间");- m.put("commits attached", "附加提交");- m.put("copied", "已复制");- m.put("deleted", "已删除");- m.put("disabled auto merge", "禁用自动合并");- m.put("discarded", "已放弃");- m.put("enabled auto merge", "启用自动合并");- m.put("imported", "已导入");- m.put("moved from other project", "从其他项目移动");- m.put("referenced from code comment", "从代码评论引用");- m.put("referenced from issue", "从工单引用");- m.put("referenced from other issue", "从其他工单引用");- m.put("referenced from other pull request", "从其他合并请求引用");- m.put("referenced from pull request", "从合并请求引用");- m.put("removed \"{0}\" {1}", "移除了 \"{0}\" {1}");- m.put("removed comment", "移除评论");- m.put("removed from iteration \"{0}\"", "从迭代 \"{0}\" 移除");- m.put("reopened", "重新打开");- m.put("requested for changes", "请求更改");- m.put("restored source branch", "恢复源分支");+ m.put("Checking field values...", "检查字段值...");+ m.put("Checking fields...", "检查字段...");+ m.put("Checking state and field ordinals...", "检查状态和字段排序...");+ m.put("Checking state...", "检查状态...");+ m.put("Fixing...", "修复中...");+ m.put("Workflow reconciliation completed", "工单工作流一致性检查完成");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");@@ -3570,6 +3564,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {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 到目标分支");+ m.put("Closed", "关闭");}@Override