Skip to content

The Unified and Autonomous Development Platform

wip: i18n support

Robin Shen9b0180fb800b
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 2558976723..391793ea40 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -408,8 +408,22 @@ public class BlobTextDiffPanel extends Panel {
explicit("action"), explicit("param1"), explicit("param2"),
explicit("param3"), explicit("param4"), explicit("param5"),
explicit("param6"), explicit("param7"), explicit("param8"));
-
- String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s);",
+
+ var translations = new HashMap<String, String>();
+ translations.put("unable-to-comment", _T("Unable to comment"));
+ translations.put("perma-link", _T("Permanent link of this selection"));
+ translations.put("copy-to-clipboard", _T("Copy selected text to clipboard"));
+ translations.put("add-comment", _T("Add comment on this selection"));
+ translations.put("login-to-comment", _T("Login to comment on selection"));
+ translations.put("covered-by-tests", _T("Covered by tests"));
+ translations.put("not-covered-by-any-test", _T("Not covered by any test"));
+ translations.put("partially-covered-by-some-tests", _T("Partially covered by some tests"));
+ translations.put("unsaved-changes-prompt", _T("There are unsaved changes, discard and continue?"));
+ translations.put("show-comment", _T("Click to show comment of marked text"));
+ translations.put("loading", _T("Loading..."));
+ translations.put("invalid-selection", _T("Invalid selection, click for details"));
+
+ String script = String.format("onedev.server.blobTextDiff.onDomReady('%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s);",
getMarkupId(), symbolTooltip.getMarkupId(),
change.getOldBlobIdent().revision,
change.getNewBlobIdent().revision,
@@ -418,7 +432,7 @@ public class BlobTextDiffPanel extends Panel {
callback, blameMessageBehavior.getCallback(),
convertToJson(markRange), convertToJson(openCommentInfo),
convertToJson(annotationInfoModel.getObject()),
- commentContainerId);
+ commentContainerId, convertToJson(translations));
response.render(OnDomReadyHeaderItem.forScript(script));
@@ -427,7 +441,7 @@ public class BlobTextDiffPanel extends Panel {
jsonOfMarkRange = convertToJson(markRange);
else
jsonOfMarkRange = "undefined";
- script = String.format("onedev.server.blobTextDiff.onWindowLoad('%s', %s);", getMarkupId(), jsonOfMarkRange);
+ script = String.format("onedev.server.blobTextDiff.onLoad('%s', %s);", getMarkupId(), jsonOfMarkRange);
response.render(OnLoadHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
index dc182bda9d..d4a60b14aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js
@@ -2,7 +2,8 @@ onedev.server.blobTextDiff = {
symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute, cm-builtin, cm-qualifier",
onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, oldPath, newPath,
callback, blameMessageCallback, markRange, openComment,
- annotationInfo, commentContainerId) {
+ annotationInfo, commentContainerId, translations) {
+ onedev.server.blobTextDiff.translations = translations;
var $container = $("#" + containerId);
$container.data("commentContainerId", commentContainerId);
$container.data("callback", callback);
@@ -332,7 +333,7 @@ onedev.server.blobTextDiff = {
function showInvalidSelection() {
var $content = $("<div></div>");
- $content.append(`<a class='invalid'><svg class='icon'><use xlink:href='${onedev.server.icons}#warning'/></svg> Invalid selection, click for details</a>`);
+ $content.append(`<a class='invalid'><svg class='icon'><use xlink:href='${onedev.server.icons}#warning'/></svg> ${onedev.server.blobTextDiff.translations["invalid-selection"]}</a>`);
$content.children("a").attr("href", "https://docs.onedev.io/appendix/diff-selection").attr("target", "_blank");
return {
position: position,
@@ -481,7 +482,7 @@ onedev.server.blobTextDiff = {
onedev.server.blobTextDiff.mark($container, markRange);
}
},
- onWindowLoad: function(containerId, markRange) {
+ onLoad: function(containerId, markRange) {
var $container = $("#" + containerId);
if (markRange && onedev.server.viewState.getFromHistory() === undefined)
onedev.server.blobTextDiff.scrollTo($container, markRange);
@@ -758,7 +759,7 @@ onedev.server.blobTextDiff = {
var tooltipId = "blame-message-" + containerId + "_" + oldLine + "_" + newLine;
$container.data("blameMessageCallback")(tooltipId, $(this).data("hash"));
- var $tooltip = $("<div class='blame-message'><div class='loading'>Loading...</div></div>");
+ var $tooltip = $("<div class='blame-message'><div class='loading'>" + onedev.server.blobTextDiff.translations["loading"] + "</div></div>");
$tooltip.attr("id", tooltipId);
$tooltip.data("trigger", this);
$tooltip.data("alignment", alignment);
@@ -770,11 +771,11 @@ onedev.server.blobTextDiff = {
var $container = $("#" + containerId);
if (!markUrl) {
- $content = $(`<div><span class='invalid'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#warning'/></svg> Unable to comment here</a>`);
+ $content = $(`<div><span class='invalid'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#warning'/></svg> ${onedev.server.blobTextDiff.translations["unable-to-comment"]}</span></div>`);
} else {
- var $content = $(`<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#link'/></svg> Permanent link of this selection</a>`);
+ var $content = $(`<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#link'/></svg> ${onedev.server.blobTextDiff.translations["perma-link"]}</a>`);
$content.children("a.permanent").attr("href", markUrl);
- $content.append(`<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#copy'/></svg> Copy selected text to clipboard</a>`);
+ $content.append(`<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#copy'/></svg> ${onedev.server.blobTextDiff.translations["copy-to-clipboard"]}</a>`);
var clipboard = new ClipboardJS(".copy-marked", {
text: function(trigger) {
return markedText;
@@ -785,7 +786,7 @@ onedev.server.blobTextDiff = {
$(".selection-popover").remove();
});
if (loggedIn) {
- $content.append(`<a class='comment'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#comment'/></svg> Add comment on this selection</a>`);
+ $content.append(`<a class='comment'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#comment'/></svg> ${onedev.server.blobTextDiff.translations["add-comment"]}</a>`);
$content.children("a.comment").click(function() {
if (onedev.server.blobTextDiff.confirmUnsavedChanges($container)) {
$container.data("callback")("addComment", markRange.leftSide,
@@ -794,7 +795,7 @@ onedev.server.blobTextDiff = {
});
} else {
var loginHref = $(".sign-in").attr("href");
- $content.append(`<a class='comment' href='${loginHref}'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#warning'/></svg> Login to comment on selection</a>`);
+ $content.append(`<a class='comment' href='${loginHref}'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#warning'/></svg> ${onedev.server.blobTextDiff.translations["login-to-comment-on-selection"]}</a>`);
}
}
@@ -805,7 +806,7 @@ onedev.server.blobTextDiff = {
},
confirmUnsavedChanges: function($container) {
return $("#"+$container.data("commentContainerId")).find("form.dirty").length == 0
- || confirm("There are unsaved changes, discard and continue?");
+ || confirm(onedev.server.blobTextDiff.translations["unsaved-changes-prompt"]);
},
expand: function(containerId, blockIndex, expandedHtml) {
var $container = $("#" + containerId);
@@ -873,7 +874,6 @@ onedev.server.blobTextDiff = {
var $startTd = $container.find("td.content[data-" + oldOrNew + "='" + (startCursor[0]-1) + "']");
var $endTd = $container.find("td.content[data-" + oldOrNew + "='" + (endCursor[0]-1) + "']");
if ($startTd.length == 0) {
- console.error("Unable to find start td!");
$startTd = undefined;
} else if ($startTd.length == 2) {
if (oldOrNew == "old") {
@@ -883,7 +883,6 @@ onedev.server.blobTextDiff = {
}
}
if ($endTd.length == 0) {
- console.error("Unable to find end td!");
$endTd = undefined;
} else if ($endTd.length == 2) {
if (oldOrNew == "old") {
@@ -1126,13 +1125,17 @@ onedev.server.blobTextDiff = {
var cssClass = coverageStatus.toLowerCase();
var title;
if (coverageStatus == 'COVERED')
- title = "Covered by tests";
+ title = onedev.server.blobTextDiff.translations["covered-by-tests"];
else if (coverageStatus == 'NOT_COVERED')
- title = "Not covered by any test";
+ title = onedev.server.blobTextDiff.translations["not-covered-by-any-test"];
else
- title = "Partially covered by some tests";
+ title = onedev.server.blobTextDiff.translations["partially-covered-by-some-tests"];
- $lineNumTd.find(".coverage").addClass(cssClass).attr("title", title);
+ $lineNumTd.find(".coverage").addClass(cssClass).attr("data-tippy-content", title);
+ tippy($lineNumTd.find(".coverage")[0], {
+ delay: [500, 0],
+ placement: 'auto'
+ });
},
addCommentIndicator: function($container, leftSide, line, comments) {
var oldOrNew = leftSide?"old":"new";
@@ -1160,7 +1163,7 @@ onedev.server.blobTextDiff = {
cssClasses += " updated";
updated = true;
}
- content += `<a class='${cssClasses}' title='Click to show comment of marked text'>#${comments[i].id}</a>`;
+ content += `<a class='${cssClasses}' data-tippy-content='${onedev.server.blobTextDiff.translations["show-comment"]}'>#${comments[i].id}</a>`;
}
if (updated)
@@ -1195,6 +1198,10 @@ onedev.server.blobTextDiff = {
comment.range.fromColumn, comment.range.toRow, comment.range.toColumn);
}
});
+ tippy(this, {
+ delay: [500, 0],
+ placement: 'auto'
+ });
});
onedev.server.blobTextDiff.highlightCommentTrigger($container);
});
@@ -1202,7 +1209,7 @@ onedev.server.blobTextDiff = {
var comment = comments[0];
if (comment.updated)
$indicator.addClass("updated");
- $indicator.addClass("comment-trigger").attr("title", "Click to show comment of marked text");
+ $indicator.addClass("comment-trigger").attr("data-tippy-content", onedev.server.blobTextDiff.translations["show-comment"]);
$indicator.append("<svg class='icon'><use xlink:href='" + onedev.server.icons + "#comment'/></svg>");
$indicator.mouseover(function() {
onedev.server.blobTextDiff.mark($container, comment.range);
@@ -1216,6 +1223,10 @@ onedev.server.blobTextDiff = {
comment.range.fromColumn, comment.range.toRow, comment.range.toColumn);
}
});
+ tippy($indicator[0], {
+ delay: [500, 0],
+ placement: 'auto'
+ });
}
$lineNumTd.children(".comment-indicator").remove();
$lineNumTd.prepend($indicator);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index 7920d70902..a3fbcf15f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -61,8 +61,8 @@
<div wicket:id="content"></div>
</div>
<div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>
+ <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware"><wicket:t>Save</wicket:t></button>
+ <button wicket:id="cancel" class="btn btn-sm btn-secondary"><wicket:t>Cancel</wicket:t></button>
</div>
</form>
</wicket:fragment>
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.java
index c3a379fc6f..a9f1bfde8e 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
@@ -986,7 +986,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
"not-covered-by-any-test", _T("Not covered by any test"),
"partially-covered-by-some-tests", _T("Partially covered by some tests"),
"unsaved-changes-prompt", _T("There are unsaved changes, discard and continue?"),
- "click-to-show-comment-of-marked-text", _T("Click to show comment of marked text"),
+ "show-comment", _T("Click to show comment of marked text"),
"loading", _T("Loading..."));
String script = String.format("onedev.server.sourceView.onDomReady("
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
index d13790c9ad..391c113d3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
@@ -331,7 +331,7 @@ onedev.server.sourceView = {
cssClasses += " updated";
updated = true;
}
- content += `<a class='${cssClasses}' data-tippy-content='${onedev.server.sourceView.translations["click-to-show-comment-of-marked-text"]}'>#${comments[i].id}</a>`;
+ content += `<a class='${cssClasses}' data-tippy-content='${onedev.server.sourceView.translations["show-comment"]}'>#${comments[i].id}</a>`;
}
let cssClasses = "comment-indicator";
@@ -380,7 +380,7 @@ onedev.server.sourceView = {
if (comment.updated)
cssClasses += " updated";
var svg = `<svg class='icon'><use xlink:href='${onedev.server.icons}#comment'/></svg>`;
- $gutter.append(`<a class='${cssClasses}' data-tippy-content='${onedev.server.sourceView.translations["click-to-show-comment-of-marked-text"]}'>${svg}</a>`);
+ $gutter.append(`<a class='${cssClasses}' data-tippy-content='${onedev.server.sourceView.translations["show-comment"]}'>${svg}</a>`);
var $indicator = $gutter.children("a");
$indicator.mouseover(function() {
onedev.server.codemirror.mark(cm, comment.range);
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 e78cf6665a..9b8ef50671 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
@@ -139,7 +139,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Applicable Senders", "适用发送者");
m.put("Applicable Users", "适用用户");
m.put("Application (client) ID", "应用(客户端)ID");
- m.put("Apply suggested change from code comment", "从代码注解应用建议的更改");
+ m.put("Apply suggested change from code comment", "从代码评论应用建议的更改");
m.put("Approved", "已批准");
m.put("Arbitrary scope", "任意范围");
m.put("Arbitrary type", "任意类型");
@@ -352,16 +352,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Code", "代码");
m.put("Code Analysis", "代码分析");
m.put("Code Analysis Setting", "代码分析设置");
- m.put("Code Comment", "代码注解");
- m.put("Code Comment Management", "代码注解管理");
- m.put("Code Comments", "代码注解");
+ m.put("Code Comment", "代码评论");
+ m.put("Code Comment Management", "代码评论管理");
+ m.put("Code Comments", "代码评论");
m.put("Code Compare", "代码比较");
m.put("Code Management", "代码管理");
m.put("Code Privilege", "代码权限");
m.put("Code Search", "代码搜索");
- m.put("Code comment", "代码注解");
+ m.put("Code comment", "代码评论");
m.put("Code comment administrative permission inside a project, including batch operations over multiple code comments",
- "项目内的代码注解管理权限,包括对多个代码注解的批量操作");
+ "项目内的代码评论管理权限,包括对多个代码评论的批量操作");
m.put("Code is committed", "代码已提交");
m.put("Code push", "代码推送");
m.put("Code read permission is required to import build spec (import project: {0}, import revision: {1})",
@@ -2345,6 +2345,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"此密钥用于确定项目层次结构中是否存在缓存命中(按顺序从当前项目搜索到根项目,以下加载密钥同理)。如果缓存的密钥与此处定义的密钥完全相同,则视为缓存命中");
m.put("This key is used to download and upload cache in project hierarchy (search from current project to root project in order)",
"此密钥用于在项目层次结构中下载和上传缓存(按顺序从当前项目搜索到根项目)");
+ m.put("This line has confusable unicode character modification", "此行有可疑的 Unicode 字符修改");
m.put("This operation is disallowed by branch protection rule", "此操作被分支保护规则禁止");
m.put("This permission enables one to access confidential issues", "此权限允许访问机密工单");
m.put("This permission enables one to schedule issues into iterations", "此权限允许将工单调度到迭代中");
@@ -2625,7 +2626,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("{0} edited {1}", "{0} 编辑于 {1}");
m.put("{0} files", "{0} 个文件");
m.put("{0} tags", "{0} 个标签");
- m.put("This line has confusable unicode character modification", "此行有可疑的 Unicode 字符修改");
+ m.put("Unable to comment here", "无法在此添加评论");
+ m.put("Invalid selection, click for details", "无效的选择,点击查看详情");
// Manually added keys
m.put("Create Administrator Account", "创建管理员账户");