Skip to content

The Unified and Autonomous Development Platform

wip: i18n support

Robin Shene1ff03fab5b5
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 6db921b42a..86a56b5cd9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -131,6 +131,7 @@ public abstract class TaskButton extends AjaxButton {
ExecutorService executorService = OneDev.getInstance(ExecutorService.class);
List<JobLogEntryEx> messages = new ArrayList<>();
messages.add(new JobLogEntryEx(new JobLogEntry(new Date(), _T("Please wait..."))));
+ var errorMessage = _T("Error executing task");
TaskFuture future = getTaskFutures().put(path, new TaskFuture(executorService.submit(new Callable<TaskResult>() {
@Override
@@ -170,7 +171,7 @@ public abstract class TaskButton extends AjaxButton {
else
logger.error(null, e);
}
- return new TaskResult(false, new PlainMessage("Error " + title));
+ return new TaskResult(false, new PlainMessage(errorMessage));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.html
index 3f8f58e215..e93525c8bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.html
@@ -2,8 +2,8 @@
<form wicket:id="form" class="leave-confirm rounded border p-4">
<div wicket:id="editor"></div>
<div class="actions">
- <button wicket:id="save" class="btn btn-primary">Save</button> &nbsp;
- <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
+ <button wicket:id="save" class="btn btn-primary"><wicket:t>Save</wicket:t></button> &nbsp;
+ <button wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></button>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java
index 3d8b6c6839..36323ed6a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditPanel.java
@@ -1,5 +1,8 @@
package io.onedev.server.web.component.user.accesstoken;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
@@ -58,7 +61,7 @@ abstract class AccessTokenEditPanel extends Panel {
nameConflict = true;
}
if (nameConflict) {
- editor.error(new Path(new PathNode.Named("name")), "Name already used by another access token of the owner");
+ editor.error(new Path(new PathNode.Named("name")), _T("Name already used by another access token of the owner"));
target.add(AccessTokenEditPanel.this);
} else {
token.setName(bean.getName());
@@ -69,7 +72,7 @@ abstract class AccessTokenEditPanel extends Panel {
var authorizations = new ArrayList<AccessTokenAuthorization>();
for (var authorizationBean : bean.getAuthorizations()) {
if (!projectPaths.add(authorizationBean.getProjectPath())) {
- editor.error(new Path(new PathNode.Named("authorizations")), "Duplicate authorizations found: " + authorizationBean.getProjectPath());
+ editor.error(new Path(new PathNode.Named("authorizations")), MessageFormat.format(_T("Duplicate authorizations found: {0}"), authorizationBean.getProjectPath()));
target.add(AccessTokenEditPanel.this);
return;
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.html
index 397a90a2a2..11d5d1fa26 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenListPanel.html
@@ -6,6 +6,6 @@
<div wicket:id="newToken"></div>
</div>
<wicket:fragment wicket:id="addNewLinkFrag">
- <a wicket:id="link" class="btn btn-block btn-light"><wicket:svg href="plus" class="icon align-middle mr-1"></wicket:svg> <span>Create New</span></a>
+ <a wicket:id="link" class="btn btn-block btn-light"><wicket:svg href="plus" class="icon align-middle mr-1"></wicket:svg> <span><wicket:t>Create New</wicket:t></span></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
index f7820b236b..14f24539f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
@@ -2,10 +2,10 @@
<div class="access-token border rounded">
<h6 class="border-bottom px-4 py-3">
<span wicket:id="name" class="mr-2"></span>
- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit this access token"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="regenerate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Regenerate this access token"><wicket:svg href="refresh" class="icon"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this access token"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- <span wicket:id="expired" class="badge badge-light-danger">Expired</span>
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="regenerate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1"><wicket:svg href="refresh" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <span wicket:id="expired" class="badge badge-light-danger"><wicket:t>Expired</wicket:t></span>
</h6>
<div wicket:id="viewer" class="p-4"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
index 0b1e447b92..0d85f387ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
@@ -1,20 +1,25 @@
package io.onedev.server.web.component.user.accesstoken;
-import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.AccessTokenManager;
-import io.onedev.server.model.AccessToken;
-import io.onedev.server.util.CryptoUtils;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.editable.BeanContext;
+import static io.onedev.server.web.translation.Translation._T;
+
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AccessTokenManager;
+import io.onedev.server.model.AccessToken;
+import io.onedev.server.util.CryptoUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.editable.BeanContext;
+
abstract class AccessTokenPanel extends Panel {
public AccessTokenPanel(String id) {
@@ -34,7 +39,7 @@ abstract class AccessTokenPanel extends Panel {
onEdit(target);
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Edit this access token"))));
add(new AjaxLink<Void>("regenerate") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -51,7 +56,7 @@ abstract class AccessTokenPanel extends Panel {
target.add(AccessTokenPanel.this);
Session.get().success("Access token regenerated successfully");
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Regenerate this access token"))));
add(new AjaxLink<Void>("delete") {
@Override
@@ -65,7 +70,7 @@ abstract class AccessTokenPanel extends Panel {
onDelete(target);
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Delete this access token"))));
add(new WebMarkupContainer("expired").setVisible(getToken().isExpired()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html
index 9d75ae5585..e99ebb2cac 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.html
@@ -1,15 +1,15 @@
<wicket:panel>
<table wicket:id="keys" class="gpg-key-list table table-hover"></table>
<ul class="text-muted font-size-sm mt-4 ml-n4">
- <li>Check <a href="https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification#gpg-commit-signature-verification" target="_blank">GitHub's guide</a> on how to generate and use GPG keys to sign your commits</li>
- <li>Email addresses with <span class="badge badge-warning badge-sm">ineffective</span> mark are those not belong to or not verified by key owner</li>
+ <li><wicket:t>Check <a href="https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification#gpg-commit-signature-verification" target="_blank">GitHub's guide</a> on how to generate and use GPG keys to sign your commits</wicket:t></li>
+ <li><wicket:t>Email addresses with <span class="badge badge-warning badge-sm">ineffective</span> mark are those not belong to or not verified by key owner</wicket:t></li>
</ul>
<wicket:fragment wicket:id="emailAddressesFrag">
<div wicket:id="values" class="value text-nowrap">
- <span wicket:id="value"></span> <span wicket:id="ineffective" class="badge badge-sm badge-warning">ineffective</span>
+ <span wicket:id="value"></span> <span wicket:id="ineffective" class="badge badge-sm badge-warning"><wicket:t>ineffective</wicket:t></span>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this key"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java
index d10acbeba4..20d52c402e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/GpgKeyListPanel.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.user.gpgkey;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -9,6 +11,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -144,7 +147,7 @@ public class GpgKeyListPanel extends GenericPanel<List<GpgKey>> {
attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Delete this key"))));
cellItem.add(fragment);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html
index aeca927f0c..91ad6c183b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="insert-gpg-key">
<div class="modal-header">
- <h5 class="modal-title">Add a GPG Public Key</h5>
+ <h5 class="modal-title"><wicket:t>Add a GPG Public Key</wicket:t></h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<form wicket:id="form">
@@ -9,8 +9,8 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="add" type="submit" class="btn btn-primary dirty-aware" value="Add">
- <button wicket:id="cancel" type="button" class="btn btn-secondary">Cancel</button>
+ <input wicket:id="add" type="submit" class="btn btn-primary dirty-aware">
+ <button wicket:id="cancel" type="button" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></button>
</div>
</form>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
index 6d99ab44fa..83fa74c010 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/gpgkey/InsertGpgKeyPanel.java
@@ -1,10 +1,14 @@
package io.onedev.server.web.component.user.gpgkey;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
import java.util.Date;
import org.apache.wicket.ajax.AjaxRequestTarget;
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.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
@@ -21,7 +25,6 @@ import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.page.my.MyPage;
public abstract class InsertGpgKeyPanel extends Panel {
@@ -59,16 +62,14 @@ public abstract class InsertGpgKeyPanel extends Panel {
gpgKey.setKeyId(gpgKey.getKeyIds().get(0));
if (gpgKey.getKeyIds().stream().anyMatch(it->gpgKeyManager.findSigningKey(it)!=null)) {
- editor.error(new Path(new PathNode.Named("content")), "This key or one of its subkey is already in use");
+ editor.error(new Path(new PathNode.Named("content")), _T("This key or one of its subkey is already in use"));
target.add(form);
} else {
boolean hasErrors = false;
for (String emailAddressValue: GpgUtils.getEmailAddresses(gpgKey.getPublicKeys().get(0))) {
EmailAddress emailAddress = OneDev.getInstance(EmailAddressManager.class).findByValue(emailAddressValue);
if (emailAddress == null || !emailAddress.isVerified() || !emailAddress.getOwner().equals(getUser())) {
- String who = (getPage() instanceof MyPage)? "yours": "the user";
- editor.error(new Path(new PathNode.Named("content")), "This key is associated with " + emailAddressValue
- + ", however it is NOT a verified email address of " + who);
+ editor.error(new Path(new PathNode.Named("content")), MessageFormat.format(_T("This key is associated with {0}, however it is NOT a verified email address of this user"), emailAddressValue));
target.add(form);
hasErrors = true;
break;
@@ -88,7 +89,7 @@ public abstract class InsertGpgKeyPanel extends Panel {
target.add(form);
}
- });
+ }.add(AttributeAppender.append("value", _T("Add"))));
form.add(new AjaxLink<Void>("cancel") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java b/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java
index ea92a1ae51..a12654f2f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/activity/UserActivity.java
@@ -7,7 +7,7 @@ import org.apache.wicket.Component;
public abstract class UserActivity implements Serializable {
- public enum Type {CODE_COMMIT, ISSUE, PULL_REQUEST_AND_CODE_REVIEW}
+ public enum Type {ISSUE, CODE_COMMIT, PULL_REQUEST_AND_CODE_REVIEW}
private final Date date;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html
index b67e849b6f..b520670df5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="mb-3">
- <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
+ <a wicket:id="deleteSelected" class="btn btn-danger"><wicket:t>Delete Selected</wicket:t></a>
</div>
<table wicket:id="queries" class="table table-condensed"></table>
<wicket:fragment wicket:id="linkFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
index cc315a3537..8ee55b4763 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.user.querywatch;
import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;
import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
@@ -117,11 +118,11 @@ class BuildQueryWatchesPanel extends GenericPanel<User> {
super.onComponentTag(tag);
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select query watches to delete");
+ tag.put("data-tippy-content", _T("Please select query watches to delete"));
}
}
- }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete selected query watches?"))).setOutputMarkupId(true);
add(deleteSelected);
@@ -137,16 +138,16 @@ class BuildQueryWatchesPanel extends GenericPanel<User> {
};
columns.add(selectionColumn);
- columns.add(new AbstractColumn<>(Model.of("Name")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
var name = rowModel.getObject().name;
if (name.startsWith(COMMON_NAME_PREFIX))
- name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";
+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (" + _T("common") + ")";
else
- name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";
+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (" + _T("personal") + ")";
var fragment = new Fragment(componentId, "linkFrag", BuildQueryWatchesPanel.this);
var projectId = rowModel.getObject().projectId;
@@ -164,7 +165,7 @@ class BuildQueryWatchesPanel extends GenericPanel<User> {
}
});
- columns.add(new AbstractColumn<>(Model.of("Project")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Project"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
@@ -178,7 +179,7 @@ class BuildQueryWatchesPanel extends GenericPanel<User> {
fragment.add(link);
cellItem.add(fragment);
} else {
- cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, "<i>" + _T("Global") + "</i>").setEscapeModelStrings(false));
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html
index b67e849b6f..b520670df5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="mb-3">
- <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
+ <a wicket:id="deleteSelected" class="btn btn-danger"><wicket:t>Delete Selected</wicket:t></a>
</div>
<table wicket:id="queries" class="table table-condensed"></table>
<wicket:fragment wicket:id="linkFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
index bf1c21c339..b35120be56 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.user.querywatch;
import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;
import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
@@ -100,11 +101,11 @@ class CommitQueryWatchesPanel extends GenericPanel<User> {
super.onComponentTag(tag);
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select query watches to delete");
+ tag.put("data-tippy-content", _T("Please select query watches to delete"));
}
}
- }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete selected query watches?"))).setOutputMarkupId(true);
add(deleteSelected);
@@ -120,16 +121,16 @@ class CommitQueryWatchesPanel extends GenericPanel<User> {
};
columns.add(selectionColumn);
- columns.add(new AbstractColumn<>(Model.of("Name")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
var name = rowModel.getObject().name;
if (name.startsWith(COMMON_NAME_PREFIX))
- name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";
+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (" + _T("common") + ")";
else
- name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";
+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (" + _T("personal") + ")";
var fragment = new Fragment(componentId, "linkFrag", CommitQueryWatchesPanel.this);
var project = getProjectManager().load(rowModel.getObject().projectId);
@@ -140,7 +141,7 @@ class CommitQueryWatchesPanel extends GenericPanel<User> {
}
});
- columns.add(new AbstractColumn<>(Model.of("Project")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Project"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html
index a2087cb3e5..d1fcf3b549 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html
@@ -1,10 +1,12 @@
<wicket:panel>
<div class="alert alert-notice alert-light mb-4">
- 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
+ <wicket:t>
+ 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
+ </wicket:t>
</div>
<div class="mb-3">
- <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
+ <a wicket:id="deleteSelected" class="btn btn-danger"><wicket:t>Delete Selected</wicket:t></a>
</div>
<table wicket:id="queries" class="table table-condensed"></table>
<wicket:fragment wicket:id="linkFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
index 89df8a534a..18ddc427bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.user.querywatch;
import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;
import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
@@ -117,11 +118,11 @@ class IssueQueryWatchesPanel extends GenericPanel<User> {
super.onComponentTag(tag);
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select query watches to delete");
+ tag.put("data-tippy-content", _T("Please select query watches to delete"));
}
}
- }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete selected query watches?"))).setOutputMarkupId(true);
add(deleteSelected);
@@ -137,16 +138,16 @@ class IssueQueryWatchesPanel extends GenericPanel<User> {
};
columns.add(selectionColumn);
- columns.add(new AbstractColumn<>(Model.of("Name")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
var name = rowModel.getObject().name;
if (name.startsWith(COMMON_NAME_PREFIX))
- name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";
+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (" + _T("common") + ")";
else
- name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";
+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (" + _T("personal") + ")";
var fragment = new Fragment(componentId, "linkFrag", IssueQueryWatchesPanel.this);
var projectId = rowModel.getObject().projectId;
@@ -164,7 +165,7 @@ class IssueQueryWatchesPanel extends GenericPanel<User> {
}
});
- columns.add(new AbstractColumn<>(Model.of("Project")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Project"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
@@ -178,20 +179,20 @@ class IssueQueryWatchesPanel extends GenericPanel<User> {
fragment.add(link);
cellItem.add(fragment);
} else {
- cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, "<i>" + _T("Global") + "</i>").setEscapeModelStrings(false));
}
}
});
- columns.add(new AbstractColumn<>(Model.of("Watch Status")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Watch Status"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
if (rowModel.getObject().watching) {
- cellItem.add(new Label(componentId, "Watch"));
+ cellItem.add(new Label(componentId, _T("Watch")));
} else {
- cellItem.add(new Label(componentId, "Ignore"));
+ cellItem.add(new Label(componentId, _T("Ignore")));
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html
index b67e849b6f..b520670df5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="mb-3">
- <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
+ <a wicket:id="deleteSelected" class="btn btn-danger"><wicket:t>Delete Selected</wicket:t></a>
</div>
<table wicket:id="queries" class="table table-condensed"></table>
<wicket:fragment wicket:id="linkFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
index 8bfa158e0c..4df74321a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.user.querywatch;
import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;
import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
@@ -117,11 +118,11 @@ class PackQueryWatchesPanel extends GenericPanel<User> {
super.onComponentTag(tag);
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select query watches to delete");
+ tag.put("data-tippy-content", _T("Please select query watches to delete"));
}
}
- }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete selected query watches?"))).setOutputMarkupId(true);
add(deleteSelected);
@@ -144,9 +145,9 @@ class PackQueryWatchesPanel extends GenericPanel<User> {
IModel<QueryInfo> rowModel) {
var name = rowModel.getObject().name;
if (name.startsWith(COMMON_NAME_PREFIX))
- name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";
+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (" + _T("common") + ")";
else
- name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";
+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (" + _T("personal") + ")";
var fragment = new Fragment(componentId, "linkFrag", PackQueryWatchesPanel.this);
var projectId = rowModel.getObject().projectId;
@@ -178,7 +179,7 @@ class PackQueryWatchesPanel extends GenericPanel<User> {
fragment.add(link);
cellItem.add(fragment);
} else {
- cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, "<i>" + _T("Global") + "</i>").setEscapeModelStrings(false));
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html
index bee6e6976c..c9e979a69d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html
@@ -1,10 +1,12 @@
<wicket:panel>
<div class="alert alert-notice alert-light mb-4">
- Pull request query watch only affects new pull requests. To manage watch status of existing pull requests
- in batch, filter pull requests by watch status in pull requests page, and then take appropriate action
+ <wicket:t>
+ Pull request query watch only affects new pull requests. To manage watch status of existing pull requests
+ in batch, filter pull requests by watch status in pull requests page, and then take appropriate action
+ </wicket:t>
</div>
<div class="mb-4">
- <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>
+ <a wicket:id="deleteSelected" class="btn btn-danger"><wicket:t>Delete Selected</wicket:t></a>
</div>
<table wicket:id="queries" class="table"></table>
<wicket:fragment wicket:id="linkFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
index 4802ceeb86..10acf176f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.user.querywatch;
import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;
import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.ArrayList;
@@ -118,11 +119,11 @@ class PullRequestQueryWatchesPanel extends GenericPanel<User> {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select query watches to delete");
+ tag.put("data-tippy-content", _T("Please select query watches to delete"));
}
}
- }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete selected query watches?"))).setOutputMarkupId(true);
add(deleteSelected);
@@ -138,16 +139,16 @@ class PullRequestQueryWatchesPanel extends GenericPanel<User> {
};
columns.add(selectionColumn);
- columns.add(new AbstractColumn<>(Model.of("Name")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
var name = rowModel.getObject().name;
if (name.startsWith(COMMON_NAME_PREFIX))
- name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";
+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (" + _T("common") + ")";
else
- name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";
+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (" + _T("personal") + ")";
var fragment = new Fragment(componentId, "linkFrag", PullRequestQueryWatchesPanel.this);
var projectId = rowModel.getObject().projectId;
@@ -167,7 +168,7 @@ class PullRequestQueryWatchesPanel extends GenericPanel<User> {
}
});
- columns.add(new AbstractColumn<>(Model.of("Project")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Project"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
@@ -182,20 +183,20 @@ class PullRequestQueryWatchesPanel extends GenericPanel<User> {
fragment.add(link);
cellItem.add(fragment);
} else {
- cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, "<i>" + _T("Global") + "</i>").setEscapeModelStrings(false));
}
}
});
- columns.add(new AbstractColumn<>(Model.of("Watch Status")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Watch Status"))) {
@Override
public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,
IModel<QueryInfo> rowModel) {
if (rowModel.getObject().watching) {
- cellItem.add(new Label(componentId, "Watch"));
+ cellItem.add(new Label(componentId, _T("Watch")));
} else {
- cellItem.add(new Label(componentId, "Ignore"));
+ cellItem.add(new Label(componentId, _T("Ignore")));
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java
index 862b99d3bd..eefde22d37 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.user.querywatch;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +41,7 @@ public abstract class QueryWatchesPanel extends GenericPanel<User> {
List<Tab> tabs = new ArrayList<>();
- var issueTab = new AjaxActionTab(Model.of("Issue"), null) {
+ var issueTab = new AjaxActionTab(Model.of(_T("Issue")), null) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
onTabSelected(target, TAB_ISSUE);
@@ -47,7 +49,7 @@ public abstract class QueryWatchesPanel extends GenericPanel<User> {
};
tabs.add(issueTab);
- var pullRequestTab = new AjaxActionTab(Model.of("Pull Request"), null) {
+ var pullRequestTab = new AjaxActionTab(Model.of(_T("Pull Request")), null) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
onTabSelected(target, TAB_PULL_REQUEST);
@@ -55,7 +57,7 @@ public abstract class QueryWatchesPanel extends GenericPanel<User> {
};
tabs.add(pullRequestTab);
- var buildTab = new AjaxActionTab(Model.of("Build"), null) {
+ var buildTab = new AjaxActionTab(Model.of(_T("Build")), null) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
onTabSelected(target, TAB_BUILD);
@@ -63,7 +65,7 @@ public abstract class QueryWatchesPanel extends GenericPanel<User> {
};
tabs.add(buildTab);
- var packTab = new AjaxActionTab(Model.of("Pack"), null) {
+ var packTab = new AjaxActionTab(Model.of(_T("Pack")), null) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
onTabSelected(target, TAB_PACK);
@@ -71,7 +73,7 @@ public abstract class QueryWatchesPanel extends GenericPanel<User> {
};
tabs.add(packTab);
- var commitTab = new AjaxActionTab(Model.of("Commit"), null) {
+ var commitTab = new AjaxActionTab(Model.of(_T("Commit")), null) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
onTabSelected(target, TAB_COMMIT);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 24c3d6ca04..2b78018ddd 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -22,7 +22,7 @@
<div wicket:id="feedback"></div>
</td>
<td class="actions minimum">
- <a wicket:id="deleteElement" class="btn btn-icon btn-light btn-hover-danger" title="Delete this"><wicket:svg href="trash" class="icon delete"/></a>
+ <a wicket:id="deleteElement" class="btn btn-icon btn-light btn-hover-danger"><wicket:svg href="trash" class="icon delete"/></a>
</td>
</tr>
</tbody>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index f76434a7f8..d03eeb0650 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -119,7 +119,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
PropertyContext<Serializable> propertyContext = item.getModelObject();
- item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));
+ item.add(new Label("header", _T(EditableUtils.getDisplayName(propertyContext.getPropertyGetter()))));
item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));
String required;
@@ -285,7 +285,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
onPropertyUpdating(target);
}
- }.setDefaultFormProcessing(false));
+ }.setDefaultFormProcessing(false).add(AttributeAppender.append("data-tippy-content", _T("Delete this"))));
return row;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
index 4777d4e676..3ee2f97d7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.editable.beanlist;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
@@ -76,7 +78,7 @@ public class BeanListPropertyViewer extends Panel {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
PropertyContext<?> propertyContext = item.getModelObject();
- item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));
+ item.add(new Label("header", _T(EditableUtils.getDisplayName(propertyContext.getPropertyGetter()))));
item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html
index c4226ccd84..11b642b3e9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="job-privilege-edit leave-confirm">
<div class="modal-header">
- <h5 id="modal-title" class="modal-title">Job Privilege</h5>
+ <h5 id="modal-title" class="modal-title"><wicket:t>Job Privilege</wicket:t></h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
@@ -9,8 +9,8 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary">
+ <a wicket:id="cancel" class="btn btn-secondary"><wicket:t>Cancel</wicket:t></a>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
index cf93618ab0..a22fc65b82 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeEditPanel.java
@@ -1,11 +1,14 @@
package io.onedev.server.web.editable.jobprivilege;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
@@ -85,7 +88,7 @@ abstract class JobPrivilegeEditPanel extends Panel {
}
}
- });
+ }.add(AttributeAppender.append("value", _T("Save"))));
form.add(new AjaxLink<Void>("cancel") {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
index 8db9f1e990..fa66453462 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.html
@@ -2,11 +2,11 @@
<div class="job-privilege-list">
<table wicket:id="privileges" class="table-hover"></table>
<div class="foot">
- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <a wicket:id="addNew"class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
index c658be4bec..540f931368 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
@@ -1,25 +1,24 @@
package io.onedev.server.web.editable.jobprivilege;
-import com.google.common.base.Joiner;
-import io.onedev.server.model.support.role.JobPrivilege;
-import io.onedev.server.util.CollectionUtils;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyUpdating;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -30,11 +29,20 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
-import static io.onedev.server.web.translation.Translation._T;
+import com.google.common.base.Joiner;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import io.onedev.server.model.support.role.JobPrivilege;
+import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
@@ -74,7 +82,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Add new"))));
List<IColumn<JobPrivilege, Void>> columns = new ArrayList<>();
@@ -101,7 +109,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
});
- columns.add(new AbstractColumn<>(Model.of("Job Names")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Job Names"))) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
@@ -109,25 +117,25 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- columns.add(new AbstractColumn<>(Model.of("Privilege")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Privilege"))) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
JobPrivilege privilege = rowModel.getObject();
if (privilege.isManageJob()) {
- cellItem.add(new Label(componentId, "manage job"));
+ cellItem.add(new Label(componentId, _T("manage job")));
} else if (privilege.isRunJob()) {
- cellItem.add(new Label(componentId, "run job"));
+ cellItem.add(new Label(componentId, _T("run job")));
} else {
var accessibles = new ArrayList<>();
if (privilege.isAccessLog())
- accessibles.add("log");
+ accessibles.add(_T("log"));
if (privilege.isAccessPipeline())
- accessibles.add("pipeline");
- accessibles.add("artifacts");
+ accessibles.add(_T("pipeline"));
+ accessibles.add(_T("artifacts"));
if (privilege.getAccessibleReports() != null)
- accessibles.add("reports:" + privilege.getAccessibleReports());
- cellItem.add(new Label(componentId, "access [" + Joiner.on(", ").join(accessibles) + "]"));
+ accessibles.add(_T("reports") + ":" + privilege.getAccessibleReports());
+ cellItem.add(new Label(componentId, MessageFormat.format(_T("access [{0}]"), Joiner.on(", ").join(accessibles))));
}
}
});
@@ -159,13 +167,13 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Edit"))));
fragment.add(new AjaxLink<Void>("delete") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this privilege?"));
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(_T("Do you really want to delete this privilege?")));
}
@Override
@@ -176,7 +184,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
target.add(JobPrivilegeListEditPanel.this);
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Delete"))));
cellItem.add(fragment);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.html
index ad48380333..feb00ce07a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.html
@@ -10,6 +10,6 @@
</div>
</div>
<wicket:fragment wicket:id="topbarTitleFrag">
- <a wicket:id="groups">Groups</a> <span class="dot"></span> <span class="text-truncate"><wicket:t>Create Group</wicket:t></span>
+ <a wicket:id="groups"><wicket:t>Groups</wicket:t></a> <span class="dot"></span> <span class="text-truncate"><wicket:t>Create Group</wicket:t></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java
index 75d7611fb4..18ec5f93db 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java
@@ -54,7 +54,7 @@ public class NewGroupPage extends AdministrationPage {
}
if (editor.isValid()) {
groupManager.create(group);
- Session.get().success("Group created");
+ Session.get().success(_T("Group created"));
setResponsePage(GroupMembershipsPage.class, GroupMembershipsPage.paramsOf(group));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.html
index b10a3b4403..6c93fa299a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.html
@@ -3,11 +3,11 @@
<div class="card-body">
<form wicket:id="form" class="leave-confirm">
<div wicket:id="editor"></div>
- <input class="btn btn-primary dirty-aware mt-3" value="Save" type="submit">
+ <input wicket:id="save" class="btn btn-primary dirty-aware mt-3" type="submit">
</form>
</div>
</div>
<wicket:fragment wicket:id="topbarTitleFrag">
- <a wicket:id="roles">Roles</a> <span class="dot"></span> <span class="text-truncate">Create New</span>
+ <a wicket:id="roles"><wicket:t>Roles</wicket:t></a> <span class="dot"></span> <span class="text-truncate"><wicket:t>Create New</wicket:t></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java
index c02bae6db9..937f769874 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java
@@ -1,10 +1,14 @@
package io.onedev.server.web.page.admin.rolemanagement;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.Collection;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -46,20 +50,22 @@ public class NewRolePage extends AdministrationPage {
Role roleWithSameName = roleManager.find(role.getName());
if (roleWithSameName != null) {
editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another role");
+ _T("This name has already been used by another role"));
}
if (editor.isValid()) {
Collection<LinkSpec> authorizedLinks = new ArrayList<>();
for (String linkName: role.getEditableIssueLinks())
authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));
roleManager.create(role, authorizedLinks);
- Session.get().success("Role created");
+ Session.get().success(_T("Role created"));
setResponsePage(RoleListPage.class);
}
}
};
form.add(editor);
+ form.add(new WebMarkupContainer("save").add(AttributeAppender.append("value", _T("Save"))));
+
add(form);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.html
index ee21e91e3a..68313bd7ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.html
@@ -2,7 +2,7 @@
<wicket:container wicket:id="content"></wicket:container>
<wicket:fragment wicket:id="ownerFrag">
<div class="alert alert-notice bg-white shadow">
- <b>Project Owner</b> is a built-in role with full permission over projects
+ <wicket:t><b>Project Owner</b> is a built-in role with full permission over projects</wicket:t>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="nonOwnerFrag">
@@ -12,14 +12,14 @@
<div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
<div class="mt-5 d-flex">
- <input class="btn btn-primary dirty-aware mr-1" value="Save" type="submit">
- <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
+ <input wicket:id="save" class="btn btn-primary dirty-aware mr-1" type="submit">
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto"><wicket:t>Delete</wicket:t></a>
</div>
</form>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="topbarTitleFrag">
- <a wicket:id="roles">Roles</a> <span class="dot"></span> <span wicket:id="roleName" class="text-truncate"></span>
+ <a wicket:id="roles"><wicket:t>Roles</wicket:t></a> <span class="dot"></span> <span wicket:id="roleName" class="text-truncate"></span>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java
index 10c69368f6..c6f7c5028a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java
@@ -1,6 +1,9 @@
package io.onedev.server.web.page.admin.rolemanagement;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -8,7 +11,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.link.BookmarkablePageLink;
@@ -106,7 +111,7 @@ public class RoleDetailPage extends AdministrationPage {
Role roleWithSameName = roleManager.find(role.getName());
if (roleWithSameName != null && !roleWithSameName.equals(role)) {
editor.error(new Path(new PathNode.Named("name")),
- "This name has already been used by another role.");
+ _T("This name has already been used by another role."));
}
if (editor.isValid()) {
Collection<LinkSpec> authorizedLinks = new ArrayList<>();
@@ -114,7 +119,7 @@ public class RoleDetailPage extends AdministrationPage {
authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));
roleManager.update(role, authorizedLinks, oldName);
setResponsePage(RoleDetailPage.class, RoleDetailPage.paramsOf(role));
- Session.get().success("Role updated");
+ Session.get().success(MessageFormat.format(_T("Role \"{0}\" updated"), role.getName()));
}
}
@@ -122,13 +127,13 @@ public class RoleDetailPage extends AdministrationPage {
form.add(editor);
form.add(new FencedFeedbackPanel("feedback", form));
-
+ form.add(new WebMarkupContainer("save").add(AttributeAppender.append("value", _T("Save"))));
form.add(new Link<Void>("delete") {
@Override
public void onClick() {
OneDev.getInstance(RoleManager.class).delete(getRole());
- Session.get().success("Role '" + getRole().getName() + "' deleted");
+ Session.get().success(MessageFormat.format(_T("Role \"{0}\" deleted"), getRole().getName()));
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(Role.class);
if (redirectUrlAfterDelete != null)
@@ -143,7 +148,7 @@ public class RoleDetailPage extends AdministrationPage {
setVisible(!getRole().isOwner());
}
- }.add(new ConfirmClickModifier("Do you really want to delete role '" + getRole().getName() + "'?")));
+ }.add(new ConfirmClickModifier(MessageFormat.format(_T("Do you really want to delete role \"{0}\"?"), getRole().getName()))));
fragment.add(form);
add(fragment);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.html
index 005456c5b9..43ab67fb60 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.html
@@ -3,7 +3,7 @@
<div class="card-body">
<div class="d-flex align-items-center mb-4">
<div class="clearable-wrapper flex-grow-1 mr-3">
- <input wicket:id="filterRoles" class="form-control search" placeholder="Filter roles...">
+ <input wicket:id="filterRoles" class="form-control search">
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java
index 26e3f56997..7d06852cac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleListPage.java
@@ -1,16 +1,19 @@
package io.onedev.server.web.page.admin.rolemanagement;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
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.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -41,6 +44,7 @@ import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
+import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
public class RoleListPage extends AdministrationPage {
@@ -113,6 +117,7 @@ public class RoleListPage extends AdministrationPage {
}
}));
+ searchField.add(AttributeAppender.append("placeholder", _T("Filter roles...")));
searchField.add(new OnTypingDoneBehavior(100) {
@Override
@@ -138,7 +143,7 @@ public class RoleListPage extends AdministrationPage {
List<IColumn<Role, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<Role, Void>(Model.of("Name")) {
+ columns.add(new AbstractColumn<Role, Void>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {
@@ -164,7 +169,7 @@ public class RoleListPage extends AdministrationPage {
}
});
- columns.add(new AbstractColumn<Role, Void>(Model.of("Description")) {
+ columns.add(new AbstractColumn<Role, Void>(Model.of(_T("Description"))) {
@Override
public void populateItem(Item<ICellPopulator<Role>> cellItem, String componentId, IModel<Role> rowModel) {
@@ -184,7 +189,7 @@ public class RoleListPage extends AdministrationPage {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- String message = "Do you really want to delete role '" + rowModel.getObject().getName() + "'?";
+ String message = MessageFormat.format(_T("Do you really want to delete role \"{0}\"?"), rowModel.getObject().getName());
attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
}
@@ -192,7 +197,7 @@ public class RoleListPage extends AdministrationPage {
public void onClick(AjaxRequestTarget target) {
Role role = rowModel.getObject();
OneDev.getInstance(RoleManager.class).delete(role);
- Session.get().success("Role '" + role.getName() + "' deleted");
+ Session.get().success(MessageFormat.format(_T("Role \"{0}\" deleted"), role.getName()));
target.add(rolesTable);
}
@@ -201,7 +206,7 @@ public class RoleListPage extends AdministrationPage {
super.onComponentTag(tag);
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "This is a built-in role and can not be deleted");
+ tag.put("data-tippy-content", _T("This is a built-in role and can not be deleted"));
}
}
@@ -278,7 +283,7 @@ public class RoleListPage extends AdministrationPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Roles");
+ return new Label(componentId, _T("Roles"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.html
index 87795c09d8..a63fed7bf8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.html
@@ -11,7 +11,7 @@
</div>
</div>
<wicket:fragment wicket:id="actionFrag">
- <a wicket:id="resend" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Resend invitation"><wicket:svg href="mail" class="icon align-middle"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Cancel invitation"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
+ <a wicket:id="resend" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1"><wicket:svg href="mail" class="icon align-middle"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
index d8b514b0d7..5fd41a91b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/InvitationListPage.java
@@ -1,23 +1,19 @@
package io.onedev.server.web.page.admin.usermanagement;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserInvitationManager;
-import io.onedev.server.model.UserInvitation;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
-import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
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.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -34,10 +30,19 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserInvitationManager;
+import io.onedev.server.model.UserInvitation;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
+import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
public class InvitationListPage extends AdministrationPage {
@@ -110,6 +115,7 @@ public class InvitationListPage extends AdministrationPage {
}
}));
+ searchField.add(AttributeAppender.append("placeholder", _T("Filter")));
searchField.add(new OnTypingDoneBehavior(100) {
@@ -136,7 +142,7 @@ public class InvitationListPage extends AdministrationPage {
List<IColumn<UserInvitation, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<>(Model.of("Email Address")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Email Address"))) {
@Override
public void populateItem(Item<ICellPopulator<UserInvitation>> cellItem,
@@ -166,21 +172,20 @@ public class InvitationListPage extends AdministrationPage {
if (OneDev.getInstance(SettingManager.class).getMailService() != null) {
UserInvitation invitation = rowModel.getObject();
getInvitationManager().sendInvitationEmail(invitation);
- Session.get().success("Invitation sent to '" + invitation.getEmailAddress() + "'");
+ Session.get().success(MessageFormat.format(_T("Invitation sent to \"{0}\""), invitation.getEmailAddress()));
} else {
- Session.get().error("Mail service not configured");
+ Session.get().error(_T("Mail service not configured"));
}
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Resend invitation"))));
fragment.add(new AjaxLink<Void>("delete") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- String message = "Do you really want to cancel invitation to '"
- + rowModel.getObject().getEmailAddress() + "'?";
+ String message = MessageFormat.format(_T("Do you really want to cancel invitation to \"{0}\"?"), rowModel.getObject().getEmailAddress());
attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
}
@@ -188,7 +193,7 @@ public class InvitationListPage extends AdministrationPage {
public void onClick(AjaxRequestTarget target) {
UserInvitation invitation = rowModel.getObject();
getInvitationManager().delete(invitation);
- Session.get().success("Invitation to '" + invitation.getEmailAddress() + "' deleted");
+ Session.get().success(MessageFormat.format(_T("Invitation to \"{0}\" deleted"), invitation.getEmailAddress()));
target.add(invitationsTable);
}
@@ -198,7 +203,7 @@ public class InvitationListPage extends AdministrationPage {
setVisible(SecurityUtils.isAdministrator());
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Cancel invitation"))));
cellItem.add(fragment);
}
@@ -264,7 +269,7 @@ public class InvitationListPage extends AdministrationPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Invitations");
+ return new Label(componentId, _T("Invitations"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
index e6db1b3096..c355db03a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationBean.java
@@ -1,6 +1,18 @@
package io.onedev.server.web.page.admin.usermanagement;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.List;
+
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.NotEmpty;
+
+import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
+
import com.google.common.base.Splitter;
+
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
@@ -8,12 +20,6 @@ import io.onedev.server.annotation.Multiline;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.UserInvitationManager;
import io.onedev.server.validation.Validatable;
-import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
-
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
-import java.util.List;
@Editable
@ClassValidating
@@ -44,17 +50,17 @@ public class NewInvitationBean implements Serializable, Validatable {
for (String emailAddress: getListOfEmailAddresses()) {
if (!new EmailValidator().isValid(emailAddress, null)) {
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("Invalid email address: " + emailAddress)
+ context.buildConstraintViolationWithTemplate(MessageFormat.format(_T("Invalid email address: {0}"), emailAddress))
.addPropertyNode("emailAddresses").addConstraintViolation();
return false;
} else if (OneDev.getInstance(EmailAddressManager.class).findByValue(emailAddress) != null) {
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("Email address already in use: " + emailAddress)
+ context.buildConstraintViolationWithTemplate(MessageFormat.format(_T("Email address already in use: {0}"), emailAddress))
.addPropertyNode("emailAddresses").addConstraintViolation();
return false;
} else if (OneDev.getInstance(UserInvitationManager.class).findByEmailAddress(emailAddress) != null) {
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("Email address already invited: " + emailAddress)
+ context.buildConstraintViolationWithTemplate(MessageFormat.format(_T("Email address already invited: {0}"), emailAddress))
.addPropertyNode("emailAddresses").addConstraintViolation();
return false;
} else {
@@ -63,7 +69,7 @@ public class NewInvitationBean implements Serializable, Validatable {
}
if (!found) {
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate("At least one email address should be specified")
+ context.buildConstraintViolationWithTemplate(_T("At least one email address should be specified"))
.addPropertyNode("emailAddresses").addConstraintViolation();
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.html
index c1473574c0..e3e6eae0e5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.html
@@ -9,11 +9,11 @@
<div wicket:id="editor" class="mb-4"></div>
<div wicket:id="feedback"></div>
<div class="d-flex align-items-center">
- <a wicket:id="invite" class="dirty-aware btn btn-primary">Invite</a>
+ <a wicket:id="invite" class="dirty-aware btn btn-primary"><wicket:t>Invite</wicket:t></a>
</div>
</form>
</wicket:fragment>
<wicket:fragment wicket:id="noMailServiceFrag">
- <div class="alert alert-notice alert-light-warning mb-0">Please configure <a wicket:id="mailSetting">mail setting</a> first</div>
+ <div class="alert alert-notice alert-light-warning mb-0"><wicket:t>Please configure <a wicket:id="mailSetting">mail setting</a> first</wicket:t></div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
index 6b3792caaf..ba69ce2942 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewInvitationPage.java
@@ -1,5 +1,18 @@
package io.onedev.server.web.page.admin.usermanagement;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -11,14 +24,6 @@ import io.onedev.server.web.component.taskbutton.TaskResult.PlainMessage;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.mailservice.MailServicePage;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
public class NewInvitationPage extends AdministrationPage {
@@ -37,12 +42,14 @@ public class NewInvitationPage extends AdministrationPage {
Form<?> form = new Form<Void>("form");
form.add(BeanContext.edit("editor", bean));
form.add(new FencedFeedbackPanel("feedback", form));
+ var sendingMessage = _T("Sending invitation to \"{0}\"...");
+ var sentMessage = _T("Invitations sent");
form.add(new TaskButton("invite") {
@Override
protected TaskResult runTask(TaskLogger logger) throws InterruptedException {
for (String emailAddress: bean.getListOfEmailAddresses()) {
- logger.log("Sending invitation to '" + emailAddress + "'...");
+ logger.log(MessageFormat.format(sendingMessage, emailAddress));
UserInvitation invitation = new UserInvitation();
invitation.setEmailAddress(emailAddress);
UserInvitationManager userInvitationManager = OneDev.getInstance(UserInvitationManager.class);
@@ -51,7 +58,7 @@ public class NewInvitationPage extends AdministrationPage {
if (Thread.interrupted())
throw new InterruptedException();
}
- return new TaskResult(true, new PlainMessage("Invitations sent"));
+ return new TaskResult(true, new PlainMessage(sentMessage));
}
@Override
@@ -72,7 +79,7 @@ public class NewInvitationPage extends AdministrationPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Invite Users");
+ return new Label(componentId, _T("Invite Users"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html
index 356f467eab..2d502a1162 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div class="alert alert-notice alert-light mb-5">
- Access token is intended for api access and repository pull/push. It can not be used to sign in to web ui
+ <wicket:t>Access token is intended for api access and repository pull/push. It can not be used to sign in to web ui </wicket:t>
</div>
<div wicket:id="accessTokens"></div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.java
index 451cecadeb..02ee35c902 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/accesstoken/MyAccessTokensPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.my.accesstoken;
+import static io.onedev.server.web.translation.Translation._T;
+
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -33,7 +35,7 @@ public class MyAccessTokensPage extends MyPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "My Access Tokens");
+ return new Label(componentId, _T("My Access Tokens"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html
index 1753f14e94..b06c070932 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by you</div>
- <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="alert alert-light alert-notice mb-4"><wicket:t>Add GPG keys here to verify commits/tags signed by you</wicket:t></div>
+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<div wicket:id="keyList"></div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
index ea3708c6e7..1cfb00f77b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java
@@ -1,10 +1,13 @@
package io.onedev.server.web.page.my.gpgkeys;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -57,7 +60,7 @@ public class MyGpgKeysPage extends MyPage {
};
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Add GPG Key"))));
keyList = new GpgKeyListPanel("keyList", new LoadableDetachableModel<List<GpgKey>>() {
@@ -75,7 +78,7 @@ public class MyGpgKeysPage extends MyPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "My GPG Keys");
+ return new Label(componentId, _T("My GPG Keys"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java
index 6d6818c2a9..37b244fbfb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.my.querywatch;
+import static io.onedev.server.web.translation.Translation._T;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
@@ -48,7 +50,7 @@ public class MyQueryWatchesPage extends MyPage {
@Override
protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Query Watches");
+ return new Label(componentId, _T("Query Watches"));
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/accesstoken/UserAccessTokensPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/accesstoken/UserAccessTokensPage.html
index d2c089c61d..ae53f1c88f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/accesstoken/UserAccessTokensPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/accesstoken/UserAccessTokensPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div id="user-access-tokens">
<div class="alert alert-notice alert-light mb-5">
- Access token is intended for api access or repository pull/push. It can not be used to sign in to web ui
+ <wicket:t>Access token is intended for api access or repository pull/push. It can not be used to sign in to web ui</wicket:t>
</div>
<div wicket:id="accessTokens"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.html
index 5890430bb7..496ff178db 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.html
@@ -1,10 +1,12 @@
<wicket:extend>
<div class="alert alert-notice alert-light-info mb-4">
- When authorize a project, all child projects will also be authorized with assigned roles
+ <wicket:t>
+ When authorize a project, all child projects will also be authorized with assigned roles
+ </wicket:t>
</div>
<form wicket:id="form" class="user-authorizations leave-confirm">
<div wicket:id="feedback" class="mb-4"></div>
<div wicket:id="editor"></div>
- <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
+ <input wicket:id="submit" type="submit" class="btn btn-primary dirty-aware mt-4">
</form>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.java
index 163f67fc8d..5743926409 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/authorization/UserAuthorizationsPage.java
@@ -1,5 +1,8 @@
package io.onedev.server.web.page.user.authorization;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -8,7 +11,9 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.Session;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -58,7 +63,7 @@ public class UserAuthorizationsPage extends UserPage {
Collection<UserAuthorization> authorizations = new ArrayList<>();
for (ProjectAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {
if (!projectNames.add(authorizationBean.getProjectPath())) {
- error("Duplicate authorizations found: " + authorizationBean.getProjectPath());
+ error(MessageFormat.format(_T("Duplicate authorizations found: {0}"), authorizationBean.getProjectPath()));
return;
} else {
var project = getProjectManager().findByPath(authorizationBean.getProjectPath());
@@ -73,12 +78,13 @@ public class UserAuthorizationsPage extends UserPage {
}
OneDev.getInstance(UserAuthorizationManager.class).syncAuthorizations(getUser(), authorizations);
- Session.get().success("Project authorizations updated");
+ Session.get().success(_T("Project authorizations updated"));
}
};
form.add(new FencedFeedbackPanel("feedback", form));
form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));
+ form.add(new WebMarkupContainer("submit").add(AttributeAppender.append("value", _T("Save"))));
add(form);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.html
index b03bd38886..aa37b28c0d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div class="user-gpg-key-list">
- <div class="alert alert-light alert-notice mb-4">Add GPG keys here to verify commits/tags signed by this user</div>
- <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4" title="Add GPG Key"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <div class="alert alert-light alert-notice mb-4"><wicket:t>Add GPG keys here to verify commits/tags signed by this user</wicket:t></div>
+ <a wicket:id="newKey" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<div wicket:id="keyList"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
index 5fa739b544..8a022c9e8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/gpgkeys/UserGpgKeysPage.java
@@ -1,11 +1,13 @@
package io.onedev.server.web.page.user.gpgkeys;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -57,7 +59,7 @@ public class UserGpgKeysPage extends UserPage {
};
}
- });
+ }.add(AttributeAppender.append("data-tippy-content", _T("Add GPG Key"))));
keyList = new GpgKeyListPanel("keyList", new LoadableDetachableModel<List<GpgKey>>() {
@@ -72,10 +74,5 @@ public class UserGpgKeysPage extends UserPage {
add(keyList.setOutputMarkupId(true));
}
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "User GPG Keys");
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.html
index 9eccd237fc..aa281ff898 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.html
@@ -3,10 +3,10 @@
<div class="head">
<div class="d-flex align-items-center flex-wrap">
<div class="clearable-wrapper mr-3 mb-4">
- <input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name...">
+ <input wicket:id="filterGroups" class="form-control search">
</div>
<input wicket:id="addNew" type="hidden" class="form-control mr-3 mb-4">
- <a wicket:id="delete" class="btn btn-light-danger mb-4">Delete <wicket:svg href="arrow4" class="icon"/></a>
+ <a wicket:id="delete" class="btn btn-light-danger mb-4"><wicket:t>Delete</wicket:t> <wicket:svg href="arrow4" class="icon"/></a>
</div>
</div>
<table wicket:id="memberships" class="memberships table"></table>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java
index e9cede80d6..3e7418c715 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/user/membership/UserMembershipsPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.user.membership;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -10,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
@@ -89,6 +92,7 @@ public class UserMembershipsPage extends UserPage {
TextField<String> searchField;
add(searchField = new TextField<String>("filterGroups", Model.of(query)));
+ searchField.add(AttributeAppender.append("placeholder", _T("Filter by name...")));
searchField.add(new OnTypingDoneBehavior(100) {
@Override
@@ -130,7 +134,7 @@ public class UserMembershipsPage extends UserPage {
protected void onInitialize() {
super.onInitialize();
- getSettings().setPlaceholder("Add to group...");
+ getSettings().setPlaceholder(_T("Add to group..."));
getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult");
getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection");
getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup");
@@ -145,7 +149,7 @@ public class UserMembershipsPage extends UserPage {
target.add(membershipsTable);
if (selectionColumn != null)
selectionColumn.getSelections().clear();
- Session.get().success("Group added");
+ Session.get().success(_T("Group added"));
}
@Override
@@ -167,7 +171,7 @@ public class UserMembershipsPage extends UserPage {
@Override
public String getLabel() {
- return "Delete Selected Memberships";
+ return _T("Delete Selected Memberships");
}
@Override
@@ -215,7 +219,7 @@ public class UserMembershipsPage extends UserPage {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select memberships to delete");
+ tag.put("data-tippy-content", _T("Please select memberships to delete"));
}
}
@@ -229,7 +233,7 @@ public class UserMembershipsPage extends UserPage {
@Override
public String getLabel() {
- return "Delete All Queried Memberships";
+ return _T("Delete All Queried Memberships");
}
@Override
@@ -255,7 +259,7 @@ public class UserMembershipsPage extends UserPage {
@Override
protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete all queried memberships";
+ return _T("Type <code>yes</code> below to delete all queried memberships");
}
@Override
@@ -278,7 +282,7 @@ public class UserMembershipsPage extends UserPage {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No memberships to delete");
+ tag.put("data-tippy-content", _T("No memberships to delete"));
}
}
@@ -296,7 +300,7 @@ public class UserMembershipsPage extends UserPage {
columns.add(selectionColumn = new SelectionColumn<>());
- columns.add(new AbstractColumn<>(Model.of("Name")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Name"))) {
@Override
public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,
@@ -317,7 +321,7 @@ public class UserMembershipsPage extends UserPage {
}
});
- columns.add(new AbstractColumn<>(Model.of("Description")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Description"))) {
@Override
public void populateItem(Item<ICellPopulator<Membership>> cellItem, String componentId,
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
index d4dc8542ac..ba6805daff 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
@@ -30,6 +30,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"<b class='text-danger'>注意:</b> 此步骤需要企业版订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用 30 天</a>");
m.put("<b class='text-warning'>NOTE: </b><a href='https://docs.onedev.io/tutorials/issue/time-tracking' target='_blank'>Time tracking</a> is an enterprise feature. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",
"<b class='text-warning'>注意:</b><a href='https://docs.onedev.io/tutorials/issue/time-tracking' target='_blank'>时间跟踪</a>是企业版功能。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a>30天");
+ m.put("<b>Project Owner</b> is a built-in role with full permission over projects", "<b>项目所有者</b>是一个内置角色,拥有项目的所有权限");
m.put("<b>Tips: </b> Type <tt>@</tt> to <a href='https://docs.onedev.io/appendix/job-variables' target='_blank' tabindex='-1'>insert variable</a>. Use <tt>@@</tt> for literal <tt>@</tt>",
"<b>提示: </b> 输入 <tt>@</tt> 插入变量。使用 <tt>@@</tt> 插入字符 <tt>@</tt>");
m.put("<i>No Name</i>", "<i>无名称</i>");
@@ -54,6 +55,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Access Token Secret", "访问令牌密钥");
m.put("Access Token for Target Project", "目标项目的访问令牌");
m.put("Access Tokens", "访问令牌");
+ m.put("Access token is intended for api access and repository pull/push. It can not be used to sign in to web ui",
+ "访问令牌用于 API 访问和仓库拉取/推送。它不能用于登录 Web UI");
+ m.put("Access token is intended for api access or repository pull/push. It can not be used to sign in to web ui",
+ "访问令牌用于 API 访问或仓库拉取/推送。它不能用于登录 Web UI");
m.put("Account Email", "账户邮箱");
m.put("Account Name", "账户名称");
m.put("Active Directory", "Active Directory");
@@ -61,11 +66,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Activities", "活动");
m.put("Activity by type", "按类型统计的活动");
m.put("Add", "添加");
+ m.put("Add GPG Key", "添加 GPG 密钥");
+ m.put("Add GPG keys here to verify commits/tags signed by this user", "在此添加 GPG 密钥以验证此用户的代码提交/标签签名");
+ m.put("Add GPG keys here to verify commits/tags signed by you", "在此添加 GPG 密钥以验证由您签名的提交/标签");
m.put("Add Issues to Iteration", "将工单添加到迭代");
m.put("Add New", "添加");
m.put("Add New Email Address", "添加新电子邮件地址");
m.put("Add SSH Key", "添加 SSH 密钥");
m.put("Add Spent Time", "添加已用时间");
+ m.put("Add a GPG Public Key", "添加一个 GPG 公钥");
m.put("Add a SSH Key", "添加 SSH 密钥");
m.put("Add after", "添加到后面");
m.put("Add before", "添加到前面");
@@ -79,6 +88,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Add new import", "添加新导入");
m.put("Add project", "添加项目");
m.put("Add to batch to commit with other suggestions later", "稍后与其他建议一起提交");
+ m.put("Add to group...", "添加到组...");
m.put("Add {0}", "添加 {0}");
m.put("Added commit \"{0}\" (<i class='text-danger'>missing in repository</i>)", "代码提交 \"{0}\"(<i class='text-danger'>仓库中不存在</i>)");
m.put("Added commit \"{0}\" ({1})", "代码提交 \"{0}\"({1})");
@@ -161,6 +171,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Asymmetric", "非对称");
m.put("At least one choice need to be specified", "至少需要指定一个选项");
m.put("At least one email address should be configured, please add a new one first", "至少应配置一个电子邮件地址,请先添加一个新地址");
+ m.put("At least one email address should be specified", "至少需要指定一个电子邮件地址");
m.put("At least one entry should be specified", "至少需要指定一个条目");
m.put("At least one event type needs to be selected", "至少需要选择一个事件类型");
m.put("At least one field needs to be specified", "至少需要指定一个字段");
@@ -278,7 +289,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Build Volume Storage Size", "构建卷存储大小");
m.put("Build administrative permission for all jobs inside a project, including batch operations over multiple builds",
"项目中所有任务的构建管理权限,包括多个构建的批量操作");
- m.put("Build and package", "构建和包");
m.put("Build docker image with docker buildx. This step can only be executed by server docker executor or remote docker executor, and it uses the buildx builder specified in these executors to do the job. To build image with Kubernetes executor, please use kaniko step instead",
"使用docker buildx构建docker镜像。此步骤只能由服务器docker执行器或远程docker执行器执行,并使用这些执行器中指定的buildx构建器进行构建。如需使用Kubernetes执行器构建镜像,请改用kaniko步骤");
m.put("Build docker image with kaniko. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor",
@@ -326,6 +336,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Can not link to self", "不能链接到自己");
m.put("Can not save malformed query", "无法保存格式错误的查询");
m.put("Cancel", "取消");
+ m.put("Cancel invitation", "取消邀请");
m.put("Cancelled", "已取消");
m.put("Certificates to Trust", "信任的证书");
m.put("Change", "更改");
@@ -336,6 +347,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Change to another value", "更改为其他值");
m.put("Changes since last visit", "自上次访问以来的更改");
m.put("Channel Notification", "频道通知");
+ m.put("Check <a href=\"https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification#gpg-commit-signature-verification\" target=\"_blank\">GitHub's guide</a> on how to generate and use GPG keys to sign your commits",
+ "检查 <a href=\"https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification#gpg-commit-signature-verification\" target=\"_blank\">GitHub 的指南</a> 如何生成和使用 GPG 密钥来签署您的提交");
m.put("Check Commit Message Footer", "检查提交消息尾部");
m.put("Check Incoming Email", "检查接收的电子邮件");
m.put("Check Update", "检查更新");
@@ -401,6 +414,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Code comment", "代码评论");
m.put("Code comment administrative permission inside a project, including batch operations over multiple code comments",
"项目内的代码评论管理权限,包括对多个代码评论的批量操作");
+ m.put("Code commit", "代码提交");
m.put("Code is committed", "代码已提交");
m.put("Code push", "代码推送");
m.put("Code read permission is required to import build spec (import project: {0}, import revision: {1})",
@@ -437,7 +451,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Commit signature required but no GPG signing key specified", "提交签名需要但未指定 GPG 签名密钥");
m.put("Commit suggestion", "提交建议");
m.put("Commits", "提交");
- m.put("Commits are taken from default branch of non-forked repositories", "提交取自非分叉仓库的默认分支");
+ m.put("Commits are taken from default branch of non-forked repositories", "代码提交取自非分叉仓库的默认分支");
m.put("Committed After", "提交后");
m.put("Committed Before", "提交前");
m.put("Committed By", "提交者");
@@ -473,7 +487,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Create Branch Bean With Revision", "带版本的创建分支 Bean");
m.put("Create Child Projects", "创建子项目");
m.put("Create Group", "创建组");
- m.put("Create New", "创建新工单");
+ m.put("Create New", "新建");
m.put("Create New File", "创建新文件");
m.put("Create Pull Request", "创建合并请求");
m.put("Create Tag", "创建标签");
@@ -538,6 +552,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Delete All Queried Memberships", "删除所有查询的成员");
m.put("Delete All Queried Projects", "删除所有查询的项目");
m.put("Delete All Queried Users", "删除所有查询的用户");
+ m.put("Delete Selected", "删除选中的");
m.put("Delete Selected Comments", "删除选中的评论");
m.put("Delete Selected Memberships", "删除选定的成员");
m.put("Delete Selected Projects", "删除选中的项目");
@@ -545,6 +560,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Delete Source Branch After Merge", "合并后删除源分支");
m.put("Delete dashboard", "删除仪表板");
m.put("Delete from branch {0}", "从分支 {0} 删除");
+ m.put("Delete this", "删除");
+ m.put("Delete this access token", "删除此访问令牌");
m.put("Delete this branch", "删除此分支");
m.put("Delete this field", "删除该字段");
m.put("Delete this group", "删除此组");
@@ -595,13 +612,17 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Do not ignore", "不要忽略");
m.put("Do not retrieve", "不检索");
m.put("Do not retrieve groups", "不检索组");
+ m.put("Do you really want to cancel invitation to \"{0}\"?", "您真的要取消邀请 \"{0}\" 吗?");
m.put("Do you really want to delete \"{0}\"?", "您真的要删除 \"{0}\" 吗?");
m.put("Do you really want to delete group \"{0}\"?", "您真的要删除组 \"{0}\" 吗?");
- m.put("Do you really want to delete tag {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 SSH key?", "您确定要删除此 SSH 密钥吗?");
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?", "您真的要删除这个电子邮件地址吗?");
+ m.put("Do you really want to delete this privilege?", "确定要删除此权限吗?");
m.put("Do you really want to delete this reply?", "您真的要删除此回复吗?");
m.put("Do you really want to discard batched suggestions?", "您真的要丢弃批量建议吗?");
m.put("Do you really want to enable this account?", "您真的要启用此账户吗?");
@@ -633,6 +654,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Edit on source branch", "在源分支编辑");
m.put("Edit plain", "编辑纯文本");
m.put("Edit saved queries", "编辑保存的查询");
+ m.put("Edit this access token", "编辑此访问令牌");
m.put("Edit {0}", "编辑 {0}");
m.put("Editable Issue Fields", "可编辑的工单字段");
m.put("Editable Issue Links", "可编辑的工单链接");
@@ -643,7 +665,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Email Templates", "邮件模板");
m.put("Email Verification", "邮件验证");
m.put("Email address", "电子邮件地址");
+ m.put("Email address already in use: {0}", "电子邮件地址已被使用: {0}");
+ m.put("Email address already invited: {0}", "电子邮件地址已被邀请: {0}");
m.put("Email address already used by another user", "电子邮件地址已被另一个用户使用");
+ m.put("Email addresses with <span class=\"badge badge-warning badge-sm\">ineffective</span> mark are those not belong to or not verified by key owner",
+ "带有 <span class=\"badge badge-warning badge-sm\">无效</span> 标记的电子邮件地址是那些不属于或未被密钥所有者验证的电子邮件地址");
m.put("Email templates", "邮箱模板");
m.put("Empty file added.", "空文件已添加");
m.put("Empty file removed.", "空文件已删除");
@@ -689,6 +715,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Error calculating commits: check log for details", "计算提交时出错:请检查日志");
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 build spec", "解析构建规范时出错");
m.put("Error reverting on {0}: Merge conflicts detected", "revert 到 {0} 时出错:合并冲突检测到");
m.put("Error reverting on {0}: {1}", "revert 到 {0} 时出错:{1}");
@@ -717,6 +744,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Expects one or more <tt>&lt;number&gt;(w|d|h|m)</tt>. For instance <tt>1w 1d 1h 1m</tt> represents 1 week ({0} days), 1 day ({1} hours), 1 hour, and 1 minute",
"需要一个或多个 <tt>&lt;数字&gt;(w|d|h|m)</tt>。例如 <tt>1w 1d 1h 1m</tt> 表示 1 周({0} 天)、1 天({1} 小时)、1 小时和 1 分钟");
m.put("Expire Date", "过期日期");
+ m.put("Expired", "已过期");
m.put("Explicit SSL (StartTLS)", "显式 SSL (StartTLS)");
m.put("Export as OCI layout", "导出为 OCI 布局");
m.put("External Auth Source", "外部认证源");
@@ -751,6 +779,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Filter by name or email address", "按名称或电子邮件地址过滤");
m.put("Filter by name...", "按名称过滤...");
m.put("Filter by path", "按路径过滤");
+ m.put("Filter roles...", "筛选角色...");
m.put("Filter tags...", "过滤标签...");
m.put("Find branch", "查找分支");
m.put("Find or create branch", "查找或创建分支");
@@ -827,6 +856,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Gitea Repositories to Import", "Gitea 要导入的仓库");
m.put("Gitea Repository", "Gitea 仓库");
m.put("Github Access Token Secret", "GitHub 访问令牌密钥");
+ m.put("Global", "全局");
m.put("Global Build Setting", "全局构建设置");
m.put("Global Issue Setting", "全局工单设置");
m.put("Global Pack Setting", "全局打包设置");
@@ -870,6 +900,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Group Retrieval", "组检索");
m.put("Group Search Base", "组搜索基础");
m.put("Group Search Filter", "组搜索过滤器");
+ m.put("Group added", "组已添加");
+ m.put("Group created", "组已创建");
m.put("Groups", "组");
m.put("Groups Claim", "组声明");
m.put("HTTP(S)", "HTTP(S)");
@@ -973,9 +1005,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Invalid PCRE syntax", "无效的 PCRE 语法");
m.put("Invalid credentials", "无效的凭据");
m.put("Invalid date range, expecting \"yyyy-MM-dd to yyyy-MM-dd\"", "无效的日期范围,期望 \"yyyy-MM-dd to yyyy-MM-dd\"");
+ m.put("Invalid email address: {0}", "无效的电子邮件地址: {0}");
m.put("Invalid request path", "无效的请求路径");
m.put("Invalid selection, click for details", "无效的选择,点击查看详情");
+ m.put("Invitation sent to \"{0}\"", "邀请已发送至 \"{0}\"");
+ m.put("Invitation to \"{0}\" deleted", "邀请已取消: \"{0}\"");
m.put("Invitations", "邀请");
+ m.put("Invitations sent", "邀请已发送");
+ m.put("Invite", "邀请");
+ m.put("Invite Users", "邀请用户");
m.put("Is Site Admin", "是否为站点管理员");
m.put("Issue", "工单");
m.put("Issue Close States", "工单关闭状态");
@@ -1018,6 +1056,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Issue list", "工单列表");
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",
+ "工单查询订阅仅影响新工单。要批量管理现有工单的订阅状态,请在工单页面中按订阅状态过滤工单,然后采取适当行动");
m.put("Issue state duration statistics", "工单状态持续时间统计");
m.put("Issue state frequency statistics", "工单状态频率统计");
m.put("Issue state trend statistics", "工单状态趋势统计");
@@ -1140,6 +1180,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Mail Service", "邮件服务");
m.put("Mail Service Bean", "邮件服务Bean");
m.put("Mail service", "邮件服务");
+ m.put("Mail service not configured", "邮件服务未配置");
m.put("Malformed email address", "格式错误的电子邮件地址");
m.put("Manage Job", "管理任务");
m.put("Manager DN", "管理员DN");
@@ -1196,6 +1237,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Multiple Lines", "多行");
m.put("Multiple On the Other Side", "多行在另一侧");
m.put("Must not be empty", "不能为空");
+ m.put("My Access Tokens", "我的访问令牌");
+ m.put("My GPG Keys", "我的 GPG 密钥");
m.put("My Overview", "我的概览");
m.put("My Profile", "我的个人资料");
m.put("My SSH Keys", "我的 SSH 密钥");
@@ -1205,6 +1248,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Name Of Empty Value", "空值的名称");
m.put("Name On the Other Side", "另一侧的名称");
m.put("Name Prefix", "名称前缀");
+ m.put("Name already used by another access token of the owner", "此名称已被其他访问令牌的所有者使用");
m.put("Name invalid", "名称无效");
m.put("Name of the link", "链接的名称");
m.put("Name of the link on the other side. For instance if name is <tt>sub issues</tt>, name on the other side can be <tt>parent issue</tt>",
@@ -1606,10 +1650,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Ownered By", "拥有者");
m.put("PEM private key begins with '-----BEGIN RSA PRIVATE KEY-----'", "PEM 私钥以 '-----BEGIN RSA PRIVATE KEY-----' 开头");
m.put("PMD Report", "PMD 报告");
- m.put("Pack", "打包");
- m.put("Pack Notification", "打包通知");
- m.put("Pack Size Limit", "打包大小限制");
- m.put("Pack Type", "打包类型");
+ m.put("Pack", "包");
+ m.put("Pack Notification", "包通知");
+ m.put("Pack Size Limit", "包大小限制");
+ m.put("Pack Type", "包类型");
m.put("Package", "包");
m.put("Package Management", "包管理");
m.put("Package Notification", "包通知");
@@ -1668,6 +1712,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Please <a wicket:id=\"download\" class=\"font-weight-bolder\">download</a> recovery codes below and keep them secret. These codes can be used to provide one-time access to your account in case you can not access the authentication application. They will <b>NOT</b> be displayed again",
"请<a wicket:id=\"download\" class=\"font-weight-bolder\">下载</a>下方的恢复代码并妥善保管。这些代码可用于在您无法访问认证应用程序时提供一次性账户访问权限。它们<b>不会</b>再次显示");
m.put("Please choose revision to create branch from", "请选择要从中创建分支的版本");
+ m.put("Please configure <a wicket:id=\"mailSetting\">mail setting</a> first", "请先配置 <a wicket:id=\"mailSetting\">邮件设置</a>");
m.put("Please confirm", "请确认");
m.put("Please confirm the password.", "请确认密码。");
m.put("Please input one of your recovery codes saved when enable two-factor authentication",
@@ -1677,6 +1722,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Please select comments to set resolved", "请选择要设置为已解决的评论");
m.put("Please select comments to set unresolved", "请选择要设置为未解决的评论");
m.put("Please select memberships to delete", "请选择要删除的成员");
+ m.put("Please select query watches to delete", "请选择要删除的查询订阅");
m.put("Please select revision to create tag from", "请选择要从中创建标签的版本");
m.put("Please select users to disable", "请选择要禁用的用户");
m.put("Please select users to enable", "请选择要启用的用户");
@@ -1711,6 +1757,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Principal name of the account to login into office 365 mail server to send/receive emails. Make sure this account <b>owns</b> the registered application indicated by application id above",
"登录到 office 365 邮件服务器发送/接收电子邮件的帐户的主名称。确保此帐户 <b>拥有</b> 上述应用程序 ID 指示的注册应用程序");
m.put("Private Key Secret", "私钥密钥");
+ m.put("Privilege", "权限");
m.put("Privilege Settings", "权限设置");
m.put("Profile", "资料");
m.put("Profile updated", "配置已更新");
@@ -1729,6 +1776,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Project Pack Setting", "项目打包设置");
m.put("Project Path", "项目路径");
m.put("Project Pull Request Setting", "项目合并请求设置");
+ m.put("Project authorizations updated", "项目授权已更新");
m.put("Project does not have any code yet", "项目还没有代码");
m.put("Project id", "项目 ID");
m.put("Project list", "项目列表");
@@ -1751,7 +1799,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Publish Problem Report Step", "发布问题报告步骤");
m.put("Publish Report Step", "发布报告步骤");
m.put("Publish Unit Test Report Step", "发布单元测试报告步骤");
- m.put("Published package \"{0}\" of type \"{1}\" in project \"{2}\"", "在项目 \"{2}\" 中发布类型为 \"{1}\" 的包 \"{0}\"");
m.put("Pull Image", "拉取镜像");
m.put("Pull Request", "合并请求");
m.put("Pull Request Filter", "合并请求过滤");
@@ -1766,7 +1813,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Pull request", "合并请求");
m.put("Pull request administrative permission inside a project, including batch operations over multiple pull requests",
"在项目中对多个合并请求进行批量操作的权限");
- m.put("Pull request and code comment", "合并请求和代码评论");
+ m.put("Pull request and code review", "合并请求和代码评审");
m.put("Pull request discard", "合并请求丢弃");
m.put("Pull request duration statistics", "合并请求持续时间统计");
m.put("Pull request frequency statistics", "合并请求频率统计");
@@ -1778,6 +1825,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Pull request not exist or access denied", "合并请求不存在或访问被拒绝");
m.put("Pull request number", "合并请求编号");
m.put("Pull request open or update", "合并请求打开或更新");
+ m.put("Pull request query watch only affects new pull requests. To manage watch status of existing pull requests in batch, filter pull requests by watch status in pull requests page, and then take appropriate action",
+ "合并请求查询订阅仅影响新合并请求。要批量管理现有合并请求的订阅状态,请在合并请求页面中按订阅状态过滤合并请求,然后采取适当行动");
m.put("Push Image", "推送镜像");
m.put("Push docker image from OCI layout via crane. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor",
"此步骤需要由服务器 docker 执行器、远程 docker 执行器或 Kubernetes 执行器执行");
@@ -1814,6 +1863,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Reference Pull Request", "引用合并请求");
m.put("Refresh Token", "刷新令牌");
m.put("Refs", "引用");
+ m.put("Regenerate this access token", "重新生成此访问令牌");
m.put("Registry Login", "注册登录");
m.put("Registry Logins", "注册登录");
m.put("Registry Url", "注册 URL");
@@ -1848,6 +1898,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Required Reviewers", "要求审查者");
m.put("Required Services", "所需服务");
m.put("Resend Verification Email", "重新发送验证电子邮件");
+ m.put("Resend invitation", "重新发送邀请");
m.put("Resolved", "已解决");
m.put("Resolved comment on file \"{0}\" in project \"{1}\"", "将项目 \"{1}\" 的文件 \"{0}\" 上的评论标记为已解决");
m.put("Resource Settings", "资源设置");
@@ -1867,7 +1918,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"版本索引中... (当前版本中的符号导航在索引后才会准确)");
m.put("Right", "右");
m.put("Role", "角色");
+ m.put("Role \"{0}\" deleted", "角色 \"{0}\" 已删除");
+ m.put("Role \"{0}\" updated", "角色 \"{0}\" 已更新");
m.put("Role Management", "角色管理");
+ m.put("Role created", "角色已创建");
+ m.put("Roles", "角色");
m.put("Root Projects", "根项目");
m.put("Roslynator Report", "Roslynator 报告");
m.put("Ruff Report", "Ruff 报告");
@@ -1919,7 +1974,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Scan Path", "扫描路径");
m.put("Scan Paths", "扫描路径");
m.put("Scan below QR code with your TOTP authenticators", "使用您的 TOTP 认证器扫描下方二维码");
- m.put("Schedule Issues", "调度问题");
+ m.put("Schedule Issues", "工单排程");
m.put("Script Name", "脚本名称");
m.put("Scripting Value", "脚本值");
m.put("Search", "搜索");
@@ -1936,7 +1991,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Select", "选择");
m.put("Select Branch to Cherry Pick to", "选择分支进行 cherry-pick");
m.put("Select Branch to Revert on", "选择分支进行 revert");
- m.put("Select Existing", "选择现有工单");
+ m.put("Select Existing", "选择已有");
m.put("Select iteration to schedule issues into", "选择迭代调度问题");
m.put("Select organization to import from. Leave empty to import from repositories under current account",
"选择要从中导入的组织。留空以从当前帐户下的存储库导入");
@@ -1950,6 +2005,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Send notification", "发送通知");
m.put("SendGrid", "SendGrid");
m.put("Sendgrid Webhook Setting", "SendGrid Webhook 设置");
+ m.put("Sending invitation to \"{0}\"...", "正在邀请 \"{0}\"...");
m.put("Sequential Group", "顺序组");
m.put("Server", "服务器");
m.put("Server Docker Executor", "服务器 Docker 执行器");
@@ -2415,7 +2471,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Storage not found", "未找到存储");
m.put("Stored with Git LFS", "使用 Git LFS 存储");
m.put("Subject", "主题");
- m.put("Submitted build \"{0}\" for job \"{1}\"", "运行任务 \"{1}\" 的构建 \"{0}\"");
m.put("Subscription Key", "订阅密钥");
m.put("Subscription data", "订阅数据");
m.put("Successful", "成功");
@@ -2503,14 +2558,20 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("This filter is used to determine the LDAP entry for current user. For example: <i>(&(uid={0})(objectclass=person))</i>. In this example, <i>{0}</i> represents login name of current user.",
"此过滤器用于确定当前用户的 LDAP 条目。例如:<i>(&(uid={0})(objectclass=person))</i>。在此示例中,<i>{0}</i> 表示当前用户的登录名");
m.put("This is a Git LFS object, but the storage file is missing", "这是一个 Git LFS 对象,但存储文件缺失");
+ m.put("This is a built-in role and can not be deleted", "这是一个内置角色,无法删除");
m.put("This is a disabled service account", "这是一个已禁用的服务账户");
m.put("This is a service account for task automation purpose", "这是一个用于任务自动化的服务账户");
+ m.put("This key is associated with {0}, however it is NOT a verified email address of this user",
+ "此密钥与 {0} 相关联,然而它不是此用户的已验证电子邮件地址");
m.put("This key is used to determine if there is a cache hit in project hierarchy (search from current project to root project in order, same for load keys below). A cache is considered hit if its key is exactly the same as the key defined here",
"此密钥用于确定项目层次结构中是否存在缓存命中(按顺序从当前项目搜索到根项目,以下加载密钥同理)。如果缓存的密钥与此处定义的密钥完全相同,则视为缓存命中");
m.put("This key is used to download and upload cache in project hierarchy (search from current project to root project in order)",
"此密钥用于在项目层次结构中下载和上传缓存(按顺序从当前项目搜索到根项目)");
+ m.put("This 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 group", "此名称已被另一个组使用");
+ 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 permission enables one to access confidential issues", "此权限允许访问机密工单");
m.put("This permission enables one to schedule issues into iterations", "此权限允许将工单调度到迭代中");
@@ -2693,6 +2754,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Volume Mounts", "卷挂载");
m.put("Waiting", "等待");
m.put("Watch", "观察");
+ m.put("Watch Status", "订阅状态");
m.put("Web Hook", "Web Hook");
m.put("Web Hooks", "Web Hooks");
m.put("Web Hooks Bean", "Web Hooks Bean");
@@ -2795,6 +2857,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("builds", "构建");
m.put("choose a color for this state", "选择一个颜色");
m.put("cmd-k to show command palette", "cmd-k 显示命令面板");
+ m.put("common", "公共");
m.put("container-image", "容器镜像");
m.put("ctrl-k to show command palette", "ctrl-k 显示命令面板");
m.put("curl Command Line", "curl 命令行");
@@ -2802,7 +2865,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("default", "默认");
m.put("descending", "降序");
m.put("disabled", "禁用");
- m.put("does not have any value of", "没有任何值");
+ m.put("does not have any value of", "没有下列任何值");
m.put("exclude", "排除");
m.put("false", "假");
m.put("found 1 comment", "找到 1 条评论");
@@ -2811,7 +2874,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("found {0} comments", "找到 {0} 条评论");
m.put("found {0} projects", "找到 {0} 个项目");
m.put("found {0} users", "找到 {0} 个用户");
- m.put("has any value of", "具有任何值");
+ m.put("has any value of", "具有下列任何值");
+ m.put("ineffective", "无效");
m.put("is empty", "为空");
m.put("is not empty", "不为空");
m.put("issues", "工单");
@@ -2835,6 +2899,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("on file {0}", "在文件 {0} 上");
m.put("outdated", "过时");
m.put("packages", "包");
+ m.put("personal", "个人");
m.put("pull requests", "合并请求");
m.put("root", "根");
m.put("search in this revision will be accurate after indexed", "索引完成后,在当前版本中的搜索将更准确");
@@ -2866,7 +2931,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");
m.put("{javax.validation.constraints.NotNull.message}", "不能为空");
m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");
-
+ m.put("access [{0}]", "访问 [{0}]");
+ m.put("artifacts", "制品");
+ m.put("log", "日志");
+ m.put("manage job", "管理任务");
+ m.put("pipeline", "流水线");
+ m.put("reports", "报告");
+ m.put("run job", "运行任务");
+
// Manually added keys
m.put("Create Administrator Account", "创建管理员账户");
m.put("Server Setup", "服务器设置");
@@ -2912,7 +2984,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Internal Database", "内部数据库");
m.put("External System", "外部系统");
m.put("Tell user to reset password", "告诉用户重置密码");
- m.put("Commits are taken from default branch of non-forked repositories", "提交取自非分叉仓库的默认分支");
+ m.put("Commits are taken from default branch of non-forked repositories", "代码提交取自非分叉仓库的默认分支");
m.put("issue", "工单");
m.put("code commit", "代码提交");
m.put("pull request and code review", "合并请求和代码评审");