The Unified and Autonomous Development Platform
wip: i18n support
Robin Shen8d88e6713f3a
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 7374c49908..918a30ce42 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -49,7 +49,6 @@ import org.hibernate.SessionFactory;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;import org.hibernate.collection.internal.PersistentBag;import org.hibernate.type.Type;-import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.inject.matcher.AbstractMatcher;@@ -366,6 +365,7 @@ import io.onedev.server.util.xstream.ReflectionConverter;import io.onedev.server.util.xstream.StringConverter;import io.onedev.server.util.xstream.VersionedDocumentConverter;import io.onedev.server.validation.ValidatorProvider;+import io.onedev.server.validation.MessageInterpolator;import io.onedev.server.web.DefaultUrlManager;import io.onedev.server.web.DefaultWicketFilter;import io.onedev.server.web.DefaultWicketServlet;@@ -427,7 +427,7 @@ public class CoreModule extends AbstractPluginModule {Configuration<?> configuration = Validation.byDefaultProvider().configure()- .messageInterpolator(new ParameterMessageInterpolator());+ .messageInterpolator(new MessageInterpolator());return configuration.buildValidatorFactory();}).in(Singleton.class);diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 1adbbf0823..07dc3308cd 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -67,7 +67,6 @@ import com.google.common.collect.Sets;import io.onedev.commons.bootstrap.SecretMasker;import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Markdown;@@ -103,6 +102,7 @@ import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.util.BuildAware;+import io.onedev.server.web.util.TextUtils;import io.onedev.server.web.util.WicketUtils;@Entity@@ -317,7 +317,7 @@ public class Build extends ProjectBelonging@Overridepublic String toString() {- return WordUtils.toWords(name());+ return TextUtils.getDisplayValue(this);}public abstract boolean isFinished();diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 3773f9d108..6b0e1171e5 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -1,9 +1,75 @@package io.onedev.server.model;+import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;+import static io.onedev.server.model.PullRequest.PROP_CLOSE_DAY;+import static io.onedev.server.model.PullRequest.PROP_CLOSE_MONTH;+import static io.onedev.server.model.PullRequest.PROP_CLOSE_WEEK;+import static io.onedev.server.model.PullRequest.PROP_COMMENT_COUNT;+import static io.onedev.server.model.PullRequest.PROP_CONFUSED_COUNT;+import static io.onedev.server.model.PullRequest.PROP_EYES_COUNT;+import static io.onedev.server.model.PullRequest.PROP_HEART_COUNT;+import static io.onedev.server.model.PullRequest.PROP_ROCKET_COUNT;+import static io.onedev.server.model.PullRequest.PROP_SMILE_COUNT;+import static io.onedev.server.model.PullRequest.PROP_STATUS;+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DAY;+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_MONTH;+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_WEEK;+import static io.onedev.server.model.PullRequest.PROP_TADA_COUNT;+import static io.onedev.server.model.PullRequest.PROP_THUMBS_DOWN_COUNT;+import static io.onedev.server.model.PullRequest.PROP_THUMBS_UP_COUNT;+import static io.onedev.server.model.PullRequest.PROP_TITLE;+import static io.onedev.server.model.PullRequest.PROP_UUID;+import static io.onedev.server.model.support.TimeGroups.PROP_DAY;+import static io.onedev.server.model.support.TimeGroups.PROP_MONTH;+import static io.onedev.server.model.support.TimeGroups.PROP_WEEK;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;+import static java.lang.ThreadLocal.withInitial;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.Stack;+import java.util.UUID;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.persistence.AttributeOverride;+import javax.persistence.AttributeOverrides;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Embedded;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.hibernate.annotations.DynamicUpdate;+import com.fasterxml.jackson.annotation.JsonIgnore;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.commons.utils.WordUtils;+import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentStorageSupport;import io.onedev.server.entitymanager.PullRequestManager;@@ -13,7 +79,11 @@ import io.onedev.server.entityreference.PullRequestReference;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.CommitMessageError;import io.onedev.server.git.service.GitService;-import io.onedev.server.model.support.*;+import io.onedev.server.model.support.EntityWatch;+import io.onedev.server.model.support.LabelSupport;+import io.onedev.server.model.support.LastActivity;+import io.onedev.server.model.support.ProjectBelonging;+import io.onedev.server.model.support.TimeGroups;import io.onedev.server.model.support.code.BranchProtection;import io.onedev.server.model.support.code.BuildRequirement;import io.onedev.server.model.support.pullrequest.AutoMerge;@@ -26,24 +96,9 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.util.PullRequestAware;+import io.onedev.server.web.util.TextUtils;import io.onedev.server.web.util.WicketUtils;import io.onedev.server.xodus.VisitInfoManager;-import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.annotations.DynamicUpdate;--import javax.annotation.Nullable;-import javax.persistence.*;-import java.util.*;-import java.util.stream.Collectors;--import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;-import static io.onedev.server.model.PullRequest.*;-import static io.onedev.server.model.support.TimeGroups.*;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;-import static java.lang.ThreadLocal.withInitial;@Entity@Table(@@ -224,7 +279,7 @@ public class PullRequest extends ProjectBelonging@Overridepublic String toString() {- return WordUtils.toWords(name());+ return TextUtils.getDisplayValue(this);}}diff --git a/server-core/src/main/java/io/onedev/server/validation/MessageInterpolator.java b/server-core/src/main/java/io/onedev/server/validation/MessageInterpolator.javanew file mode 100644index 0000000000..e550a0ddf3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/validation/MessageInterpolator.java@@ -0,0 +1,29 @@+package io.onedev.server.validation;++import java.util.Locale;++import org.apache.wicket.Session;+import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;++import io.onedev.server.web.WebSession;++public class MessageInterpolator extends ParameterMessageInterpolator {++ @Override+ public String interpolate(String messageTemplate, Context context) {+ Locale locale = null;+ if (Session.exists()) {+ WebSession session = (WebSession) Session.get();+ locale = session.getLocale();+ }+ if (locale == null)+ locale = Locale.getDefault();+ return interpolate(messageTemplate, context, locale);+ }++ @Override+ public String interpolate(String messageTemplate, Context context, Locale locale) {+ return super.interpolate(messageTemplate, context, locale);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 8dccbbb950..015a1d5891 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.codecomment;+import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;@@ -202,7 +204,7 @@ public abstract class CodeCommentPanel extends Panel {};form.add(contentInput);contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));+ contentInput.setLabel(Model.of(_T("Comment")));FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);feedback.setOutputMarkupPlaceholderTag(true);@@ -589,7 +591,7 @@ public abstract class CodeCommentPanel extends Panel {};contentInput.setRequired(resolved == null);- contentInput.setLabel(Model.of("Content"));+ contentInput.setLabel(Model.of(_T("Content")));form.add(contentInput);FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);@@ -879,7 +881,7 @@ public abstract class CodeCommentPanel extends Panel {};contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));+ contentInput.setLabel(Model.of(_T("Content")));form.add(contentInput);FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.javaindex 8fb5b3486a..3b17f846c2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/FileQueryOptionEditor.java@@ -3,6 +3,9 @@ package io.onedev.server.web.component.codequeryoption;import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.FileQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -31,12 +34,12 @@ public class FileQueryOptionEditor extends FormComponentPanel<FileQueryOption> {WebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));- term.setRequired(true).setLabel(Model.of("File name"));+ term.setRequired(true).setLabel(Model.of(_T("File name")));term.add(validatable -> {try {new FileQuery.Builder(validatable.getValue()).count(1).build().asLuceneQuery();} catch (TooGeneralQueryException e) {- validatable.error(messageSource -> "Search is too general");+ validatable.error(messageSource -> _T("Search is too general"));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.javaindex a683099e02..d28abea76b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/SymbolQueryOptionEditor.java@@ -4,6 +4,9 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.SymbolQueryOption;import io.onedev.server.search.code.query.TooGeneralQueryException;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -35,10 +38,10 @@ public class SymbolQueryOptionEditor extends FormComponentPanel<SymbolQueryOptioWebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));- term.setRequired(true).setLabel(Model.of("Symbol name"));+ term.setRequired(true).setLabel(Model.of(_T("Symbol name")));term.add(validatable -> {if (StringUtils.isBlank(validatable.getValue())) {- validatable.error(messageSource -> "This field is required");+ validatable.error(messageSource -> _T("This field is required"));} else {try {new SymbolQuery.Builder(validatable.getValue())@@ -46,7 +49,7 @@ public class SymbolQueryOptionEditor extends FormComponentPanel<SymbolQueryOptio.build().asLuceneQuery();} catch (TooGeneralQueryException e) {- validatable.error((IValidationError) messageSource -> "Search is too general");+ validatable.error((IValidationError) messageSource -> _T("Search is too general"));}}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.java b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.javaindex 2a4df4b5ec..9ce7e19ba4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codequeryoption/TextQueryOptionEditor.java@@ -14,6 +14,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.validation.IValidationError;+import static io.onedev.server.web.translation.Translation._T;+import java.util.regex.Pattern;import java.util.regex.PatternSyntaxException;@@ -41,7 +43,7 @@ public class TextQueryOptionEditor extends FormComponentPanel<TextQueryOption> {WebMarkupContainer termContainer = new WebMarkupContainer("term");add(termContainer);term = new TextField<>("term", Model.of(option.getTerm()));- term.setRequired(true).setLabel(Model.of("Search for"));+ term.setRequired(true).setLabel(Model.of(_T("Search for")));term.add(validatable -> {boolean regex = this.regex.getInput() != null;try {@@ -53,9 +55,9 @@ public class TextQueryOptionEditor extends FormComponentPanel<TextQueryOption> {.build().asLuceneQuery();} catch (PatternSyntaxException e) {- validatable.error((IValidationError) messageSource -> "Invalid PCRE syntax");+ validatable.error((IValidationError) messageSource -> _T("Invalid PCRE syntax"));} catch (TooGeneralQueryException e) {- validatable.error((IValidationError) messageSource -> "Search is too general");+ validatable.error((IValidationError) messageSource -> _T("Search is too general"));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.javaindex 4ad3018511..1762e66388 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.comment;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -153,7 +155,7 @@ public abstract class CommentPanel extends Panel {editor.replaceWith(viewer);target.add(viewer);} catch (StaleStateException e) {- warn("Some one changed the content you are editing. Reload the page and try again.");+ warn(_T("Some one changed the content you are editing. Reload the page and try again."));target.add(feedback);} catch (ExplicitException e) {error(e.getMessage());diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex e6b2ceb0ed..a28c1c3319 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -107,6 +107,7 @@ import java.nio.charset.StandardCharsets;import java.nio.file.Paths;import java.util.*;+import static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;/**@@ -870,7 +871,7 @@ public abstract class RevisionDiffPanel extends Panel {});contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));+ contentInput.setLabel(Model.of(_T("Comment")));FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);feedback.setOutputMarkupPlaceholderTag(true);@@ -2083,7 +2084,7 @@ public abstract class RevisionDiffPanel extends Panel {});contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));+ contentInput.setLabel(Model.of(_T("Comment")));FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);feedback.setOutputMarkupPlaceholderTag(true);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 1fbfc7aa0c..50dab5cc77 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.issue.activities;import static io.onedev.server.security.SecurityUtils.canAccessTimeTracking;+import static io.onedev.server.web.translation.Translation._T;import java.util.ArrayList;import java.util.Collection;@@ -246,7 +247,7 @@ public abstract class IssueActivitiesPanel extends Panel {@Overrideprotected List<Behavior> getInputBehaviors() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ return Lists.newArrayList(AttributeModifier.replace("placeholder", _T("Leave a comment")));}@Override@@ -255,7 +256,7 @@ public abstract class IssueActivitiesPanel extends Panel {}};input.setOutputMarkupId(true);- input.setRequired(true).setLabel(Model.of("Comment"));+ input.setRequired(true).setLabel(Model.of(_T("Comment")));Form<?> form = new Form<Void>("form");form.add(new FencedFeedbackPanel("feedback", form));@@ -267,7 +268,7 @@ public abstract class IssueActivitiesPanel extends Panel {super.onSubmit(target, form);String content = input.getModelObject();if (content.length() > IssueComment.MAX_CONTENT_LEN) {- error("Comment too long");+ error(_T("Comment too long"));target.add(form);} else {IssueComment comment = new IssueComment();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex c871845982..3a27bdfe23 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.create;+import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;@@ -111,7 +113,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementFieldUtils.getEditableFields(getProject(), fieldNames)));titleInput = new TextField<>("title", Model.of(""));- titleInput.setRequired(true).setLabel(Model.of("Title"));+ titleInput.setRequired(true).setLabel(Model.of(_T("Title")));add(titleInput);add(new FencedFeedbackPanel("titleFeedback", titleInput));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 c73f0e63a2..96e161b075 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@@ -27,6 +27,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;+import static io.onedev.server.web.translation.Translation._T;public abstract class IssueEditableTitlePanel extends Panel {@@ -62,7 +63,7 @@ public abstract class IssueEditableTitlePanel extends Panel {});titleInput.setRequired(true);- titleInput.setLabel(Model.of("Title"));+ titleInput.setLabel(Model.of(_T("Title")));form.add(titleInput);diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex d0e90641e7..b440393fb9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -63,6 +63,7 @@ import java.io.IOException;import java.io.InputStream;import java.util.*;+import static io.onedev.server.web.translation.Translation._T;import static org.unbescape.html.HtmlEscape.escapeHtml5;abstract class InsertUrlPanel extends Panel {@@ -418,7 +419,7 @@ abstract class InsertUrlPanel extends Panel {if (maxFilesize <= 0)maxFilesize = 1;form.add(new DropzoneField("file", model, acceptedFiles, 1, maxFilesize)- .setRequired(true).setLabel(Model.of("Attachment")));+ .setRequired(true).setLabel(Model.of(_T("Attachment"))));form.add(new AjaxButton("insert"){});form.add(new AjaxLink<Void>("cancel") {@@ -441,7 +442,7 @@ abstract class InsertUrlPanel extends Panel {form.add(feedback);form.add(new DropzoneField("file", model, acceptedFiles, 1, maxUploadFileSize)- .setRequired(true).setLabel(Model.of("Attachment")));+ .setRequired(true).setLabel(Model.of(_T("Attachment"))));form.add(new TextField<String>("directory", new IModel<String>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.html b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.htmlindex 7321589d74..d41055083b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.html@@ -1,6 +1,6 @@<wicket:panel><div class="type-select">- <input wicket:id="input" class="form-control" placeholder="Type to filter">+ <input wicket:id="input" class="form-control"><div wicket:id="content" class="content mt-3"></div></div><wicket:fragment wicket:id="groupNodeFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.javaindex 15094f7212..f04b38ecc0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java@@ -1,16 +1,20 @@package io.onedev.server.web.component.typeselect;-import io.onedev.commons.loader.AppLoader;-import io.onedev.commons.loader.ImplementationRegistry;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.util.Similarities;-import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;-import io.onedev.server.web.editable.EditableUtils;+import static io.onedev.server.util.HtmlUtils.getText;+import static io.onedev.server.web.editable.EditableUtils.getDescription;+import static io.onedev.server.web.translation.Translation._T;+import static org.apache.commons.lang3.StringUtils.substringBefore;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Set;+import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxChannel;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -32,13 +36,15 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import java.io.Serializable;-import java.util.*;--import static io.onedev.server.util.HtmlUtils.getText;-import static io.onedev.server.web.editable.EditableUtils.getDescription;-import static io.onedev.server.web.translation.Translation._T;-import static org.apache.commons.lang3.StringUtils.substringBefore;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.ImplementationRegistry;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.util.Similarities;+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import io.onedev.server.web.editable.EditableUtils;public abstract class TypeSelectPanel<T extends Serializable> extends Panel {@@ -50,9 +56,8 @@ public abstract class TypeSelectPanel<T extends Serializable> extends Panel {List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(TypeSelectPanel.class, getClass());Class<? extends T> baseType = (Class<T>) typeArguments.get(0);-ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);- types = new ArrayList<>(registry.getImplementations(baseType));+ types = new ArrayList<Class<? extends T>>(registry.getImplementations(baseType));EditableUtils.sortAnnotatedElements(types);}@@ -61,6 +66,7 @@ public abstract class TypeSelectPanel<T extends Serializable> extends Panel {super.onInitialize();TextField<String> searchField = new TextField<>("input", Model.of(""));+ searchField.add(new AttributeModifier("placeholder", _T("Type to filter")));add(searchField);searchField.add(new OnTypingDoneBehavior(100) {@@ -83,12 +89,12 @@ public abstract class TypeSelectPanel<T extends Serializable> extends Panel {@Overrideprotected double getSimilarScore(TreeNode item) {- String fullName = item.getName();+ String fullName = _T(item.getName());if (item instanceof TypeNode) {TypeNode<?> typeNode = (TypeNode<?>) item;String groupName = EditableUtils.getGroup(typeNode.type);if (groupName != null)- fullName = groupName + "/" + fullName;+ fullName = _T(groupName) + "/" + fullName;}return Similarities.getSimilarScore(StringUtils.deleteWhitespace(fullName),diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.htmlindex 4f7c4b7462..5503d92852 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html@@ -1,17 +1,17 @@<wicket:panel><div class="email-addresses"><ul class="alert alert-light px-5 mb-5">- <li>Primary email address will be used to receive notifications, show gravatar (if enabled) etc.</li>- <li>Git email address will be used as git author/committer for commits created on web UI</li>- <li>When determine if <span wicket:id="who"></span> author/committer of a git commit, all emails listed here will be checked</li>- <li>Unverified email address is <b>NOT</b> applicable for above functionalities</li>+ <li><wicket:t>Primary email address will be used to receive notifications, show gravatar (if enabled) etc.</wicket:t></li>+ <li><wicket:t>Git email address will be used as git author/committer for commits created on web UI</wicket:t></li>+ <li><wicket:t>When determine if the user is author/committer of a git commit, all emails listed here will be checked</wicket:t></li>+ <li><wicket:t>Unverified email address is <b>NOT</b> applicable for above functionalities</wicket:t></li></ul><table class="table"><tr wicket:id="emailAddresses"><td><span wicket:id="value" class="font-size-lg"></span>- <span wicket:id="primary" class="badge badge-info badge-sm ml-3">Primary</span>- <span wicket:id="git" class="badge badge-info badge-sm ml-1">Git</span>+ <span wicket:id="primary" class="badge badge-info badge-sm ml-3"><wicket:t>Primary</wicket:t></span>+ <span wicket:id="git" class="badge badge-info badge-sm ml-1"><wicket:t>Git</wicket:t></span><span wicket:id="verificationStatus" class="ml-1"></span></td><td>@@ -20,10 +20,10 @@</tr><tr><td colspan="2">- <div class="mb-2 mt-4 font-weight-bolder">Add New Email Address</div>+ <div class="mb-2 mt-4 font-weight-bolder"><wicket:t>Add New Email Address</wicket:t></div><div class="form-group"><form wicket:id="form" class="form-inline">- <input wicket:id="emailAddress" class="form-control form-control-sm flex-flow-0 mr-3" placeholder="Email Address">+ <input wicket:id="emailAddress" class="form-control form-control-sm flex-flow-0 mr-3"><button type="submit" class="btn btn-icon btn-sm btn-primary"><wicket:svg href="plus" class="icon"/></button></form><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.javaindex fa22ad5e7e..e8a97cecae 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java@@ -1,17 +1,12 @@package io.onedev.server.web.component.user.emailaddresses;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.EmailAddressManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.EmailAddress;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.page.my.MyPage;-import io.onedev.server.web.util.ConfirmClickModifier;+import static io.onedev.server.web.translation.Translation._T;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.AttributeModifier;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -31,9 +26,17 @@ import org.apache.wicket.validation.IErrorMessageSource;import org.apache.wicket.validation.IValidationError;import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.EmailAddressManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.EmailAddress;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.util.ConfirmClickModifier;public class EmailAddressesPanel extends GenericPanel<User> {@@ -46,12 +49,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overrideprotected void onInitialize() {super.onInitialize();-- if (getPage() instanceof MyPage)- add(new Label("who", "you are "));- else- add(new Label("who", "this user is "));-+add(new ListView<EmailAddress>("emailAddresses", new AbstractReadOnlyModel<List<EmailAddress>>() {@Override@@ -85,7 +83,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overridepublic String getLabel() {- return "Set As Primary";+ return _T("Set As Primary");}@Override@@ -107,7 +105,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overridepublic String getLabel() {- return "Use For Git Operations";+ return _T("Use For Git Operations");}@Override@@ -129,7 +127,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overridepublic String getLabel() {- return "Resend Verification Email";+ return _T("Resend Verification Email");}@Override@@ -140,10 +138,10 @@ public class EmailAddressesPanel extends GenericPanel<User> {public void onClick(AjaxRequestTarget target) {if (OneDev.getInstance(SettingManager.class).getMailService() != null) {getEmailAddressManager().sendVerificationEmail(item.getModelObject());- Session.get().success("Verification email sent, please check it");+ Session.get().success(_T("Verification email sent, please check it"));} else {target.appendJavaScript(String.format("alert('%s');",- "Unable to send verification email as mail service is not configured yet"));+ _T("Unable to send verification email as mail service is not configured yet")));}dropdown.close();}@@ -170,12 +168,12 @@ public class EmailAddressesPanel extends GenericPanel<User> {if (hasMultipleEmailAddresses)getEmailAddressManager().delete(getEmailAddressManager().load(emailAddressId));else- Session.get().warn("At least one email address should be configured, please add a new one first");+ Session.get().warn(_T("At least one email address should be configured, please add a new one first"));}};if (getUser().getEmailAddresses().size() > 1)- link.add(new ConfirmClickModifier("Do you really want to delete this email address?"));+ link.add(new ConfirmClickModifier(_T("Do you really want to delete this email address?")));return link;}@@ -201,7 +199,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {super.onSubmit();if (getEmailAddressManager().findByValue(emailAddressValue) != null) {- error("This email address is being used");+ error(_T("This email address is being used"));} else {EmailAddress address = new EmailAddress();address.setValue(emailAddressValue);@@ -231,7 +229,8 @@ public class EmailAddressesPanel extends GenericPanel<User> {}});- input.setLabel(Model.of("Email address"));+ input.add(AttributeModifier.append("placeholder", _T("Email address")));+ input.setLabel(Model.of(_T("Email address")));input.setRequired(true);input.add(validatable -> {String emailAddress = validatable.getValue();@@ -240,7 +239,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {@Overridepublic Serializable getErrorMessage(IErrorMessageSource messageSource) {- return "Malformed email address";+ return _T("Malformed email address");}});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.javaindex f589e61248..6182ed3110 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.agentquery;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.form.FormComponent;@@ -34,7 +36,7 @@ public class AgentQueryEditPanel extends PropertyEditor<String> {add(input = new TextField<String>("input", Model.of(getModelObject())));input.setType(getDescriptor().getPropertyClass());- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AgentQueryBehavior(forExecutor));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex 79430cf7ba..26b0dee7ad 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -64,7 +64,7 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change") {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 8d4fbcb522..0b93541e62 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.branchchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -57,7 +59,7 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex 7f3ecf5bc2..e93d412353 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.branchchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -54,7 +56,7 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.javaindex 027ac0ac64..b3014a54ca 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.build.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -69,7 +71,7 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.javaindex ee08a76359..255fda97c2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java@@ -15,6 +15,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import javax.annotation.Nullable;public class BuildSingleChoiceEditor extends PropertyEditor<Long> {@@ -63,7 +65,7 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.javaindex 65778ea9d1..5faf9b24b4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.buildspec.job.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -53,7 +55,7 @@ public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {};input.setRequired(descriptor.isPropertyRequired());- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.javaindex 03a25f4d49..6db952e5c8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/choice/JobSingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.buildspec.job.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -47,7 +49,7 @@ public class JobSingleChoiceEditor extends PropertyEditor<String> {};input.setRequired(descriptor.isPropertyRequired());- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 3be91cee9a..8911401bff 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -117,7 +119,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 3c2af3273a..e133f36344 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.HashMap;import java.util.List;import java.util.Map;@@ -112,7 +114,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.javaindex dbe301c225..62764454e2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java@@ -32,6 +32,8 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import java.io.Serializable;import java.util.ArrayList;import java.util.List;@@ -58,7 +60,7 @@ public class CodePropertyEditor extends PropertyEditor<Serializable> {elsecontainer.add(input = new TextArea<String>("input", Model.of(StringUtils.join((List<?>)getModelObject(), "\n"))));- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.setOutputMarkupId(true);input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.javaindex 5167dfffbc..1bb7c97ad8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.color;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -24,7 +26,7 @@ public class ColorPropertyEditor extends PropertyEditor<String> {input = new ColorPicker("input", Model.of(getModelObject()), !getDescriptor().isPropertyRequired());add(input);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.javaindex d592c82c22..ec8171833b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.date;+import static io.onedev.server.web.translation.Translation._T;+import java.lang.reflect.Method;import java.util.Date;@@ -43,7 +45,7 @@ public class DatePropertyEditor extends PropertyEditor<Date> {withTime? "Choose date and time...": "Choose date..."));}- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 8e8a333a2f..43566ddb0e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.enumeration;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.EnumSet;import java.util.HashMap;@@ -96,7 +98,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {});}- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));if (radioChoice) {input.add(new AjaxFormChoiceComponentUpdatingBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex b91b6ce85e..ad0c78e066 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.enumlist;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.EnumSet;import java.util.HashMap;@@ -79,7 +81,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 916d45dcd7..dec7dc3e6f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.groupchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -74,7 +76,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 0202db4bcb..a0351b7758 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.groupchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Comparator;import java.util.List;@@ -72,7 +74,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.javaindex 85449c5001..d298b93d04 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/image/ImagePropertyEditor.java@@ -4,6 +4,9 @@ import io.onedev.server.annotation.Image;import io.onedev.server.web.component.imagedata.upload.ImageUploadField;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;@@ -30,7 +33,7 @@ public class ImagePropertyEditor extends PropertyEditor<String> {}};add(input);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javaindex bd214ce2ad..5232e6fb2a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.issue.choice;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -73,7 +75,7 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.javaindex 8786e19a63..2fefa82ddd 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java@@ -15,6 +15,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -67,7 +69,7 @@ public class IterationMultiChoiceEditor extends PropertyEditor<List<String>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.javaindex 27ec978423..9953ab054b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java@@ -15,6 +15,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -68,7 +70,7 @@ public class IterationSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.javaindex c8c7a55088..bd978f9829 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.markdown;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -43,7 +45,7 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {}});- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));}protected List<Behavior> getInputBehaviors() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 9873fcb399..601fb0c717 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.numeric;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;@@ -25,7 +27,7 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {input = new TextField<Number>("input", Model.of(getModelObject()));input.setType(getDescriptor().getPropertyClass());add(input);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex d5a60ec6b4..8f64480d6f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.parentchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -69,7 +71,7 @@ public class ParentChoiceEditor extends PropertyEditor<String> {};input.setRequired(false);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.javaindex 1635f6d694..c339fd7a21 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java@@ -33,14 +33,14 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {input = new PasswordTextField("input", Model.of(getModelObject()));input.setResetPassword(true);input.setRequired(false);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(AttributeModifier.replace("placeholder", _T("Type password here")));add(input);inputAgain = new PasswordTextField("inputAgain", Model.of(getModelObject()));inputAgain.setResetPassword(true);inputAgain.setRequired(false);- inputAgain.setLabel(Model.of(getDescriptor().getDisplayName()));+ inputAgain.setLabel(Model.of(_T(getDescriptor().getDisplayName())));inputAgain.add(AttributeModifier.replace("placeholder", _T("Confirm password here")));add(inputAgain);@@ -72,13 +72,13 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {protected String convertInputToValue() throws ConversionException {if (input.getConvertedInput() != null) {if (inputAgain.getConvertedInput() == null)- throw new ConversionException("Please confirm the password.");+ throw new ConversionException(_T("Please confirm the password."));else if (!input.getConvertedInput().equals(inputAgain.getConvertedInput()))- throw new ConversionException("Password and its confirmation should be identical.");+ throw new ConversionException(_T("Password and its confirmation should be identical."));elsereturn input.getConvertedInput();} else if (inputAgain.getConvertedInput() != null) {- throw new ConversionException("Password and its confirmation should be identical.");+ throw new ConversionException(_T("Password and its confirmation should be identical."));} else {return input.getConvertedInput();}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.javaindex 11cc46dfd9..f61ce5becf 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java@@ -5,6 +5,9 @@ import io.onedev.server.annotation.Password;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.PasswordTextField;@@ -27,7 +30,7 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {input = new PasswordTextField("input", Model.of(getModelObject()));input.setRequired(false);input.setResetPassword(false);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);Password password = getDescriptor().getPropertyGetter().getAnnotation(Password.class);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex 913672cab0..30ff7db1b0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.project.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -81,7 +83,7 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex 67712f6e92..7e21b85d49 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.project.choice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -73,7 +75,7 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.javaindex 32379ee204..271b802fe9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/query/ProjectQueryEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.project.query;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;@@ -26,7 +28,7 @@ public class ProjectQueryEditor extends PropertyEditor<String> {input = new TextField<String>("input", getModel());input.add(new ProjectQueryBehavior(false));- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javaindex dab358f9fa..af4d85afee 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.pullrequest.choice;+import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -63,7 +65,7 @@ public class PullRequestChoiceEditor extends PropertyEditor<Long> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.javaindex ce11e0bf08..988633a6ba 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.refreshtoken;+import static io.onedev.server.web.translation.Translation._T;+import java.net.URI;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;@@ -62,7 +64,7 @@ public class RefreshTokenPropertyEditor extends PropertyEditor<String> {input = new PasswordTextField("input", Model.of(getModelObject()));input.setRequired(true);input.setResetPassword(false);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));add(input);input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.javaindex 652d1c891c..ed7fe2124a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.rolechoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -67,7 +69,7 @@ public class RoleMultiChoiceEditor extends PropertyEditor<Collection<String>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.javaindex 965c0c1741..33c7316bf7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.rolechoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Comparator;import java.util.List;@@ -65,7 +67,7 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 8c439d3840..c3e5dc9d98 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.scriptchoice;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -64,7 +66,7 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.javaindex a20b06c9da..7f30255485 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyEditor.java@@ -4,6 +4,9 @@ import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;@@ -43,7 +46,7 @@ public class SecretPropertyEditor extends PropertyEditor<String> {input2 = new TextArea<>("input2", Model.of(getModelObject()));input2.setRequired(false);- input2.setLabel(Model.of(getDescriptor().getDisplayName()));+ input2.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input2.add(new OnTypingDoneBehavior() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex c4b38857d7..37c90dc245 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -15,6 +15,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import java.lang.reflect.Method;public class StringPropertyEditor extends PropertyEditor<String> {@@ -54,8 +56,8 @@ public class StringPropertyEditor extends PropertyEditor<String> {fragment.add(input = new TextField<String>("input", Model.of(getModelObject())));input.setType(getDescriptor().getPropertyClass());add(fragment);- }- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ }+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));if (inputAssist != null) {input.add(inputAssist);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.javaindex 3a6647bd87..3c67296769 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.stringlist;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -42,7 +44,7 @@ public class StringListEditor extends PropertyEditor<List<String>> {}};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 60d8fc5ea8..438b9b64a5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.userchoice;+import static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;import java.util.ArrayList;@@ -111,7 +112,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 8404670aac..3de408138a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -1,5 +1,6 @@package io.onedev.server.web.editable.userchoice;+import static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;import java.util.Comparator;@@ -111,7 +112,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {};- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new AjaxFormComponentUpdatingBehavior("change"){diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex df2d4ef976..19962b3b2f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -13,6 +13,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import static io.onedev.server.web.translation.Translation._T;+import javax.validation.ValidationException;public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {@@ -34,7 +36,7 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {period = null;input = new TextField<>("input", Model.of(period));add(input);- input.setLabel(Model.of(getDescriptor().getDisplayName()));+ input.setLabel(Model.of(_T(getDescriptor().getDisplayName())));input.add(new OnTypingDoneBehavior() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.javaindex 64e1a85e37..08510e2e11 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java@@ -7,6 +7,9 @@ import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.dropzonefield.DropzoneField;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.upload.UploadManager;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -65,7 +68,7 @@ public abstract class BlobUploadPanel extends Panel {"files",new PropertyModel<String>(this, "uploadId"),null, 0, maxUploadFileSize);- dropzone.setRequired(true).setLabel(Model.of("File"));+ dropzone.setRequired(true).setLabel(Model.of(_T("File")));form.add(dropzone);form.add(new AjaxButton("upload") {@@ -76,7 +79,7 @@ public abstract class BlobUploadPanel extends Panel {String commitMessage = BlobUploadPanel.this.commitMessage;if (StringUtils.isBlank(commitMessage))- commitMessage = "Add files via upload";+ commitMessage = _T("Add files via upload");var upload = getUploadManager().getUpload(uploadId);try {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex b371501106..cd12015d84 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -522,7 +522,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}});- contentInput.setRequired(true).setLabel(Model.of("Comment"));+ contentInput.setRequired(true).setLabel(Model.of(_T("Comment")));FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);feedback.setOutputMarkupPlaceholderTag(true);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.javaindex a51e673228..980899c098 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.builds.detail.artifacts;import static io.onedev.server.util.IOUtils.BUFFER_SIZE;+import static io.onedev.server.web.translation.Translation._T;import java.io.BufferedOutputStream;import java.io.File;@@ -84,7 +85,7 @@ public abstract class ArtifactUploadPanel extends Panel {"files",new PropertyModel<String>(this, "uploadId"),null, 0, maxUploadFileSize);- dropzone.setRequired(true).setLabel(Model.of("File"));+ dropzone.setRequired(true).setLabel(Model.of(_T("File")));form.add(dropzone);form.add(new AjaxButton("upload") {@@ -101,7 +102,7 @@ public abstract class ArtifactUploadPanel extends Panel {super.onSubmit(target, form);if (directory != null && directory.contains("..")) {- error("'..' is not allowed in the directory");+ error(_T("'..' is not allowed in the directory"));target.add(feedback);} else {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);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 ea308b7d2f..1d616b1f73 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@@ -1,6 +1,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.util.ArrayList;import java.util.Arrays;@@ -695,7 +696,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio}});- titleInput.setRequired(true).setLabel(Model.of("Title"));+ titleInput.setRequired(true).setLabel(Model.of(_T("Title")));form.add(new FencedFeedbackPanel("titleFeedback", titleInput));@@ -748,7 +749,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio};descriptionInput.add(validatable -> {if (validatable.getValue().length() > PullRequest.MAX_DESCRIPTION_LEN) {- validatable.error(messageSource -> "Description too long");+ validatable.error(messageSource -> _T("Description too long"));}});@@ -871,15 +872,15 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatiorequest.setMergePreview(mergePreview);if (merged != null) {- String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> Able to merge without conflicts",- SpriteImage.getVersionedHref("tick-circle-o"));+ String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> ", SpriteImage.getVersionedHref("tick-circle-o"))+ + _T("Able to merge without conflicts");Component result = new Label(componentId, html);result.add(AttributeAppender.append("class", "no-conflict"));result.setEscapeModelStrings(false);return result;} else {- String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> There are merge conflicts. "- + "You can still create the pull request though", SpriteImage.getVersionedHref("warning-o"));+ String html = String.format("<svg class='icon mt-n1 mr-1'><use xlink:href='%s'/></svg> ", SpriteImage.getVersionedHref("warning-o"))+ + _T("There are merge conflicts. You can still create the pull request though");Component result = new Label(componentId, html);result.add(AttributeAppender.append("class", "conflict"));result.setEscapeModelStrings(false);@@ -889,8 +890,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Overridepublic Component getLoadingComponent(String markupId) {- String html = String.format("<svg class='icon spin mt-n1 mr-1'><use xlink:href='%s'/></svg> Calculating merge preview...",- SpriteImage.getVersionedHref("loading"));+ String html = String.format("<svg class='icon spin mt-n1 mr-1'><use xlink:href='%s'/></svg> ", SpriteImage.getVersionedHref("loading"))+ + _T("Calculating merge preview...");Component component = new Label(markupId, html);component.add(AttributeAppender.append("class", "calculating"));component.setEscapeModelStrings(false);@@ -1073,7 +1074,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "<span class='text-nowrap'>Create Pull Request</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-nowrap'>" + _T("Create Pull Request") + "</span>").setEscapeModelStrings(false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex f93ef25450..a25b9ce890 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.pullrequests.detail.activities;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -258,7 +260,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}};- input.setRequired(true).setLabel(Model.of("Comment"));+ input.setRequired(true).setLabel(Model.of(_T("Comment")));form.add(input);form.add(new FencedFeedbackPanel("feedback", form));@@ -271,7 +273,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {String content = input.getModelObject();if (content.length() > PullRequestComment.MAX_CONTENT_LEN) {- form.error("Comment too long");+ form.error(_T("Comment too long"));target.add(form);} else {PullRequestComment comment = new PullRequestComment();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.javaindex ff0537ba72..08e6d68c6a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;+import static io.onedev.server.web.translation.Translation._T;+import java.util.Collection;import java.util.List;@@ -116,7 +118,7 @@ class PullRequestCommentPanel extends Panel {@Overrideprotected String getRequiredLabel() {- return "Comment";+ return _T("Comment");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.javaindex 5d66262ae3..e8a748feef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java@@ -262,7 +262,7 @@ public class LoginPage extends SimplePage {LoginPage.this.passcode = object;}- }).setLabel(Model.of("Passcode")).setRequired(true).add(AttributeAppender.append("placeholder", _T("6-digits passcode"))));+ }).setLabel(Model.of(_T("Passcode"))).setRequired(true).add(AttributeAppender.append("placeholder", _T("6-digits passcode"))));fragment.add(form);@@ -312,7 +312,7 @@ public class LoginPage extends SimplePage {LoginPage.this.recoveryCode = object;}- }).setLabel(Model.of("Recovery code")).setRequired(true).add(AttributeAppender.append("placeholder", _T("Recovery code"))));+ }).setLabel(Model.of(_T("Recovery code"))).setRequired(true).add(AttributeAppender.append("placeholder", _T("Recovery code"))));fragment.add(form);replace(fragment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.javaindex 528c6d0d8b..3c5bb8d15e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java@@ -30,6 +30,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import javax.annotation.Nullable;++import static io.onedev.server.web.translation.Translation._T;+import java.util.Arrays;import java.util.HashMap;import java.util.Map;@@ -73,7 +76,7 @@ public class PasswordResetPage extends SimplePage {loginNameOrEmail = object;}- }).setLabel(Model.of("Login name or email")).setRequired(true));+ }).setLabel(Model.of(_T("Login name or email"))).setRequired(true));form.add(new TaskButton("resettingPassword") {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 b37c03d103..6a52256707 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@@ -65,6 +65,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Administration", "管理");m.put("Administrative permission over a project", "项目的管理权限");m.put("Advanced Search", "高级搜索");+ m.put("Age", "年龄");m.put("Agent", "代理");m.put("Agent Attribute", "代理属性");m.put("Agent Edit Bean", "代理编辑Bean");@@ -2194,6 +2195,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Two-factor authentication is now configured", "两阶段验证现已配置完成");m.put("Type", "类型");m.put("Type password here", "在此输入密码");+ m.put("Type to filter", "过滤");m.put("URL", "URL");m.put("Unauthorized", "未授权");m.put("Undefined Field Resolution", "未定义字段解析");@@ -2379,6 +2381,47 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{0} commits", "{0} 个提交");m.put("{0} files", "{0} 个文件");m.put("{0} tags", "{0} 个标签");+ m.put("'..' is not allowed in the directory", "'..' 不允许在目录中使用");+ m.put("Able to merge without conflicts", "可以合并而没有冲突");+ m.put("Add New Email Address", "添加新电子邮件地址");+ m.put("Add files via upload", "通过上传添加文件");+ m.put("At least one email address should be configured, please add a new one first", "至少应配置一个电子邮件地址,请先添加一个新地址");+ m.put("Attachment", "附件");+ m.put("Bean", "Bean");+ m.put("Calculating merge preview...", "计算合并预览...");+ m.put("Comment", "评论");+ m.put("Comment too long", "评论过长");+ m.put("Create Pull Request", "创建拉取请求");+ m.put("Description too long", "描述过长");+ m.put("Do you really want to delete this email address?", "您真的要删除这个电子邮件地址吗?");+ m.put("Email address", "电子邮件地址");+ m.put("File name", "文件名");+ m.put("Git email address will be used as git author/committer for commits created on web UI",+ "Git 电子邮件地址将用于在 Web UI 上创建的提交的作者/提交者");+ m.put("Invalid PCRE syntax", "无效的 PCRE 语法");+ m.put("Leave a comment", "留下评论");+ m.put("Login name or email", "登录名或电子邮件");+ m.put("Malformed email address", "格式错误的电子邮件地址");+ m.put("Passcode", "Passcode");+ m.put("Password and its confirmation should be identical.", "密码和其确认应相同。");+ m.put("Please confirm the password.", "请确认密码。");+ m.put("Primary email address will be used to receive notifications, show gravatar (if enabled) etc.",+ "主电子邮件地址将用于接收通知、显示 Gravatar(如果启用)等。");+ m.put("Resend Verification Email", "重新发送验证电子邮件");+ m.put("Search for", "搜索");+ m.put("Search is too general", "搜索过于笼统");+ m.put("Set As Primary", "设置为主");+ m.put("Some one changed the content you are editing. Reload the page and try again.", "有人修改了您正在编辑的内容。重新加载页面并重试。");+ m.put("Symbol name", "符号名称");+ m.put("There are merge conflicts. You can still create the pull request though", "有合并冲突。您仍然可以创建拉取请求");+ m.put("This email address is being used", "此电子邮件地址正在使用");+ m.put("This field is required", "此字段是必填的");+ m.put("Unable to send verification email as mail service is not configured yet", "无法发送验证电子邮件,因为邮件服务未配置");+ m.put("Unverified email address is <b>NOT</b> applicable for above functionalities", "未验证的电子邮件地址不适用于上述功能");+ m.put("Use For Git Operations", "用于 Git 操作");+ m.put("Verification email sent, please check it", "验证电子邮件已发送,请检查");+ m.put("When determine if the user is author/committer of a git commit, all emails listed here will be checked",+ "确定用户是否是 git 提交的作者/提交者时,将检查此处列出的所有电子邮件");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");