The Unified and Autonomous Development Platform
wip: i18n
Robin Shen22d57a6bc2dc
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestAssigned.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestAssigned.javaindex 0cad7a23b0..1150919ed3 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestAssigned.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestAssigned.java@@ -1,5 +1,8 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;import java.util.Date;import io.onedev.server.OneDev;@@ -25,7 +28,7 @@ public class PullRequestAssigned extends PullRequestEvent {@Overridepublic String getActivity() {- return "assigned to \"" + getAssignee().getDisplayName() + "\"";+ return MessageFormat.format(_T("assigned to \"{0}\""), getAssignee().getDisplayName());}public User getAssignee() {diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.javaindex d7a81a8027..1eee031fab 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestBuildCommitUpdated.java@@ -5,6 +5,8 @@ import io.onedev.server.util.CommitAware;import io.onedev.server.util.ProjectScopedCommit;import org.eclipse.jgit.lib.ObjectId;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;public class PullRequestBuildCommitUpdated extends PullRequestEvent implements CommitAware {@@ -17,7 +19,7 @@ public class PullRequestBuildCommitUpdated extends PullRequestEvent implements C@Overridepublic String getActivity() {- return "Build commit updated";+ return _T("build commit updated");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCheckFailed.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCheckFailed.javaindex ea286c649f..69f57f53dd 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCheckFailed.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCheckFailed.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;import io.onedev.server.model.PullRequest;@@ -19,7 +21,7 @@ public class PullRequestCheckFailed extends PullRequestEvent {@Overridepublic String getActivity() {- return "Check failed";+ return _T("check failed");}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentCreated.javaindex ca8a6a8e7c..98078ee1f7 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentCreated.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import io.onedev.server.OneDev;import io.onedev.server.web.UrlManager;import io.onedev.server.model.CodeComment;@@ -22,7 +24,7 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent {@Overridepublic String getActivity() {- return "created code comment";+ return _T("created code comment");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentReplyCreated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentReplyCreated.javaindex f61a916311..04a6813e25 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentReplyCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentReplyCreated.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.web.UrlManager;@@ -30,7 +32,7 @@ public class PullRequestCodeCommentReplyCreated extends PullRequestCodeCommentEv@Overridepublic String getActivity() {- return "replied code comment";+ return _T("replied code comment");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.javaindex 6e8ec82b58..c1aa61c5e9 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCodeCommentStatusChanged.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import javax.annotation.Nullable;import io.onedev.server.OneDev;@@ -37,9 +39,9 @@ public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentE@Overridepublic String getActivity() {if (getChange().isResolved())- return "resolved code comment";+ return _T("resolved code comment");else- return "unresolved code comment";+ return _T("unresolved code comment");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.javaindex 8e86d15e06..cde2898e51 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Collection;import io.onedev.server.OneDev;@@ -38,7 +40,7 @@ public class PullRequestCommentCreated extends PullRequestEvent {@Overridepublic String getActivity() {- return "commented";+ return _T("commented");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentEdited.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentEdited.javaindex da5496e076..92c4811ec1 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentEdited.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentEdited.java@@ -5,6 +5,8 @@ import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.model.PullRequestComment;import io.onedev.server.security.SecurityUtils;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;public class PullRequestCommentEdited extends PullRequestEvent {@@ -29,7 +31,7 @@ public class PullRequestCommentEdited extends PullRequestEvent {@Overridepublic String getActivity() {- return "comment edited";+ return _T("comment edited");}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.javaindex fc7d123ba0..ee8150a0ca 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java@@ -4,6 +4,8 @@ import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;public class PullRequestDeleted extends ProjectEvent {@@ -23,7 +25,7 @@ public class PullRequestDeleted extends ProjectEvent {@Overridepublic String getActivity() {- return "pull request deleted";+ return _T("pull request deleted");}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.javaindex f2e3228638..7febd45576 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestMergePreviewUpdated.java@@ -2,6 +2,8 @@ package io.onedev.server.event.project.pullrequest;import io.onedev.server.model.PullRequest;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;public class PullRequestMergePreviewUpdated extends PullRequestEvent {@@ -14,7 +16,7 @@ public class PullRequestMergePreviewUpdated extends PullRequestEvent {@Overridepublic String getActivity() {- return "Merge preview updated";+ return _T("merge preview updated");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestOpened.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestOpened.javaindex 79e230e2e8..b617cd04b4 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestOpened.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import io.onedev.server.model.PullRequest;import io.onedev.server.util.commenttext.CommentText;import io.onedev.server.util.commenttext.MarkdownText;@@ -19,7 +21,7 @@ public class PullRequestOpened extends PullRequestEvent {@Overridepublic String getActivity() {- return "opened";+ return _T("opened");}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewRequested.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewRequested.javaindex 528df420f2..06a1390220 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewRequested.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewRequested.java@@ -1,5 +1,8 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;import java.util.Date;import io.onedev.server.OneDev;@@ -20,7 +23,7 @@ public class PullRequestReviewRequested extends PullRequestEvent {@Overridepublic String getActivity() {- return "requested review from " + getReviewer().getDisplayName();+ return MessageFormat.format(_T("requested review from {0}"), getReviewer().getDisplayName());}public User getReviewer() {diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewerRemoved.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewerRemoved.javaindex 983801262a..257d31fc3f 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewerRemoved.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestReviewerRemoved.java@@ -1,5 +1,8 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;import java.util.Date;import io.onedev.server.OneDev;@@ -25,7 +28,7 @@ public class PullRequestReviewerRemoved extends PullRequestEvent {@Overridepublic String getActivity() {- return "removed reviewer \"" + getReviewer().getDisplayName() + "\"";+ return MessageFormat.format(_T("removed reviewer \"{0}\""), getReviewer().getDisplayName());}public User getReviewer() {diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.javaindex 3e3cbb4a42..19d41f287d 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Date;import io.onedev.server.event.project.ProjectEvent;@@ -23,7 +25,7 @@ public class PullRequestTouched extends ProjectEvent {@Overridepublic String getActivity() {- return "touched";+ return _T("touched");}}diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.javaindex 59f6a7d8c3..c805a28bf4 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUnassigned.java@@ -1,5 +1,8 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;import java.util.Date;import javax.annotation.Nullable;@@ -22,7 +25,7 @@ public class PullRequestUnassigned extends PullRequestEvent {@Overridepublic String getActivity() {- return "unassigned from \"" + getAssignee().getDisplayName() + "\"";+ return MessageFormat.format(_T("unassigned from \"{0}\""), getAssignee().getDisplayName());}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUpdated.javaindex 44862abddf..8e065b2dec 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestUpdated.java@@ -1,5 +1,7 @@package io.onedev.server.event.project.pullrequest;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Collection;import java.util.stream.Collectors;@@ -28,7 +30,7 @@ public class PullRequestUpdated extends PullRequestEvent {@Overridepublic String getActivity() {- return "added commits";+ return _T("added commits");}public Collection<User> getCommitters() {diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.javaindex b719db8f3b..09dfa1f5cd 100644--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java@@ -5,6 +5,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Collection;import java.util.Date;import java.util.stream.Collectors;@@ -26,7 +28,7 @@ public class PullRequestsDeleted extends ProjectEvent {@Overridepublic String getActivity() {- return "pull requests deleted";+ return _T("pull requests deleted");}}diff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/DateUtils.javaindex cb0bb286fe..04c6d3cb15 100644--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/DateUtils.java@@ -34,8 +34,6 @@ public class DateUtils {public static final String TIME_FORMAT = "HH:mm";public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_FORMAT);-- private static final PrettyTime PRETTY_TIME = new PrettyTime();public static final List<String> RELAX_DATE_EXAMPLES = Lists.newArrayList("2:30pm", "4-23", "2018-2-3", "one hour ago", "2 hours ago", "3PM", "noon", "today",@@ -43,7 +41,7 @@ public class DateUtils {"4 weeks ago", "last month", "1 month 2 days ago", "last year", "1 year ago");public static String formatAge(Date date) {- return PRETTY_TIME.format(date);+ return new PrettyTime(WebSession.get().getLocale()).format(date);}public static ZoneId getZoneId() {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 95907745ac..d75bf1d48d 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@@ -58,7 +58,7 @@<div class="reviews mr-3" wicket:id="reviews"></div><div class="jobs mr-3" wicket:id="jobs"></div><div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm">- <a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>+ <wicket:t><a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span></wicket:t></div></div></wicket:fragment>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 7128d05e0d..c211194c3e 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@@ -988,9 +988,9 @@ public abstract class PullRequestListPanel extends Panel {fragment.add(new UserIdentPanel("user", lastActivity.getUser(), Mode.NAME));elsefragment.add(new WebMarkupContainer("user").setVisible(false));- fragment.add(new Label("activity", lastActivity.getDescription()));+ fragment.add(new Label("activity", _T("action:" + lastActivity.getDescription())));fragment.add(new Label("date", DateUtils.formatAge(lastActivity.getDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(lastActivity.getDate()))));+ .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(lastActivity.getDate()))));cellItem.add(fragment);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.javaindex e1fe895124..173a57eb66 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java@@ -1,13 +1,14 @@package io.onedev.server.web.page.admin.pluginsettings;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.page.layout.AdministrationSettingContribution;-import io.onedev.server.web.page.layout.ContributedAdministrationSetting;+import static io.onedev.server.web.translation.Translation._T;++import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;+import java.text.MessageFormat;++import javax.annotation.Nullable;+import javax.validation.Validator;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -18,10 +19,14 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import javax.annotation.Nullable;-import javax.validation.Validator;-import java.io.Serializable;-import java.lang.reflect.InvocationTargetException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.page.admin.AdministrationPage;+import io.onedev.server.web.page.layout.AdministrationSettingContribution;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;public class ContributedAdministrationSettingPage extends AdministrationPage {@@ -47,7 +52,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {}if (settingClass == null)- throw new RuntimeException("Unexpected setting: " + settingName);+ throw new RuntimeException(MessageFormat.format(_T("Unexpected setting: {0}"), settingName));}private SettingManager getSettingManager() {@@ -76,7 +81,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {elsegetSettingManager().removeContributedSetting(settingClass);- getSession().success("Setting has been saved");+ getSession().success(_T("Setting has been saved"));setResponsePage(ContributedAdministrationSettingPage.class, paramsOf(settingClass));}@@ -152,7 +157,7 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, EditableUtils.getDisplayName(settingClass));+ return new Label(componentId, _T(EditableUtils.getDisplayName(settingClass)));}public static String getSettingName(Class<?> settingClass) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex cad5efd24b..5fb32270a0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -369,7 +369,7 @@ public abstract class LayoutPage extends BasePage {}contributedMenuItemsOfGroup.add(new SidebarMenuItem.Page(null,- EditableUtils.getDisplayName(contributedSettingClass),+ _T(EditableUtils.getDisplayName(contributedSettingClass)),ContributedAdministrationSettingPage.class,ContributedAdministrationSettingPage.paramsOf(contributedSettingClass)));}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 7b3fc84a86..b6e2ca959c 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@@ -26,6 +26,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("7 days", "7 天");m.put("<a href=\"https://guides.github.com/features/mastering-markdown/\" target=\"_blank\">GitHub flavored markdown</a> is accepted, with <a href=\"https://docs.onedev.io/appendix/markdown-syntax\" target=\"_blank\">mermaid and katex support</a>.","可使用 <a href=\"https://guides.github.com/features/mastering-markdown/\" target=\"_blank\">GitHub 风格的 markdown</a>,并支持 <a href=\"https://docs.onedev.io/appendix/markdown-syntax\" target=\"_blank\">mermaid 和 katex</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 step requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",@@ -36,6 +38,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("<b>Tips: </b> Type <tt>@</tt> to <a href='https://docs.onedev.io/appendix/job-variables' target='_blank' tabindex='-1'>insert variable</a>. Use <tt>@@</tt> for literal <tt>@</tt>","<b>提示: </b> 输入 <tt>@</tt> 插入变量。使用 <tt>@@</tt> 插入字符 <tt>@</tt>");m.put("<i>No Name</i>", "<i>无名称</i>");+ 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 regular expression</a> to validate commit message footer",@@ -43,7 +48,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("A pull request is open for this change", "一个合并请求正在审查此更改");m.put("API url of your JIRA cloud instance, for instance, <tt>https://your-domain.atlassian.net/rest/api/3</tt>","你的JIRA云实例的API地址,例如:<tt>https://your-domain.atlassian.net/rest/api/3</tt>");- m.put("Able to merge without conflicts", "可以合并而没有冲突");+ m.put("Able to merge without conflicts", "没有冲突,可以合并");m.put("Absolute or relative url of the image", "图片的绝对或相对 URL");m.put("Absolute or relative url of the link", "链接的绝对或相对 URL");m.put("Access Anonymously", "匿名访问");@@ -3164,18 +3169,25 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("YouTrack Projects to Import", "要导入的 YouTrack 项目");m.put("[Reset Password] Please Reset Your OneDev Password", "[重置密码] 请重置您的 OneDev 密码");m.put("access [{0}]", "访问 [{0}]");+ m.put("added commits", "添加提交");m.put("and more", "更多");m.put("artifacts", "制品");m.put("assign to me", "分配给我");+ m.put("assigned to \"{0}\"", "分配给 \"{0}\"");m.put("base", "基准");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("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 路径");@@ -3206,6 +3218,7 @@ 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", "八月");@@ -3227,8 +3240,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("personal", "个人");m.put("pipeline", "流水线");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("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", "索引完成后,在当前版本中的搜索将更准确");@@ -3237,7 +3256,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("space", "空格");m.put("submit", "提交");m.put("tags", "标签");+ m.put("touched", "触摸");m.put("true", "真");+ m.put("unassigned from \"{0}\"", "取消分配给 \"{0}\"");+ m.put("unresolved code comment", "将代码评论标记为未解决");m.put("w%02d", "第 %d 周");m.put("week.Fri", "周五");m.put("week.Mon", "周一");@@ -3267,10 +3289,14 @@ 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("<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("<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",+ "<b class='text-danger'>注意:</b> 这需要企业订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");+ m.put("High Availability & Scalability", "高可用和可扩展");+ m.put("Set up Microsoft Teams notification settings. Settings will be inherited by child projects, and can be overridden by defining settings with same webhook url. ",+ "设置 Microsoft Teams 通知设置。设置将继承给子项目,并可以通过定义具有相同 webhook url 的设置来覆盖。");+ m.put("Setting has been saved", "设置已保存");+ m.put("Subscription Management", "订阅管理");+ m.put("Unexpected setting: {0}", "未知设置:{0}");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");@@ -3347,6 +3373,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("action:deleted source branch", "删除了源分支");m.put("action:restored source branch", "恢复了源分支");m.put("action:changed target branch", "更改了目标分支");+ m.put("action:commented", "评论");}@Overridediff --git a/server-ee b/server-eeindex 1c81da9370..9dcb407057 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 1c81da93706c864235347d502499ebcb29dabde1+Subproject commit 9dcb4070576a70f811ff54aba623df277ad81272