The Unified and Autonomous Development Platform
wip: i18n support
Robin Shence668e443d07
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java b/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.javaindex b6586b9b87..d6b95a45e4 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ExtractTranslationKeys.java@@ -116,6 +116,9 @@ public class ExtractTranslationKeys extends CommandHandler {var editable = clazz.getAnnotation(Editable.class);if (editable != null) {extractedTranslationKeys.add(EditableUtils.getDisplayName(clazz));+ var group = EditableUtils.getGroup(clazz);+ if (group != null)+ extractedTranslationKeys.add(group);var description = editable.description();if (description.length() != 0) {extractedTranslationKeys.add(description);diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.javaindex 3edf1da4cf..ea17e7414d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java@@ -170,20 +170,20 @@ public class TimeTrackingSetting implements Serializable {}}- public String formatWorkingPeriod(int minutes) {+ public String formatWorkingPeriod(int minutes, boolean translate) {if (useHoursAndMinutesOnly) {int hours = minutes / 60;minutes = minutes % 60;StringBuilder builder = new StringBuilder();if (hours != 0)- builder.append(MessageFormat.format(_T("{0}h"), hours)).append(" ");+ builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", hours)).append(" ");if (minutes != 0)- builder.append(MessageFormat.format(_T("{0}m"), minutes));+ builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", minutes));String formatted = builder.toString().trim();if (formatted.length() == 0)- formatted = MessageFormat.format(_T("{0}h"), 0);+ formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", 0);return formatted;} else {int weeks = minutes / (60 * hoursPerDay * daysPerWeek);@@ -195,17 +195,17 @@ public class TimeTrackingSetting implements Serializable {StringBuilder builder = new StringBuilder();if (weeks != 0)- builder.append(MessageFormat.format(_T("{0}w"), weeks)).append(" ");+ builder.append(MessageFormat.format(translate? _T("{0}w"): "{0}w", weeks)).append(" ");if (days != 0)- builder.append(MessageFormat.format(_T("{0}d"), days)).append(" ");+ builder.append(MessageFormat.format(translate? _T("{0}d"): "{0}d", days)).append(" ");if (hours != 0)- builder.append(MessageFormat.format(_T("{0}h"), hours)).append(" ");+ builder.append(MessageFormat.format(translate? _T("{0}h"): "{0}h", hours)).append(" ");if (minutes != 0)- builder.append(MessageFormat.format(_T("{0}m"), minutes));+ builder.append(MessageFormat.format(translate? _T("{0}m"): "{0}m", minutes));String formatted = builder.toString().trim();if (formatted.length() == 0)- formatted = MessageFormat.format(_T("{0}h"), 0);+ formatted = MessageFormat.format(translate? _T("{0}h"): "{0}h", 0);return formatted;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.javaindex 0c4d7723fd..8f6db222f0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java@@ -52,9 +52,9 @@ public class IssueOwnEstimatedTimeChangeData extends IssueChangeData {public ActivityDetail getActivityDetail() {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue, true));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue));+ newFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue, true));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.javaindex f44d82356a..e3631881ba 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java@@ -60,9 +60,9 @@ public class IssueOwnSpentTimeChangeData extends IssueChangeData {public ActivityDetail getActivityDetail() {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue, true));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue));+ newFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue, true));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.javaindex 51d76c9ced..252b37b460 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java@@ -52,9 +52,9 @@ public class IssueTotalEstimatedTimeChangeData extends IssueChangeData {public ActivityDetail getActivityDetail() {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue, true));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue));+ newFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue, true));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.javaindex cb7a8bbc33..f10461708f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java@@ -52,9 +52,9 @@ public class IssueTotalSpentTimeChangeData extends IssueChangeData {public ActivityDetail getActivityDetail() {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue, true));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue));+ newFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue, true));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.javaindex 70efa863e8..137ae94730 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java@@ -60,7 +60,7 @@ public class EstimatedTimeCriteria extends Criteria<Issue> {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();return quote(NAME_ESTIMATED_TIME) + " "+ IssueQuery.getRuleName(operator) + " "- + quote(timeTrackingSetting.formatWorkingPeriod(value));+ + quote(timeTrackingSetting.formatWorkingPeriod(value, false));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.javaindex 935947e0cc..98327440ca 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java@@ -60,7 +60,7 @@ public class SpentTimeCriteria extends Criteria<Issue> {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();return quote(NAME_SPENT_TIME) + " "+ IssueQuery.getRuleName(operator) + " "- + quote(timeTrackingSetting.formatWorkingPeriod(value));+ + quote(timeTrackingSetting.formatWorkingPeriod(value, false));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 2cb4cc24b5..85bf71876d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -552,7 +552,7 @@ public abstract class BuildListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No builds to cancel");+ tag.put("data-tippy-content", _T("No builds to cancel"));}}@@ -625,7 +625,7 @@ public abstract class BuildListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No builds to re-run");+ tag.put("data-tippy-content", _T("No builds to re-run"));}}@@ -691,7 +691,7 @@ public abstract class BuildListPanel extends Panel {configure();if (!isEnabled()) {tag.put("disabled", "disabled");- tag.put("title", "No builds to delete");+ tag.put("data-tippy-content", _T("No builds to delete"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.htmlindex 3dd705a182..ecfd8ae41e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.html@@ -4,7 +4,7 @@<div class="has-builds"><wicket:enclosure child="showInList"><div class="head d-flex align-items-center py-3 px-3 border-bottom">- <h6 class="mb-0 mr-4">Builds</h6>+ <h6 class="mb-0 mr-4"><wicket:t>Builds</wicket:t></h6><a wicket:id="showInList" class="show-in-list" t:data-tippy-content="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a></div></wicket:enclosure>diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.javaindex b87d3960b6..5fcf845937 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.build.minilist;+import static io.onedev.server.web.translation.Translation._T;+import java.util.List;import javax.annotation.Nullable;@@ -76,7 +78,7 @@ public class MiniBuildListPanel extends GenericPanel<List<Build>> {});add(fragment);} else {- add(new Label("content", "No builds").add(AttributeAppender.append("class", "no-builds font-italic mx-5 my-4 text-nowrap")));+ add(new Label("content", _T("No builds")).add(AttributeAppender.append("class", "no-builds font-italic mx-5 my-4 text-nowrap")));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.htmlindex 65f0f82eb7..e2bda38830 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html@@ -9,14 +9,14 @@</div><wicket:fragment wicket:id="detailViewFrag"><div wicket:id="note" class="note mt-3"></div>- <div class="d-flex align-items-center d-empty-none mt-3"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary font-size-sm mr-2">Edit</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary font-size-sm">Delete</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div>+ <div class="d-flex align-items-center d-empty-none mt-3"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary font-size-sm mr-2"><wicket:t>Edit</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary font-size-sm"><wicket:t>Delete</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div></wicket:fragment><wicket:fragment wicket:id="detailEditFrag"><form wicket:id="form"><div wicket:id="editor"></div><div class="mt-3">- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware mr-1">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 mr-1"><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/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex b5c3ba1f62..99ef1d60eb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -41,7 +41,7 @@ class IssueWorkPanel extends Panel {add(new UserIdentPanel("user", getWork().getUser(), Mode.AVATAR_AND_NAME));var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();- add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes())));+ add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes(), true)));add(new Label("age", DateUtils.formatAge(getWork().getDate())).add(new AttributeAppender("title", formatDateTime(getWork().getDate()))));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.htmlindex 8d2d0deb97..6bc98f1078 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><form wicket:id="form" class="leave-confirm board-spec-edit"><div class="modal-header">- <h5 id="modal-title" class="modal-title">Issue Board</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>Issue Board</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">@@ -9,7 +9,7 @@</div><div class="modal-footer"><input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" t:value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex c8370f9d6e..25a7bf6a6e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.issue.board;+import static io.onedev.server.web.translation.Translation._T;+import java.util.List;import javax.annotation.Nullable;@@ -67,11 +69,11 @@ public abstract class BoardEditPanel extends Panel {BoardSpec oldBoard = boards.get(boardIndex);if (!board.getName().equals(oldBoard.getName()) && getBoard(board.getName()) != null) {editor.error(new Path(new PathNode.Named("name")),- "This name has already been used by another board");+ _T("This name has already been used by another board"));}} else if (getBoard(board.getName()) != null) {editor.error(new Path(new PathNode.Named("name")),- "This name has already been used by another board");+ _T("This name has already been used by another board"));}if (editor.isValid()) {board.populateColumns();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.htmlindex ce2280a65a..66d7bf4c91 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html@@ -1,7 +1,7 @@<wicket:panel><form wicket:id="form" class="new-board-card leave-confirm"><div class="modal-header">- <h5 id="modal-title" class="modal-title">New Issue</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>New Issue</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">@@ -9,7 +9,7 @@</div><div class="modal-footer"><input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" t:value="Save"></input>- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex a61f673cf5..7113449f28 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -685,8 +685,8 @@ public abstract class IssueListPanel extends Panel {}if (withTimeTracking) {if (issue.getProject().isTimeTracking() && issue.getTotalEstimatedTime() != 0) {- worksheet.value(rowIndex, colIndex++, timeTrackingSetting.formatWorkingPeriod(issue.getTotalEstimatedTime()));- worksheet.value(rowIndex, colIndex++, timeTrackingSetting.formatWorkingPeriod(issue.getTotalSpentTime()));+ worksheet.value(rowIndex, colIndex++, timeTrackingSetting.formatWorkingPeriod(issue.getTotalEstimatedTime(), true));+ worksheet.value(rowIndex, colIndex++, timeTrackingSetting.formatWorkingPeriod(issue.getTotalSpentTime(), true));} else {colIndex++;colIndex++;@@ -769,8 +769,8 @@ public abstract class IssueListPanel extends Panel {if (withTimeTracking) {if (issue.getProject().isTimeTracking() && issue.getTotalEstimatedTime() != 0) {- row.add(timeTrackingSetting.formatWorkingPeriod(issue.getTotalEstimatedTime()));- row.add(timeTrackingSetting.formatWorkingPeriod(issue.getTotalSpentTime()));+ row.add(timeTrackingSetting.formatWorkingPeriod(issue.getTotalEstimatedTime(), true));+ row.add(timeTrackingSetting.formatWorkingPeriod(issue.getTotalSpentTime(), true));} else {row.add("");row.add("");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.javaindex 5d153e3e49..e4ed06c581 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java@@ -50,8 +50,8 @@ public abstract class QueriedIssuesProgressPanel extends Panel {}));var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();- fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getEstimatedTime())));- fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getSpentTime())));+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getEstimatedTime(), true)));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getSpentTime(), true)));add(fragment);} else {add(new Fragment("content", "noQueryFrag", this));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.javaindex 94451d5e3b..c5c50429f0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java@@ -48,37 +48,37 @@ abstract class TimingDetailPanel extends Panel {var fragment = new Fragment("content", "aggregationFrag", this);int estimatedTime = getIssue().getTotalEstimatedTime();- fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime)));- fragment.add(new Label("ownEstimatedTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnEstimatedTime())));+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime, true)));+ fragment.add(new Label("ownEstimatedTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnEstimatedTime(), true)));fragment.add(newEstimatedTimeEditLink("editOwnEstimatedTime"));int aggregatedTime = getTimeTrackingManager().aggregateSourceLinkEstimatedTime(getIssue(), timeAggregationLink);aggregatedTime += getTimeTrackingManager().aggregateTargetLinkEstimatedTime(getIssue(), timeAggregationLink);fragment.add(new Label("estimatedTimeAggregationLink", timeAggregationLink));- fragment.add(new Label("aggregatedEstimatedTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime)));+ fragment.add(new Label("aggregatedEstimatedTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime, true)));int spentTime = getIssue().getTotalSpentTime();- fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime)));- fragment.add(new Label("ownSpentTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnSpentTime())));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime, true)));+ fragment.add(new Label("ownSpentTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnSpentTime(), true)));fragment.add(newLogWorkLink("logWork"));fragment.add(newStartWorkLink("startWork"));aggregatedTime = getTimeTrackingManager().aggregateSourceLinkSpentTime(getIssue(), timeAggregationLink);aggregatedTime += getTimeTrackingManager().aggregateTargetLinkSpentTime(getIssue(), timeAggregationLink);fragment.add(new Label("spentTimeAggregationLink", timeAggregationLink));- fragment.add(new Label("aggregatedSpentTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime)));+ fragment.add(new Label("aggregatedSpentTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime, true)));add(fragment);} else {var fragment = new Fragment("content", "noAggregationFrag", this);int estimatedTime = getIssue().getTotalEstimatedTime();- fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime)));+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime, true)));fragment.add(newEstimatedTimeEditLink("editEstimatedTime"));int spentTime = getIssue().getTotalSpentTime();- fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime)));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime, true)));fragment.add(newLogWorkLink("logWork"));fragment.add(newStartWorkLink("startWork"));diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.javaindex 4e732b9353..2660852251 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java@@ -2,6 +2,7 @@ package io.onedev.server.web.component.iteration;import static io.onedev.server.util.DateUtils.formatDate;import static io.onedev.server.util.DateUtils.toDate;+import static io.onedev.server.web.translation.Translation._T;import static java.time.LocalDate.ofEpochDay;import java.time.LocalDate;@@ -27,15 +28,15 @@ public class IterationDateLabel extends Label {Iteration iteration = iterationIModel.getObject();if (iteration.getStartDay() != null && iteration.getDueDay() != null) {return ""- + "<span title='Start date'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span>"+ + "<span data-tippy-content='" + _T("Start date") + "'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span>"+ " " + arrow + " "- + "<span title='Due date'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";+ + "<span data-tippy-content='" + _T("Due date") + "'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";} else if (iteration.getStartDay() != null) {- return "<span title='Start date'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span> " + arrow;+ return "<span data-tippy-content='" + _T("Start date") + "'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span> " + arrow;} else if (iteration.getDueDay() != null) {- return arrow + " <span title='Due date'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";+ return arrow + " <span data-tippy-content='" + _T("Due date") + "'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";} else {- return "<i> No start/due date</i>";+ return "<i>" + _T("No start/due date") + "</i>";}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.htmlindex f092cf2ddb..b92f3592a5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.html@@ -1,10 +1,10 @@<wicket:panel><span class="actions d-inline-flex align-items-center">- <a wicket:id="reopen" t:data-tippy-content="Reopen this iteration">Reopen</a>- <a wicket:id="close" t:data-tippy-content="Close this iteration">Close</a>+ <a wicket:id="reopen" t:data-tippy-content="Reopen this iteration"><wicket:t>Reopen</wicket:t></a>+ <a wicket:id="close" t:data-tippy-content="Close this iteration"><wicket:t>Close</wicket:t></a><span class="dot mx-2"></span>- <a wicket:id="edit" t:data-tippy-content="Edit this iteration">Edit</a>+ <a wicket:id="edit" t:data-tippy-content="Edit this iteration"><wicket:t>Edit</wicket:t></a><span class="dot mx-2"></span>- <a wicket:id="delete" t:data-tippy-content="Delete this iteration">Delete</a>+ <a wicket:id="delete" t:data-tippy-content="Delete this iteration"><wicket:t>Delete</wicket:t></a></span></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.javaindex 15056a7e9c..30f09d77dd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/actions/IterationActionsPanel.java@@ -1,5 +1,9 @@package io.onedev.server.web.component.iteration.actions;+import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -35,7 +39,7 @@ public abstract class IterationActionsPanel extends GenericPanel<Iteration> {getIterationManager().createOrUpdate(getIteration());target.add(IterationActionsPanel.this);onUpdated(target);- getSession().success("Iteratioin '" + getIteration().getName() + "' reopened");+ getSession().success(MessageFormat.format(_T("Iteration \"{0}\" reopened"), getIteration().getName()));}@Override@@ -60,7 +64,7 @@ public abstract class IterationActionsPanel extends GenericPanel<Iteration> {getIterationManager().createOrUpdate(getIteration());target.add(IterationActionsPanel.this);onUpdated(target);- getSession().success("Iteration '" + getIteration().getName() + "' closed");+ getSession().success(MessageFormat.format(_T("Iteration \"{0}\" closed"), getIteration().getName()));}});@@ -74,7 +78,7 @@ public abstract class IterationActionsPanel extends GenericPanel<Iteration> {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);attributes.getAjaxCallListeners().add(new ConfirmClickListener(- "Do you really want to delete iteration '" + getIteration().getName() + "'?"));+ MessageFormat.format(_T("Do you really want to delete iteration \"{0}\"?"), getIteration().getName())));}@Override@@ -82,7 +86,7 @@ public abstract class IterationActionsPanel extends GenericPanel<Iteration> {getIterationManager().delete(getIteration());target.add(IterationActionsPanel.this);onDeleted(target);- getSession().success("Iteration '" + getIteration().getName() + "' deleted");+ getSession().success(MessageFormat.format(_T("Iteration \"{0}\" deleted"), getIteration().getName()));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.javaindex d0ca251bca..bc075b06d5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/BurndownIndicators.java@@ -1,5 +1,11 @@package io.onedev.server.web.component.iteration.burndown;+import static io.onedev.server.web.translation.Translation._T;+import static java.util.stream.Collectors.toList;++import java.util.ArrayList;+import java.util.List;+import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.SettingManager;@@ -8,11 +14,6 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.web.util.WicketUtils;-import java.util.ArrayList;-import java.util.List;--import static java.util.stream.Collectors.toList;-public class BurndownIndicators {public static final String ISSUE_COUNT = "Issue Count";@@ -47,4 +48,16 @@ public class BurndownIndicators {return ISSUE_COUNT;}+ public static String getDisplayName(String indicator) {+ if (indicator.equals(REMAINING_TIME)) {+ return _T("Remaining time");+ } else if (indicator.equals(ESTIMATED_TIME)) {+ return _T("Estimated time");+ } else if (indicator.equals(ISSUE_COUNT)) {+ return _T("Issue count");+ } else {+ return indicator;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.javaindex 190873337c..e6f6b3e790 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java@@ -5,7 +5,9 @@ import static io.onedev.server.web.component.iteration.burndown.BurndownIndicatoimport static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.ISSUE_COUNT;import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.REMAINING_TIME;import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getDefault;+import static io.onedev.server.web.translation.Translation._T;+import java.text.MessageFormat;import java.time.LocalDate;import java.time.ZoneId;import java.util.ArrayList;@@ -58,12 +60,12 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {if (getIteration().getStartDay() != null && getIteration().getDueDay() != null) {if (getIteration().getStartDay() < getIteration().getDueDay()) {if (getIteration().getDueDay() - getIteration().getStartDay() >= MAX_DAYS)- message = "Iteration spans too long to show burndown chart";+ message = _T("Iteration spans too long to show burndown chart");} else {- message = "Iteration start date should be before due date";+ message = _T("Iteration start date should be before due date");}} else {- message = "Iteration start and due date should be specified to show burndown chart";+ message = _T("Iteration start and due date should be specified to show burndown chart");}if (message != null) {var fragment = new Fragment("content", "messageFrag", this);@@ -144,7 +146,7 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {guidelineYAxisValues.add(initialIssueMetric);}- lines.add(new Line("Guide Line", guidelineYAxisValues, "#7E8299", null, "dashed"));+ lines.add(new Line(_T("Guide Line"), guidelineYAxisValues, "#7E8299", null, "dashed"));String yAxisValueFormatter;if (getIndicator().equals(REMAINING_TIME) || getIndicator().equals(ESTIMATED_TIME)) {@@ -169,7 +171,7 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {@Overridepublic String getObject() {if (aggregationLink != null && (getIndicator().equals(ESTIMATED_TIME) || getIndicator().equals(REMAINING_TIME)))- return"To avoid duplication, estimated/remaining time showing here does not include those aggregated from '" + aggregationLink + "'";+ return MessageFormat.format(_T("To avoid duplication, estimated/remaining time showing here does not include those aggregated from \"{0}\""), aggregationLink);elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.htmlindex db24c10133..f5bf126d24 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.html@@ -3,11 +3,11 @@<div class="card-body"><div class="d-flex align-items-center flex-wrap"><span wicket:id="states" class="btn-group mr-4 mb-4">- <a wicket:id="open" class="btn btn-outline-secondary">Open</a>- <a wicket:id="closed" class="btn btn-outline-secondary">Closed</a>+ <a wicket:id="open" class="btn btn-outline-secondary"><wicket:t>Open</wicket:t></a>+ <a wicket:id="closed" class="btn btn-outline-secondary"><wicket:t>Closed</wicket:t></a></span><div class="mr-4 mb-4">- <a wicket:id="sort" class="btn btn-outline-secondary">Sort <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>+ <a wicket:id="sort" class="btn btn-outline-secondary"><wicket:t>Sort</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a></div><a wicket:id="newIteration" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon mr-1"></wicket:svg></a></div>@@ -19,6 +19,6 @@</wicket:fragment><wicket:fragment wicket:id="nameFrag"><a wicket:id="link"><span wicket:id="label"></span></a>- <span wicket:id="inherited" class="badge badge-info badge-sm ml-2">Inherited</span>+ <span wicket:id="inherited" class="badge badge-info badge-sm ml-2"><wicket:t>Inherited</wicket:t></span></wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.javaindex 60b1235ab9..371bd5121c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.component.iteration.list;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -217,7 +219,7 @@ public class IterationListPanel extends GenericPanel<Project> {List<IColumn<Iteration, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<>(Model.of("Name")) {+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {@Overridepublic String getCssClass() {@@ -256,7 +258,7 @@ public class IterationListPanel extends GenericPanel<Project> {});- columns.add(new AbstractColumn<>(Model.of("Start/Due Date")) {+ columns.add(new AbstractColumn<>(Model.of(_T("Start/Due Date"))) {@Overridepublic String getCssClass() {@@ -271,7 +273,7 @@ public class IterationListPanel extends GenericPanel<Project> {});- columns.add(new AbstractColumn<>(Model.of("Description")) {+ columns.add(new AbstractColumn<>(Model.of(_T("Description"))) {@Overridepublic String getCssClass() {@@ -286,7 +288,7 @@ public class IterationListPanel extends GenericPanel<Project> {});- columns.add(new AbstractColumn<>(Model.of("Issue Stats")) {+ columns.add(new AbstractColumn<>(Model.of(_T("Issue Stats"))) {@Overridepublic String getCssClass() {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.javaindex 6afb2e905b..dc5c833ee3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java@@ -29,7 +29,7 @@ public class WorkingPeriodEditSupport implements EditSupport {protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();- return new Label(id, timeTrackingSetting.formatWorkingPeriod(model.getObject()));+ return new Label(id, timeTrackingSetting.formatWorkingPeriod(model.getObject(), true));} else {return new EmptyValueLabel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex 19962b3b2f..848d3b0158 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -31,7 +31,7 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {String period;if (getModelObject() != null)- period = getTimeTrackingSetting().formatWorkingPeriod(getModelObject()).toString();+ period = getTimeTrackingSetting().formatWorkingPeriod(getModelObject(), false);elseperiod = null;input = new TextField<>("input", Model.of(period));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.htmlindex 8966c85ec6..71658bcd9f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.html@@ -1,7 +1,7 @@<wicket:extend><div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> Define default issue boards for all projects here.- A certain project can override this setting to define its own issue boards.+ <wicket:svg href="bulb" class="icon"/> <wicket:t>Define default issue boards for all projects here.+ A certain project can override this setting to define its own issue boards.</wicket:t></div><a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" t:data-tippy-content="Add default issue board"><wicket:svg href="plus" class="icon"></wicket:svg></a><table wicket:id="issueBoards" class="table table-hover"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.javaindex 0423f290b2..4ca45111d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/defaultboard/DefaultBoardListPage.java@@ -31,6 +31,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -161,7 +163,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this board?"));+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(_T("Do you really want to delete this board?")));}@Override@@ -211,7 +213,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Default Issue Boards");+ return new Label(componentId, _T("Default Issue Boards"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.htmlindex aedb09dc69..873ed6905c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="content d-flex flex-column flex-grow-1 overflow-hidden"><div class="head d-flex align-items-center flex-shrink-0">- <span class="mr-2">Backlog</span>+ <span class="mr-2"><wicket:t>Backlog</wicket:t></span><span wicket:id="count" class="card-count badge badge-secondary badge-sm mr-2"></span><div class="ml-auto"><a wicket:id="addCard" t:data-tippy-content="Add new card to this column" class="add-card"><wicket:svg href="plus" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex f9b16b9b2f..cf6ab22c30 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -42,6 +42,7 @@ import java.util.List;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsEmpty;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsNot;import static io.onedev.server.security.SecurityUtils.canManageIssues;+import static io.onedev.server.web.translation.Translation._T;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;abstract class BacklogColumnPanel extends AbstractColumnPanel {@@ -160,7 +161,7 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {@Overrideprotected void respond(AjaxRequestTarget target) {if (!canManageIssues(getProject()))- throw new UnauthorizedException("Permission denied");+ throw new UnauthorizedException(_T("Permission denied"));IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();var issueId = params.getParameterValue("issueId").toLong();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex aa0faf94a2..0a36569d0b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.issues.boards;import static io.onedev.server.security.SecurityUtils.canAccessIssue;import static io.onedev.server.security.SecurityUtils.canManageIssues;import static io.onedev.server.security.SecurityUtils.getAuthUser;+import static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;import java.util.Collections;@@ -359,7 +360,7 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {Hibernate.initialize(iteration);send(getPage(), Broadcast.BREADTH, new IssueDragging(target, issue));} else {- Session.get().warn("Issue management permission required to move issues");+ Session.get().warn(_T("Issue management permission required to move issues"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 16677c3e34..77c41636d7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -63,6 +63,7 @@ import java.util.concurrent.atomic.AtomicReference;import static io.onedev.server.search.entity.issue.IssueQueryLexer.*;import static io.onedev.server.security.SecurityUtils.canManageIssues;+import static io.onedev.server.web.translation.Translation._T;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;abstract class BoardColumnPanel extends AbstractColumnPanel {@@ -249,7 +250,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {if (fieldSpec != null)title = "<i>" + HtmlEscape.escapeHtml5(fieldSpec.getNameOfEmptyValue()) + "</i>";else- title = "<i>No value</i>";+ title = "<i>" + _T("No value") + "</i>";}WebMarkupContainer head = new WebMarkupContainer("head");@@ -347,7 +348,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {@Overrideprotected void respond(AjaxRequestTarget target) {if (!canManageIssues(getProject()))- throw new UnauthorizedException("Permission denied");+ throw new UnauthorizedException(_T("Permission denied"));IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();var issueId = params.getParameterValue("issueId").toLong();@@ -432,7 +433,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {} else {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null)- throw new ExplicitException("Undefined custom field: " + fieldName);+ throw new ExplicitException(_T("Undefined custom field: ") + fieldName);Serializable fieldBean = issue.getFieldBean(FieldUtils.getFieldBeanClass(), true);BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());@@ -495,7 +496,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {}}- new DependentFieldsEditor(target, fieldBean, propertyNames, false, "Dependent Fields");+ new DependentFieldsEditor(target, fieldBean, propertyNames, false, _T("Dependent Fields"));} else {getIssueChangeManager().changeFields(issue, fieldValues);cardListPanel.onCardDropped(target, issueId, cardIndex, true);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.htmlindex 7cee6ac9f1..83dd5e8f4e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html@@ -17,6 +17,6 @@</div><wicket:fragment wicket:id="commitsFrag"><div wicket:id="commits" class="commits"></div>- <div class="font-size-sm text-muted"><wicket:svg href="info-circle" class="icon"/> This page lists recent commits fixing the issue</div>+ <div class="font-size-sm text-muted"><wicket:svg href="info-circle" class="icon"/> <wicket:t>This page lists recent commits fixing the issue</wicket:t></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 7735307390..6e8515bc4a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.boards;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -116,7 +118,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});List<Tab> tabs = new ArrayList<>();- tabs.add(new AjaxActionTab(Model.of("Activities")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Activities"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -134,7 +136,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteif (!getIssue().getFixCommits(false).isEmpty()) {if (SecurityUtils.canReadCode(getIssue().getProject())) {- tabs.add(new AjaxActionTab(Model.of("Fixing Commits")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Fixing Commits"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -146,7 +148,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});if (!getIssue().getPullRequests().isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Pull Requests"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -166,7 +168,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte}}- tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Fixing Builds"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -191,7 +193,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {- tabs.add(new AjaxActionTab(Model.of("Authorizations")) {+ tabs.add(new AjaxActionTab(Model.of(_T("Authorizations"))) {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {@@ -232,7 +234,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this issue?"));+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(_T("Do you really want to delete this issue?")));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex 87bf9f9c73..c4b8a9b35b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -9,7 +9,7 @@<span wicket:id="label"></span><wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg></a>- <a wicket:id="backlog" t:data-tippy-content="Show issues not scheduled into current iteration" class="bg-white backlog btn btn-outline-secondary btn-hover-primary text-nowrap"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Backlog</a>+ <a wicket:id="backlog" t:data-tippy-content="Show issues not scheduled into current iteration" class="bg-white backlog btn btn-outline-secondary btn-hover-primary text-nowrap"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> <wicket:t>Backlog</wicket:t></a><a wicket:id="iteration" t:data-tippy-content="Iteration" class="iteration-selector btn text-nowrap bg-white"><wicket:svg href="iteration" class="icon mr-2"></wicket:svg><span wicket:id="label"></span>@@ -35,20 +35,20 @@</wicket:fragment><wicket:fragment wicket:id="noBoardsFrag"><div class="alert alert-outline-secondary bg-white shadow no-boards">- <span class="mr-3">No issue boards defined</span>- <a wicket:id="newBoard" class="mr-3"><wicket:svg href="plus" class="icon mr-1"></wicket:svg>Add New</a>- <a wicket:id="useDefault"><wicket:svg href="undo" class="icon"></wicket:svg>Use Default</a>+ <span class="mr-3"><wicket:t>No issue boards defined</wicket:t></span>+ <a wicket:id="newBoard" class="mr-3"><wicket:svg href="plus" class="icon mr-1"></wicket:svg><wicket:t>Add New</wicket:t></a>+ <a wicket:id="useDefault"><wicket:svg href="undo" class="icon"></wicket:svg><wicket:t>Use Default</wicket:t></a></div></wicket:fragment><wicket:fragment wicket:id="boardMenuFrag"><div class="board-menu p-4">- <div class="text-muted mb-3"><wicket:svg href="bulb" class="icon"/> The first board will be the default board</div>+ <div class="text-muted mb-3"><wicket:svg href="bulb" class="icon"/> <wicket:t>The first board will be the default board</wicket:t></div><table class="boards table"><tr wicket:id="boards" class="board"><td class="name"><span wicket:id="dragIndicator" class="drag-indicator"><wicket:svg href="grip" class="icon"/></span><a wicket:id="select" class="select"><span wicket:id="name"></span></a>- <span wicket:id="default" class="badge badge-sm badge-light-info ml-2">default</span>+ <span wicket:id="default" class="badge badge-sm badge-light-info ml-2"><wicket:t>default</wicket:t></span></td><td wicket:id="actions" class="actions text-right"><a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" t:data-tippy-content="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>@@ -57,8 +57,8 @@</td></tr></table>- <a wicket:id="newBoard" class="btn btn-light btn-hover-primary btn-sm btn-block new-board"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Add New Board</a>- <a wicket:id="useDefault" class="btn btn-light btn-hover-primary btn-sm btn-block use-global"><wicket:svg href="undo" class="icon mr-2"></wicket:svg> Use Default Boards</a>+ <a wicket:id="newBoard" class="btn btn-light btn-hover-primary btn-sm btn-block new-board"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> <wicket:t>Add New Board</wicket:t></a>+ <a wicket:id="useDefault" class="btn btn-light btn-hover-primary btn-sm btn-block use-global"><wicket:svg href="undo" class="icon mr-2"></wicket:svg> <wicket:t>Use Default Boards</wicket:t></a></div></wicket:fragment><wicket:fragment wicket:id="iterationMenuFrag">@@ -68,7 +68,7 @@<tr wicket:id="iterations" class="iteration"><td class="name text-nowrap"><a wicket:id="select"><span wicket:id="name"></span></a>- <span wicket:id="inherited" class="ml-2 badge badge-info badge-sm">Inherited</span>+ <span wicket:id="inherited" class="ml-2 badge badge-info badge-sm"><wicket:t>Inherited</wicket:t></span><a wicket:id="burndown" t:data-tippy-content="Burndown chart" class="ml-2"><wicket:svg href="burndown" class="icon"/></a></td><td class="status text-nowrap">@@ -83,18 +83,18 @@</tr></table></wicket:enclosure>- <a wicket:id="showClosed" class="show-closed btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="double-arrow" class="icon rotate-90 mr-2"></wicket:svg> Show Closed</a>- <a wicket:id="unscheduled" class="no-iteration btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Unscheduled Issues</a>- <a wicket:id="all" class="all btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="all" class="icon mr-2"></wicket:svg> All Issues</a>- <a wicket:id="newIteration" class="new-iterations btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Create Iteration</a>+ <a wicket:id="showClosed" class="show-closed btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="double-arrow" class="icon rotate-90 mr-2"></wicket:svg> <wicket:t>Show Closed</wicket:t></a>+ <a wicket:id="unscheduled" class="no-iteration btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> <wicket:t>Unscheduled Issues</wicket:t></a>+ <a wicket:id="all" class="all btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="all" class="icon mr-2"></wicket:svg> <wicket:t>All Issues</wicket:t></a>+ <a wicket:id="newIteration" class="new-iterations btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> <wicket:t>Create Iteration</wicket:t></a></div></wicket:fragment><wicket:fragment wicket:id="iterationActionsFrag">- <a wicket:id="close" class="action">Close</a>- <a wicket:id="reopen" class="action">Reopen</a>+ <a wicket:id="close" class="action"><wicket:t>Close</wicket:t></a>+ <a wicket:id="reopen" class="action"><wicket:t>Reopen</wicket:t></a><span class="dot mx-2"></span>- <a wicket:id="edit" class="action">Edit</a>+ <a wicket:id="edit" class="action"><wicket:t>Edit</wicket:t></a><span class="dot mx-2"></span>- <a wicket:id="delete" class="action">Delete</a>+ <a wicket:id="delete" class="action"><wicket:t>Delete</wicket:t></a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex a1899e38b3..de70dee9f0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -1,5 +1,46 @@package io.onedev.server.web.page.project.issues.boards;+import static io.onedev.server.model.Issue.NAME_BOARD_POSITION;+import static io.onedev.server.web.translation.Translation._T;+import static java.util.stream.Collectors.toList;++import java.io.Serializable;+import java.text.MessageFormat;+import java.util.Date;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.commons.lang3.math.NumberUtils;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+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.feedback.IFeedbackMessageFilter;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+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.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IterationManager;@@ -32,43 +73,6 @@ import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.page.project.issues.iteration.IterationBurndownPage;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.editbean.IterationEditBean;-import org.apache.commons.lang3.SerializationUtils;-import org.apache.commons.lang3.StringUtils;-import org.apache.commons.lang3.math.NumberUtils;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-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.feedback.IFeedbackMessageFilter;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-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.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import javax.annotation.Nullable;-import java.io.Serializable;-import java.util.Date;-import java.util.List;--import static io.onedev.server.model.Issue.NAME_BOARD_POSITION;-import static java.util.stream.Collectors.toList;public class IssueBoardsPage extends ProjectIssuesPage {@@ -139,9 +143,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {query = IssueQuery.parse(getProject(), queryString, option, true);} catch (Exception e) {if (e instanceof ExplicitException)- contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));+ contentFrag.error(new QueryParseMessage(backlog, _T("Error parsing %squery: ") + e.getMessage()));else- contentFrag.error(new QueryParseMessage(backlog, "Malformed %squery"));+ contentFrag.error(new QueryParseMessage(backlog, _T("Malformed %squery")));return null;}@@ -150,9 +154,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {baseQuery = IssueQuery.parse(getProject(), baseQueryString, option, true);} catch (Exception e) {if (e instanceof ExplicitException)- contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));+ contentFrag.error(new QueryParseMessage(backlog, _T("Error parsing %sbase query: ") + e.getMessage()));else- contentFrag.error(new QueryParseMessage(backlog, "Malformed %sbase query"));+ contentFrag.error(new QueryParseMessage(backlog, _T("Malformed %sbase query")));return null;}query = IssueQuery.merge(baseQuery, query);@@ -172,7 +176,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {if (StringUtils.isNotBlank(boardName)) {boardIndex = BoardSpec.getBoardIndex(boards, boardName);if (boardIndex == -1)- throw new ExplicitException("Can not find issue board: " + boardName);+ throw new ExplicitException(_T("Can not find issue board: ") + boardName);} else {boardIndex = 0;}@@ -295,7 +299,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {&& getProject().getIssueSetting().getBoardSpecs() != null);}- }.add(new ConfirmClickModifier("This will discard all project specific boards, do you want to continue?")));+ }.add(new ConfirmClickModifier(_T("This will discard all project specific boards, do you want to continue?"))));menuFragment.add(new ListView<BoardSpec>("boards", boards) {@@ -363,7 +367,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {setResponsePage(IssueBoardsPage.class, params);}- }.add(new ConfirmClickModifier("Do you really want to delete board '" + item.getModelObject().getName() + "'?") ));+ }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete board \"{0}\"?"), item.getModelObject().getName()))));}});@@ -437,10 +441,10 @@ public class IssueBoardsPage extends ProjectIssuesPage {super.onInitialize();if (getIterationSelection() instanceof IterationSelection.All) {- add(new Label("label", "<i>All</i>").setEscapeModelStrings(false));+ add(new Label("label", "<i>" + _T("All") + "</i>").setEscapeModelStrings(false));add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));} else if (getIterationSelection() instanceof IterationSelection.Unscheduled) {- add(new Label("label", "<i>Unscheduled</i>").setEscapeModelStrings(false));+ add(new Label("label", "<i>" + _T("Unscheduled") + "</i>").setEscapeModelStrings(false));add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));} else {var iteration = getIterationSelection().getIteration();@@ -493,9 +497,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {}dropdown.close();if (iteration.isClosed())- Session.get().success("Iteration '" + iteration.getName() + "' is closed");+ Session.get().success(MessageFormat.format(_T("Iteration \"{0}\" is closed"), iteration.getName()));else- Session.get().success("Iteration '" + iteration.getName() + "' is reopened");+ Session.get().success(MessageFormat.format(_T("Iteration \"{0}\" is reopened"), iteration.getName()));}@Override@@ -568,7 +572,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {public void onClick(AjaxRequestTarget target) {dropdown.close();- new BeanEditModalPanel<>(target, bean, "Edit Iteration") {+ new BeanEditModalPanel<>(target, bean, _T("Edit Iteration")) {@Overrideprotected String onSave(AjaxRequestTarget target, IterationEditBean bean) {@@ -590,7 +594,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);attributes.getAjaxCallListeners().add(new ConfirmClickListener(- "Do you really want to delete iteration '" + item.getModelObject().getName() + "'?"));+ MessageFormat.format(_T("Do you really want to delete iteration \"{0}\"?"), item.getModelObject().getName())));}@Override@@ -606,7 +610,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {} else {getIterationManager().delete(iteration);}- Session.get().success("Iteration '" + iteration.getName() + "' deleted");+ Session.get().success(MessageFormat.format(_T("Iteration \"{0}\" deleted"), iteration.getName()));}});@@ -663,7 +667,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {public void onClick(AjaxRequestTarget target) {dropdown.close();var bean = IterationEditBean.ofNew(getProject(), getBoard().getIterationPrefix());- new BeanEditModalPanel<>(target, bean, "Create Iteration") {+ new BeanEditModalPanel<>(target, bean, _T("Create Iteration")) {@Overrideprotected String onSave(AjaxRequestTarget target, IterationEditBean bean) {@@ -732,9 +736,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {});if (backlog)- queryInput.add(AttributeAppender.append("placeholder", "Filter backlog issues"));+ queryInput.add(AttributeAppender.append("placeholder", _T("Filter backlog issues")));else- queryInput.add(AttributeAppender.append("placeholder", "Filter issues"));+ queryInput.add(AttributeAppender.append("placeholder", _T("Filter issues")));form.add(queryInput);@@ -980,19 +984,19 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overridepublic String toString() {- return String.format(template, backlog?"backlog ":"");+ return String.format(template, backlog?_T("backlog "):"");}}@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Issue Boards");+ return new Label(componentId, _T("Issue Boards"));}@Overrideprotected String getPageTitle() {- return "Issue Boards - " + getProject().getPath();+ return _T("Issue Boards") + " - " + getProject().getPath();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.htmlindex 8c57aa881c..ad614a7faa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html@@ -1,7 +1,7 @@<wicket:panel><form wicket:id="form" class="leave-confirm new-board"><div class="modal-header">- <h5 id="modal-title" class="modal-title">New Board</h5>+ <h5 id="modal-title" class="modal-title"><wicket:t>New Board</wicket:t></h5><button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">@@ -9,7 +9,7 @@</div><div class="modal-footer"><input wicket:id="create" type="submit" class="dirty-aware btn btn-primary" t:value="Create"></input>- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex aae4db06f2..b5fd065a71 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -17,6 +17,8 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;+import static io.onedev.server.web.translation.Translation._T;+import java.util.List;abstract class NewBoardPanel extends Panel {@@ -47,7 +49,7 @@ abstract class NewBoardPanel extends Panel {int indexWithSameName = BoardSpec.getBoardIndex(boards, newBoard.getName());if (indexWithSameName != -1) {editor.error(new Path(new PathNode.Named("name")),- "This name has already been used by another issue board in the project");+ _T("This name has already been used by another issue board in the project"));}if (editor.isValid()){newBoard.populateColumns();@@ -55,7 +57,7 @@ abstract class NewBoardPanel extends Panel {boards.add(newBoard);getProject().getIssueSetting().setBoardSpecs(boards);OneDev.getInstance(ProjectManager.class).update(getProject());- Session.get().success("New issue board created");+ Session.get().success(_T("New issue board created"));onBoardCreated(target, newBoard);} else {target.add(NewBoardPanel.this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.htmlindex d3ee06b679..a070325755 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html@@ -9,7 +9,7 @@</div><div class="modal-footer"><input wicket:id="ok" type="submit" class="btn btn-primary" t:value="Ok"></input>- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a></div></form></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.htmlindex 3ad16c78eb..939105a2ee 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="d-flex align-items-center flex-nowrap mb-4">- <span class="font-size-lg mr-3">Show States By</span> <div class="flex-shrink-1"><select wicket:id="by" class="form-control"></select></div>+ <span class="font-size-lg mr-3"><wicket:t>Show States By</wicket:t></span> <div class="flex-shrink-1"><select wicket:id="by" class="form-control"></select></div></div><div wicket:id="burndown" class="rounded border-secondary border-dashed p-3"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.javaindex 26c190555a..fba31bbace 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationBurndownPage.java@@ -1,8 +1,13 @@package io.onedev.server.web.page.project.issues.iteration;-import io.onedev.server.model.Iteration;-import io.onedev.server.model.Project;-import io.onedev.server.web.component.iteration.burndown.IterationBurndownPanel;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getChoices;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getDefault;++import java.io.Serializable;+import java.util.List;++import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.markup.html.form.DropDownChoice;@@ -11,12 +16,10 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import javax.annotation.Nullable;-import java.io.Serializable;-import java.util.List;--import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getChoices;-import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getDefault;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.web.component.iteration.burndown.BurndownIndicators;+import io.onedev.server.web.component.iteration.burndown.IterationBurndownPanel;public class IterationBurndownPage extends IterationDetailPage {@@ -56,7 +59,7 @@ public class IterationBurndownPage extends IterationDetailPage {@Overridepublic Object getDisplayValue(String object) {- return object;+ return BurndownIndicators.getDisplayName(object);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.htmlindex c924ef5d93..0a20896a13 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.html@@ -4,11 +4,11 @@<div class="card-body"><div class="d-flex mb-4 align-items-center flex-wrap"><div wicket:id="name" class="name mr-3 font-weight-bold font-size-h6"></div>- <div wicket:id="inherited" class="badge badge-sm badge-info mr-3">Inherited</div>+ <div wicket:id="inherited" class="badge badge-sm badge-info mr-3"><wicket:t>Inherited</wicket:t></div><div wicket:id="status" class="status mr-3"></div><div wicket:id="dates" class="dates mr-3"></div><div wicket:id="actions" class="actions mr-3"></div>- <a wicket:id="create" class="mr-3">Create</a>+ <a wicket:id="create" class="mr-3"><wicket:t>Create</wicket:t></a></div><div wicket:id="description" class="mt-4 mb-2 alert alert-light"></div><ul wicket:id="iterationTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>@@ -18,7 +18,7 @@</div><wicket:fragment wicket:id="projectTitleFrag"><span class="d-flex align-items-center">- <a wicket:id="iterations">Iterations</a>+ <a wicket:id="iterations"><wicket:t>Iterations</wicket:t></a><span class="dot"></span><span wicket:id="iterationName" class="text-truncated"></span></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.javaindex 44ae11b51e..c5e763d333 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationDetailPage.java@@ -32,6 +32,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;+import static io.onedev.server.web.translation.Translation._T;+import java.util.ArrayList;import java.util.List;@@ -117,8 +119,8 @@ public abstract class IterationDetailPage extends ProjectPage {List<Tab> tabs = new ArrayList<>();var params = paramsOf(getProject(), getIteration());- tabs.add(new PageTab(Model.of("Issues"), IterationIssuesPage.class, params));- tabs.add(new PageTab(Model.of("Burndown"), IterationBurndownPage.class, params));+ tabs.add(new PageTab(Model.of(_T("Issues")), IterationIssuesPage.class, params));+ tabs.add(new PageTab(Model.of(_T("Burndown")), IterationBurndownPage.class, params));add(new Tabbable("iterationTabs", tabs).setOutputMarkupId(true));}@@ -152,7 +154,7 @@ public abstract class IterationDetailPage extends ProjectPage {@Overrideprotected String getPageTitle() {- return "Iteration " + getIteration().getName() + " - " + getProject().getPath();+ return _T("Iteration") + " " + getIteration().getName() + " - " + getProject().getPath();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.htmlindex 79354849f3..0b16a845d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.html@@ -11,11 +11,11 @@</div><wicket:fragment wicket:id="projectTitleFrag"><span class="d-flex align-items-center">- <a wicket:id="iterations">Iterations</a>+ <a wicket:id="iterations"><wicket:t>Iterations</wicket:t></a><span class="dot"></span><a wicket:id="iteration"><span wicket:id="name" class="text-truncated"></span></a><span class="dot"></span>- Edit+ <wicket:t>Edit</wicket:t></span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.javaindex 629342a7d3..a5d0c6c09a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationEditPage.java@@ -11,6 +11,9 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.editbean.IterationEditBean;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.markup.html.basic.Label;@@ -60,7 +63,7 @@ public class IterationEditPage extends ProjectPage {bean.update(getIteration());OneDev.getInstance(IterationManager.class).createOrUpdate(getIteration());- Session.get().success("Iteration saved");+ Session.get().success(_T("Iteration saved"));setResponsePage(IterationIssuesPage.class,IterationIssuesPage.paramsOf(getIteration().getProject(), getIteration(), null));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.javaindex 3fbd48872b..df9ec00951 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/iteration/IterationListPage.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.iteration;+import static io.onedev.server.web.translation.Translation._T;+import javax.annotation.Nullable;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -93,12 +95,12 @@ public class IterationListPage extends ProjectPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Iterations");+ return new Label(componentId, _T("Iterations"));}@Overrideprotected String getPageTitle() {- return "Iterations - " + getProject().getPath();+ return _T("Iterations") + " - " + getProject().getPath();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex 8b75c00847..8df5096e99 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@@ -93,10 +93,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Add Issue...", "添加工单...");m.put("Add Issues to Iteration", "将工单添加到迭代");m.put("Add New", "添加");+ m.put("Add New Board", "新建看板");m.put("Add New Email Address", "添加新电子邮件地址");+ m.put("Add New Timesheet", "新建时间表");m.put("Add SSH key", "添加 SSH 密钥");m.put("Add SSO provider", "添加 SSO 提供者");m.put("Add Spent Time", "添加已用时间");+ m.put("Add Timesheet", "新建时间表");m.put("Add a GPG Public Key", "添加一个 GPG 公钥");m.put("Add a SSH Key", "添加 SSH 密钥");m.put("Add after", "添加到后面");@@ -156,6 +159,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Alert Settings", "提醒设置");m.put("Alerts", "提醒");m.put("All", "全部");+ m.put("All Issues", "所有工单");m.put("All accessible", "所有可访问的");m.put("All builds", "所有构建");m.put("All changes", "所有更改");@@ -274,8 +278,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Avatar", "头像");m.put("Avatar Service Url", "头像服务地址");m.put("Avatar and name", "头像和名称");- m.put("Backlog", "待办事项");- m.put("Backlog Base Query", "待办基础查询");+ m.put("Backlog", "待办");+ m.put("Backlog Base Query", "待办工单基础查询");m.put("Backup", "备份");m.put("Backup Schedule", "备份计划");m.put("Backup Setting", "备份设置");@@ -286,6 +290,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Base64 encoded PEM format, starting with -----BEGIN CERTIFICATE----- and ending with -----END CERTIFICATE-----","Base64 编码的 PEM 格式,以 -----BEGIN CERTIFICATE----- 开头,以 -----END CERTIFICATE----- 结尾");m.put("Basic Settings", "基本设置");+ m.put("Basic settings updated", "基本设置已更新");m.put("Batch Edit All Queried Issues", "批量编辑所有查询的工单");m.put("Batch Edit Selected Issues", "批量编辑选定的工单");m.put("Batch Editing {0} Issues", "批量编辑 {0} 个工单");@@ -380,6 +385,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Builds", "构建");m.put("Buildx Builder", "Buildx构建器");m.put("Built In Fields Bean", "内建字段Bean");+ m.put("Burndown", "燃尽图");m.put("Burndown chart", "燃尽图");m.put("Button Image Url", "按钮图像地址");m.put("By Group", "按组");@@ -410,6 +416,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Can not delete yourself", "不能删除自己");m.put("Can not disable root account", "不能禁用根账户");m.put("Can not disable yourself", "不能禁用自己");+ m.put("Can not find issue board: ", "找不到工单看板:");m.put("Can not link to self", "不能链接到自己");m.put("Can not move project \"{0}\" to be under itself or its descendants", "不能将项目 \"{0}\" 移动到其自身或其子项目下");m.put("Can not perform this operation now", "当前无法执行此操作");@@ -495,6 +502,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Close", "关闭");m.put("Close Iteration", "关闭迭代");m.put("Close this iteration", "关闭此迭代");+ m.put("Closed", "已关闭");m.put("Closed Issue State", "已关闭的工单状态");m.put("Closest due date", "最近的截止日期");m.put("Clover Coverage Report", "Clover 覆盖率报告");@@ -609,6 +617,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Create Child Projects", "创建子项目");m.put("Create Group", "创建组");m.put("Create Issue", "创建工单");+ m.put("Create Iteration", "创建迭代");m.put("Create New", "新建");m.put("Create New File", "创建新文件");m.put("Create Project", "创建项目");@@ -659,6 +668,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Default Fixed Issue Filters", "默认已修复工单过滤器");m.put("Default Fixed Issue Filters Bean", "默认已修复工单过滤器 Bean");m.put("Default Group", "默认分组");+ m.put("Default Issue Boards", "默认工单看板");m.put("Default Merge Strategy", "默认合并策略");m.put("Default Multi Value Provider", "默认多值提供器");m.put("Default Project", "默认项目");@@ -674,6 +684,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {"默认角色影响系统中所有用户获得的默认权限。实际的默认权限将是该项目及其所有父项目中的默认角色所包含的<b class='text-warning'>所有权限</b>");m.put("Define all custom issue fields here. Each project can decide to use all or a subset of these fields via its issue transition setting. <b class=\"text-warning\">NOTE: </b> Newly defined fields by default only appear in new issues. Batch edit existing issues from issue list page if you want them to have these new fields","在此处定义所有自定义工单字段。每个项目可以通过其工单状态设置决定使用所有或这些字段的一个子集。<b class=\"text-warning\">注意:</b> 默认情况下,新定义的字段仅出现在新工单中。如果您希望这些新字段出现在现有工单中,请从工单列表页面批量编辑这些工单");+ m.put("Define default issue boards for all projects here. A certain project can override this setting to define its own issue boards.",+ "在此定义所有项目的默认工单看板。特定项目可以覆盖此设置以定义其自己的工单看板。");m.put("Delay for the first retry in seconds. Delay of subsequent retries will be calculated using an exponential back-off based on this value","首次重试的延迟时间(秒)。后续重试的延迟时间将基于该值进行指数退避计算");m.put("Delete", "删除");@@ -720,7 +732,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Deletions", "删除数");m.put("Denied", "拒绝");m.put("Dependencies & Services", "依赖与服务");+ m.put("Dependency Management", "依赖管理");m.put("Dependency job finished", "依赖任务已完成");+ m.put("Dependent Fields", "依赖字段");m.put("Descending", "降序");m.put("Description", "描述");m.put("Description Templates", "描述模板");@@ -762,13 +776,16 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Do you really want to cancel invitation to \"{0}\"?", "您真的要取消邀请 \"{0}\" 吗?");m.put("Do you really want to change target branch to {0}?", "确定要将目标分支更改为 {0} 吗?");m.put("Do you really want to delete \"{0}\"?", "您真的要删除 \"{0}\" 吗?");+ m.put("Do you really want to delete board \"{0}\"?", "您确定要删除看板 \"{0}\" 吗?");m.put("Do you really want to delete group \"{0}\"?", "您真的要删除组 \"{0}\" 吗?");+ m.put("Do you really want to delete iteration \"{0}\"?", "您确定要删除迭代 \"{0}\" 吗?");m.put("Do you really want to delete role \"{0}\"?", "确定要删除角色 \"{0}\" 吗?");m.put("Do you really want to delete selected query watches?", "您真的要删除选中的查询订阅吗?");m.put("Do you really want to delete tag {0}?", "确定要删除标签 {0} 吗?");m.put("Do you really want to delete this GPG key?", "您确定要删除此 GPG 密钥吗?");m.put("Do you really want to delete this SSH key?", "您确定要删除此 SSH 密钥吗?");m.put("Do you really want to delete this access token?", "您确定要删除此访问令牌吗?");+ m.put("Do you really want to delete this board?", "您确定要删除此看板吗?");m.put("Do you really want to delete this code comment and all its replies?", "您真的要删除此代码评论及其所有回复吗?");m.put("Do you really want to delete this code comment?", "您真的要删除此代码评论吗?");m.put("Do you really want to delete this email address?", "您真的要删除这个电子邮件地址吗?");@@ -777,6 +794,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Do you really want to delete this privilege?", "确定要删除此权限吗?");m.put("Do you really want to delete this pull request?", "确定要删除此合并请求吗?");m.put("Do you really want to delete this reply?", "您真的要删除此回复吗?");+ m.put("Do you really want to delete timesheet \"{0}\"?", "您真的要删除时间表 \"{0}\" 吗?");m.put("Do you really want to discard batched suggestions?", "您真的要丢弃批量建议吗?");m.put("Do you really want to enable this account?", "您真的要启用此账户吗?");m.put("Do you really want to remove password of this user?", "您真的要删除此用户的密码吗?");@@ -799,12 +817,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Dry Run", "试运行");m.put("Due Date", "截止日期");m.put("Due Date Issue Field", "截止日期工单字段");+ m.put("Due date", "截止日期");m.put("Duplicate authorizations found: {0}", "找到重复的授权:{0}");m.put("Durations", "持续时间");m.put("ESLint Report", "ESLint 报告");m.put("Edit", "编辑");m.put("Edit Avatar", "编辑头像");m.put("Edit Estimated Time", "编辑预计时间");+ m.put("Edit Iteration", "编辑迭代");m.put("Edit My Avatar", "编辑我的头像");m.put("Edit Source", "编辑源码");m.put("Edit Timesheet", "编辑工时表");@@ -886,6 +906,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Error cherry-picking to {0}: Merge conflicts detected", "cherry-pick 到 {0} 时出错:合并冲突检测到");m.put("Error cherry-picking to {0}: {1}", "cherry-pick 到 {0} 时出错:{1}");m.put("Error executing task", "执行任务时发生错误");+ m.put("Error parsing %sbase query: ", "解析%s基准查询时出错:");+ m.put("Error parsing %squery: ", "解析%s查询时出错:");m.put("Error parsing build spec", "解析构建规范时出错");m.put("Error reverting on {0}: Merge conflicts detected", "revert 到 {0} 时出错:合并冲突检测到");m.put("Error reverting on {0}: {1}", "revert 到 {0} 时出错:{1}");@@ -897,6 +919,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Estimated Time Edit Bean", "预计时间编辑 Bean");m.put("Estimated Time Issue Field", "预计时间工单字段");m.put("Estimated Time:", "预计时间");+ m.put("Estimated time", "预计时间");m.put("Estimated/Spent time. Click for details", "预计/已用时间。点击查看详情");m.put("Evaluate script to get choices", "运行脚本以获取选项");m.put("Evaluate script to get default value", "运行脚本以获取默认值");@@ -924,6 +947,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Expire Date", "过期日期");m.put("Expired", "已过期");m.put("Explicit SSL (StartTLS)", "显式 SSL (StartTLS)");+ m.put("Export", "导出");m.put("Export All Queried Issues To...", "导出所有查询的工单到...");m.put("Export CSV", "导出 CSV");m.put("Export XLSX", "导出 XLSX");@@ -962,12 +986,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Files to Be Analyzed", "要分析的文件");m.put("Filter", "过滤");m.put("Filter Issues", "过滤工单");+ m.put("Filter backlog issues", "过滤待办工单");m.put("Filter branches...", "过滤分支...");m.put("Filter by name", "按名称过滤");m.put("Filter by name or email address", "按名称或电子邮件地址过滤");m.put("Filter by name...", "按名称过滤...");m.put("Filter by path", "按路径过滤");m.put("Filter by test suite", "按测试套件筛选");+ m.put("Filter issues", "过滤工单");m.put("Filter roles", "过滤角色");m.put("Filter tags...", "过滤标签...");m.put("Filter targets", "筛选目标");@@ -1103,6 +1129,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Group created", "组已创建");m.put("Groups", "组");m.put("Groups Claim", "组声明");+ m.put("Guide Line", "引导线");m.put("HTTP(S)", "HTTP(S)");m.put("HTTP(S) Clone URL", "HTTP(S) 克隆 URL");m.put("Has Owner Permissions", "有所有者权限");@@ -1124,7 +1151,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("IMAP User", "IMAP 用户");m.put("IMPORTANT:", "重要:");m.put("Id", "ID");- m.put("Identify Field", "识别字段");+ m.put("Identify Field", "区分字段");m.put("If enabled, source branch will be deleted automatically after merge the pull request if user has permission to do that","如果启用,在用户有权限的情况下,源分支将在合并合并请求后自动删除");m.put("If specified, OneDev will only display iterations with this prefix", "如果指定,OneDev 将只显示具有此前缀的迭代");@@ -1197,6 +1224,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Incompatibilities", "不兼容性");m.put("Indicator", "指示器");m.put("Inherit from parent", "从父级继承");+ m.put("Inherited", "继承");m.put("Input Spec", "输入规范");m.put("Input URL", "输入 URL");m.put("Input allowed CORS origin, hit ENTER to add", "输入允许的 CORS 来源,按回车键添加");@@ -1230,6 +1258,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Is Site Admin", "是否为站点管理员");m.put("Issue", "工单");m.put("Issue #{0} deleted", "工单 #{0} 已删除");+ m.put("Issue Board", "看板");+ m.put("Issue Boards", "工单看板");m.put("Issue Close States", "工单关闭状态");m.put("Issue Creation Setting", "工单创建设置");m.put("Issue Creation Settings", "工单创建设置");@@ -1258,6 +1288,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Issue State Mapping", "工单状态映射");m.put("Issue State Mappings", "工单状态映射");m.put("Issue Statistics", "工单统计");+ m.put("Issue Stats", "工单统计");m.put("Issue Status Mapping", "工单状态映射");m.put("Issue Status Mappings", "工单状态映射");m.put("Issue Stopwatch Overdue", "工单计时器超时");@@ -1271,9 +1302,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Issue administrative permission inside a project, including batch operations over multiple issues","工单管理权限,包括对多个工单的批量操作");m.put("Issue already linked", "工单已链接");+ m.put("Issue count", "工单数量");m.put("Issue in state", "工单状态");m.put("Issue list", "工单列表");m.put("Issue management not enabled in this project", "工单管理未启用此项目");+ m.put("Issue management permission required to move issues", "移动工单需要管理员权限");m.put("Issue not exist or access denied", "工单不存在或访问被拒绝");m.put("Issue number", "工单编号");m.put("Issue query watch only affects new issues. To manage watch status of existing issues in batch, filter issues by watch status in issues page, and then take appropriate action",@@ -1290,11 +1323,20 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Issues moved", "工单已移动");m.put("Italic", "斜体");m.put("Iteration", "迭代");+ m.put("Iteration \"{0}\" closed", "迭代 \"{0}\" 已关闭");+ m.put("Iteration \"{0}\" deleted", "迭代 \"{0}\" 已删除");+ m.put("Iteration \"{0}\" is closed", "迭代 \"{0}\" 已关闭");+ m.put("Iteration \"{0}\" is reopened", "迭代 \"{0}\" 已重新打开");+ m.put("Iteration \"{0}\" reopened", "迭代 \"{0}\" 已重新打开");m.put("Iteration Edit Bean", "迭代编辑Bean");m.put("Iteration Name", "迭代名称");m.put("Iteration Names", "迭代名称");m.put("Iteration Prefix", "迭代前缀");m.put("Iteration list", "迭代列表");+ m.put("Iteration saved", "迭代已保存");+ m.put("Iteration spans too long to show burndown chart", "迭代时间跨度太长,无法显示燃尽图");+ m.put("Iteration start and due date should be specified to show burndown chart", "迭代开始和截止日期应指定以显示燃尽图");+ m.put("Iteration start date should be before due date", "迭代开始日期应早于截止日期");m.put("Iterations", "迭代");m.put("Iterations Bean", "迭代Bean");m.put("JIRA Issue Priority", "JIRA 工单优先级");@@ -1413,6 +1455,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Mail Service Bean", "邮件服务Bean");m.put("Mail service", "邮件服务");m.put("Mail service not configured", "邮件服务未配置");+ m.put("Malformed %sbase query", "解析%s基准查询时出错");+ m.put("Malformed %squery", "解析%s查询时出错");m.put("Malformed email address", "格式错误的电子邮件地址");m.put("Malformed query", "查询语法错误");m.put("Manage Job", "管理任务");@@ -1524,11 +1568,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Named Query", "命名查询");m.put("Network Options", "网络选项");m.put("Never expire", "永不过期");+ m.put("New Board", "新建看板");m.put("New Invitation Bean", "新邀请Bean");+ m.put("New Issue", "新工单");m.put("New Password", "新密码");m.put("New State", "新状态");m.put("New User Bean", "新用户Bean");m.put("New Value", "新值");+ m.put("New issue board created", "新建工单看板");m.put("New user created", "新用户创建成功");m.put("New version available. Red for security/critical update, yellow for bug fix, blue for feature update. Click to show changes. Disable in system setting","新版本可用。红色表示安全/关键更新,黄色表示错误修复,蓝色表示功能更新。点击查看更改。可在系统设置中禁用");@@ -1549,6 +1596,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No branch to revert on", "没有分支可以 revert");m.put("No branches Found", "未找到分支");m.put("No branches found", "未找到分支");+ m.put("No builds", "没有构建");+ m.put("No builds to cancel", "没有构建可以取消");+ m.put("No builds to delete", "没有构建可以删除");+ m.put("No builds to re-run", "没有构建可以重新运行");m.put("No comment", "无评论");m.put("No comments to delete", "没有要删除的评论");m.put("No comments to set as read", "没有要设置为已读的评论");@@ -1571,6 +1622,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No ignored licenses", "无忽略的许可证");m.put("No image attachments", "没有图片附件");m.put("No imports defined", "无导入");+ m.put("No issue boards defined", "未定义工单看板");m.put("No issues in iteration", "迭代中没有工单");m.put("No issues to copy", "没有工单可复制");m.put("No issues to delete", "没有工单可删除");@@ -1600,14 +1652,17 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("No required services", "无所需服务");m.put("No secret config", "无秘密配置");m.put("No services defined", "未定义服务");+ m.put("No start/due date", "无开始/截止日期");m.put("No step templates defined", "未定义步骤模板");m.put("No tags found", "未找到标签");+ m.put("No timesheets defined", "未定义时间表");m.put("No users to delete", "没有要删除的用户");m.put("No users to disable", "没有要禁用的用户");m.put("No users to enable", "没有要启用的用户");m.put("No valid query to show progress", "没有有效的查询来显示进度");m.put("No valid signature for head commit", "头部提交没有有效的签名");m.put("No valid signature for head commit of target branch", "目标分支的最新提交没有有效签名");+ m.put("No value", "未指定值");m.put("No verified primary email address", "没有验证的主电子邮件地址");m.put("Node Selector", "节点选择器");m.put("Node Selector Entry", "节点选择器条目");@@ -1625,6 +1680,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Not specified", "未指定");m.put("Note", "备注");m.put("Nothing to preview", "没有预览内容");+ m.put("Notification", "通知");m.put("Notifications", "通知");m.put("Notify Build Events", "通知构建事件");m.put("Notify Code Comment Events", "通知代码评论事件");@@ -1991,6 +2047,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"执行模糊查询。使用 '~' 包围搜索文本以添加更多条件,例如:~text to search~ author(robin)");m.put("Permanent link", "永久链接");m.put("Permanent link of this selection", "此选择的永久链接");+ m.put("Permission denied", "权限不足");m.put("Permission will be checked upon actual operation", "权限将在实际操作时检查");m.put("Physical memory in mega bytes", "物理内存(兆字节)");m.put("Pick Existing", "选择现有");@@ -2056,6 +2113,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Preset Commit Message", "预设提交信息");m.put("Preset commit message updated", "预设提交信息已更新");m.put("Press 'y' to get permalink", "按 'y' 获取永久链接");+ m.put("Prev", "上一");m.put("Prevent Creation", "防止创建");m.put("Prevent Deletion", "防止删除");m.put("Prevent Forced Push", "防止强制推送");@@ -2078,7 +2136,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Privilege", "权限");m.put("Privilege Settings", "权限设置");m.put("Profile", "个人资料");- m.put("Basic settings updated", "基本设置已更新");m.put("Programming language", "编程语言");m.put("Project", "项目");m.put("Project \"{0}\" deleted", "项目 \"{0}\" 已删除");@@ -2121,6 +2178,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"此步骤调用 docker builder prune 命令来删除服务器 docker 执行器或远程 docker 执行器中指定的 buildx 构建器缓存");m.put("Public", "公开");m.put("Public Role", "公共角色");+ m.put("Publish", "发布");m.put("Publish Coverage Report Step", "发布覆盖率报告步骤");m.put("Publish Problem Report Step", "发布问题报告步骤");m.put("Publish Report Step", "发布报告步骤");@@ -2230,6 +2288,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Registry Login", "注册登录");m.put("Registry Logins", "注册登录");m.put("Registry Url", "注册 URL");+ m.put("Remaining time", "剩余时间");m.put("Remember Me", "记住我");m.put("Remote Docker Executor", "远程 Docker 执行器");m.put("Remote Machine", "远程机器");@@ -2257,6 +2316,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Replied to comment on file \"{0}\" in project \"{1}\"", "在项目 \"{1}\" 的文件 \"{0}\" 上回复评论");m.put("Reply", "回复");m.put("Report Name", "报告名称");+ m.put("Repository Sync", "仓库同步");m.put("Request For Changes", "请求更改");m.put("Request Scopes", "请求范围");m.put("Request review", "请求审查");@@ -2369,6 +2429,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Secret Config File", "密钥配置文件");m.put("Secret Setting", "密钥设置");m.put("Security", "安全");+ m.put("Security & Compliance", "安全与合规");m.put("Security Setting", "安全设置");m.put("Security Settings", "安全设置");m.put("Select", "选择");@@ -2458,6 +2519,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Shell", "Shell");m.put("Show Branch/Tag", "显示分支/标签");m.put("Show Build Status", "显示构建状态");+ m.put("Show Closed", "显示已关闭");m.put("Show Code Stats", "显示代码统计");m.put("Show Condition", "显示条件");m.put("Show Conditionally", "显示条件");@@ -2468,6 +2530,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Show Package Stats", "显示包统计");m.put("Show Pull Request Stats", "显示合并请求统计");m.put("Show Saved Queries", "显示保存的查询");+ m.put("Show States By", "显示状态");m.put("Show Works Of", "显示工作量");m.put("Show changes", "显示变更");m.put("Show commented code snippet", "显示注释的代码片段");@@ -2506,6 +2569,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Some other pull requests are opening to this branch", "其他合并请求正在打开此分支");m.put("Some projects might be hidden due to permission policy", "由于权限策略,某些项目可能被隐藏");m.put("Some required builds not passed", "一些必需的构建未通过");+ m.put("Sort", "排序");m.put("Source", "源");m.put("Source Docker Image", "Docker 镜像源");m.put("Source Path", "源路径");@@ -2857,6 +2921,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {"指定每周的工作天数。这将影响工作周期的解析和显示。例如,如果此属性设置为 <tt>5</tt>,则 <tt>1w</tt> 等同于 <tt>5d</tt>");m.put("Specify working hours per day. This will affect parsing and displaying of working periods. For instance <tt>1d</tt> is the same as <tt>8h</tt> if this property is set to <tt>8</tt>","指定每天的工作小时数。这将影响工作周期的解析和显示。例如,如果此属性设置为 <tt>8</tt>,则 <tt>1d</tt> 等同于 <tt>8h</tt>");+ m.put("Spent", "已花费");m.put("Spent Time", "已用时间");m.put("Spent Time Issue Field", "工单耗时字段");m.put("Spent Time:", "已用时间");@@ -2875,8 +2940,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Start At", "开始于");m.put("Start Date", "开始日期");m.put("Start Page", "起始页面");+ m.put("Start date", "开始日期");m.put("Start to watch once I am involved", "一旦我参与,开始观察");m.put("Start work", "开始工作");+ m.put("Start/Due Date", "开始/截止日期");m.put("State", "状态");m.put("State Durations", "状态持续时间");m.put("State Frequencies", "状态频率");@@ -2966,6 +3033,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Test Settings", "测试设置");m.put("Text", "文本");m.put("The URL of the server endpoint that will receive the webhook POST requests", "接收 Webhook POST 请求的服务器端点 URL");+ m.put("The first board will be the default board", "第一个看板将成为默认看板");+ m.put("The first timesheet will be the default timesheet", "第一个时间表将成为默认时间表");m.put("The permission to access build log", "访问构建日志的权限");m.put("The permission to access build pipeline", "访问构建流水线的权限");m.put("The permission to run job manually. It also implies the permission to access build log, build pipeline and all published reports",@@ -2983,6 +3052,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {"这些认证器通常在您的手机上运行,例如 Google Authenticator、Microsoft Authenticator、Authy、1Password 等");m.put("This <span wicket:id=\"elementTypeName\"></span> is imported from <a wicket:id=\"link\" class=\"alert-link\"><span wicket:id=\"label\"></span></a>","此 <span wicket:id=\"elementTypeName\"></span> 是从 <a wicket:id=\"link\" class=\"alert-link\"><span wicket:id=\"label\"></span></a> 导入的");+ m.put("This Month", "本月");+ m.put("This Week", "本周");m.put("This account is disabled", "此账户已禁用");m.put("This address should be <code>verified sender</code> in SendGrid and will be used as sender address of various email notifications. One can also reply to this address to post issue or pull request comments if <code>Receive Posted Email</code> option is enabled below","此地址应在 SendGrid 中为 <code>已验证的发送者</code>,将用作各种电子邮件通知的发送者地址。如果下面启用了 <code>接收已发布电子邮件</code> 选项,用户也可以回复此地址以发布工单或合并请求评论");@@ -3019,11 +3090,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {"此密钥用于在项目层次结构中下载和上传缓存(按顺序从当前项目搜索到根项目)");m.put("This key or one of its subkey is already in use", "此密钥或其子密钥已被使用");m.put("This line has confusable unicode character modification", "此行有可疑的 Unicode 字符修改");+ m.put("This name has already been used by another board", "此名称已被另一个看板使用");m.put("This name has already been used by another group", "此名称已被另一个组使用");+ m.put("This name has already been used by another issue board in the project", "此名称已被项目中的另一个工单看板使用");m.put("This name has already been used by another project", "此名称已被其他项目使用");m.put("This name has already been used by another role", "此名称已被另一个角色使用");m.put("This name has already been used by another role.", "此名称已被另一个角色使用。");m.put("This operation is disallowed by branch protection rule", "此操作被分支保护规则禁止");+ m.put("This page lists recent commits fixing the issue", "此页面列出了修复工单的最近提交");m.put("This permission enables one to access confidential issues", "此权限允许访问机密工单");m.put("This permission enables one to schedule issues into iterations", "此权限允许将工单调度到迭代中");m.put("This property is imported from {0}", "此属性是从 {0} 导入的");@@ -3053,6 +3127,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("This user is authenticating via internal database.", "此用户通过内部数据库进行身份验证。");m.put("This user is currently authenticating via external system. Setting password will switch to use internal database","该用户当前通过外部系统进行身份验证。设置密码将切换到使用内部数据库");+ m.put("This will discard all project specific boards, do you want to continue?", "这将丢弃所有项目特定的看板,您确定要继续吗?");m.put("Threads", "线程");m.put("Time Estimate Issue Field", "工单时间估算字段");m.put("Time Range", "时间范围");@@ -3071,6 +3146,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("To States", "到状态");m.put("To authenticate via internal database, <a wicket:id=\"setPasswordForUser\">set password for user</a> or <a wicket:id=\"tellUserToResetPassword\">tell user to reset password</a>","通过内部数据库进行身份验证,<a wicket:id=\"setPasswordForUser\">设置用户密码</a> 或 <a wicket:id=\"tellUserToResetPassword\">告诉用户重置密码</a>");+ m.put("To avoid duplication, estimated/remaining time showing here does not include those aggregated from \"{0}\"",+ "为避免重复,此处显示的估计/剩余时间不包括从 \"{0}\" 聚合的时间");+ m.put("To avoid duplication, spent time showing here does not include those aggregated from \"{0}\"",+ "为避免重复,这里显示的时间不包括从 \"{0}\" 聚合的时间");m.put("Toggle change history", "切换更改历史");m.put("Toggle comments", "切换评论");m.put("Toggle commits", "切换提交");@@ -3089,6 +3168,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Total estimated time", "总预计时间");m.put("Total spent time", "总已用时间");m.put("Total spent time / total estimated time", "总已用时间 / 总预计时间");+ m.put("Total time", "总时间");m.put("Total:", "总计");m.put("Touched File", "触及的文件");m.put("Touched Files", "触及的文件");@@ -3146,6 +3226,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Unable to diff as the file is too large.", "无法比较,因为文件太大");m.put("Unable to find issue #{0} in project {1}", "在项目 {1} 中找不到工单 #{0}");m.put("Unable to find pull request #{0} in project {1}", "在项目 {1} 中找不到合并请求 #{0}");+ m.put("Unable to find timesheet: ", "找不到时间表:");m.put("Unable to notify user as mail service is not configured", "无法通知用户,因为邮件服务未配置");m.put("Unable to send verification email as mail service is not configured yet", "无法发送验证电子邮件,因为邮件服务未配置");m.put("Unauthorize this user", "取消此用户的授权");@@ -3154,6 +3235,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Undefined Field Resolution", "未定义字段解析");m.put("Undefined Field Value Resolution", "未定义字段值解析");m.put("Undefined State Resolution", "未定义状态解析");+ m.put("Undefined custom field: ", "未定义自定义字段:");m.put("Under which condition this step should run. <b>Successful</b> means all non-optional steps running before this step are successful","在什么条件下应运行此步骤。<b>成功</b>表示在此步骤之前运行的所有非可选步骤都已成功");m.put("Unexpected setting: {0}", "未知设置:{0}");@@ -3165,6 +3247,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Unpin this issue", "取消置顶此工单");m.put("Unresolved", "未解决");m.put("Unresolved comment on file \"{0}\" in project \"{1}\"", "将项目 \"{1}\" 的文件 \"{0}\" 上的评论标记为未解决");+ m.put("Unscheduled", "未计划");+ m.put("Unscheduled Issues", "未计划工单");m.put("Unspecified", "未指定");m.put("Unsupported", "不支持");m.put("Unverified", "未验证");@@ -3199,6 +3283,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Use '\\' to escape quotes", "使用 '\\' 转义引号");m.put("Use Avatar Service", "使用头像服务");m.put("Use Default", "使用默认");+ m.put("Use Default Boards", "使用默认看板");m.put("Use For Git Operations", "用于 Git 操作");m.put("Use Git in System Path", "使用系统路径中的 Git");m.put("Use Hours And Minutes Only", "仅使用小时和分钟");@@ -3241,6 +3326,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Users deleted successfully", "用户删除成功");m.put("Users disabled successfully", "用户禁用成功");m.put("Users enabled successfully", "用户启用成功");+ m.put("Utilities", "工具");m.put("Valid signature required for head commit of this branch per branch protection rule","此分支的头部提交需要有效的签名,受分支保护规则限制");m.put("Value", "值");@@ -3381,6 +3467,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("artifacts", "制品");m.put("assign to me", "分配给我");m.put("authored by", "作者是");+ m.put("backlog ", "待办");m.put("base", "基准");m.put("before specified date", "在指定日期之前");m.put("branch the build commit is merged into", "构建提交合并到的分支");@@ -3430,6 +3517,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("has any value of", "具有下列任何值");m.put("head", "头部");m.put("ineffective", "无效");+ m.put("inherited", "继承");m.put("is empty", "为空");m.put("is not empty", "不为空");m.put("issue:Number", "工单号");@@ -3513,6 +3601,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");+ m.put("logged work", "已花费");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.javaindex 615b2b73ba..97885e6380 100644--- a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java@@ -9,12 +9,12 @@ public class TimeTrackingSettingTest {@Testpublic void test() {var timeTrackingSetting = new TimeTrackingSetting();- assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d 30h")));- assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d30h")));- assertEquals("1w 3d 5h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("8d 5h")));- assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0h")));- assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0m")));- assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0")));+ assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d 30h"), false));+ assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d30h"), false));+ assertEquals("1w 3d 5h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("8d 5h"), false));+ assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0h"), false));+ assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0m"), false));+ assertEquals("0h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0"), false));try {timeTrackingSetting.parseWorkingPeriod("abc");assertTrue(false);diff --git a/server-ee b/server-eeindex 5be37474a9..58f38c5dd8 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 5be37474a9074047921d4315e8488927a322ee5e+Subproject commit 58f38c5dd80787982c9a40576ac630479f8b99c3