Skip to content

The Unified and Autonomous Development Platform

wip: i18n support

Robin Shen5ca31145e1c0
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
index 0092277cb2..4381b2c136 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -62,7 +62,7 @@ public class CommandStep extends Step {
return (boolean) EditContext.get().getInputValue("runInContainer");
}
- @Editable(order=100, description="Specify container image to execute commands inside")
+ @Editable(order=100, name="container-image", description="Specify container image to execute commands inside")
@ShowCondition("isRunInContainerEnabled")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
index a27e797f64..6ea1a3ef14 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
@@ -1,5 +1,7 @@
package io.onedev.server.markdown;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -74,7 +76,7 @@ public class CodeProcessor implements HtmlProcessor {
Selection selection = suggestionSupport.getSelection();
List<String> content = selection.getContent();
List<DiffBlock<String>> diffBlocks = DiffUtils.diff(content, suggestion);
- codeElement.html("<div class='pb-2 mb-2 head font-size-xs mx-n2 px-2'>Suggested change</div>"
+ codeElement.html("<div class='pb-2 mb-2 head font-size-xs mx-n2 px-2'>" + _T("Suggested change") + "</div>"
+ new DiffRenderer(diffBlocks).renderDiffs());
codeElement.attr("data-suggestion", suggestionContent);
codeElement.attr("data-suggestionfile", suggestionSupport.getFileName());
@@ -94,7 +96,7 @@ public class CodeProcessor implements HtmlProcessor {
}
}
} else {
- codeElement.prepend("<p><i>Suggested change</i></p>");
+ codeElement.prepend("<p><i>" + _T("Suggested change") + "</i></p>");
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
index e249b443be..79cd0c1941 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
@@ -18,6 +18,9 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import javax.annotation.Nullable;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import java.util.Collection;
@@ -45,7 +48,7 @@ abstract class BeanEditContentPanel extends Panel {
if (getTitle() != null)
form.add(new Label("title", getTitle()));
else
- form.add(new Label("title", EditableUtils.getDisplayName(getBean().getClass())));
+ form.add(new Label("title", _T(EditableUtils.getDisplayName(getBean().getClass()))));
String description = StringUtils.trimToNull(StringUtils.stripStart(
EditableUtils.getDescription(getBean().getClass()), "."));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
index 47d5ce5db9..8ea0861405 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
@@ -59,7 +59,7 @@ public abstract class CreateBranchPanel extends Panel {
String branchName = helperBean.getName();
if (project.getObjectId(GitUtils.branch2ref(branchName), false) != null) {
editor.error(new Path(new PathNode.Named("name")),
- MessageFormat.format(_T("Branch '{0}' already exists, please choose a different name"), branchName));
+ MessageFormat.format(_T("Branch \"{0}\" already exists, please choose a different name"), branchName));
target.add(form);
} else if (project.getBranchProtection(branchName, user).isPreventCreation()) {
editor.error(new Path(new PathNode.Named("name")),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
index 55b57238dd..ea17227b51 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="branch-selector p-4">
<div class="d-flex align-items-center">
- <input wicket:id="branch" class="form-control form-control-sm branch" placeholder="Search branch"></input>
+ <input wicket:id="branch" class="form-control form-control-sm branch"></input>
<wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>
</div>
<ul wicket:id="branches" class="branches list-unstyled mb-0 mt-3">
@@ -9,6 +9,6 @@
<a wicket:id="link"><wicket:svg href="tick" class="icon mr-2"/> <span wicket:id="label"></span></a>
</li>
</ul>
- <div wicket:id="noBranches" class="no-branches alert alert-notice alert-light-warning mb-0 mt-4 px-4 py-3">No branches Found</div>
+ <div wicket:id="noBranches" class="no-branches alert alert-notice alert-light-warning mb-0 mt-4 px-4 py-3"><wicket:t>No branches Found</wicket:t></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
index a1853c4333..d78ee52281 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.branch.picker;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
@@ -66,6 +68,7 @@ public abstract class BranchSelector extends Panel {
super.onInitialize();
branchField = new TextField<String>("branch", Model.of(""));
+ branchField.add(AttributeAppender.append("placeholder", _T("Search branch")));
branchField.setOutputMarkupId(true);
add(branchField);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
index 6c2ca027e0..572c7f9cd0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
@@ -64,7 +64,7 @@ public abstract class CreateTagPanel extends Panel {
User user = SecurityUtils.getAuthUser();
if (project.getObjectId(GitUtils.tag2ref(tagName), false) != null) {
editor.error(new Path(new PathNode.Named("name")),
- MessageFormat.format(_T("Tag '{0}' already exists, please choose a different name."), helperBean.getName()));
+ MessageFormat.format(_T("Tag \"{0}\" already exists, please choose a different name."), helperBean.getName()));
target.add(form);
} else if (project.getTagProtection(tagName, user).isPreventCreation()) {
editor.error(new Path(new PathNode.Named("name")), _T("Unable to create protected tag"));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html
index e1aa495892..07be70399b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html
@@ -14,8 +14,8 @@
<wicket:fragment wicket:id="titleViewFrag">
<span wicket:id="title" class="mr-2"></span>
<span wicket:id="confidential" title="Confidential" class="text-warning mr-2"><wicket:svg href="incognito" class="icon icon-lg"/></span>
- <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2" title="Copy issue number and title"><wicket:svg href="copy" class="icon"></wicket:svg></a>
- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-2" title="Edit issue title"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2"><wicket:svg href="copy" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-2"><wicket:svg href="edit" class="icon"></wicket:svg></a>
<span wicket:id="progress" class="d-flex align-items-center mr-2"></span>
</wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
index 96e161b075..e5019a00bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
@@ -146,7 +146,8 @@ public abstract class IssueEditableTitlePanel extends Panel {
setVisible(SecurityUtils.canModifyIssue(getIssue()));
}
- });
+ }.add(new AttributeAppender("data-tippy-content", Model.of(_T("Edit issue title")))));
+
titleViewer.add(new CopyToClipboardLink("copy",
Model.of(getIssue().getTitle() + " (" + getIssue().getReference().toString(getProject()) + ")")));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
index 6a986032b7..8dae0bafde 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
@@ -22,8 +22,8 @@
<input wicket:id="text" class="form-control text"></input>
</div>
<div class="actions clearfix">
- <a wicket:id="cancel" class="btn btn-secondary float-right ml-2">Cancel</a>
- <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary float-right">Insert</button>
+ <a wicket:id="cancel" class="btn btn-secondary float-right ml-2"><wicket:t>Cancel</wicket:t></a>
+ <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary float-right"><wicket:t>Insert</wicket:t></button>
</div>
</form>
</wicket:fragment>
@@ -33,28 +33,28 @@
<wicket:fragment wicket:id="pickAttachedImageFrag">
<ul class="attachments list-unstyled">
<li wicket:id="attachments" class="attachment image">
- <a wicket:id="select" title="Insert this image" class="insert mx-auto d-block mb-2"><img wicket:id="image"></img></a>
- <a wicket:id="delete" title="Remove this image" class="delete btn btn-light-danger">Remove</a>
+ <a wicket:id="select" class="insert mx-auto d-block mb-2"><img wicket:id="image"></img></a>
+ <a wicket:id="delete" class="delete btn btn-light-danger"><wicket:t>Remove</wicket:t></a>
</li>
</ul>
- <div wicket:id="noAttachments" class="alert alert-light-warning">No image attachments</div>
+ <div wicket:id="noAttachments" class="alert alert-light-warning"><wicket:t>No image attachments</wicket:t></div>
</wicket:fragment>
<wicket:fragment wicket:id="pickAttachedFileFrag">
<ul class="attachments list-unstyled">
<li wicket:id="attachments" class="attachment file d-flex">
- <a wicket:id="select" title="Insert link to this file" class="insert btn btn-block btn-light btn-hover-primary flex-grow-1 mr-2"><span wicket:id="file"></span></a>
- <a wicket:id="delete" title="Remove this file" class="delete btn btn-light-danger btn-icon btn-hover-danger flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="select" class="insert btn btn-block btn-light btn-hover-primary flex-grow-1 mr-2"><span wicket:id="file"></span></a>
+ <a wicket:id="delete" class="delete btn btn-light-danger btn-icon btn-hover-danger flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</li>
</ul>
- <div wicket:id="noAttachments" class="alert alert-light-warning">No file attachments</div>
+ <div wicket:id="noAttachments" class="alert alert-light-warning"><wicket:t>No file attachments</wicket:t></div>
</wicket:fragment>
<wicket:fragment wicket:id="uploadAttachmentFrag">
<form wicket:id="form" class="upload-attachment">
<div wicket:id="feedback" class="feedback"></div>
<div wicket:id="file"></div>
<div class="text-right mt-4">
- <a wicket:id="cancel" class="btn btn-secondary float-right ml-2">Cancel</a>
- <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary">Insert</button>
+ <a wicket:id="cancel" class="btn btn-secondary float-right ml-2"><wicket:t>Cancel</wicket:t></a>
+ <button wicket:id="insert" type="submit" class="dirty-aware btn btn-primary"><wicket:t>Insert</wicket:t></button>
</div>
</form>
</wicket:fragment>
@@ -65,22 +65,22 @@
<div wicket:id="file"></div>
</div>
<div class="form-group directory">
- <label>Directory</label>
+ <label><wicket:t>Directory</wicket:t></label>
<div class="input-group">
<input wicket:id="directory" class="form-control"></input>
<span class="input-group-append">
- <a wicket:id="select" title="Select" class="btn btn-outline-secondary btn-icon"><wicket:svg href="folder-open" class="icon"></wicket:svg></a>
+ <a wicket:id="select" class="btn btn-outline-secondary btn-icon"><wicket:svg href="folder-open" class="icon"></wicket:svg></a>
</span>
</div>
- <p class="form-text text-muted">Optionally specify relative directory to put uploaded files</p>
+ <p class="form-text text-muted"><wicket:t>Optionally specify relative directory to put uploaded files</wicket:t></p>
</div>
<div class="form-group">
- <label>Commit Message</label>
- <textarea wicket:id="commitMessage" placeholder="Add files via upload" class="form-control" rows="6"></textarea>
+ <label><wicket:t>Commit Message</wicket:t></label>
+ <textarea wicket:id="commitMessage" class="form-control" rows="6"></textarea>
</div>
<div class="text-right">
- <a wicket:id="cancel" class="btn btn-secondary float-right ml-2">Cancel</a>
- <button wicket:id="insert" class="btn btn-primary dirty-aware">Commit &amp; Insert</button>
+ <a wicket:id="cancel" class="btn btn-secondary float-right ml-2"><wicket:t>Cancel</wicket:t></a>
+ <button wicket:id="insert" class="btn btn-primary dirty-aware"><wicket:t>Commit &amp; Insert</wicket:t></button>
</div>
</form>
</wicket:fragment>
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.java
index b440393fb9..976ee6d54d 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
@@ -1,33 +1,21 @@
package io.onedev.server.web.component.markdown;
-import com.google.common.base.Preconditions;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.exception.ExceptionUtils;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.BlobIdentFilter;
-import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.FilenameUtils;
-import io.onedev.server.util.UrlUtils;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.ReferenceInputBehavior;
-import io.onedev.server.web.component.blob.BlobFolderSelector;
-import io.onedev.server.web.component.blob.BlobSelector;
-import io.onedev.server.web.component.dropzonefield.DropzoneField;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.tabbable.AjaxActionTab;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.upload.FileUpload;
-import io.onedev.server.web.upload.UploadManager;
+import static io.onedev.server.web.translation.Translation._T;
+import static org.unbescape.html.HtmlEscape.escapeHtml5;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.activation.MimetypesFileTypeMap;
+import javax.annotation.Nullable;
+
import org.apache.commons.fileupload.FileUploadException;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
@@ -35,6 +23,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -48,7 +37,11 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.*;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.lang.Bytes;
@@ -56,15 +49,35 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.unbescape.javascript.JavaScriptEscape;
-import javax.activation.MimetypesFileTypeMap;
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
+import com.google.common.base.Preconditions;
-import static io.onedev.server.web.translation.Translation._T;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.exception.ExceptionUtils;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.BlobIdentFilter;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.FilenameUtils;
+import io.onedev.server.util.UrlUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
+import io.onedev.server.web.component.blob.BlobFolderSelector;
+import io.onedev.server.web.component.blob.BlobSelector;
+import io.onedev.server.web.component.dropzonefield.DropzoneField;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.tabbable.AjaxActionTab;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.upload.FileUpload;
+import io.onedev.server.web.upload.UploadManager;
abstract class InsertUrlPanel extends Panel {
@@ -77,13 +90,7 @@ abstract class InsertUrlPanel extends Panel {
private static final MetaDataKey<HashSet<String>> FILE_PICKER_STATE = new MetaDataKey<HashSet<String>>(){};
private static final MetaDataKey<HashSet<String>> FOLDER_PICKER_STATE = new MetaDataKey<HashSet<String>>(){};
-
- private static final String TAB_INPUT_URL = "Input URL";
-
- private static final String TAB_PICK_EXISTING = "Pick Existing";
-
- private static final String TAB_UPLOAD = "Upload";
-
+
private static final String CONTENT_ID = "content";
private String uploadId;
@@ -121,11 +128,11 @@ abstract class InsertUrlPanel extends Panel {
Form<?> form = new Form<Void>("form");
form.add(new FencedFeedbackPanel("feedback", form));
- form.add(new Label("urlLabel", isImage?"Image URL":"Link URL"));
- form.add(new Label("urlHelp", isImage?"Absolute or relative url of the image":"Absolute or relative url of the link"));
+ form.add(new Label("urlLabel", isImage? _T("Image URL") : _T("Link URL")));
+ form.add(new Label("urlHelp", isImage? _T("Absolute or relative url of the image") : _T("Absolute or relative url of the link")));
form.add(new TextField<String>("url", new PropertyModel<String>(this, "linkUrl")));
- form.add(new Label("textLabel", isImage?"Image Text": "Link Text"));
+ form.add(new Label("textLabel", isImage? _T("Image Text") : _T("Link Text")));
form.add(new TextField<String>("text", new PropertyModel<String>(this, "linkText")));
form.add(new AjaxButton("insert", form) {
@@ -135,9 +142,9 @@ abstract class InsertUrlPanel extends Panel {
super.onSubmit(target, form);
if (StringUtils.isBlank(linkUrl)) {
if (isImage)
- error("Image URL should be specified");
+ error(_T("Image URL should be specified"));
else
- error("Link URL should be specified");
+ error(_T("Link URL should be specified"));
target.add(fragment);
} else {
if (linkText == null)
@@ -309,12 +316,18 @@ abstract class InsertUrlPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- markdownEditor.insertUrl(target, true, attachmentUrl,
+ markdownEditor.insertUrl(target, isImage, attachmentUrl,
linkText != null ? linkText : attachmentName, null);
onClose(target);
}
};
+
+ if (isImage)
+ selectLink.add(new AttributeAppender("data-tippy-content", _T("Insert this image")));
+ else
+ selectLink.add(new AttributeAppender("data-tippy-content", _T("Insert link to this file")));
+
if (isImage)
selectLink.add(new ExternalImage("image", escapeHtml5(attachmentUrl)));
else
@@ -322,12 +335,12 @@ abstract class InsertUrlPanel extends Panel {
item.add(selectLink);
- item.add(new AjaxLink<Void>("delete") {
+ var deleteLink = new AjaxLink<Void>("delete") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete '" + attachmentName + "'?"));
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(MessageFormat.format(_T("Do you really want to delete \"{0}\"?"), attachmentName)));
}
@Override
@@ -342,7 +355,12 @@ abstract class InsertUrlPanel extends Panel {
target.add(fragment);
}
- });
+ };
+ if (isImage)
+ deleteLink.add(new AttributeAppender("data-tippy-content", _T("Remove this image")));
+ else
+ deleteLink.add(new AttributeAppender("data-tippy-content", _T("Remove this file")));
+ item.add(deleteLink);
}
@Override
@@ -504,7 +522,7 @@ abstract class InsertUrlPanel extends Panel {
};
}
- });
+ }.add(new AttributeAppender("data-tippy-content", _T("Select"))));
form.add(new AjaxLink<Void>("cancel") {
@Override
@@ -521,8 +539,8 @@ abstract class InsertUrlPanel extends Panel {
}
};
- form.add(new TextArea<String>("commitMessage",
- new PropertyModel<String>(this, "commitMessage")).add(behavior));
+ form.add(new TextArea<String>("commitMessage", new PropertyModel<String>(this, "commitMessage"))
+ .add(behavior).add(new AttributeAppender("placeholder", _T("Add files via upload"))));
form.add(new AjaxButton("insert") {
@@ -533,7 +551,7 @@ abstract class InsertUrlPanel extends Panel {
BlobRenderContext context = Preconditions.checkNotNull(markdownEditor.getBlobRenderContext());
String commitMessage = InsertUrlPanel.this.commitMessage;
if (StringUtils.isBlank(commitMessage))
- commitMessage = "Add files via upload";
+ commitMessage = _T("Add files via upload");
var upload = getUploadManager().getUpload(uploadId);
try {
@@ -576,47 +594,51 @@ abstract class InsertUrlPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new Label("title", isImage?"Insert Image":"Insert Link"));
+ add(new Label("title", isImage? _T("Insert Image") : _T("Insert Link")));
if (markdownEditor.getBlobRenderContext() == null && markdownEditor.getAttachmentSupport() == null) {
add(newInputUrlPanel());
} else {
+ String tabInputUrl = _T("Input URL");
+ String tabPickExisting = _T("Pick Existing");
+ String tabUpload = _T("Upload");
+
Fragment fragment = new Fragment(CONTENT_ID, "tabbedFrag", this);
List<Tab> tabs = new ArrayList<>();
- AjaxActionTab inputUrlTab = new AjaxActionTab(Model.of(TAB_INPUT_URL)) {
+ AjaxActionTab inputUrlTab = new AjaxActionTab(Model.of(tabInputUrl)) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
Component content = newInputUrlPanel();
target.add(content);
fragment.replace(content);
- WebSession.get().setMetaData(ACTIVE_TAB, TAB_INPUT_URL);
+ WebSession.get().setMetaData(ACTIVE_TAB, tabInputUrl);
}
};
tabs.add(inputUrlTab);
-
- AjaxActionTab pickExistingTab = new AjaxActionTab(Model.of(TAB_PICK_EXISTING)) {
+
+ AjaxActionTab pickExistingTab = new AjaxActionTab(Model.of(tabPickExisting)) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
Component content = newPickExistingPanel();
target.add(content);
fragment.replace(content);
- WebSession.get().setMetaData(ACTIVE_TAB, TAB_PICK_EXISTING);
+ WebSession.get().setMetaData(ACTIVE_TAB, tabPickExisting);
}
};
tabs.add(pickExistingTab);
- AjaxActionTab uploadTab = new AjaxActionTab(Model.of(TAB_UPLOAD)) {
+ AjaxActionTab uploadTab = new AjaxActionTab(Model.of(tabUpload)) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
Component content = newUploadPanel();
target.add(content);
fragment.replace(content);
- WebSession.get().setMetaData(ACTIVE_TAB, TAB_UPLOAD);
+ WebSession.get().setMetaData(ACTIVE_TAB, tabUpload);
}
};
@@ -626,10 +648,10 @@ abstract class InsertUrlPanel extends Panel {
inputUrlTab.setSelected(false);
String activeTab = WebSession.get().getMetaData(ACTIVE_TAB);
- if (TAB_PICK_EXISTING.equals(activeTab)) {
+ if (tabPickExisting.equals(activeTab)) {
pickExistingTab.setSelected(true);
fragment.add(newPickExistingPanel());
- } else if (TAB_UPLOAD.equals(activeTab)) {
+ } else if (tabUpload.equals(activeTab)) {
uploadTab.setSelected(true);
fragment.add(newUploadPanel());
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/JavascriptTranslations.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/JavascriptTranslations.java
new file mode 100644
index 0000000000..28114bf2f6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/JavascriptTranslations.java
@@ -0,0 +1,42 @@
+package io.onedev.server.web.component.markdown;
+
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.util.HashMap;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.server.OneDev;
+
+public class JavascriptTranslations {
+
+ static String get() {
+ try {
+ var map = new HashMap<String, String>();
+
+ map.put("loading", _T("Loading..."));
+ map.put("loading-emojis", _T("Loading emojis..."));
+ map.put("commented-code-outdated", _T("Commented code is outdated"));
+ map.put("suggest-changes", _T("Suggest changes"));
+ map.put("upload-should-be-less-than", _T("Upload should be less than {0} Mb"));
+ map.put("uploading-file", _T("Uploading file"));
+ map.put("unable-to-connect-to-server", _T("Unable to connect to server"));
+ map.put("programming-language", _T("Programming language"));
+ map.put("copy-to-clipboard", _T("Copy to clipboard"));
+ map.put("suggestion-outdated", _T("Suggestion is outdated either due to code change or pull request close"));
+ map.put("remove-from-batch", _T("Remove from batch"));
+ map.put("add-to-batch", _T("Add to batch to commit with other suggestions later"));
+ map.put("commit-suggestion", _T("Commit suggestion"));
+ map.put("issue-not-exist-or-access-denied", _T("Issue not exist or access denied"));
+ map.put("pull-request-not-exist-or-access-denied", _T("Pull request not exist or access denied"));
+ map.put("build-not-exist-or-access-denied", _T("Build not exist or access denied"));
+ map.put("commit-not-exist-or-access-denied", _T("Commit not exist or access denied"));
+ map.put("enter-description-here", _T("Enter description here"));
+
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(map);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index c7fdd85013..9085803851 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -3,35 +3,35 @@
<div class="head flex-shrink-0">
<div class="actions d-flex flex-wrap">
<div class="normal-mode flex-wrap d-none d-lg-flex mr-4">
- <a class="do-bold" title="Bold"><wicket:svg href="bold" class="icon"></wicket:svg></a>
- <a class="do-italic" title="Italic"><wicket:svg href="italic" class="icon"></wicket:svg></a>
- <a class="do-header" title="Heading"><wicket:svg href="header" class="icon"></wicket:svg></a>
+ <a wicket:id="doBold" class="do-bold"><wicket:svg href="bold" class="icon"></wicket:svg></a>
+ <a wicket:id="doItalic" class="do-italic"><wicket:svg href="italic" class="icon"></wicket:svg></a>
+ <a wicket:id="doHeader" class="do-header"><wicket:svg href="header" class="icon"></wicket:svg></a>
<span class="separator"></span>
- <a class="do-link" title="Link"><wicket:svg href="link" class="icon"></wicket:svg></a>
- <a class="do-image" title="Image"><wicket:svg href="image" class="icon"></wicket:svg></a>
+ <a wicket:id="doLink" class="do-link"><wicket:svg href="link" class="icon"></wicket:svg></a>
+ <a wicket:id="doImage" class="do-image"><wicket:svg href="image" class="icon"></wicket:svg></a>
<span class="separator"></span>
- <a class="do-list" title="Unordered list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
- <a class="do-orderlist" title="Ordered list"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>
- <a class="do-tasklist" title="Task list"><wicket:svg href="tick-box" class="icon"></wicket:svg></a>
- <a class="do-code" title="Code"><wicket:svg href="code" class="icon"></wicket:svg></a>
- <a class="do-quote" title="Quote"><wicket:svg href="quote" class="icon"></wicket:svg></a>
+ <a wicket:id="doList" class="do-list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
+ <a wicket:id="doOrderlist" class="do-orderlist"><wicket:svg href="ordered-list" class="icon"></wicket:svg></a>
+ <a wicket:id="doTasklist" class="do-tasklist"><wicket:svg href="tick-box" class="icon"></wicket:svg></a>
+ <a wicket:id="doCode" class="do-code"><wicket:svg href="code" class="icon"></wicket:svg></a>
+ <a wicket:id="doQuote" class="do-quote"><wicket:svg href="quote" class="icon"></wicket:svg></a>
<span class="separator"></span>
- <a class="do-emoji" title="Show emojis"><wicket:svg href="smile" class="icon"></wicket:svg></a>
- <a wicket:id="doMention" class="do-mention" title="Mention someone"><wicket:svg href="at" class="icon"></wicket:svg></a>
- <a wicket:id="doReference" title="Reference issue, build, or pull request"><wicket:svg href="reference" class="icon"></wicket:svg></a>
+ <a wicket:id="doEmoji" class="do-emoji"><wicket:svg href="smile" class="icon"></wicket:svg></a>
+ <a wicket:id="doMention" class="do-mention"><wicket:svg href="at" class="icon"></wicket:svg></a>
+ <a wicket:id="doReference"><wicket:svg href="reference" class="icon"></wicket:svg></a>
</div>
<div class="compact-mode mr-2">
<a wicket:id="actionMenuTrigger"><wicket:svg href="menu" class="icon"></wicket:svg></a>
</div>
<div class="ml-auto d-flex flex-wrap">
- <a wicket:id="doSuggestion" class="do-suggestion mr-2" title="Code suggestion"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- <a class="do-fixedwidth" title="Toggle fixed width font"><wicket:svg href="text-width" class="icon"></wicket:svg></a>
- <a class="do-fullscreen" title="Full screen"><wicket:svg href="maximize" class="icon"></wicket:svg></a>
- <a class="do-help" title="Help"><wicket:svg href="question" class="icon"></wicket:svg></a>
+ <a wicket:id="doSuggestion" class="do-suggestion mr-2"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ <a wicket:id="doFixedwidth" class="do-fixedwidth"><wicket:svg href="text-width" class="icon"></wicket:svg></a>
+ <a wicket:id="doFullscreen" class="do-fullscreen"><wicket:svg href="maximize" class="icon"></wicket:svg></a>
+ <a wicket:id="doHelp" class="do-help"><wicket:svg href="question" class="icon"></wicket:svg></a>
<span class="separator"></span>
- <a wicket:id="editLink" class="edit" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a class="preview" title="Preview"><wicket:svg href="eye" class="icon"></wicket:svg></a>
- <a wicket:id="splitLink" class="split" title="Split view"><wicket:svg href="split" class="icon"></wicket:svg></a>
+ <a wicket:id="editLink" class="edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="previewLink" class="preview"><wicket:svg href="eye" class="icon"></wicket:svg></a>
+ <a wicket:id="splitLink" class="split"><wicket:svg href="split" class="icon"></wicket:svg></a>
<div wicket:id="lazyResourceLoader" class="d-none"></div>
</div>
</div>
@@ -41,9 +41,12 @@
</div>
<div class="emojis"></div>
<div class="help text-muted font-size-sm">
- <wicket:svg href="bulb" class="icon icon-sm"></wicket:svg> <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted,
+ <wicket:svg href="bulb" class="icon icon-sm"></wicket:svg>
+ <wicket:t>
+ <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted,
with <a href="https://docs.onedev.io/appendix/markdown-syntax" target="_blank">mermaid and katex support</a>.
- <span wicket:id="canAttachFile">You may also drop file/image to the input box, or paste image from clipboard</span>
+ </wicket:t>
+ <span wicket:id="canAttachFile"><wicket:t>You may also drop file/image to the input box, or paste image from clipboard</wicket:t></span>
</div>
</div>
<div class="body d-flex flex-grow-1 overflow-hidden position-relative">
@@ -59,26 +62,26 @@
</div>
</div>
<wicket:fragment wicket:id="referenceMenuFrag">
- <a wicket:id="issue" class="dropdown-item do-reference"><wicket:svg href="bug" class="icon mr-1"></wicket:svg> Reference Issue</a>
- <a wicket:id="pullRequest" class="dropdown-item do-reference" data-type="pr"><wicket:svg href="pull-request" class="icon mr-1"></wicket:svg> Reference Pull Request</a>
- <a wicket:id="build" class="dropdown-item do-reference" data-type="build"><wicket:svg href="play-circle" class="icon mr-1"></wicket:svg> Reference Build</a>
+ <a wicket:id="issue" class="dropdown-item do-reference"><wicket:svg href="bug" class="icon mr-1"></wicket:svg> <wicket:t>Reference Issue</wicket:t></a>
+ <a wicket:id="pullRequest" class="dropdown-item do-reference" data-type="pr"><wicket:svg href="pull-request" class="icon mr-1"></wicket:svg> <wicket:t>Reference Pull Request</wicket:t></a>
+ <a wicket:id="build" class="dropdown-item do-reference" data-type="build"><wicket:svg href="play-circle" class="icon mr-1"></wicket:svg> <wicket:t>Reference Build</wicket:t></a>
</wicket:fragment>
<wicket:fragment wicket:id="actionMenuFrag">
- <a class="dropdown-item do-bold"><wicket:svg href="bold" class="icon mr-1"></wicket:svg> Bold</a>
- <a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon mr-1"></wicket:svg> Italic</a>
- <a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> Heading</a>
+ <a class="dropdown-item do-bold"><wicket:svg href="bold" class="icon mr-1"></wicket:svg> <wicket:t>Bold</wicket:t></a>
+ <a class="dropdown-item do-italic"><wicket:svg href="italic" class="icon mr-1"></wicket:svg> <wicket:t>Italic</wicket:t></a>
+ <a class="dropdown-item do-header"><wicket:svg href="header" class="icon mr-1"></wicket:svg> <wicket:t>md.heading</wicket:t></a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> Link</a>
- <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> Image</a>
+ <a class="dropdown-item do-link"><wicket:svg href="link" class="icon mr-1"></wicket:svg> <wicket:t>Link</wicket:t></a>
+ <a class="dropdown-item do-image"><wicket:svg href="image" class="icon mr-1"></wicket:svg> <wicket:t>md.image</wicket:t></a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon mr-1"></wicket:svg> Unordered List</a>
- <a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon mr-1"></wicket:svg> Ordered List</a>
- <a class="dropdown-item do-tasklist"><wicket:svg href="tick-box" class="icon mr-1"></wicket:svg> Task List</a>
- <a class="dropdown-item do-code"><wicket:svg href="code" class="icon mr-1"></wicket:svg> Code</a>
- <a class="dropdown-item do-quote"><wicket:svg href="quote" class="icon mr-1"></wicket:svg> Quote</a>
+ <a class="dropdown-item do-list"><wicket:svg href="unordered-list" class="icon mr-1"></wicket:svg> <wicket:t>Unordered List</wicket:t></a>
+ <a class="dropdown-item do-orderlist"><wicket:svg href="ordered-list" class="icon mr-1"></wicket:svg> <wicket:t>Ordered List</wicket:t></a>
+ <a class="dropdown-item do-tasklist"><wicket:svg href="tick-box" class="icon mr-1"></wicket:svg> <wicket:t>Task List</wicket:t></a>
+ <a class="dropdown-item do-code"><wicket:svg href="code" class="icon mr-1"></wicket:svg> <wicket:t>Code</wicket:t></a>
+ <a class="dropdown-item do-quote"><wicket:svg href="quote" class="icon mr-1"></wicket:svg> <wicket:t>Quote</wicket:t></a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item do-emoji"><wicket:svg href="smile" class="icon mr-1"></wicket:svg> Show Emojis</a>
- <a wicket:id="doMention" class="dropdown-item do-mention"><wicket:svg href="at" class="icon mr-1"></wicket:svg> Mention Someone</a>
+ <a class="dropdown-item do-emoji"><wicket:svg href="smile" class="icon mr-1"></wicket:svg> <wicket:t>Show Emojis</wicket:t></a>
+ <a wicket:id="doMention" class="dropdown-item do-mention"><wicket:svg href="at" class="icon mr-1"></wicket:svg> <wicket:t>Mention Someone</wicket:t></a>
<wicket:container wicket:id="doReference"></wicket:container>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 208787d296..ec9bf2b602 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.markdown;
+import static io.onedev.server.web.translation.Translation._T;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;
@@ -143,7 +144,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
input = StringUtils.replace(input, "\r\n", "\n");
return renderMarkdown(input);
} else {
- return "<div class='message'>Nothing to preview</div>";
+ return "<div class='message'>" + _T("Nothing to preview") + "</div>";
}
}
@@ -190,9 +191,24 @@ public class MarkdownEditor extends FormComponentPanel<String> {
container.setOutputMarkupId(true);
add(container);
-
+
+ container.add(new WebMarkupContainer("doBold").add(AttributeAppender.append("data-tippy-content", _T("Bold"))));
+ container.add(new WebMarkupContainer("doItalic").add(AttributeAppender.append("data-tippy-content", _T("Italic"))));
+ container.add(new WebMarkupContainer("doHeader").add(AttributeAppender.append("data-tippy-content", _T("md.heading"))));
+ container.add(new WebMarkupContainer("doLink").add(AttributeAppender.append("data-tippy-content", _T("Link"))));
+ container.add(new WebMarkupContainer("doImage").add(AttributeAppender.append("data-tippy-content", _T("md.image"))));
+ container.add(new WebMarkupContainer("doList").add(AttributeAppender.append("data-tippy-content", _T("Unordered list"))));
+ container.add(new WebMarkupContainer("doOrderlist").add(AttributeAppender.append("data-tippy-content", _T("Ordered list"))));
+ container.add(new WebMarkupContainer("doTasklist").add(AttributeAppender.append("data-tippy-content", _T("Task list"))));
+ container.add(new WebMarkupContainer("doCode").add(AttributeAppender.append("data-tippy-content", _T("Code"))));
+ container.add(new WebMarkupContainer("doQuote").add(AttributeAppender.append("data-tippy-content", _T("Quote"))));
+ container.add(new WebMarkupContainer("doEmoji").add(AttributeAppender.append("data-tippy-content", _T("Show emojis"))));
+ container.add(new WebMarkupContainer("previewLink").add(AttributeAppender.append("data-tippy-content", _T("Preview"))));
+
WebMarkupContainer editLink = new WebMarkupContainer("editLink");
- WebMarkupContainer splitLink = new WebMarkupContainer("splitLink");
+ editLink.add(AttributeAppender.append("data-tippy-content", _T("Edit")));
+ WebMarkupContainer splitLink = new WebMarkupContainer("splitLink");
+ splitLink.add(AttributeAppender.append("data-tippy-content", _T("Split view")));
WebMarkupContainer preview = new WebMarkupContainer("preview");
WebMarkupContainer edit = new WebMarkupContainer("edit");
container.add(editLink);
@@ -205,7 +221,6 @@ public class MarkdownEditor extends FormComponentPanel<String> {
var referenceSupport = getReferenceSupport();
container.add(new DropdownLink("doReference") {
-
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
var fragment = new Fragment(id, "referenceMenuFrag", MarkdownEditor.this) {
@@ -224,7 +239,11 @@ public class MarkdownEditor extends FormComponentPanel<String> {
return fragment;
}
- }.setVisible(referenceSupport != null));
+ }.add(AttributeAppender.append("data-tippy-content", "Reference issue, build, or pull request")).setVisible(referenceSupport != null));
+
+ container.add(new WebMarkupContainer("doFixedwidth").add(AttributeAppender.append("data-tippy-content", _T("Toggle fixed width font"))));
+ container.add(new WebMarkupContainer("doFullscreen").add(AttributeAppender.append("data-tippy-content", _T("Full screen"))));
+ container.add(new WebMarkupContainer("doHelp").add(AttributeAppender.append("data-tippy-content", _T("Help"))));
container.add(new DropdownLink("actionMenuTrigger") {
@@ -266,7 +285,9 @@ public class MarkdownEditor extends FormComponentPanel<String> {
});
- container.add(new WebMarkupContainer("doMention").setVisible(getUserMentionSupport() != null));
+ container.add(new WebMarkupContainer("doMention")
+ .add(AttributeAppender.append("data-tippy-content", _T("Mention someone")))
+ .setVisible(getUserMentionSupport() != null));
container.add(new WebMarkupContainer("doSuggestion") {
@@ -288,7 +309,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
setVisible(getSuggestionSupport() != null);
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Code suggestion"))));
edit.add(input = new TextArea<>("input", Model.of(getModelObject())) {
@@ -616,7 +637,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
else
escapedAutosaveKey = "undefined";
- String script = String.format("onedev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, '%s', '%s', %s);",
+ String script = String.format("onedev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, '%s', '%s', %s, %s);",
container.getMarkupId(),
actionCallback,
ATWHO_LIMIT,
@@ -626,7 +647,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {
getReferenceSupport() != null,
escapeJavaScript(ProjectPathValidator.PATTERN.pattern()),
escapeJavaScript(ProjectKeyValidator.PATTERN.pattern()),
- escapedAutosaveKey);
+ escapedAutosaveKey,
+ JavascriptTranslations.get());
response.render(OnDomReadyHeaderItem.forScript(script));
script = String.format("onedev.server.markdown.onLoad('%s');", container.getMarkupId());
@@ -691,5 +713,5 @@ public class MarkdownEditor extends FormComponentPanel<String> {
public void focus(AjaxRequestTarget target) {
target.appendJavaScript(String.format("$('#%s textarea').focus();", getMarkupId()));
}
-
-}
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 9ece4b9ac7..f9f8f18738 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -330,11 +330,11 @@ public class MarkdownViewer extends GenericPanel<String> {
CharSequence suggestionCallback = suggestionBehavior.getCallbackFunction(
explicit(SUGGESTION_ACTION), explicit(SUGGESTION_CONTENT));
- String script = String.format("onedev.server.markdown.onViewerDomReady('%s', %s, '%s', %s, %s);",
+ String script = String.format("onedev.server.markdown.onViewerDomReady('%s', %s, '%s', %s, %s, %s);",
getMarkupId(),
contentVersionSupport!=null?taskCallback:"undefined",
SourcePositionTrackExtension.DATA_START_ATTRIBUTE,
- referenceCallback, suggestionCallback);
+ referenceCallback, suggestionCallback, JavascriptTranslations.get());
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index c87f8e7fde..f1fb85e845 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -64,7 +64,8 @@ onedev.server.markdown = {
},
onDomReady: function(containerId, callback, atWhoLimit, attachmentUploadUrl,
attachmentMaxSize, canMentionUser, canReferenceEntity,
- projectPathPattern, projectKeyPattern, autosaveKey) {
+ projectPathPattern, projectKeyPattern, autosaveKey, translations) {
+ onedev.server.markdown.translations = translations;
var $container = $("#" + containerId);
var useFixedWidthFontCookieName = "markdownEditor.useFixedWidthFont";
var useFixedWidthFont = Cookies.get(useFixedWidthFontCookieName);
@@ -89,12 +90,12 @@ onedev.server.markdown = {
$head.find(".dropdown>a").dropdown();
if ($suggestion.attr("disabled") == "disabled") {
- $suggestion.attr("title", "Commented code is outdated");
+ $suggestion.attr("title", onedev.server.markdown.translations["commented-code-outdated"]);
} else {
if (onedev.server.util.isMac())
- $suggestion.attr("title", "Suggest changes (cmd-g)");
+ $suggestion.attr("title", onedev.server.markdown.translations["suggest-changes"] + " (cmd-g)");
else
- $suggestion.attr("title", "Suggest changes (ctrl-g)");
+ $suggestion.attr("title", onedev.server.markdown.translations["suggest-changes"] + " (ctrl-g)");
$suggestion.click(function() {
var content = $(this).data("content");
@@ -139,7 +140,7 @@ onedev.server.markdown = {
$rendered.data("caretOffset", caretOffset);
onedev.server.perfectScrollbar.empty($rendered);
- $rendered.html("<div class='message'>Loading...</div>");
+ $rendered.html("<div class='message'>" + onedev.server.markdown.translations["loading"] + "</div>");
$editLink.removeClass("active");
$previewLink.addClass("active");
@@ -151,7 +152,7 @@ onedev.server.markdown = {
$input.focus();
- $rendered.html("<div class='message'>Loading...</div>");
+ $rendered.html("<div class='message'>" + onedev.server.markdown.translations["loading"] + "</div>");
$editLink.removeClass("active");
$previewLink.removeClass("active");
@@ -639,15 +640,15 @@ onedev.server.markdown = {
function uploadFile(file) {
if (file.size> attachmentMaxSize) {
- var message = "!!Upload should be less than " + Math.round(attachmentMaxSize/1024/1024) + " Mb!!";
- onedev.server.markdown.updateUploadMessage($input, message);
+ var message = "!!" + onedev.server.markdown.translations["upload-should-be-less-than"] + "!!";
+ onedev.server.markdown.updateUploadMessage($input, message.replace("{0}", Math.round(attachmentMaxSize/1024/1024)));
} else {
var xhr = new XMLHttpRequest();
var val = $input.val();
var i=1;
- var message = "[Uploading file...]";
+ var message = "[" + onedev.server.markdown.translations["uploading-file"] + "...]";
while (val.indexOf(message) != -1) {
- message = "[Uploading file" + (++i) + "...]";
+ message = "[" + onedev.server.markdown.translations["uploading-file"] + (++i) + "...]";
}
xhr.replaceMessage = message;
@@ -673,7 +674,7 @@ onedev.server.markdown = {
};
xhr.onerror = function() {
onedev.server.markdown.updateUploadMessage($input,
- "!!Unable to connect to server!!", xhr.replaceMessage);
+ "!!" + onedev.server.markdown.translations["unable-to-connect-to-server"] + "!!", xhr.replaceMessage);
};
xhr.open("POST", attachmentUploadUrl, true);
@@ -846,7 +847,7 @@ onedev.server.markdown = {
$actionMenu.find(".do-code").click(function() {
$input.focus();
- var langHint = "programming language";
+ var langHint = onedev.server.markdown.translations["programming-language"];
var selected = $input.range();
var prefix = onedev.server.markdown.getBlockPrefix($input);
var suffix = onedev.server.markdown.getBlockSuffix($input);
@@ -884,7 +885,7 @@ onedev.server.markdown = {
$actionMenu.find(".do-emoji").click(function() {
if (!$emojis.hasClass("loaded") && !$emojis.hasClass("loading")) {
$emojis.addClass("loading");
- $emojis.html("Loading emojis...");
+ $emojis.html(onedev.server.markdown.translations["loading-emojis"]);
callback("loadEmojis");
}
$emojis.toggle();
@@ -1101,7 +1102,7 @@ onedev.server.markdown = {
if (!$this.parent().hasClass("suggestion")) {
var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg>";
- var $copy = $("<a class='pressable' title='Copy to clipboard'>" + icon + "</a>");
+ var $copy = $("<a class='pressable' data-tippy-content='" + onedev.server.markdown.translations["copy-to-clipboard"] + "'>" + icon + "</a>");
$actions.append($copy);
var options = {
text: function() {
@@ -1118,18 +1119,18 @@ onedev.server.markdown = {
if (suggestionCallback) {
if ($this.data("suggestionoutdated")) {
var icon = "<svg class='icon icon-sm'><use xlink:href='" + onedev.server.icons + "#warning'/></svg>";
- var $warning = $("<a class='ml-2' disabled='disabled' title='Suggestion is outdated either due to code change or pull request close'>" + icon + "</a>");
+ var $warning = $("<a class='ml-2' disabled='disabled' data-tippy-content='" + onedev.server.markdown.translations["suggestion-outdated"] + "'>" + icon + "</a>");
$actions.append($warning);
} else if ($this.data("suggestionapplyinbatch")) {
var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#minus-square'/></svg>";
- var $removeFromBatch = $("<a class='pressable ml-2' title='Remove from batch'>" + icon + "</a>");
+ var $removeFromBatch = $("<a class='pressable ml-2' data-tippy-content='" + onedev.server.markdown.translations["remove-from-batch"] + "'>" + icon + "</a>");
$removeFromBatch.click(function() {
suggestionCallback("removeFromBatch");
});
$actions.append($removeFromBatch);
} else if ($this.data("suggestionappliable")) {
var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#add-to-git'/></svg>";
- var $apply = $("<a class='pressable ml-2' title='Commit suggestion'>" + icon + "</a>");
+ var $apply = $("<a class='pressable ml-2' data-tippy-content='" + onedev.server.markdown.translations["commit-suggestion"] + "'>" + icon + "</a>");
$actions.append($apply);
$apply.click(function() {
suggestionCallback("apply", $this.data("suggestion"));
@@ -1137,7 +1138,7 @@ onedev.server.markdown = {
if ($this.data("suggestionbatchappliable")) {
var icon = "<svg class='icon flip-x'><use xlink:href='" + onedev.server.icons + "#plus-square'/></svg>";
- var $addToBatch = $("<a class='pressable ml-2' title='Add to batch to commit with other suggestions later'>" + icon + "</a>");
+ var $addToBatch = $("<a class='pressable ml-2' data-tippy-content='" + onedev.server.markdown.translations["add-to-batch"] + "'>" + icon + "</a>");
$addToBatch.click(function() {
suggestionCallback("addToBatch", $this.data("suggestion"));
});
@@ -1158,7 +1159,8 @@ onedev.server.markdown = {
}
},
onViewerDomReady: function(containerId, taskCallback, taskSourcePositionDataAttribute, referenceCallback,
- suggestionCallback) {
+ suggestionCallback, translations) {
+ onedev.server.markdown.translations = translations;
var $container = $("#" + containerId);
$container.data("suggestionCallback", suggestionCallback);
@@ -1195,7 +1197,7 @@ onedev.server.markdown = {
referenceType = "commit";
}
if (referenceType) {
- var $tooltip = $("<div id='reference-tooltip'>Loading...</div>");
+ var $tooltip = $("<div id='reference-tooltip'>" + onedev.server.markdown.translations["loading"] + "</div>");
$tooltip.data("trigger", this);
$tooltip.data("alignment", alignment);
$("body").append($tooltip);
@@ -1229,7 +1231,7 @@ onedev.server.markdown = {
}).text(state);
$tooltip.find(".title").text(title);
} else {
- $tooltip.empty().append("<i>Issue not exist or access denied</i>");
+ $tooltip.empty().append("<i>" + onedev.server.markdown.translations["issue-not-exist-or-access-denied"] + "</i>");
}
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
@@ -1243,7 +1245,7 @@ onedev.server.markdown = {
$tooltip.find(".status").addClass(statusCss).text(status);
$tooltip.find(".title").text(title);
} else {
- $tooltip.empty().append("<i>Pull request not exist or access denied</i>");
+ $tooltip.empty().append("<i>" + onedev.server.markdown.translations["pull-request-not-exist-or-access-denied"] + "</i>");
}
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
@@ -1256,7 +1258,7 @@ onedev.server.markdown = {
"</div>");
$tooltip.find(".title").text(title);
} else {
- $tooltip.empty().append("<i>Build not exist or access denied</i>");
+ $tooltip.empty().append("<i>" + onedev.server.markdown.translations["build-not-exist-or-access-denied"] + "</i>");
}
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
@@ -1280,7 +1282,7 @@ onedev.server.markdown = {
$tooltip.find(".date").text(date);
$tooltip.find(".body").text(commitMessage);
} else {
- $tooltip.empty().append("<i>Commit not exist or access denied</i>");
+ $tooltip.empty().append("<i>" + onedev.server.markdown.translations["commit-not-exist-or-access-denied"] + "</i>");
}
$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});
},
@@ -1322,7 +1324,7 @@ onedev.server.markdown = {
var sanitizedUrl = $('<div>'+url+'</div>').text();
var message;
- var defaultDescription = "Enter description here";
+ var defaultDescription = onedev.server.markdown.translations["enter-description-here"];
if (name)
message = '['+name+']('+sanitizedUrl+')';
else
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
index fcaea62c46..4a6bff1c41 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java
@@ -48,6 +48,7 @@ import java.util.List;
import static io.onedev.server.git.GitUtils.branch2ref;
import static io.onedev.server.git.GitUtils.tag2ref;
+import static io.onedev.server.web.translation.Translation._T;
import static org.eclipse.jgit.lib.Constants.R_REFS;
public abstract class RevisionSelector extends Panel {
@@ -160,15 +161,15 @@ public abstract class RevisionSelector extends Panel {
protected String load() {
if (branchesActive) {
if (canCreateBranch) {
- return "Find or create branch";
+ return _T("Find or create branch");
} else {
- return "Find branch";
+ return _T("Find branch");
}
} else {
if (canCreateTag) {
- return "Find or create tag";
+ return _T("Find or create tag");
} else {
- return "Find tag";
+ return _T("Find tag");
}
}
}
@@ -201,7 +202,7 @@ public abstract class RevisionSelector extends Panel {
List<Tab> tabs = new ArrayList<>();
AjaxActionTab branchesTab;
- tabs.add(branchesTab = new AjaxActionTab(Model.of("branches")) {
+ tabs.add(branchesTab = new AjaxActionTab(Model.of(_T("branches"))) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
@@ -211,7 +212,7 @@ public abstract class RevisionSelector extends Panel {
});
AjaxActionTab tagsTab;
- tabs.add(tagsTab = new AjaxActionTab(Model.of("tags")) {
+ tabs.add(tagsTab = new AjaxActionTab(Model.of(_T("tags"))) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
@@ -401,7 +402,7 @@ public abstract class RevisionSelector extends Panel {
item.add(AttributeAppender.append("class", "active"));
itemsView.add(item);
}
- itemsContainer.add(new Label("noItems", branchesActive? "No branches found": "No tags found") {
+ itemsContainer.add(new Label("noItems", branchesActive? _T("No branches found"): _T("No tags found")) {
@Override
protected void onConfigure() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java
index 885f45c80a..7f001d5ef0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.suggestionapply;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
@@ -15,7 +17,7 @@ public class SuggestionApplyBean implements Serializable {
private String branch;
- private String commitMessage = "Apply suggested change from code comment";
+ private String commitMessage = _T("Apply suggested change from code comment");
@Editable(order=100, description="Specify branch to commit suggested change")
@BranchChoice
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
index 0986a34935..7b9293891c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html
@@ -13,7 +13,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="nameEditFrag">
<form wicket:id="form" class="leave-confirm name">
- <input wicket:id="input" type="text" placeholder="Name your file" class="form-control form-control-sm form-control-solid"></input>
+ <input wicket:id="input" type="text" class="form-control form-control-sm form-control-solid"></input>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="treeNodeFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index 685eb0922e..19e18949fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -49,6 +49,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import javax.annotation.Nullable;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -283,6 +286,7 @@ public class BlobNavigator extends Panel {
name = file.path;
nameInput = new TextField<String>("input", Model.of(name));
+ nameInput.add(AttributeAppender.append("placeholder", _T("Name your file")));
form.add(nameInput);
nameInput.add(new AjaxFormSubmitBehavior(form, "input") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html
index 01b494694a..d810644aa2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html
@@ -1,5 +1,5 @@
<wicket:panel>
<div class="no-name alert alert-notice alert-light-warning">
- Please specify file name above before editing content
+ <wicket:t>Please specify file name above before editing content</wicket:t>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation.java
index 290a084fcb..a5cf846609 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.translation;
import java.io.File;
import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -17,6 +17,8 @@ public class Translation extends TranslationResourceBundle {
private static final Logger logger = LoggerFactory.getLogger(Translation.class);
+ private static final Map<String, String> m = new HashMap<>();
+
public static String _T(String key) {
return Localizer.get().getString("t: " + key, null);
}
@@ -56,10 +58,23 @@ public class Translation extends TranslationResourceBundle {
}
}
+ static {
+ init();
+ Translation.watchUpdate(Translation.class, () -> {
+ init();
+ });
+ }
+
+ private static void init() {
+ m.clear();
+ m.put("md.heading", "Heading");
+ m.put("md.image", "Image");
+ m.put("container-image", "Image");
+ }
@Override
protected Map<String, String> getContents() {
- return Collections.emptyMap();
+ return m;
}
}
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.java
index 4dba5e7e2a..dedd50d66d 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
@@ -22,6 +22,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("(on behalf of <b>{0}</b>)", "(代表 <b>{0}</b>)");
m.put("6-digits passcode", "6 位数代码");
m.put("7 days", "7 天");
+ m.put("<a href=\"https://guides.github.com/features/mastering-markdown/\" target=\"_blank\">GitHub flavored markdown</a> is accepted, with <a href=\"https://docs.onedev.io/appendix/markdown-syntax\" target=\"_blank\">mermaid and katex support</a>.",
+ "可使用 <a href=\"https://guides.github.com/features/mastering-markdown/\" target=\"_blank\">GitHub 风格的 markdown</a>,并支持 <a href=\"https://docs.onedev.io/appendix/markdown-syntax\" target=\"_blank\">mermaid 和 katex</a>。");
m.put("<a wicket:id=\"verifyRecoveryCode\">Verify by recovery code</a> if you can not access your TOTP authenticator",
"<a wicket:id=\"verifyRecoveryCode\">通过恢复代码验证</a>(如果您无法访问 TOTP 认证器)");
m.put("<b class='text-danger'>NOTE: </b> This step requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",
@@ -38,6 +40,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("API url of your JIRA cloud instance, for instance, <tt>https://your-domain.atlassian.net/rest/api/3</tt>",
"你的JIRA云实例的API地址,例如:<tt>https://your-domain.atlassian.net/rest/api/3</tt>");
m.put("Able to merge without conflicts", "可以合并而没有冲突");
+ m.put("Absolute or relative url of the image", "图片的绝对或相对 URL");
+ m.put("Absolute or relative url of the link", "链接的绝对或相对 URL");
m.put("Access Anonymously", "匿名访问");
m.put("Access Build Log", "访问构建日志");
m.put("Access Build Pipeline", "访问构建流水线");
@@ -69,6 +73,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Add new file", "添加新文件");
m.put("Add new import", "添加新导入");
m.put("Add project", "添加项目");
+ m.put("Add to batch to commit with other suggestions later", "稍后与其他建议一起提交");
m.put("Add {0}", "添加 {0}");
m.put("Additions", "新增");
m.put("Administration", "管理");
@@ -203,10 +208,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Board Spec", "看板规范");
m.put("Boards", "看板");
m.put("Body", "正文");
+ m.put("Bold", "加粗");
m.put("Both", "两者");
m.put("Bottom", "底部");
m.put("Branch", "分支");
- m.put("Branch '{0}' already exists, please choose a different name", "分支 '{0}' 已存在,请选择不同的名称");
+ m.put("Branch \"{0}\" already exists, please choose a different name", "分支 \"{0}\" 已存在,请选择不同的名称");
m.put("Branch Choice Bean", "分支选择Bean");
m.put("Branch Name", "分支名称");
m.put("Branch Protection", "分支保护");
@@ -249,6 +255,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Build frequency statistics", "构建频率统计");
m.put("Build is successful", "构建成功");
m.put("Build list", "构建列表");
+ m.put("Build not exist or access denied", "构建不存在或访问被拒绝");
m.put("Build number", "构建编号");
m.put("Build required for deletion. Submit pull request instead", "需要构建才能删除。请提交合并请求");
m.put("Build required for this change. Submit pull request instead", "需要构建才能更改。请提交合并请求");
@@ -357,13 +364,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Code push", "代码推送");
m.put("Code read permission is required to import build spec (import project: {0}, import revision: {1})",
"需要代码读取权限才能导入构建规范(导入项目:{0},导入版本:{1})");
+ m.put("Code suggestion", "代码建议");
m.put("Code write permission is required for this operation", "需要代码写入权限才能执行此操作");
m.put("Collapse all", "全部折叠");
m.put("Color", "颜色");
m.put("Commands", "命令");
m.put("Comment", "评论");
m.put("Comment too long", "评论过长");
+ m.put("Commented code is outdated", "注释的代码已过时");
m.put("Commit", "提交");
+ m.put("Commit &amp; Insert", "提交并插入");
m.put("Commit Batched Suggestions", "提交批量建议");
m.put("Commit Message", "提交信息");
m.put("Commit Message Bean", "提交信息 Bean");
@@ -379,7 +389,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Commit date", "提交日期");
m.put("Commit hash", "提交哈希");
m.put("Commit index version", "提交索引版本");
+ m.put("Commit not exist or access denied", "提交不存在或访问被拒绝");
m.put("Commit signature required but no GPG signing key specified", "提交签名需要但未指定 GPG 签名密钥");
+ m.put("Commit suggestion", "提交建议");
m.put("Commits", "提交");
m.put("Committed After", "提交后");
m.put("Committed Before", "提交前");
@@ -394,6 +406,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Confirm password here", "在此确认密码");
m.put("Confirm your action", "确认你的操作");
m.put("Connector", "连接器");
+ m.put("container-image", "容器镜像");
m.put("Container default", "容器默认");
m.put("Content", "内容");
m.put("Contributed settings", "贡献的设置");
@@ -487,6 +500,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Diff options", "差异选项");
m.put("Digest invalid", "摘要无效");
m.put("Directories to Skip", "要跳过的目录");
+ m.put("Directory", "目录");
m.put("Directory (tenant) ID", "目录(租户)ID");
m.put("Disable Auto Update Check", "禁用自动更新检查");
m.put("Disable Dashboard", "禁用仪表盘");
@@ -500,6 +514,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Do not ignore", "不要忽略");
m.put("Do not retrieve", "不检索");
m.put("Do not retrieve groups", "不检索组");
+ m.put("Do you really want to delete \"{0}\"?", "您真的要删除 \"{0}\" 吗?");
m.put("Do you really want to delete this email address?", "您真的要删除这个电子邮件地址吗?");
m.put("Do you really want to remove this link?", "您确定要删除此链接吗?");
m.put("Docker Executable", "Docker 可执行文件");
@@ -519,6 +534,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Edit Source", "编辑源码");
m.put("Edit Timesheet", "编辑工时表");
m.put("Edit dashboard", "编辑仪表板");
+ m.put("Edit issue title", "编辑工单标题");
m.put("Edit on branch {0}", "在分支 {0} 编辑");
m.put("Edit on source branch", "在源分支编辑");
m.put("Edit plain", "编辑纯文本");
@@ -563,6 +579,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"启用此选项以允许上传在 CI/CD 任务期间生成的构建缓存。上传的缓存可以被项目后续的构建使用,只要缓存密钥匹配");
m.put("Enforce Conventional Commits", "强制执行 Conventional Commits");
m.put("Enforce Two-factor Authentication", "强制执行两阶段认证");
+ m.put("Enter description here", "输入描述");
m.put("Enter your details to login to your account", "输入您的详细信息登录到您的账户");
m.put("Entries", "条目");
m.put("Entry", "条目");
@@ -629,6 +646,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Filter", "过滤");
m.put("Filter Issues", "过滤工单");
m.put("Filter by path", "按路径过滤");
+ m.put("Find branch", "查找分支");
+ m.put("Find or create branch", "查找或创建分支");
+ m.put("Find or create tag", "查找或创建标签");
+ m.put("Find tag", "查找标签");
m.put("Finish", "完成");
m.put("First applicable executor", "第一个适用的执行器");
m.put("Fix Type", "修复类型");
@@ -651,6 +672,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("From States", "从状态");
m.put("From {0}", "从 {0}");
m.put("Full Name", "全名");
+ m.put("Full screen", "全屏");
m.put("Furthest due date", "最晚截止日期");
m.put("GPG Keys", "GPG 密钥");
m.put("GPG Public Key", "GPG 公钥");
@@ -744,6 +766,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("HTTP(S)", "HTTP(S)");
m.put("HTTP(S) Clone URL", "HTTP(S) 克隆 URL");
m.put("Has Owner Permissions", "有所有者权限");
+ m.put("Help", "帮助");
m.put("Hide comment", "隐藏注释");
m.put("Hide saved queries", "隐藏保存的查询");
m.put("High", "高");
@@ -781,6 +804,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Ignore trailing", "忽略后缀");
m.put("Ignored Licenses", "忽略的许可证");
m.put("Image", "容器镜像");
+ m.put("Image Text", "图片文本");
+ m.put("Image URL", "图片 URL");
+ m.put("Image URL should be specified", "图片 URL 应该指定");
m.put("Imap Ssl Setting", "IMAP SSL 设置");
m.put("Imap With Ssl", "IMAP 使用 SSL");
m.put("Implicit SSL", "隐式 SSL");
@@ -821,10 +847,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Indicator", "指示器");
m.put("Inherit from parent", "从父级继承");
m.put("Input Spec", "输入规范");
+ m.put("Input URL", "输入 URL");
m.put("Input allowed CORS origin, hit ENTER to add", "输入允许的 CORS 来源,按回车键添加");
m.put("Input title here", "输入标题");
m.put("Input user search base. Hit ENTER to add", "输入用户搜索基础。按回车键添加");
m.put("Insert", "插入");
+ m.put("Insert Image", "插入图片");
+ m.put("Insert Link", "插入链接");
+ m.put("Insert link to this file", "插入链接到此文件");
+ m.put("Insert this image", "插入此图片");
m.put("Install Subscription Key", "安装订阅密钥");
m.put("Integer", "整数");
m.put("Interpreter", "解释器");
@@ -872,11 +903,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Issue already linked", "工单已链接");
m.put("Issue in state", "工单状态");
m.put("Issue list", "工单列表");
+ m.put("Issue not exist or access denied", "工单不存在或访问被拒绝");
m.put("Issue number", "工单编号");
m.put("Issue state duration statistics", "工单状态持续时间统计");
m.put("Issue state frequency statistics", "工单状态频率统计");
m.put("Issue state trend statistics", "工单状态趋势统计");
m.put("Issues", "工单");
+ m.put("Italic", "斜体");
m.put("Iteration", "迭代");
m.put("Iteration Edit Bean", "迭代编辑Bean");
m.put("Iteration Name", "迭代名称");
@@ -958,8 +991,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("License Agreement", "许可协议");
m.put("License Setting", "许可证设置");
m.put("Line changes", "行变化");
+ m.put("Link", "链接");
m.put("Link Spec", "链接规范");
m.put("Link Spec Opposite", "链接规范相反");
+ m.put("Link Text", "链接文本");
+ m.put("Link URL", "链接 URL");
+ m.put("Link URL should be specified", "链接 URL 应该指定");
m.put("Link issues", "链接工单");
m.put("Linkable Issues", "可链接的工单");
m.put("Linkable Issues On the Other Side", "可链接的工单在另一侧");
@@ -969,6 +1006,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Literal default value", "字面量默认值");
m.put("Literal value", "字面量值");
m.put("Load Keys", "加载密钥");
+ m.put("Loading emojis...", "加载表情符号...");
+ m.put("Loading...", "加载...");
m.put("Log Work", "记录工作");
m.put("Login Name", "登录名称");
m.put("Login name or email", "登录名或电子邮件");
@@ -1013,6 +1052,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Medium", "中等");
m.put("Memory Limit", "内存限制");
m.put("Memory Request", "内存请求");
+ m.put("Mention Someone", "提及某人");
+ m.put("Mention someone", "提及某人");
m.put("Merge Strategy", "合并策略");
m.put("Merged", "合并");
m.put("Meta", "元");
@@ -1048,6 +1089,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"提供商的名称将服务于两个目的:<ul><li>显示在登录按钮上<li>形成授权回调 URL,格式为 <i>&lt;server url&gt;/~sso/callback/&lt;name&gt;</i></ul>");
m.put("Name reversely", "名称反向");
m.put("Name unknown", "名称未知");
+ m.put("Name your file", "命名您的文件");
m.put("Named Agent Queries Bean", "命名代理查询Bean");
m.put("Named Agent Query", "命名代理查询");
m.put("Named Build Queries Bean", "命名构建查询Bean");
@@ -1087,6 +1129,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No any", "无任何");
m.put("No branch to cherry-pick to", "没有分支可以 cherry-pick");
m.put("No branch to revert on", "没有分支可以 revert");
+ m.put("No branches Found", "未找到分支");
+ m.put("No branches found", "未找到分支");
m.put("No config file", "无配置文件");
m.put("No default group", "无默认组");
m.put("No default role", "无默认角色");
@@ -1096,9 +1140,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No external authenticator", "无外部认证器");
m.put("No fields to prompt", "无要提示的字段");
m.put("No fields to remove", "无要删除的字段");
+ m.put("No file attachments", "没有文件附件");
m.put("No group by", "无分组");
m.put("No ignore file", "无忽略文件");
m.put("No ignored licenses", "无忽略的许可证");
+ m.put("No image attachments", "没有图片附件");
m.put("No imports defined", "无导入");
m.put("No jobs defined", "未定义任务");
m.put("No limit", "无限制");
@@ -1112,6 +1158,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No secret config", "无秘密配置");
m.put("No services defined", "未定义服务");
m.put("No step templates defined", "未定义步骤模板");
+ m.put("No tags found", "未找到标签");
m.put("Node Selector", "节点选择器");
m.put("Node Selector Entry", "节点选择器条目");
m.put("None", "无");
@@ -1124,6 +1171,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Not run", "未运行");
m.put("Not specified", "未指定");
m.put("Note", "备注");
+ m.put("Nothing to preview", "没有预览内容");
m.put("Notifications", "通知");
m.put("Notify Build Events", "通知构建事件");
m.put("Notify Code Comment Events", "通知代码评论事件");
@@ -1338,6 +1386,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"可选择指定上述任务的引用,例如 <i>refs/heads/main</i>。使用 * 进行通配符匹配");
m.put("Optionally specify registry logins to override those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, <code>@job_token@</code> for user name, and access token secret for password secret",
"可选择指定注册表登录信息,以覆盖任务执行器中定义的登录信息。对于内置注册表,使用 <code>@server_url@</code> 作为注册表 URL,<code>@job_token@</code> 作为用户名,以及访问令牌密钥作为密码密钥");
+ m.put("Optionally specify relative directory to put uploaded files", "可选地指定要上传的文件的相对目录");
m.put("Optionally specify relative path under <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a> to clone code into. Leave empty to use job workspace itself",
"可选择指定 <a href='https://docs.onedev.io/concepts#job-workspace'>任务工作空间</a> 下的相对路径,用于克隆代码。留空则使用任务工作空间本身");
m.put("Optionally specify relative path under <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a> to scan. Leave empty to use job workspace itself",
@@ -1406,6 +1455,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"可选择指定容器的默认工作目录。留空则使用容器的默认工作目录");
m.put("Options", "选项");
m.put("Order By", "排序");
+ m.put("Ordered List", "有序列表");
+ m.put("Ordered list", "有序列表");
m.put("Osv License Scanner", "OSV 许可证扫描器");
m.put("Osv Vulnerability Scanner", "OSV 漏洞扫描器");
m.put("Other", "其他");
@@ -1463,6 +1514,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ author(robin)",
"执行模糊查询。使用 '~' 包围搜索文本以添加更多条件,例如:~text to search~ author(robin)");
m.put("Permanent link of this selection", "此选择的永久链接");
+ m.put("Pick Existing", "选择现有");
m.put("Platform", "平台");
m.put("Platforms", "平台");
m.put("Please <a wicket:id=\"download\" class=\"font-weight-bolder\">download</a> recovery codes below and keep them secret. These codes can be used to provide one-time access to your account in case you can not access the authentication application. They will <b>NOT</b> be displayed again",
@@ -1471,6 +1523,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Please input one of your recovery codes saved when enable two-factor authentication",
"请输入在启用两阶段验证时保存的恢复代码");
m.put("Please login to perform this operation", "请登录才能执行此操作");
+ m.put("Please specify file name above before editing content", "请在编辑内容之前指定文件名");
m.put("Poll Interval", "轮询间隔");
m.put("Populate Tag Mappings", "填充标签映射");
m.put("Port", "端口");
@@ -1488,6 +1541,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Prevent Deletion", "防止删除");
m.put("Prevent Forced Push", "防止强制推送");
m.put("Prevent Update", "防止更新");
+ m.put("Preview", "预览");
m.put("Previous", "上一步");
m.put("Primary", "主");
m.put("Primary email address will be used to receive notifications, show gravatar (if enabled) etc.",
@@ -1499,6 +1553,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Private Key Secret", "私钥密钥");
m.put("Privilege Settings", "权限设置");
m.put("Profile", "个人资料");
+ m.put("Programming language", "编程语言");
m.put("Project", "项目");
m.put("Project Authorization Bean", "项目授权 Bean");
m.put("Project Authorizations Bean", "项目授权 Bean");
@@ -1555,6 +1610,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Pull request is opened", "合并请求被打开");
m.put("Pull request list", "合并请求列表");
m.put("Pull request merge", "合并请求合并");
+ m.put("Pull request not exist or access denied", "合并请求不存在或访问被拒绝");
m.put("Pull request number", "合并请求编号");
m.put("Pull request open or update", "合并请求打开或更新");
m.put("Push Image", "推送镜像");
@@ -1588,6 +1644,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"参考此<a href='https://docs.onedev.io/tutorials/security/sso-with-github' target='_blank'>教程</a>获取示例设置");
m.put("Refer to this <a href='https://docs.onedev.io/tutorials/security/sso-with-okta' target='_blank'>tutorial</a> for an example setup",
"参考此<a href='https://docs.onedev.io/tutorials/security/sso-with-okta' target='_blank'>教程</a>获取示例设置");
+ m.put("Reference Build", "引用构建");
+ m.put("Reference Issue", "引用工单");
+ m.put("Reference Pull Request", "引用合并请求");
m.put("Refresh Token", "刷新令牌");
m.put("Refs", "引用");
m.put("Registry Login", "注册登录");
@@ -1599,8 +1658,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Remote Shell Executor", "远程 Shell 执行器");
m.put("Remote URL", "远程 URL");
m.put("Remote Url", "远程 URL");
+ m.put("Remove", "删除");
m.put("Remove Fields", "删除字段");
m.put("Remove From Current Iteration", "从当前迭代中删除");
+ m.put("Remove from batch", "从批量中删除");
+ m.put("Remove this file", "删除此文件");
+ m.put("Remove this image", "删除此图片");
m.put("Rename {0}", "重命名 {0}");
m.put("Renovate CLI Options", "Renovate CLI 选项");
m.put("Renovate JavaScript Config", "Renovate JavaScript 配置");
@@ -1689,6 +1752,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Scripting Value", "脚本值");
m.put("Search", "搜索");
m.put("Search Groups Using Filter", "使用过滤器搜索组");
+ m.put("Search branch", "搜索分支");
m.put("Search for", "搜索");
m.put("Search is too general", "搜索过于笼统");
m.put("Secret", "密钥");
@@ -1697,6 +1761,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Security", "安全");
m.put("Security Setting", "安全设置");
m.put("Security Settings", "安全设置");
+ m.put("Select", "选择");
m.put("Select Branch to Cherry Pick to", "选择分支进行 cherry-pick");
m.put("Select Branch to Revert on", "选择分支进行 revert");
m.put("Select Existing", "选择现有工单");
@@ -1768,12 +1833,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Show Conditionally", "显示条件");
m.put("Show Description", "显示描述");
m.put("Show Duration", "显示持续时间");
+ m.put("Show Emojis", "显示表情符号");
m.put("Show Issue Status", "显示问题状态");
m.put("Show Package Stats", "显示包统计");
m.put("Show Pull Request Stats", "显示合并请求统计");
m.put("Show Saved Queries", "显示保存的查询");
m.put("Show Works Of", "显示工作量");
m.put("Show commented code snippet", "显示注释的代码片段");
+ m.put("Show emojis", "显示表情符号");
m.put("Sign In", "登录");
m.put("Sign In To", "登录到");
m.put("Sign Out", "登出");
@@ -2130,6 +2197,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"指定每天的工作小时数。这将影响工作周期的解析和显示。例如,如果此属性设置为 <tt>8</tt>,则 <tt>1d</tt> 等同于 <tt>8h</tt>");
m.put("Spent Time Issue Field", "工单耗时字段");
m.put("Split", "拆分");
+ m.put("Split view", "分割视图");
m.put("SpotBugs Report", "SpotBugs 报告");
m.put("Squash source branch commits", "压缩源分支提交");
m.put("Ssh", "SSH");
@@ -2165,6 +2233,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Subscription data", "订阅数据");
m.put("Successful", "成功");
m.put("Suffix Pattern", "后缀模式");
+ m.put("Suggest changes", "建议更改");
+ m.put("Suggested change", "建议更改");
+ m.put("Suggestion is outdated either due to code change or pull request close", "建议由于代码更改或合并请求关闭而过时");
m.put("Support & Bug Report", "技术支持与错误报告");
m.put("Support Request", "支持请求");
m.put("Switch to HTTP(S)", "切换到 HTTP(S)");
@@ -2183,7 +2254,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Tab Width", "制表符宽度");
m.put("Tabs", "制表符");
m.put("Tag", "标签");
- m.put("Tag '{0}' already exists, please choose a different name.", "标签 '{0}' 已存在,请选择不同的名称");
+ m.put("Tag \"{0}\" already exists, please choose a different name.", "标签 \"{0}\" 已存在,请选择不同的名称");
m.put("Tag Message", "标签消息");
m.put("Tag Name", "标签名称");
m.put("Tag Protection", "标签保护");
@@ -2195,6 +2266,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Target File", "目标文件");
m.put("Target Path", "目标路径");
m.put("Target Project", "目标项目");
+ m.put("Task List", "任务列表");
+ m.put("Task list", "任务列表");
m.put("Template Name", "模板名称");
m.put("Terminal close", "终端关闭");
m.put("Terminal input", "终端输入");
@@ -2280,6 +2353,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Toggle comments", "切换评论");
m.put("Toggle commits", "切换提交");
m.put("Toggle dark mode", "切换暗模式");
+ m.put("Toggle fixed width font", "切换固定宽度字体");
m.put("Toggle navigation", "切换导航");
m.put("Toggle work log", "切换工作日志");
m.put("Too many commits to load", "加载的提交太多");
@@ -2309,6 +2383,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Type password here", "在此输入密码");
m.put("Type to filter", "过滤");
m.put("URL", "URL");
+ m.put("Unable to connect to server", "无法连接到服务器");
m.put("Unable to create protected tag", "无法创建受保护的标签");
m.put("Unable to send verification email as mail service is not configured yet", "无法发送验证电子邮件,因为邮件服务未配置");
m.put("Unauthorized", "未授权");
@@ -2320,12 +2395,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Unified", "统一");
m.put("Unlimited", "无限制");
m.put("Unlink this issue", "取消链接此工单");
+ m.put("Unordered List", "无序列表");
+ m.put("Unordered list", "无序列表");
m.put("Unspecified", "未指定");
m.put("Unsupported", "不支持");
m.put("Unverified email address is <b>NOT</b> applicable for above functionalities", "未验证的电子邮件地址不适用于上述功能");
m.put("Update", "更新");
m.put("Update Dependencies via Renovate", "通过 Renovate 更新依赖");
m.put("Update body", "更新主体");
+ m.put("Upload", "上传");
m.put("Upload Access Token Secret", "上传访问令牌密钥");
m.put("Upload Cache", "上传缓存");
m.put("Upload Files", "上传文件");
@@ -2333,7 +2411,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Upload Strategy", "上传策略");
m.put("Upload a 128x128 transparent png file to be used as logo for dark mode", "上传一个 128x128 的透明 PNG 文件,用作暗模式下的标志");
m.put("Upload a 128x128 transparent png file to be used as logo for light mode", "上传一个 128x128 的透明 PNG 文件,用作亮模式下的标志");
+ m.put("Upload should be less than {0} Mb", "上传应该小于 {0} Mb");
m.put("Upload to Project", "上传到项目");
+ m.put("Uploading file", "上传文件");
m.put("Url", "URL");
m.put("Use Avatar Service", "使用头像服务");
m.put("Use For Git Operations", "用于 Git 操作");
@@ -2464,6 +2544,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Write", "写入");
m.put("You are authenticating via external system", "您正在通过外部系统进行认证");
m.put("You are authenticating via internal database", "您正在通过内部数据库进行认证");
+ m.put("You may also drop file/image to the input box, or paste image from clipboard", "您也可以将文件/图像拖到输入框中,或从剪贴板粘贴图像");
m.put("You may initialize the project by <a wicket:id=\"addFiles\" class=\"link-primary\">adding files</a>, <a wicket:id=\"setupBuildSpec\" class=\"link-primary\">setting up build spec</a>, or <a wicket:id=\"pushInstructions\" class=\"link-primary\">pushing an existing repository</a>",
"您可以通过 <a wicket:id=\"addFiles\" class=\"link-primary\">添加文件</a>、<a wicket:id=\"setupBuildSpec\" class=\"link-primary\">定义构建规范</a> 或 <a wicket:id=\"pushInstructions\" class=\"link-primary\">推送现有仓库</a> 来初始化项目");
m.put("You've been logged out", "您已登出");
@@ -2476,6 +2557,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("YouTrack Password or Access Token", "YouTrack 密码或访问令牌");
m.put("YouTrack Project", "YouTrack 项目");
m.put("YouTrack Projects to Import", "要导入的 YouTrack 项目");
+ m.put("branches", "分支");
m.put("builds", "构建");
m.put("cmd-k to show command palette", "cmd-k 显示命令面板");
m.put("ctrl-k to show command palette", "ctrl-k 显示命令面板");
@@ -2491,6 +2573,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("is not empty", "不为空");
m.put("issues", "工单");
m.put("lines", "行");
+ m.put("md.heading", "标题");
+ m.put("md.image", "图片");
m.put("new field", "新字段");
m.put("outdated", "过时");
m.put("packages", "包");
@@ -2498,12 +2582,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("root", "根");
m.put("search in this revision will be accurate after indexed", "索引完成后,在当前版本中的搜索将更准确");
m.put("submit", "提交");
+ m.put("tags", "标签");
m.put("true", "真");
m.put("{0} branches", "{0} 个分支");
m.put("{0} commits", "{0} 个提交");
m.put("{0} edited {1}", "{0} 编辑于 {1}");
m.put("{0} files", "{0} 个文件");
m.put("{0} tags", "{0} 个标签");
+ m.put("Apply suggested change from code comment", "从代码注释应用建议的更改");
// Manually added keys
m.put("Create Administrator Account", "创建管理员账户");