Skip to content

The Unified and Autonomous Development Platform

wip: i18n support

Robin Shen5db24341afd0
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
index 5e621b225c..20fe3a2145 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
@@ -126,7 +126,7 @@ public class BuildImageStep extends Step {
}
- @Editable(order=100, name="Push to Container registry")
+ @Editable(order=100, name="Push to container registry")
public static class RegistryOutput implements Output {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
index 9fd740889b..ad743944bd 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
@@ -167,7 +167,7 @@ public class BuildImageWithKanikoStep extends CommandStep {
}
- @Editable(order=100, name="Push to Container registry")
+ @Editable(order=100, name="Push to container registry")
public static class RegistryOutput implements Output {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
index 1eb16f30e7..94ec61402e 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
@@ -12,6 +12,8 @@ import io.onedev.commons.utils.match.WildcardUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
@@ -48,7 +50,7 @@ public abstract class PersonCriteria extends CommitCriteria {
persons.add("<" + it.getValue() + ">");
});
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
} else if (value.startsWith("@")) {
String userName = value.substring(1);
@@ -73,7 +75,7 @@ public abstract class PersonCriteria extends CommitCriteria {
if (value == null) { // authored by me
User user = User.get();
if (user == null) {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
} else if (user.getEmailAddresses().stream()
.anyMatch(it-> it.isVerified() && it.getValue().equalsIgnoreCase(personEmail))) {
return true;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
index 5d68906744..610566d640 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.build;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class CancelledByMeCriteria extends Criteria<Build> {
Path<User> attribute = from.get(Build.PROP_CANCELLER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -32,7 +34,7 @@ public class CancelledByMeCriteria extends Criteria<Build> {
if (User.get() != null)
return User.get().equals(build.getCanceller());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index fd58de9c42..f804088270 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.build;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<User> attribute = from.get(Build.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -37,7 +39,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(build.getSubmitter());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 3d33e2bfa3..a4cbd56c52 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.codecomment;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
Path<?> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -37,7 +39,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
if (User.get() != null)
return User.get().equals(comment.getUser());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
index 79ebe62925..62f0448cee 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.codecomment;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -30,7 +32,7 @@ public class MentionedMeCriteria extends Criteria<CodeComment> {
builder.equal(mention.get(CodeCommentMention.PROP_USER), User.get())));
return builder.exists(mentionQuery);
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -39,7 +41,7 @@ public class MentionedMeCriteria extends Criteria<CodeComment> {
if (User.get() != null)
return comment.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
index d641dac6ce..ead7409b42 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.codecomment;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -30,7 +32,7 @@ public class RepliedByMeCriteria extends Criteria<CodeComment> {
builder.equal(reply.get(CodeCommentReply.PROP_USER), User.get())));
return builder.exists(replyQuery);
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -39,7 +41,7 @@ public class RepliedByMeCriteria extends Criteria<CodeComment> {
if (User.get() != null)
return comment.getReplies().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
index 27b00a16ef..1d79e5dc42 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -30,7 +32,7 @@ public class CommentedByMeCriteria extends Criteria<Issue> {
builder.equal(comment.get(IssueComment.PROP_USER), User.get())));
return builder.exists(commentQuery);
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -39,7 +41,7 @@ public class CommentedByMeCriteria extends Criteria<Issue> {
if (User.get() != null)
return issue.getComments().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index 4cd646b817..ac11881c65 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -13,6 +13,9 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import java.nio.channels.IllegalSelectorException;
import java.util.ArrayList;
import java.util.Collection;
@@ -46,12 +49,12 @@ public class FieldOperatorCriteria extends FieldCriteria {
if (User.get() != null)
return builder.equal(valueAttribute, User.get().getName());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
} else if (operator == IssueQueryLexer.IsNotMe) {
if (User.get() != null) {
return builder.not(builder.equal(valueAttribute, User.get().getName()));
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
} else if (operator == IssueQueryLexer.IsCurrent) {
if (getFieldSpec() instanceof BuildChoiceField) {
@@ -61,7 +64,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
builder.equal(projectAttribute, build.getProject()),
builder.equal(valueAttribute, String.valueOf(build.getNumber())));
} else {
- throw new ExplicitException("No current build in query context");
+ throw new ExplicitException(_T("No current build in query context"));
}
} else if (getFieldSpec() instanceof PullRequestChoiceField) {
PullRequest request = PullRequest.get();
@@ -70,7 +73,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
builder.equal(projectAttribute, request.getTargetProject()),
builder.equal(valueAttribute, String.valueOf(request.getNumber())));
} else {
- throw new ExplicitException("No current pull request in query context");
+ throw new ExplicitException(_T("No current pull request in query context"));
}
} else if (getFieldSpec() instanceof CommitField) {
ProjectScopedCommit commit = ProjectScopedCommit.get();
@@ -79,7 +82,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
builder.equal(projectAttribute, commit.getProject()),
builder.equal(valueAttribute, commit.getCommitId().name()));
} else {
- throw new ExplicitException("No current commit in query context");
+ throw new ExplicitException(_T("No current commit in query context"));
}
} else {
throw new IllegalStateException();
@@ -97,7 +100,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
return builder.disjunction();
}
} else {
- throw new ExplicitException("No current build in query context");
+ throw new ExplicitException(_T("No current build in query context"));
}
} else {
throw new IllegalStateException();
@@ -124,7 +127,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
else
return Objects.equals(fieldValue, userName);
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
} else if (operator == IssueQueryLexer.IsCurrent) {
if (getFieldSpec() instanceof BuildChoiceField) {
@@ -132,19 +135,19 @@ public class FieldOperatorCriteria extends FieldCriteria {
if (build != null)
return build.getProject().equals(issue.getProject()) && build.getId().toString().equals(fieldValue);
else
- throw new ExplicitException("No build in query context");
+ throw new ExplicitException(_T("No build in query context"));
} else if (getFieldSpec() instanceof PullRequestChoiceField) {
PullRequest request = PullRequest.get();
if (request != null)
return request.getTargetProject().equals(issue.getProject()) && request.getId().toString().equals(fieldValue);
else
- throw new ExplicitException("No pull request in query context");
+ throw new ExplicitException(_T("No pull request in query context"));
} else if (getFieldSpec() instanceof CommitField) {
ProjectScopedCommit commit = ProjectScopedCommit.get();
if (commit != null)
return commit.getProject().equals(issue.getProject()) && commit.getCommitId().name().equals(fieldValue);
else
- throw new ExplicitException("No commit in query context");
+ throw new ExplicitException(_T("No commit in query context"));
} else {
throw new IllegalStateException();
}
@@ -157,7 +160,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
.stream()
.anyMatch(it->it.equals(fieldValue));
} else {
- throw new ExplicitException("No build in query context");
+ throw new ExplicitException(_T("No build in query context"));
}
} else {
throw new IllegalStateException();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
index 0929dcdbea..c45e8b2362 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
@@ -1,6 +1,7 @@
package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;
+import static io.onedev.server.web.translation.Translation._T;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
@@ -24,7 +25,7 @@ public class IgnoredByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class IgnoredByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).matches(issue);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<Issue> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
index ad52fbd20b..adc5263ed5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -30,7 +32,7 @@ public class MentionedMeCriteria extends Criteria<Issue> {
builder.equal(mention.get(IssueMention.PROP_USER), User.get())));
return builder.exists(mentionQuery);
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -39,7 +41,7 @@ public class MentionedMeCriteria extends Criteria<Issue> {
if (User.get() != null)
return issue.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 494c5c5400..a5c84c3ade 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -37,7 +39,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(issue.getSubmitter());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
index d0d8ecf5cd..662b7e8a20 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
@@ -1,6 +1,7 @@
package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;
+import static io.onedev.server.web.translation.Translation._T;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
@@ -24,7 +25,7 @@ public class WatchedByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class WatchedByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).matches(issue);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<Issue> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
index cf30511b65..dc23b55551 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pack;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class PublishedByMeCriteria extends PublishedByCriteria {
Path<User> attribute = from.get(Pack.PROP_USER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -37,7 +39,7 @@ public class PublishedByMeCriteria extends PublishedByCriteria {
if (User.get() != null)
return User.get().equals(pack.getUser());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
index 11159f2693..9b100e5125 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.project;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -21,7 +23,7 @@ public class OwnedByMeCriteria extends OwnedByCriteria {
if (User.get() != null)
return new OwnedByUserCriteria(User.get()).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -34,7 +36,7 @@ public class OwnedByMeCriteria extends OwnedByCriteria {
if (User.get() != null)
return new OwnedByUserCriteria(User.get()).matches(project);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index dbd8d46140..133da236fa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -28,7 +30,7 @@ public class ApprovedByMeCriteria extends ApprovedByCriteria {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -37,7 +39,7 @@ public class ApprovedByMeCriteria extends ApprovedByCriteria {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index 33b9a99349..f6bc47d205 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class AssignedToMeCriteria extends AssignedToCriteria {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -37,7 +39,7 @@ public class AssignedToMeCriteria extends AssignedToCriteria {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
index aaeb0272ab..1fb7cc8e92 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class CommentedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class CommentedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
index e518c9bc11..afb033166d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
@@ -13,6 +13,7 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredByMe;
+import static io.onedev.server.web.translation.Translation._T;
public class IgnoredByMeCriteria extends Criteria<PullRequest> {
@@ -24,7 +25,7 @@ public class IgnoredByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class IgnoredByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
index 1f44187481..685f822911 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class MentionedMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class MentionedMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
index 65b9842c28..d76daad2ca 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class NeedMyActionCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class NeedMyActionCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index a8881c9b98..7c0ccf2ce7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index f5b2af3a37..d1078976f3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -23,7 +25,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<?> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
}
@@ -37,7 +39,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(request.getSubmitter());
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
index 544aa2457b..08d6b45db1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
index 6f36e366af..99d336cff1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index 62ea11cfcf..2e0ca215ed 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.web.translation.Translation._T;
+
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -22,7 +24,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -31,7 +33,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
index 59b2d19a25..232a8e6968 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
@@ -13,6 +13,7 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;
+import static io.onedev.server.web.translation.Translation._T;
public class WatchedByMeCriteria extends Criteria<PullRequest> {
@@ -24,7 +25,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException("Please login to perform this query");
+ throw new ExplicitException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html
index 8ab262dc6a..291dcbc889 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html
@@ -1,30 +1,30 @@
<wicket:extend>
<div class="form-group">
- <label class="control-label">Type</label>
+ <label class="control-label"><wicket:t>Type</wicket:t></label>
<input wicket:id="type" type="hidden" class="form-control">
</div>
<div class="form-group">
- <label class="control-label">Label</label>
+ <label class="control-label"><wicket:t>Label</wicket:t></label>
<input wicket:id="label" type="hidden" class="form-control">
</div>
<div class="form-group">
- <label class="control-label">Published After</label>
+ <label class="control-label"><wicket:t>Published After</wicket:t></label>
<div class="clearable-wrapper">
<input wicket:id="publishedAfter" type="text" class="form-control">
</div>
</div>
<div class="form-group">
- <label class="control-label">Published Before</label>
+ <label class="control-label"><wicket:t>Published Before</wicket:t></label>
<div class="clearable-wrapper">
<input wicket:id="publishedBefore" type="text" class="form-control">
</div>
</div>
<div class="form-group">
- <label class="control-label">Published By Project</label>
+ <label class="control-label"><wicket:t>Published By Project</wicket:t></label>
<input wicket:id="publishedByProject" type="hidden" class="form-control">
</div>
<div class="form-group">
- <label class="control-label">Published By User</label>
+ <label class="control-label"><wicket:t>Published By User</wicket:t></label>
<input wicket:id="publishedByUser" type="hidden" class="form-control">
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
index 18dd631bed..646da7aa9e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
@@ -13,22 +13,22 @@
</div>
<div class="mb-4">
<a wicket:id="showSavedQueries" class="show-saved-queries text-gray d-inline-block mb-2 mr-4 text-nowrap">
- <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
+ <wicket:svg href="eye" class="icon"></wicket:svg> <wicket:t>Show Saved Queries</wicket:t>
</a>
<a wicket:id="saveQuery" class="save-query text-gray d-inline-block mb-2 mr-4 text-nowrap">
- <wicket:svg href="save" class="icon"></wicket:svg> Save Query
+ <wicket:svg href="save" class="icon"></wicket:svg> <wicket:t>Save Query</wicket:t>
</a>
<a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
- <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ <wicket:svg href="filter" class="icon"></wicket:svg> <wicket:t>Filter</wicket:t>
</a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap">
- <wicket:svg href="sort" class="icon"></wicket:svg> Order By
+ <wicket:svg href="sort" class="icon"></wicket:svg> <wicket:t>Order By</wicket:t>
</a>
<a wicket:id="operations" class="operations text-gray mr-4 mb-2 d-inline-block text-nowrap">
- <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations
+ <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> <wicket:t>Operations</wicket:t>
</a>
<a wicket:id="help" class="help text-gray mr-4 mb-2 d-inline-block text-nowrap">
- <wicket:svg href="question-circle" class="icon"></wicket:svg> How to Publish
+ <wicket:svg href="question-circle" class="icon"></wicket:svg> <wicket:t>How to Publish</wicket:t>
</a>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
@@ -47,7 +47,7 @@
<span wicket:id="labels"></span>
</wicket:fragment>
<wicket:fragment wicket:id="helpFrag">
- <div class="alert alert-notice alert-light-info">Follow below instructions to publish packages into this project</div>
+ <div class="alert alert-notice alert-light-info"><wicket:t>Follow below instructions to publish packages into this project</wicket:t></div>
<ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-4"></ul>
<div wicket:id="content"></div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index f7598aa5e9..c477fab635 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.pack.list;
import static io.onedev.server.web.translation.Translation._T;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -137,7 +138,7 @@ public abstract class PackListPanel extends Panel {
error(e.getMessage());
return null;
} else {
- info("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and \"Type\" is \"NPM\"");
+ info(_T("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and \"Type\" is \"NPM\""));
parsedQuery = new PackQuery(new FuzzyCriteria(queryString));
}
}
@@ -229,9 +230,9 @@ public abstract class PackListPanel extends Panel {
if (!isEnabled())
tag.append("class", "disabled", " ");
if (!querySubmitted)
- tag.put("title", "Query not submitted");
+ tag.put("data-tippy-content", _T("Query not submitted"));
else if (queryModel.getObject() == null)
- tag.put("title", "Can not save malformed query");
+ tag.put("data-tippy-content", _T("Can not save malformed query"));
}
@Override
@@ -251,7 +252,7 @@ public abstract class PackListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete Selected Packages";
+ return _T("Delete Selected Packages");
}
@Override
@@ -277,7 +278,7 @@ public abstract class PackListPanel extends Panel {
@Override
protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete selected packages";
+ return _T("Type <code>yes</code> below to delete selected packages");
}
@Override
@@ -301,7 +302,7 @@ public abstract class PackListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select packages to delete");
+ tag.put("data-tippy-content", _T("Please select packages to delete"));
}
}
@@ -343,7 +344,7 @@ public abstract class PackListPanel extends Panel {
@Override
protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete all queried packages";
+ return _T("Type <code>yes</code> below to delete all queried packages");
}
@Override
@@ -367,7 +368,7 @@ public abstract class PackListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No packages to delete");
+ tag.put("data-tippy-content", _T("No packages to delete"));
}
}
@@ -459,7 +460,7 @@ public abstract class PackListPanel extends Panel {
help = newHelpPanel(id);
help.add(AttributeAppender.append("class", "pack-publish-help"));
} else {
- help = new Label(id, "Please switch to packages page of a particular project for the instructions");
+ help = new Label(id, _T("Please switch to packages page of a particular project for the instructions"));
help.add(AttributeAppender.append("class", "p-3"));
}
return help;
@@ -521,9 +522,9 @@ public abstract class PackListPanel extends Panel {
@Override
public String getObject() {
if (dataProvider.size() > 1)
- return "found " + dataProvider.size() + " packages";
+ return MessageFormat.format(_T("found {0} packages"), dataProvider.size());
else
- return "found 1 package";
+ return _T("found 1 package");
}
}) {
@Override
@@ -593,7 +594,7 @@ public abstract class PackListPanel extends Panel {
if (getProject() != null && SecurityUtils.canWritePack(getProject()))
columns.add(selectionColumn = new SelectionColumn<>());
- columns.add(new AbstractColumn<>(Model.of("Package")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Package"))) {
@Override
public String getCssClass() {
@@ -636,7 +637,7 @@ public abstract class PackListPanel extends Panel {
});
if (showType) {
- columns.add(new AbstractColumn<>(Model.of("Type")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Type"))) {
@Override
public String getCssClass() {
@@ -645,12 +646,12 @@ public abstract class PackListPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<Pack>> cellItem, String componentId, IModel<Pack> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getType()));
+ cellItem.add(new Label(componentId, _T(rowModel.getObject().getType())));
}
});
}
- columns.add(new AbstractColumn<>(Model.of("Last Published")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Last Published"))) {
@Override
public String getCssClass() {
@@ -663,7 +664,7 @@ public abstract class PackListPanel extends Panel {
}
});
- columns.add(new AbstractColumn<>(Model.of("Total Size")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Total Size"))) {
@Override
public String getCssClass() {
@@ -695,7 +696,7 @@ public abstract class PackListPanel extends Panel {
packSupports.sort(Comparator.comparing(PackSupport::getOrder));
List<Tab> tabs = new ArrayList<>();
for (var packSupport: packSupports) {
- tabs.add(new AjaxActionTab(Model.of(packSupport.getPackType()), Model.of(packSupport.getPackIcon())) {
+ tabs.add(new AjaxActionTab(Model.of(_T(packSupport.getPackType())), Model.of(packSupport.getPackIcon())) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
var helpContent = packSupport.renderHelp("content", getProject()) ;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html
index f5c78631dd..184553fc7f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html
@@ -2,19 +2,19 @@
<div class="pack-side">
<div class="properties">
<div>
- <div class="name">Published By</div>
+ <div class="name"><wicket:t>Published By</wicket:t></div>
<div class="value">
<a wicket:id="publisher" class="text-break"></a>
</div>
</div>
<div>
- <div class="name">Published At</div>
+ <div class="name"><wicket:t>Published At</wicket:t></div>
<div class="value">
<span wicket:id="publishDate"></span>
</div>
</div>
<div>
- <div class="name">Total Size</div>
+ <div class="name"><wicket:t>Total Size</wicket:t></div>
<div class="value">
<span wicket:id="totalSize"></span>
</div>
@@ -32,15 +32,15 @@
</wicket:enclosure>
<div wicket:id="labels" class="labels">
<div wicket:id="head" class="d-flex align-items-center justify-content-between mb-3">
- <span class="font-weight-bolder">Labels</span>
+ <span class="font-weight-bolder"><wicket:t>Labels</wicket:t></span>
<wicket:svg href="gear" class="icon icon-sm"></wicket:svg>
</div>
<div wicket:id="body" class="body d-flex align-items-center"></div>
- <span wicket:id="labelsHelp" class="form-text font-size-sm text-muted"><wicket:svg href="bulb" class="icon icon-sm"/> Labels can be defined in Administration / Label Management</span>
+ <span wicket:id="labelsHelp" class="form-text font-size-sm text-muted"><wicket:svg href="bulb" class="icon icon-sm"/> <wicket:t>Labels can be defined in Administration / Label Management</wicket:t></span>
</div>
<wicket:enclosure child="delete">
<div class="actions">
- <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
+ <a wicket:id="delete" class="delete btn btn-light-danger"><wicket:t>Delete</wicket:t></a>
</div>
</wicket:enclosure>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
index 1ce7c6b95e..11358e2f72 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.pack.side;
import static io.onedev.server.search.commit.Revision.Type.COMMIT;
import static io.onedev.server.search.entity.issue.IssueQuery.merge;
+import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.util.List;
@@ -143,7 +144,7 @@ public abstract class PackSidePanel extends Panel {
@Override
protected String getPlaceholder() {
- return "Fixed issues since...";
+ return _T("Fixed issues since...");
}
});
} else {
@@ -162,7 +163,7 @@ public abstract class PackSidePanel extends Panel {
@Override
protected String getPlaceholder() {
- return "Changes since...";
+ return _T("Code changes since...");
}
});
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
index eb6979e6d9..90e3f77665 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
@@ -7,7 +7,7 @@
<span wicket:id="labels"></span>
</div>
<div class="font-size-sm">
- <span wicket:id="id"></span><span wicket:id="key"></span><wicket:enclosure child="forkedFrom">, forked from <a wicket:id="forkedFrom"></a></wicket:enclosure>
+ <span wicket:id="id"></span><span wicket:id="key"></span><wicket:enclosure child="forkedFrom">, <wicket:t>forked from <a wicket:id="forkedFrom"></a></wicket:t></wicket:enclosure>
</div>
</div>
<wicket:enclosure child="forkInfo">
@@ -22,12 +22,12 @@
<wicket:enclosure child="serviceDesk">
<div class="mt-2">
<a wicket:id="serviceDesk"><wicket:svg href="mail" class="icon"></wicket:svg> <span wicket:id="label"></span></a>
- <div class="font-size-sm mt-1 text-muted">Issues can be created in this project by sending email to this address</div>
+ <div class="font-size-sm mt-1 text-muted"><wicket:t>Issues can be created in this project by sending email to this address</wicket:t></div>
</div>
</wicket:enclosure>
<div wicket:id="description" class="mt-4"></div>
<wicket:enclosure child="replicas">
- <div class="font-weight-bolder font-size-lg mt-4 mb-2">Replicas</div>
+ <div class="font-weight-bolder font-size-lg mt-4 mb-2"><wicket:t>Replicas</wicket:t></div>
<table class="table mb-0">
<tbody>
<tr wicket:id="replicas">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index e4b83ebc7c..291137ff46 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -1,23 +1,15 @@
package io.onedev.server.web.component.project.info;
-import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.replica.ProjectReplica;
-import io.onedev.server.search.entity.project.ProjectQuery;
-import io.onedev.server.search.entity.project.ProjectQueryLexer;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.ParsedEmailAddress;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -38,16 +30,26 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static io.onedev.server.replica.ProjectReplica.Type.REDUNDANT;
-import static java.util.Comparator.comparingInt;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
+import io.onedev.server.OneDev;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.replica.ProjectReplica;
+import io.onedev.server.search.entity.project.ProjectQuery;
+import io.onedev.server.search.entity.project.ProjectQueryLexer;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ParsedEmailAddress;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;
+import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
public abstract class ProjectInfoPanel extends Panel {
@@ -99,7 +101,7 @@ public abstract class ProjectInfoPanel extends Panel {
+ Criteria.quote(getProject().getPath());
PageParameters params = ProjectListPage.paramsOf(query, 0, getProject().getForks().size());
Link<Void> forksLink = new BookmarkablePageLink<Void>("forks", ProjectListPage.class, params);
- forksLink.add(new Label("label", getProject().getForks().size() + " forks"));
+ forksLink.add(new Label("label", MessageFormat.format(_T("{0} forks"), getProject().getForks().size())));
forkInfo.add(forksLink);
ModalLink forkNow = new ModalLink("forkNow") {
@@ -187,8 +189,8 @@ public abstract class ProjectInfoPanel extends Panel {
for (var server: getClusterManager().getServerAddresses())
orders.put(server, index++);
return replicas.stream()
- .filter(it -> orders.containsKey(it.getKey()) && (it.getValue().getType() != REDUNDANT || it.getKey().equals(activeServer)))
- .sorted(comparingInt(o -> orders.get(o.getKey())))
+ .filter(it -> orders.containsKey(it.getKey()) && (it.getValue().getType() != ProjectReplica.Type.REDUNDANT || it.getKey().equals(activeServer)))
+ .sorted(Comparator.comparingInt(o -> orders.get(o.getKey())))
.collect(Collectors.toList());
}
}) {
@@ -197,14 +199,14 @@ public abstract class ProjectInfoPanel extends Panel {
protected void populateItem(ListItem<Map.Entry<String, ProjectReplica>> item) {
var server = item.getModelObject().getKey();
var replica = item.getModelObject().getValue();
- var escapedServer = escapeHtml5(server + " (" + getClusterManager().getServerName(server) + ")");
+ var escapedServer = HtmlEscape.escapeHtml5(server + " (" + getClusterManager().getServerName(server) + ")");
String serverInfo;
if (server.equals(activeServer))
- serverInfo = escapedServer + " <span class='badge badge-sm badge-info ml-1'>active</span>";
+ serverInfo = escapedServer + " <span class='badge badge-sm badge-info ml-1'>" + _T("active") + "</span>";
else if (replica.getVersion() == latestVersion)
- serverInfo = escapedServer + " <span class='badge badge-sm badge-success ml-1'>up to date</span>";
+ serverInfo = escapedServer + " <span class='badge badge-sm badge-success ml-1'>" + _T("up to date") + "</span>";
else
- serverInfo = escapedServer + " <span class='badge badge-sm badge-warning ml-1'>outdated</span>";
+ serverInfo = escapedServer + " <span class='badge badge-sm badge-warning ml-1'>" + _T("outdated") + "</span>";
item.add(new Label("server", serverInfo).setEscapeModelStrings(false));
var projectId = getProject().getId();
@@ -216,11 +218,11 @@ public abstract class ProjectInfoPanel extends Panel {
try {
getProjectManager().requestToSyncReplica(projectId, activeServer);
} catch (Exception e) {
- logger.error("Error requestig to sync replica of project with id '" + projectId + "'", e);
+ logger.error(MessageFormat.format("Error requestig to sync replica of project with id \"{0}\"", projectId), e);
}
return null;
});
- Session.get().success("Sync requested. Please check status after a while");
+ Session.get().success(_T("Sync requested. Please check status after a while"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index dc8ae69872..360fead7ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -230,9 +230,9 @@ public class EditableUtils {
public static String getGroupedType(Class<?> clazz) {
Editable editable = clazz.getAnnotation(Editable.class);
if (editable != null && editable.group().length() != 0)
- return editable.group() + " / " + getDisplayName(clazz);
+ return _T(editable.group()) + " / " + _T(getDisplayName(clazz));
else
- return getDisplayName(clazz);
+ return _T(getDisplayName(clazz));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html
index 8c4b639dd5..44c19133a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html
@@ -15,8 +15,8 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <button wicket:id="save" class="btn btn-primary">Save</button>
- <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
+ <button wicket:id="save" class="btn btn-primary"><wicket:t>Save</wicket:t></button>
+ <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/editable/enumeration/EnumEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
index 179da9d70a..3f94a3b21d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
@@ -1,18 +1,20 @@
package io.onedev.server.web.editable.enumeration;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.lang.reflect.AnnotatedElement;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.server.web.util.TextUtils;
public class EnumEditSupport implements EditSupport {
@@ -28,7 +30,7 @@ public class EnumEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new Label(id, StringUtils.capitalize(model.getObject().name().replace('_', ' ').toLowerCase()));
+ return new Label(id, _T(TextUtils.getDisplayValue(model.getObject())));
} else {
return new EmptyValueLabel(id) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
index 8268097346..860b387e5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.editable.enumlist;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.lang.reflect.AnnotatedElement;
import java.util.List;
@@ -14,6 +16,7 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.server.web.util.TextUtils;
public class EnumListEditSupport implements EditSupport {
@@ -35,9 +38,9 @@ public class EnumListEditSupport implements EditSupport {
String content = "";
for (Enum<?> each: model.getObject()) {
if (content.length() == 0)
- content += each.toString();
+ content += _T(TextUtils.getDisplayValue(each));
else
- content += ", " + each.toString();
+ content += ", " + _T(TextUtils.getDisplayValue(each));
}
return new Label(id, content);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
index 2d7e4af728..30420b84d2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
@@ -8,6 +8,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
@@ -34,9 +36,7 @@ public class PolymorphicPropertyViewer extends Panel {
protected void onInitialize() {
super.onInitialize();
- String displayName = EditableUtils.getDisplayName(propertyValue.getClass());
-
- add(new Label("type", displayName));
+ add(new Label("type", _T(EditableUtils.getDisplayName(propertyValue.getClass()))));
add(new Label("typeDescription", new AbstractReadOnlyModel<String>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 0204ed3cbe..75a4e0c9f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -231,7 +231,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public String getObject() {
- return buildModel.getObject().getStatus().toString();
+ return _T(buildModel.getObject().getStatus().toString());
}
}));
@@ -526,7 +526,7 @@ public abstract class BuildDetailPage extends ProjectPage
tabs.add(new BuildTab(Model.of(_T("Fixed Issues")), FixedIssuesPage.class, params));
if (SecurityUtils.canReadCode(getProject()))
- tabs.add(new BuildTab(Model.of(_T("Changes")), BuildChangesPage.class, BuildChangesPage.paramsOf(getBuild())));
+ tabs.add(new BuildTab(Model.of(_T("Code Changes")), BuildChangesPage.class, BuildChangesPage.paramsOf(getBuild())));
List<BuildTabContribution> contributions = new ArrayList<>(OneDev.getExtensions(BuildTabContribution.class));
contributions.sort(Comparator.comparing(BuildTabContribution::getOrder));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
index 4a9a9504e3..063cf8b151 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html
@@ -5,6 +5,6 @@
<div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon icon-sm mt-n1"/> This page lists fixed issues since previous successful build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a></div>
</wicket:fragment>
<wicket:fragment wicket:id="noPreviousSuccessfulBuildFrag">
- <div class="alert alert-light-warning">No previous successful build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a> to calculate fixed issues since</div>
+ <div class="alert alert-light-warning"><wicket:t>No previous successful build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a> to calculate fixed issues since</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/project/children/ProjectChildrenPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
index 75644893c5..23c29af777 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.children;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import javax.annotation.Nullable;
@@ -106,12 +108,12 @@ public class ProjectChildrenPage extends ProjectPage {
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "Child Projects");
+ return new Label(componentId, _T("Child Projects"));
}
@Override
protected String getPageTitle() {
- return "Child Projects - " + getProject().getPath();
+ return _T("Child Projects") + " - " + getProject().getPath();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
index 7379034f33..f36a5a3c1a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
@@ -35,6 +35,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import javax.annotation.Nullable;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -261,12 +264,12 @@ public class ProjectPacksPage extends ProjectPage {
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "Packages");
+ return new Label(componentId, _T("Packages"));
}
@Override
protected String getPageTitle() {
- return "Packages - " + getProject().getPath();
+ return _T("Packages") + " - " + getProject().getPath();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.html
index 3a5022e00a..f262b53e28 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.html
@@ -16,7 +16,7 @@
</div>
<wicket:fragment wicket:id="projectTitleFrag">
<span class="d-flex align-items-center">
- <a wicket:id="packs" class="text-nowrap">Packages</a>
+ <a wicket:id="packs" class="text-nowrap"><wicket:t>Packages</wicket:t></a>
<span class="dot"></span>
<svg wicket:id="packIcon" class="icon icon-lg mr-2"/><span wicket:id="packReference"></span>
</span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java
index 331ed255b3..ae8d7e1511 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java
@@ -1,5 +1,24 @@
package io.onedev.server.web.page.project.packs.detail;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+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.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PackManager;
import io.onedev.server.model.Pack;
@@ -20,21 +39,6 @@ import io.onedev.server.web.page.project.packs.ProjectPacksPage;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
-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.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import java.util.List;
public class PackDetailPage extends ProjectPage {
@@ -80,7 +84,7 @@ public class PackDetailPage extends ProjectPage {
super.onInitialize();
add(new Label("reference", getPack().getReference(false)));
- add(new Label("type", "(" + getPack().getType() + ")"));
+ add(new Label("type", "(" + _T(getPack().getType()) + ")"));
add(new SideInfoLink("moreInfo"));
@@ -105,7 +109,7 @@ public class PackDetailPage extends ProjectPage {
public void onClick() {
getPackManager().delete(getPack());
- Session.get().success("Package " + getPack().getReference(false) + " deleted");
+ Session.get().success(MessageFormat.format(_T("Package {0} deleted"), getPack().getReference(false)));
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(Pack.class);
if (redirectUrlAfterDelete != null)
@@ -114,7 +118,7 @@ public class PackDetailPage extends ProjectPage {
setResponsePage(ProjectPacksPage.class, ProjectPacksPage.paramsOf(getProject()));
}
- }.add(new ConfirmClickModifier("Do you really want to delete this package?"));
+ }.add(new ConfirmClickModifier(_T("Do you really want to delete this package?")));
}
};
@@ -122,7 +126,7 @@ public class PackDetailPage extends ProjectPage {
@Override
protected Component newTitle(String componentId) {
- return new EntityNavPanel<Pack>(componentId, "package") {
+ return new EntityNavPanel<Pack>(componentId, _T("package")) {
@Override
protected EntityQuery<Pack> parse(String queryString, Project project) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html
index 87aa85568c..b2d9a73fb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.html
@@ -8,13 +8,13 @@
<div class="d-flex align-items-center mb-4">
<span class="date-range mr-3 font-size-h5"></span>
<select class="contrib-type custom-select form-control ml-auto">
- <option>Commits</option>
- <option>Additions</option>
- <option>Deletions</option>
+ <option value="Commits"><wicket:t>Commits</wicket:t></option>
+ <option value="Additions"><wicket:t>Additions</wicket:t></option>
+ <option value="Deletions"><wicket:t>Deletions</wicket:t></option>
</select>
</div>
<div class="overall chart border p-4 rounded mb-4"></div>
<div class="top-contributors"></div>
</div>
<div wicket:id="userCard" class="user-card-content"></div>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.java
index 980b4e1bf5..e27d4a0a91 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeContribsPage.java
@@ -1,13 +1,11 @@
package io.onedev.server.web.page.project.stats.code;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.server.OneDev;
-import io.onedev.server.git.GitContribution;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.component.user.card.PersonCardPanel;
-import io.onedev.server.xodus.CommitInfoManager;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -20,8 +18,15 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.PersonIdent;
-import java.util.HashMap;
-import java.util.Map;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.git.GitContribution;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.user.card.PersonCardPanel;
+import io.onedev.server.xodus.CommitInfoManager;
public class CodeContribsPage extends CodeStatsPage {
@@ -42,7 +47,7 @@ public class CodeContribsPage extends CodeStatsPage {
protected void onInitialize() {
super.onInitialize();
if (getProject().getDefaultBranch() != null)
- add(new Label("note", "Contributions to " + getProject().getDefaultBranch() + " branch, excluding merge commits"));
+ add(new Label("note", MessageFormat.format(_T("Contributions to {0} branch, excluding merge commits"), getProject().getDefaultBranch())));
else
add(new WebMarkupContainer("note").setVisible(false));
add(new WebMarkupContainer(USER_CARD_ID).setOutputMarkupId(true));
@@ -81,23 +86,26 @@ public class CodeContribsPage extends CodeStatsPage {
PageParameters params = TopContributorsResource.paramsOf(getProject());
String topContributorsUrl = urlFor(new TopContributorsResourceReference(), params).toString();
- String jsonOfData;
+ var mapper = OneDev.getInstance(ObjectMapper.class);
try {
- jsonOfData = OneDev.getInstance(ObjectMapper.class).writeValueAsString(data);
+ var jsonOfData = mapper.writeValueAsString(data);
+ var translations = new HashMap<String, String>();
+ translations.put("commits", _T("commits"));
+ translations.put("noData", _T("No data"));
+ var jsonOfTranslations = mapper.writeValueAsString(translations);
+ CharSequence callback = userCardBehavior.getCallbackFunction(
+ CallbackParameter.explicit("name"), CallbackParameter.explicit("emailAddress"));
+ String script = String.format("onedev.server.codeStats.contribs.onDomReady(%s, '%s', %s, %b, %s);",
+ jsonOfData, topContributorsUrl, callback, isDarkMode(), jsonOfTranslations);
+ response.render(OnDomReadyHeaderItem.forScript(script));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
- }
-
- CharSequence callback = userCardBehavior.getCallbackFunction(
- CallbackParameter.explicit("name"), CallbackParameter.explicit("emailAddress"));
- String script = String.format("onedev.server.codeStats.contribs.onDomReady(%s, '%s', %s, %b);",
- jsonOfData, topContributorsUrl, callback, isDarkMode());
- response.render(OnDomReadyHeaderItem.forScript(script));
+ }
}
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "Code Contribution Statistics");
+ return new Label(componentId, _T("Code Contribution Statistics"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java
index 6d84b59848..a03f44a59d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/CodeStatsPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.stats.code;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -28,8 +30,8 @@ public abstract class CodeStatsPage extends ProjectPage {
var tabs = new ArrayList<PageTab>();
var params = paramsOf(getProject());
- tabs.add(new PageTab(Model.of("Contributions"), CodeContribsPage.class, params));
- tabs.add(new PageTab(Model.of("Source Lines"), SourceLinesPage.class, params));
+ tabs.add(new PageTab(Model.of(_T("Contributions")), CodeContribsPage.class, params));
+ tabs.add(new PageTab(Model.of(_T("Source Lines")), SourceLinesPage.class, params));
add(new Tabbable("tabs", tabs));
}
@@ -46,7 +48,7 @@ public abstract class CodeStatsPage extends ProjectPage {
@Override
protected String getPageTitle() {
- return "Code Statistics - " + getProject().getPath();
+ return _T("Code Statistics") + " - " + getProject().getPath();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
index 4dea2355c4..7bfff9a555 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/SourceLinesPage.java
@@ -1,18 +1,23 @@
package io.onedev.server.web.page.project.stats.code;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.server.OneDev;
-import io.onedev.server.xodus.CommitInfoManager;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeSet;
+
import org.apache.wicket.Component;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeSet;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.xodus.CommitInfoManager;
public class SourceLinesPage extends CodeStatsPage {
@@ -29,12 +34,17 @@ public class SourceLinesPage extends CodeStatsPage {
Map<Integer, Map<String, Integer>> data = new LinkedHashMap<>();
for (var key: new TreeSet<>(lineIncrements.keySet()))
data.put(key, lineIncrements.get(key));
+ var translations = new HashMap<String, String>();
+ translations.put("noData", _T("No data"));
+ translations.put("noDefaultBranch", _T("No default branch"));
+ translations.put("sloc", _T("SLOC on {0}"));
try {
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
String jsonOfData = mapper.writeValueAsString(data);
String jsonOfDefaultBranch = mapper.writeValueAsString(getProject().getDefaultBranch());
- String script = String.format("onedev.server.codeStats.sourceLines.onDomReady(%s, %s, %b);",
- jsonOfData, jsonOfDefaultBranch, isDarkMode());
+ String jsonOfTranslations = mapper.writeValueAsString(translations);
+ String script = String.format("onedev.server.codeStats.sourceLines.onDomReady(%s, %s, %b, %s);",
+ jsonOfData, jsonOfDefaultBranch, isDarkMode(), jsonOfTranslations);
response.render(OnDomReadyHeaderItem.forScript(script));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
@@ -43,7 +53,7 @@ public class SourceLinesPage extends CodeStatsPage {
@Override
protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "Code Line Statistics");
+ return new Label(componentId, _T("Code Line Statistics"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java
index 5ce08a83f8..904acb0f07 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java
@@ -33,6 +33,7 @@ import io.onedev.server.search.commit.CommitQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
+import io.onedev.server.web.page.user.profile.UserProfilePage;
import io.onedev.server.xodus.CommitInfoManager;
class TopContributorsResource extends AbstractResource {
@@ -91,8 +92,9 @@ class TopContributorsResource extends AbstractResource {
AuthorCriteria authorCriteria;
EmailAddress emailAddress = emailAddressManager.findByValue(author.getEmailAddress());
if (emailAddress != null && emailAddress.isVerified()) {
- authorCriteria = new AuthorCriteria(Lists.newArrayList(
- "@" + emailAddress.getOwner().getName()));
+ var user = emailAddress.getOwner();
+ authorCriteria = new AuthorCriteria(Lists.newArrayList("@" + user.getName()));
+ contributorData.put("authorProfileUrl", RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user)));
} else {
authorCriteria = new AuthorCriteria(Lists.newArrayList(
author.getName() + " <" + author.getEmailAddress() + ">"
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
index 27e4e2c114..d810cd29d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/code-stats.js
@@ -14,11 +14,11 @@ onedev.server.codeStats = {
return localDate.year()%100 + "-" + localDate.monthValue() + "-" + localDate.dayOfMonth();
},
contribs: {
- onDomReady : function(overallContributions, topContributorsDataUrl, userCardCallback, darkMode) {
+ onDomReady : function(overallContributions, topContributorsDataUrl, userCardCallback, darkMode, translations) {
var $contribs = $(".code-contribs");
var $overall = $contribs.find(".overall");
if (Object.keys(overallContributions).length === 0) {
- $overall.html("<div class='no-data'>No data</div>");
+ $overall.html("<div class='no-data'>" + translations.noData + "</div>");
return;
}
@@ -194,13 +194,32 @@ onedev.server.codeStats = {
}
function renderContributor($container, contributor, index) {
+ function createAuthorLink() {
+ var $link = $("<a class='user'></a>");
+ if (contributor.authorProfileUrl)
+ $link.attr("href", contributor.authorProfileUrl);
+ else
+ $link.css("cursor", "default");
+ return $link;
+ }
var $contrib = $("<div class='contrib border rounded p-3 mb-5'></div>");
$container.append($contrib);
var $head = $("<div class='head d-flex align-items-center'></div>");
$contrib.append($head);
var $left = $("<div class='mr-3 d-flex align-items-center'></div>");
$head.append($left);
- $left.append("<a class='user mr-3'><img class='avatar' src='" + contributor.authorAvatarUrl + "'></img></a>");
+ var $avatarLink = createAuthorLink();
+ $avatarLink.addClass("mr-3");
+ $avatarLink.append("<img class='avatar' src='" + contributor.authorAvatarUrl + "'></img>");
+ $left.append($avatarLink);
+
+ var $userInfo = $("<div></div>");
+ $left.append($userInfo);
+ var $nameDiv = $("<div class='font-weight-bold'></div>");
+ $nameLink = createAuthorLink();
+ $nameLink.append(contributor.authorName);
+ $nameDiv.append($nameLink);
+ $userInfo.append($nameDiv);
var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
$left.find("a.user").hover(function() {
@@ -212,14 +231,10 @@ onedev.server.codeStats = {
userCardCallback(contributor.authorName, contributor.authorEmailAddress);
return $card;
}, alignment);
-
- var $userInfo = $("<div></div>");
- $left.append($userInfo);
-
- $userInfo.append("<div class='font-weight-bold'>" + contributor.authorName + "</div>");
+
var $totalContribution = $("<div class='total-contribution font-size-sm'></div>");
$userInfo.append($totalContribution);
- $totalContribution.append("<a href='" + contributor.commitsUrl + "' class='commits mr-2'>" + contributor.totalCommits + " commits</a>");
+ $totalContribution.append("<a href='" + contributor.commitsUrl + "' class='commits mr-2'>" + contributor.totalCommits + " " + translations.commits + "</a>");
$totalContribution.append("<span class='additions mr-2'>" + contributor.totalAdditions + " ++</span>");
$totalContribution.append("<span class='deletions'>" + contributor.totalDeletions + " --</span>");
$head.append("<div class='ml-auto font-size-h6 font-weight-bold'>#" + (index + 1) + "</div>");
@@ -337,12 +352,12 @@ onedev.server.codeStats = {
},
sourceLines: {
- onDomReady: function(lineIncrements, defaultBranch, darkMode) {
+ onDomReady: function(lineIncrements, defaultBranch, darkMode, translations) {
var numOfTopLanguages = 10;
var $chart = $(".source-lines>.chart");
if (lineIncrements.length == 0) {
- $chart.append("<div class='no-data'>No data</div>");
+ $chart.append("<div class='no-data'>" + translations.noData + "</div>");
return;
}
@@ -403,9 +418,9 @@ onedev.server.codeStats = {
var useKilo;
var title;
if (defaultBranch != null)
- title = "SLOC on " + defaultBranch;
+ title = translations.sloc.replace("{0}", defaultBranch);
else
- title = "No default branch";
+ title = translations.noDefaultBranch;
var option = {
title: {
text: title,
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 c7384820a9..83d42d7a1c 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
@@ -21,7 +21,15 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put(" Project path can be omitted if reference from current project", "如果从当前项目引用,则可以省略项目路径");
m.put("'..' is not allowed in the directory", "'..' 不允许在目录中使用");
m.put("(on behalf of <b>{0}</b>)", "(代表 <b>{0}</b>)");
+ m.put("1. To use this package, add below to project pom.xml", "1. 要使用此包,请在项目 pom.xml 中添加以下内容");
+ m.put("1. Use below repositories in project pom.xml", "1. 在项目 pom.xml 中使用以下仓库");
m.put("1w 1d 1h 1m", "1w 1d 1h 1m");
+ m.put("2. Add below to <code>$HOME/.m2/settings.xml</code> if you want to deploy from command line",
+ "2. 如果要从命令行部署,请将以下内容添加到 <code>$HOME/.m2/settings.xml</code>");
+ m.put("2. Also add below to $HOME/.m2/settings.xml if you want to compile project from command line",
+ "2. 如果要从命令行编译项目,请将以下内容添加到 $HOME/.m2/settings.xml");
+ m.put("3. For CI/CD job, it is more convenient to use a custom settings.xml, for instance via below code in a command step:",
+ "3. 对于 CI/CD 任务,使用自定义 settings.xml 更方便,例如在命令步骤中使用以下代码");
m.put("6-digits passcode", "6 位数代码");
m.put("7 days", "7 天");
m.put("<a href=\"https://guides.github.com/features/mastering-markdown/\" target=\"_blank\">GitHub flavored markdown</a> is accepted, with <a href=\"https://docs.onedev.io/appendix/markdown-syntax\" target=\"_blank\">mermaid and katex support</a>.",
@@ -77,9 +85,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
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");
+ "访问令牌用于 API 访问和仓库拉取/推送。它不能用于登录 Web 界面");
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");
+ "访问令牌用于 API 访问或仓库拉取/推送。它不能用于登录 Web 界面");
m.put("Access token regenerated successfully", "访问令牌重新生成成功");
m.put("Account Email", "账户邮箱");
m.put("Account Name", "账户名称");
@@ -103,11 +111,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Add Timesheet", "新建时间表");
m.put("Add a GPG Public Key", "添加一个 GPG 公钥");
m.put("Add a SSH Key", "添加 SSH 密钥");
+ m.put("Add a package source like below", "添加一个包源,如下所示");
m.put("Add after", "添加到后面");
m.put("Add agent", "添加代理");
m.put("Add all cards to specified iteration", "将所有卡片添加到指定迭代");
m.put("Add assignee...", "添加分配人员...");
m.put("Add before", "添加到前面");
+ m.put("Add below to allow accessing via http protocol in new Maven versions", "添加以下内容以在新 Maven 版本中允许通过 http 协议访问");
m.put("Add child project", "添加子项目");
m.put("Add comment on this selection", "在此选择上添加注释");
m.put("Add custom field", "添加自定义字段");
@@ -183,6 +193,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Always", "总是");
m.put("Always Pull Image", "始终拉取镜像");
m.put("An issue already linked for {0}. Unlink it first", "已链接到 {0}。先取消链接");
+ m.put("And configure auth token of the registry", "并配置注册表的授权令牌");
m.put("Another pull request already open for this change", "另一个合并请求已为此更改打开");
m.put("Any agent", "任何代理");
m.put("Any branch", "任何分支");
@@ -220,6 +231,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Approved pull request \"{0}\" ({1})", "批准合并请求 \"{0}\"({1})");
m.put("Arbitrary scope", "任意范围");
m.put("Arbitrary type", "任意类型");
+ m.put("Arch Pull Command", "Arch 拉取命令");
m.put("Archived", "已归档");
m.put("Arguments", "参数");
m.put("Artifacts", "制品");
@@ -361,7 +373,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Build Management", "构建管理");
m.put("Build Notification", "构建通知");
m.put("Build Number", "构建编号");
- m.put("Build On Behalf Of", "构建代表");
+ m.put("Build On Behalf Of", "构建发起");
m.put("Build Path", "构建路径");
m.put("Build Preservation", "构建保留策略");
m.put("Build Preservations", "构建保留策略");
@@ -453,12 +465,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Change to another field", "更改为其他字段");
m.put("Change to another state", "更改为其他状态");
m.put("Change to another value", "更改为其他值");
- m.put("Changes", "更改");
m.put("Changes since last review", "上次审查后的更改");
m.put("Changes since last visit", "自上次访问以来的更改");
m.put("Changes since this action", "此操作后的变更");
m.put("Changes since this comment", "此评论后的变更");
m.put("Channel Notification", "频道通知");
+ m.put("Chart Metadata", "Chart 元数据");
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", "检查提交消息尾部");
@@ -533,13 +545,18 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Code", "代码");
m.put("Code Analysis", "代码分析");
m.put("Code Analysis Setting", "代码分析设置");
+ m.put("Code Changes", "代码变更");
m.put("Code Comment", "代码评论");
m.put("Code Comment Management", "代码评论管理");
m.put("Code Comments", "代码评论");
m.put("Code Compare", "代码比较");
+ m.put("Code Contribution Statistics", "代码贡献统计");
+ m.put("Code Line Statistics", "代码行统计");
m.put("Code Management", "代码管理");
m.put("Code Privilege", "代码权限");
m.put("Code Search", "代码搜索");
+ m.put("Code Statistics", "代码统计");
+ m.put("Code changes since...", "代码变更自...");
m.put("Code clone or download", "克隆或下载代码");
m.put("Code comment", "代码评论");
m.put("Code comment #{0} deleted", "代码评论 #{0} 已删除");
@@ -604,6 +621,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Confidential", "保密");
m.put("Config File", "配置文件");
m.put("Configuration Discovery Url", "配置发现 URL");
+ m.put("Configure your scope to use below registry", "配置您的范围以使用以下注册表");
m.put("Confirm Approve", "确认批准");
m.put("Confirm Delete Source Branch", "确认删除源分支");
m.put("Confirm Discard", "确认放弃");
@@ -618,6 +636,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Content is identical", "内容相同");
m.put("Continue to add other user after create", "创建后继续添加其他用户");
m.put("Contributed settings", "贡献的设置");
+ m.put("Contributions", "贡献");
+ m.put("Contributions to {0} branch, excluding merge commits", "在 {0} 分支上的贡献,不包括合并提交");
m.put("Copy", "复制");
m.put("Copy All Queried Issues To...", "复制所有查询的工单到...");
m.put("Copy Files with SCP", "使用 SCP 复制文件");
@@ -688,9 +708,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Default (Shell on Linux, Batch on Windows)", "默认(Linux 上为 Shell,Windows 上为 Batch)");
m.put("Default Assignees", "默认负责人");
m.put("Default Boards", "默认看板");
- m.put("Default Fixed Issue Filter", "默认已修复工单过滤器");
- m.put("Default Fixed Issue Filters", "默认已修复工单过滤器");
- m.put("Default Fixed Issue Filters Bean", "默认已修复工单过滤器 Bean");
+ m.put("Default Fixed Issue Filter", "默认修复工单过滤器");
+ m.put("Default Fixed Issue Filters", "默认修复工单过滤器");
+ m.put("Default Fixed Issue Filters Bean", "默认修复工单过滤器 Bean");
m.put("Default Group", "默认分组");
m.put("Default Issue Boards", "默认工单看板");
m.put("Default Merge Strategy", "默认合并策略");
@@ -730,6 +750,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Delete Selected Comments", "删除选中的评论");
m.put("Delete Selected Issues", "删除选定的工单");
m.put("Delete Selected Memberships", "删除选定的成员");
+ m.put("Delete Selected Packages", "删除选中的包");
m.put("Delete Selected Projects", "删除选中的项目");
m.put("Delete Selected Pull Requests", "删除选定的合并请求");
m.put("Delete Selected Users", "删除选定的用户");
@@ -757,7 +778,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Deleted source branch", "已删除源分支");
m.put("Deletion not allowed due to branch protection rule", "由于分支保护规则,不允许删除此分支");
m.put("Deletion not allowed due to tag protection rule", "由于标签保护规则,删除不允许");
- m.put("Deletions", "删除数");
+ m.put("Deletions", "删除");
m.put("Denied", "拒绝");
m.put("Dependencies & Services", "依赖与服务");
m.put("Dependency Management", "依赖管理");
@@ -775,6 +796,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Detect Vulnerabilities", "检测漏洞");
m.put("Diff is too large to be displayed.", "差异太大,无法显示");
m.put("Diff options", "比较选项");
+ m.put("Digest", "摘要");
m.put("Digest invalid", "摘要无效");
m.put("Directories to Skip", "要跳过的目录");
m.put("Directory", "目录");
@@ -827,6 +849,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Do you really want to delete this field?", "您真的要删除这个字段吗?");
m.put("Do you really want to delete this file?", "您确定要删除此文件吗?");
m.put("Do you really want to delete this issue?", "您真的要删除这个工单吗?");
+ m.put("Do you really want to delete this package?", "确定要删除这个包吗?");
m.put("Do you really want to delete this privilege?", "确定要删除此权限吗?");
m.put("Do you really want to delete this pull request?", "确定要删除此合并请求吗?");
m.put("Do you really want to delete this reply?", "您真的要删除此回复吗?");
@@ -860,6 +883,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Durations", "持续时间");
m.put("ESLint Report", "ESLint 报告");
m.put("Edit", "编辑");
+ m.put("Edit <code>$HOME/.gem/credentials</code> to add a source", "编辑 <code>$HOME/.gem/credentials</code> 以添加一个源");
+ m.put("Edit <code>$HOME/.pypirc</code> to add a package repository like below", "编辑 <code>$HOME/.pypirc</code> 以添加一个包仓库,如下所示");
m.put("Edit Avatar", "编辑头像");
m.put("Edit Estimated Time", "编辑预计时间");
m.put("Edit Iteration", "编辑迭代");
@@ -1052,11 +1077,23 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Fix Undefined Field Values", "修复未定义的字段值");
m.put("Fix Undefined Fields", "修复未定义的字段");
m.put("Fix Undefined States", "修复未定义的状态");
- m.put("Fixed Issues", "已修复的工单");
+ m.put("Fixed Issues", "修复的工单");
+ m.put("Fixed issues since...", "修复工单自...");
m.put("Fixing Builds", "修复构建");
m.put("Fixing Commits", "修复提交");
m.put("Fixing...", "修复中...");
m.put("Float", "浮点数");
+ m.put("Follow below instructions to publish packages into this project", "按照以下说明将包发布到此项目");
+ m.put("For CI/CD job, add this gem to Gemfile like below", "对于 CI/CD 任务,将此 gem 添加到 Gemfile 中,如下所示");
+ m.put("For CI/CD job, add this package to requirements.txt and run below to install the package via command step",
+ "对于 CI/CD 任务,将此包添加到 requirements.txt 中,并运行以下命令通过命令步骤安装包");
+ m.put("For CI/CD job, run below to add package repository via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤添加包仓库");
+ m.put("For CI/CD job, run below to add package source via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤添加包源");
+ m.put("For CI/CD job, run below to add source via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤添加源");
+ m.put("For CI/CD job, run below to install chart via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤安装 Chart");
+ m.put("For CI/CD job, run below to publish package via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤发布包");
+ m.put("For CI/CD job, run below to push chart to the repository via command step", "对于 CI/CD 任务,运行以下命令通过命令步骤推送 Chart 到仓库");
+ m.put("For CI/CD job, run below via a command step", "对于 CI/CD 任务,运行以下命令通过命令步骤");
m.put("For a particular project, the first matching entry will be used", "对于特定项目,第一个匹配的条目将被使用");
m.put("For build commit not reachable from default branch, a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> should be specified as access token with create branch permission",
"对于从默认分支无法到达的构建提交,应该指定一个具有创建分支权限的访问令牌作为任务密钥");
@@ -1084,6 +1121,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("GPG Trusted Keys", "GPG 受信任密钥");
m.put("GPG key deleted", "GPG 密钥已删除");
m.put("GPG public key begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'", "GPG 公钥以 '-----BEGIN PGP PUBLIC KEY BLOCK-----' 开头,以 '-----END PGP PUBLIC KEY BLOCK-----' 结尾");
+ m.put("Gem Info", "Gem 信息");
m.put("General", "常规");
m.put("General Settings", "常规设置");
m.put("General settings updated", "常规设置已更新");
@@ -1188,6 +1226,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("History of target branch and source branch is unrelated", "目标分支和源分支的历史记录不相关");
m.put("Host name or ip address of remote machine to run commands via SSH", "远程机器的名称或 IP 地址,用于通过 SSH 运行命令");
m.put("Hours Per Day", "每天小时数");
+ m.put("How to Publish", "如何发布");
m.put("Html Report", "HTML 报告");
m.put("Html Report Publish Enabled", "HTML 报告发布启用");
m.put("IMAP Host", "IMAP 主机");
@@ -1220,6 +1259,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Ignore trailing", "忽略后缀");
m.put("Ignored Licenses", "忽略的许可证");
m.put("Image", "容器镜像");
+ m.put("Image Labels", "镜像标签");
+ m.put("Image Manifest", "镜像 Manifest");
+ m.put("Image Size", "镜像大小");
m.put("Image Text", "图片文本");
m.put("Image URL", "图片 URL");
m.put("Image URL should be specified", "图片 URL 应该指定");
@@ -1287,6 +1329,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"交互式 Web shell 访问运行中的任务是企业功能。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a> 30 天");
m.put("Interpreter", "解释器");
m.put("Invalid PCRE syntax", "无效的 PCRE 语法");
+ m.put("Invalid access token: {0}", "无效的访问令牌:{0}");
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}");
@@ -1365,6 +1408,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Issue workflow changed, <a wicket:id=\"reconcile\" class=\"link-primary\">reconciliation</a> needs to be performed to make data consistent. You may do this after making all necessary changes",
"工单工作流已更改,需要执行 <a wicket:id=\"reconcile\" class=\"link-primary\">一致性检查</a> 以使数据一致。您可以在完成所有必要更改后执行此操作");
m.put("Issues", "工单");
+ m.put("Issues can be created in this project by sending email to this address", "通过发送电子邮件到此地址,可以在本项目中创建工单");
m.put("Issues copied", "工单已复制");
m.put("Issues moved", "工单已移动");
m.put("Italic", "斜体");
@@ -1410,7 +1454,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Job Property", "任务属性");
m.put("Job Requirement", "任务需求");
m.put("Job Secret", "任务密钥");
- m.put("Job Secret Edit Bean", "任务密钥编辑Bean");
+ m.put("Job Secret Edit Bean", "任务密钥编辑 Bean");
m.put("Job Secrets", "任务密钥");
m.put("Job Trigger", "任务触发器");
m.put("Job Trigger Bean", "任务触发器Bean");
@@ -1420,6 +1464,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"任务依赖决定不同任务的顺序和并发性。您还可以指定从上游任务检索的工件");
m.put("Job executors", "任务执行器");
m.put("Job name", "任务名称");
+ m.put("Job secret 'access-token' should be defined in project build setting as an access token with package ${permission} permission",
+ "任务密钥 access-token 应该在项目构建设置中定义,作为具有包 ${permission} 权限的访问令牌");
+ m.put("Job secret 'access-token' should be defined in project build setting as an access token with package read permission",
+ "任务密钥 access-token 应该在项目构建设置中定义,作为具有包读权限的访问令牌");
+ m.put("Job secret 'access-token' should be defined in project build setting as an access token with package write permission",
+ "任务密钥 access-token 应该在项目构建设置中定义,作为具有包写权限的访问令牌");
m.put("Job token", "任务令牌");
m.put("Job will run on head commit of default branch", "任务将在默认分支的头部提交上运行");
m.put("Job will run on head commit of target branch", "任务将在目标分支的头部提交上运行");
@@ -1452,6 +1502,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Language", "语言");
m.put("Last Finished of Specified Job", "指定任务的最后完成");
m.put("Last Modified", "最后修改");
+ m.put("Last Published", "最后发布时间");
m.put("Last Update", "最后更新");
m.put("Last commit", "最后提交");
m.put("Last commit hash", "最后提交哈希");
@@ -1490,9 +1541,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Login name already used by another account", "登录名已被另一个账户使用");
m.put("Login name or email", "登录名或电子邮件");
m.put("Login name or email address", "登录名或电子邮件地址");
+ m.put("Login to OneDev docker registry", "登录到 OneDev Docker 注册表");
m.put("Login to comment", "登录以评论");
m.put("Login to comment on selection", "登录以在选择上添加注释");
m.put("Login to vote", "登录以投票");
+ m.put("Login user needs to have package write permission over the project below", "登录用户需要对以下项目具有包写权限");
m.put("Logo for Dark Mode", "暗黑模式下的Logo");
m.put("Logo for Light Mode", "亮色模式下的Logo");
m.put("Long-live refresh token of above account which will be used to generate access token to access Gmail. <b class='text-info'>TIPS: </b> you may use the button at right side of this field to generate refresh token. Note that whenever client id, client secret, or account name is changed, refresh token should be re-generated",
@@ -1505,6 +1558,13 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Mail Service Bean", "邮件服务Bean");
m.put("Mail service", "邮件服务");
m.put("Mail service not configured", "邮件服务未配置");
+ m.put("Make sure the access token has package read permission over the project", "确保访问令牌对项目具有包读权限");
+ m.put("Make sure the access token has package write permission over the project", "确保访问令牌对项目具有包写权限");
+ m.put("Make sure the access token has package write permission over the project. Also make sure to run command <code>chmod 0600 $HOME/.gem/credentials</code> after creating the file",
+ "确保访问令牌对项目具有包写权限。另外,确保在创建文件后运行命令 <code>chmod 0600 $HOME/.gem/credentials</code>");
+ m.put("Make sure the account has package ${permission} permission over the project", "确保账户对项目具有包 ${permission} 权限");
+ m.put("Make sure the account has package read permission over the project", "确保账户对项目具有包读权限");
+ m.put("Make sure the user has package write permission over the project", "确保用户对项目具有包写权限");
m.put("Malformed %sbase query", "解析%s基准查询时出错");
m.put("Malformed %squery", "解析%s查询时出错");
m.put("Malformed build spec (import project: {0}, import revision: {1})", "构建规范格式错误(导入项目:{0},导入版本:{1})");
@@ -1551,6 +1611,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Merged pull request \"{0}\" ({1})", "合并合并请求 \"{0}\"({1})");
m.put("Merges pull request", "合并请求");
m.put("Meta", "元");
+ m.put("Meta Info", "元数据");
m.put("Microsoft 365", "Microsoft 365");
m.put("Microsoft Entra ID", "Microsoft Entra ID");
m.put("Min Value", "最小值");
@@ -1648,6 +1709,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No any", "无任何");
m.put("No applicable transitions or no permission to transit", "没有适用的转换或没有权限转换");
m.put("No artifacts published", "没有发布制品");
+ m.put("No authorized job secret found (project: {0}, job secret: {1})", "未找到授权的任务密钥(项目:{0},任务密钥:{1})");
m.put("No branch to cherry-pick to", "没有分支可以 cherry-pick");
m.put("No branch to revert on", "没有分支可以 revert");
m.put("No branches Found", "未找到分支");
@@ -1662,6 +1724,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No comments to set resolved", "没有评论可以设置为已解决");
m.put("No comments to set unresolved", "没有评论可以设置为未解决");
m.put("No config file", "无配置文件");
+ m.put("No data", "没有数据");
+ m.put("No default branch", "没有默认分支");
m.put("No default group", "无默认组");
m.put("No default role", "无默认角色");
m.put("No default value", "无默认值");
@@ -1694,7 +1758,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("No memberships to delete", "没有要删除的成员");
m.put("No obvious changes", "无明显改动");
m.put("No one", "无任何人");
+ m.put("No packages to delete", "没有可删除的包");
m.put("No parent", "无父级");
+ m.put("No previous successful build on <a href=\"https://docs.onedev.io/concepts#build-stream\" class=\"link-primary\" target=\"_blank\">same stream</a> to calculate fixed issues since",
+ "还没有<a href=\"https://docs.onedev.io/concepts#build-stream\" class=\"link-primary\" target=\"_blank\">相同流上的</a>成功构建,所以无法计算修复的工单");
m.put("No projects found", "没有找到项目");
m.put("No projects to delete", "没有要删除的项目");
m.put("No projects to modify", "没有要修改的项目");
@@ -1747,6 +1814,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Notify Pull Request Events", "通知合并请求");
m.put("Notify Users", "通知用户");
m.put("Ntfy.sh Notifications", "Ntfy.sh 通知");
+ m.put("NuSpec", "NuSpec");
m.put("Number of CPU Cores", "CPU 核心数");
m.put("Number of builds to preserve", "保留的构建数量");
m.put("Number of project replicas, including primary and backups", "项目副本数量,包括主节点和备份节点");
@@ -1754,10 +1822,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("OAuth2 Client information | CLIENT ID", "OAuth2 客户端信息 | CLIENT ID");
m.put("OAuth2 Client information | CLIENT SECRET", "OAuth2 客户端信息 | CLIENT SECRET");
m.put("OCI Layout Directory", "OCI 布局目录");
+ m.put("OS/ARCH", "操作系统/架构");
m.put("Ok", "确定");
m.put("Old Name", "旧名称");
m.put("Old Password", "旧密码");
- m.put("On Behalf Of", "代表");
+ m.put("On Behalf Of", "发起");
m.put("On Branches", "在分支上");
m.put("OneDev Issue Field", "OneDev 工单字段");
m.put("OneDev Issue Link", "OneDev 工单链接");
@@ -2050,6 +2119,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Package Privilege", "包权限");
m.put("Package Storage", "包存储");
m.put("Package list", "包列表");
+ m.put("Package {0} deleted", "包 {0} 已删除");
m.put("Packages", "包");
m.put("Page is in error, reload to recover", "页面发生错误,请刷新页面");
m.put("Param Instance", "参数实例");
@@ -2096,6 +2166,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Performance Settings", "性能设置");
m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and \"State\" is \"Open\"",
"执行模糊查询。在搜索文本周围使用 '~' 添加更多条件,例如:~text to search~ 和 \"State\" is \"Open\"");
+ m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and \"Type\" is \"NPM\"",
+ "执行模糊查询。用'~'包围搜索文本以添加更多条件,例如:~text to search~ 且 \"类型\" 为 \"NPM\"");
m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and open",
"执行模糊查询。使用 '~' 包围搜索文本以添加更多条件,例如:~text to search~ and open");
m.put("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and owned by me",
@@ -2147,6 +2219,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Please select issues to move", "请选择要移动的工单");
m.put("Please select issues to sync estimated/spent time", "请选择要同步估计/已用时间的工单");
m.put("Please select memberships to delete", "请选择要删除的成员");
+ m.put("Please select packages to delete", "请选择要删除的包");
m.put("Please select projects to delete", "请选择要删除的项目");
m.put("Please select projects to modify", "请选择要修改的项目");
m.put("Please select projects to move", "请选择要移动的项目");
@@ -2159,8 +2232,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Please select users to disable", "请选择要禁用的用户");
m.put("Please select users to enable", "请选择要启用的用户");
m.put("Please specify file name above before editing content", "请在编辑内容之前指定文件名");
+ m.put("Please switch to packages page of a particular project for the instructions", "请切换到特定项目的包页面以查看说明");
m.put("Please wait...", "请稍候...");
m.put("Please waiting...", "请稍候...");
+ m.put("Plugin metadata not found", "插件元数据未找到");
m.put("Poll Interval", "轮询间隔");
m.put("Populate Tag Mappings", "填充标签映射");
m.put("Port", "端口");
@@ -2246,6 +2321,14 @@ 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 After", "发布时间晚于");
+ m.put("Published At", "发布于");
+ m.put("Published Before", "发布时间早于");
+ m.put("Published By", "发布者");
+ m.put("Published By Project", "发布项目");
+ m.put("Published By User", "发布用户");
+ m.put("Published File", "已发布文件");
+ m.put("Pull Command", "拉取命令");
m.put("Pull Image", "拉取镜像");
m.put("Pull Request", "合并请求");
m.put("Pull Request Branches", "合并请求分支");
@@ -2304,10 +2387,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Pull request will be merged automatically with a preset <a wicket:id=\"commitMessage\">commit message</a> when ready. This option will be disabled upon adding new commits, changing merge strategy, or switching target branch",
"合并请求将在准备好时自动合并,并使用预设的<a wicket:id=\"commitMessage\">提交消息</a>。此选项将在添加新提交、更改合并策略或切换目标分支时禁用");
m.put("Push Image", "推送镜像");
+ m.put("Push chart to the repository", "推送 Chart 到仓库");
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 执行器执行");
- m.put("Push to Container registry", "推送至容器注册表");
m.put("Push to Remote", "推送至远程");
+ m.put("Push to container registry", "推送至容器注册表");
m.put("Pylint Report", "Pylint 报告");
m.put("Queries", "查询");
m.put("Query", "查询");
@@ -2358,9 +2442,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Refs", "引用");
m.put("Regenerate", "重新生成");
m.put("Regenerate this access token", "重新生成此访问令牌");
- m.put("Registry Login", "注册登录");
- m.put("Registry Logins", "注册登录");
- m.put("Registry Url", "注册 URL");
+ m.put("Registry Login", "注册表登录");
+ m.put("Registry Logins", "注册表登录");
+ m.put("Registry Url", "注册表 URL");
m.put("Remaining time", "剩余时间");
m.put("Remember Me", "记住我");
m.put("Remote Docker Executor", "远程 Docker 执行器");
@@ -2386,6 +2470,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Reopened pull request \"{0}\" ({1})", "重新打开合并请求 \"{0}\"({1})");
m.put("Replace With", "替换为");
m.put("Replica Count", "副本数量");
+ m.put("Replicas", "副本");
m.put("Replied to comment on file \"{0}\" in project \"{1}\"", "在项目 \"{1}\" 的文件 \"{0}\" 上回复评论");
m.put("Reply", "回复");
m.put("Report Name", "报告名称");
@@ -2448,6 +2533,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Run Job", "运行任务");
m.put("Run Options", "运行选项");
m.put("Run below commands from within your git repository:", "从您的 git 仓库中运行以下命令:");
+ m.put("Run below commands to install this gem", "运行以下命令安装此 Gem");
+ m.put("Run below commands to install this package", "运行以下命令安装此包");
+ m.put("Run below commands to use this chart", "运行以下命令使用此 Chart");
+ m.put("Run below commands to use this package", "运行以下命令使用此包");
m.put("Run docker buildx imagetools command with specified arguments. This step can only be executed by server docker executor or remote docker executor",
"使用指定参数运行 docker buildx imagetools 命令。此步骤只能由服务器 docker 执行器或远程 docker 执行器执行");
m.put("Run job", "运行任务");
@@ -2467,6 +2556,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"运行 trivy 根文件系统扫描器扫描各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>分布文件</a>。它只能由 docker 感知执行器执行,建议在项目暂存区域运行。");
m.put("Running", "运行中");
m.put("Running Takes", "运行中");
+ m.put("SLOC on {0}", "在 {0} 上的源代码行数");
m.put("SMTP Host", "SMTP 主机");
m.put("SMTP Password", "SMTP 密码");
m.put("SMTP User", "SMTP 用户");
@@ -2652,6 +2742,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Sort", "排序");
m.put("Source", "源");
m.put("Source Docker Image", "Docker 镜像源");
+ m.put("Source Lines", "源代码行");
m.put("Source Path", "源路径");
m.put("Source branch already exists", "源分支已存在");
m.put("Source branch already merged into target branch", "源分支已合并到目标分支");
@@ -2679,7 +2770,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Specify .net TRX test result file relative to <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>, for instance <tt>TestResults/*.trx</tt>. Use * or ? for pattern match",
"指定 .net TRX 测试结果文件相对 <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>,例如 <tt>TestResults/*.trx</tt>。使用 * 或 ? 进行模式匹配");
m.put("Specify <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> whose value is access token with code write permission over above projects. Commits, issues, and pull requests will also be created under name of the access token owner",
- "指定 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 的值是具有代码写入权限的访问令牌。提交、问题和合并请求也将以访问令牌所有者的名义创建");
+ "指定 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 的值是具有代码写入权限的访问令牌。提交、问题和合并请求也将以访问令牌所有者的名义创建");
m.put("Specify <a href='https://github.com/rust-lang/rust-clippy'>rust clippy</a> json output file relative to <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. This file can be generated with clippy json output option, for instance <code>cargo clippy --message-format json>check-result.json</code>. Use * or ? for pattern match",
"指定 <a href='https://github.com/rust-lang/rust-clippy'>rust clippy</a> json 输出文件相对 <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>。此文件可以通过 clippy json 输出选项生成,例如 <code>cargo clippy --message-format json>check-result.json</code>。使用 * 或 ? 进行模式匹配");
m.put("Specify Build Options", "指定构建选项");
@@ -2728,28 +2819,28 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Specify a <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>regular expression</a> before issue number",
"指定一个 <a href='http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html'>正则表达式</a> 在工单号之前");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as SSH private key",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为 SSH 私钥");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为 SSH 私钥");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as access token",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为访问令牌");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为访问令牌");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as access token to import build spec from above project if its code is not publicly accessible",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为访问令牌以从上述项目导入构建规范,如果其代码不是公开可访问的");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为访问令牌以从上述项目导入构建规范,如果其代码不是公开可访问的");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as password or access token of the registry",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为密码或访问令牌的注册表");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为密码或访问令牌的注册表");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as password or access token to access remote repository",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为访问远程仓库的密码或访问令牌");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为访问远程仓库的密码或访问令牌");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as private key for SSH authentication. <b class='text-info'>NOTE:</b> Private key with passphrase is not supported",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为 SSH 认证的私钥。<b class='text-info'>注意:</b>不支持带密码短语的私钥");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为 SSH 认证的私钥。<b class='text-info'>注意:</b>不支持带密码短语的私钥");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as private key of above user for SSH authentication. <b class='text-info'>NOTE:</b> Private key with passphrase is not supported",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 作为上述用户 SSH 认证的私钥。<b class='text-info'>注意:</b>不支持带密码短语的私钥");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a> 作为上述用户 SSH 认证的私钥。<b class='text-info'>注意:</b>不支持带密码短语的私钥");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> whose value is an access token with management permission for above project. Note that access token is not required if sync to current or child project and build commit is reachable from default branch",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a>,其值是具有上述项目管理权限的访问令牌。注意,如果同步到当前或子项目且构建提交可从默认分支访问,则不需要访问令牌");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a>,其值是具有上述项目管理权限的访问令牌。注意,如果同步到当前或子项目且构建提交可从默认分支访问,则不需要访问令牌");
m.put("Specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> whose value is an access token with upload cache permission for above project. Note that this property is not required if upload cache to current or child project and build commit is reachable from default branch",
- "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a>,其值是具有上述项目上传缓存权限的访问令牌。注意,如果上传缓存到当前或子项目且构建提交可从默认分支访问,则不需要此属性");
+ "指定一个 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>任务密钥</a>,其值是具有上述项目上传缓存权限的访问令牌。注意,如果上传缓存到当前或子项目且构建提交可从默认分支访问,则不需要此属性");
m.put("Specify a <a target='_blank' href='http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html#format'>cron schedule</a> to fire the job automatically. <b class='text-info'>Note:</b> To save resource, seconds in cron expression will be ignored, and the minimum schedule interval is one minute",
"指定一个 <a target='_blank' href='http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html#format'>cron 计划</a>以自动触发任务。<b class='text-info'>注意:</b>为节省资源,cron 表达式中的秒数将被忽略,最小调度间隔为一分钟");
m.put("Specify a Docker Image to Test Against", "指定要测试的 Docker 镜像");
m.put("Specify a custom field of Enum type", "指定枚举类型的自定义字段");
- m.put("Specify a default query to filter/order fixed issues of specified jobs", "指定用于过滤/排序指定任务已修复工单的默认查询");
+ m.put("Specify a default query to filter/order fixed issues of specified jobs", "指定用于过滤/排序指定任务修复工单的默认查询");
m.put("Specify a file relative to <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a> to write checksum into",
"指定相对于 <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a> 的文件以写入校验和");
m.put("Specify a multi-value user field to hold assignees information.<b>NOTE: </b> You may customize OneDev issue fields in case there is no appropriate option here",
@@ -3077,6 +3168,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Sync Repository", "同步仓库");
m.put("Sync Timing of All Queried Issues", "同步所有查询的工单的时间");
m.put("Sync Timing of Selected Issues", "同步选定的工单的时间");
+ m.put("Sync requested. Please check status after a while", "同步请求已发送。请稍后检查状态");
m.put("Synchronize", "同步");
m.put("System", "系统");
m.put("System Alert", "系统提醒");
@@ -3129,6 +3221,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("The secret which allows you to ensure that POST requests sent to the payload URL are from OneDev. When you set a secret you'll receive the X-OneDev-Signature header in the webhook POST request",
"确保发送到有效负载 URL 的 POST 请求来自 OneDev 的密钥。设置密钥后,您将在 Webhook POST 请求中收到 X-OneDev-Signature 头部");
m.put("Then enter the passcode shown in the TOTP authenticator to verify", "然后输入 TOTP 认证器中显示的验证码进行验证");
+ m.put("Then publish package from project directory like below", "然后从项目目录中发布包,如下所示");
+ m.put("Then push gem to the source", "然后推送 Gem 到源");
+ m.put("Then push image to desired repository under specified project", "然后推送镜像到指定项目下的目标仓库");
+ m.put("Then push package to the source", "然后推送包到源");
+ m.put("Then resolve dependency via command step", "然后通过命令步骤解析依赖");
+ m.put("Then upload package to the repository with twine", "然后通过命令步骤上传包到仓库");
m.put("There are <a wicket:id=\"openRequests\">open pull requests</a> against branch <span wicket:id=\"branch\"></span>. These pull requests will be discarded if the branch is deleted.",
"分支 <span wicket:id=\"branch\"></span> 有 <a wicket:id=\"openRequests\">打开的合并请求</a>。如果分支被删除,这些合并请求将被丢弃。");
m.put("There are merge conflicts", "存在合并冲突");
@@ -3167,6 +3265,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
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 layer cache. To use the cache, add below option to your docker buildx command",
+ "这是一个层缓存。要使用缓存,请将以下选项添加到您的 docker buildx 命令中");
m.put("This is a service account for task automation purpose", "这是一个用于任务自动化的服务账户");
m.put("This key has already been used by another project", "此键已被其他项目使用");
m.put("This key is associated with {0}, however it is NOT a verified email address of this user",
@@ -3197,6 +3297,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("This pull request has been discarded", "此合并请求已丢弃");
m.put("This report will be displayed in pull request overview page if build is triggered by pull request",
"如果构建由合并请求触发,此报告将显示在合并请求概览页面中");
+ m.put("This server is currently accessed via http protocol, please configure your docker daemon or buildx builder to <a href=\"https://docs.onedev.io/tutorials/cicd/insecure-docker-registry\" target=\"_blank\">work with insecure registry</a>",
+ "当前服务器通过 http 协议访问,请配置您的 docker 守护进程或 buildx 构建器以 <a href=\"https://docs.onedev.io/tutorials/cicd/insecure-docker-registry\" target=\"_blank\">发布镜像到不安全注册表</a>");
m.put("This shows average duration of different states over time", "显示不同状态的平均持续时间");
m.put("This shows average duration of merged pull requests over time", "此图表显示合并请求的平均持续时间");
m.put("This shows number of <b>new</b> issues in different states over time", "显示不同状态的新工单数量");
@@ -3260,6 +3362,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Toomanyrequests", "请求过多");
m.put("Top", "顶部");
m.put("Topo", "拓扑");
+ m.put("Total Size", "总大小");
m.put("Total estimated time", "总预计时间");
m.put("Total spent time", "总已用时间");
m.put("Total spent time / total estimated time", "总已用时间 / 总预计时间");
@@ -3296,12 +3399,14 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Type <code>yes</code> below to delete all queried comments", "在下面输入 <code>yes</code> 以删除所有查询的评论");
m.put("Type <code>yes</code> below to delete all queried issues", "在下方输入 <code>yes</code> 以删除所有查询的工单");
m.put("Type <code>yes</code> below to delete all queried memberships", "在下方输入 <code>yes</code> 删除所有查询的成员");
+ m.put("Type <code>yes</code> below to delete all queried packages", "在下方输入 <code>yes</code> 以删除所有查询到的包");
m.put("Type <code>yes</code> below to delete all queried projects", "在下方输入 <code>yes</code> 以删除所有查询到的项目");
m.put("Type <code>yes</code> below to delete all queried pull requests", "在下方输入 <code>yes</code> 以删除所有查询的合并请求");
m.put("Type <code>yes</code> below to delete selected builds", "在下面输入 <code>yes</code> 以删除选定的构建");
m.put("Type <code>yes</code> below to delete selected comments", "在下方输入 <code>yes</code> 以删除选中的评论");
m.put("Type <code>yes</code> below to delete selected issues", "在下方输入 <code>yes</code> 以删除选定的工单");
m.put("Type <code>yes</code> below to delete selected memberships", "在下方输入 <code>yes</code> 删除选定的成员");
+ m.put("Type <code>yes</code> below to delete selected packages", "在下方输入 <code>yes</code> 以删除选中的包");
m.put("Type <code>yes</code> below to delete selected projects", "在下方输入 <code>yes</code> 以删除选中的项目");
m.put("Type <code>yes</code> below to delete selected pull requests", "在下方输入 <code>yes</code> 以删除选定的合并请求");
m.put("Type <code>yes</code> below to discard all queried pull requests", "在下方输入 <code>yes</code> 以放弃所有查询的合并请求");
@@ -3387,6 +3492,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"使用 '**'、'*' 或 '?' 进行<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>");
m.put("Use '\\' to escape brackets", "使用 '\\' 转义括号");
m.put("Use '\\' to escape quotes", "使用 '\\' 转义引号");
+ m.put("Use @@ to reference scope in job commands to avoid being interpreted as variable", "使用 @@ 引用任务命令中的范围以避免被解释为变量");
m.put("Use Avatar Service", "使用头像服务");
m.put("Use Default", "使用默认");
m.put("Use Default Boards", "使用默认看板");
@@ -3399,6 +3505,12 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Use curl in System Path", "使用系统路径中的 curl");
m.put("Use default", "使用默认");
m.put("Use default storage class", "使用默认存储类");
+ m.put("Use job token as user name so that OneDev can know which build is ${permission.equals(\"write\")? \"deploying\": \"using\"} packages",
+ "使用任务令牌作为用户名,以便 OneDev 知道哪个构建是 ${permission.equals(\"write\")? \"deploying\": \"using\"} 包");
+ m.put("Use job token to tell OneDev the build publishing the package", "使用任务令牌告诉 OneDev 哪个构建正在发布包");
+ m.put("Use job token to tell OneDev the build pushing the chart", "使用任务令牌告诉 OneDev 哪个构建正在推送 Chart");
+ m.put("Use job token to tell OneDev the build pushing the package", "使用任务令牌告诉 OneDev 哪个构建正在推送包");
+ m.put("Use job token to tell OneDev the build using the package", "使用任务令牌告诉 OneDev 哪个构建正在使用包");
m.put("Use project dependency to retrieve artifacts from other projects", "使用项目依赖从其他项目检索产物");
m.put("Use specified choices", "使用指定的选项");
m.put("Use specified default value", "使用指定的默认值");
@@ -3453,6 +3565,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Volume Mounts", "卷挂载");
m.put("Vote", "投票");
m.put("Votes", "投票");
+ m.put("WARNING:", "警告:");
m.put("Waiting", "等待");
m.put("Waiting for approvals", "等待审批");
m.put("Watch", "观察");
@@ -3549,6 +3662,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("You are rebasing source branch on top of target branch", "您正在将源分支 rebase 到目标分支之上");
m.put("You are viewing a subset of all changes. <a wicket:id=\"fullChanges\" class=\"link-primary ml-2\">show all changes</a>",
"您正在查看部分更改。<a wicket:id=\"fullChanges\" class=\"link-primary ml-2\">显示所有更改</a>");
+ m.put("You can also achieve this by adding a build docker image step to your CI/CD job and configuring the built-in registry login with an access token secret that has package write permissions",
+ "您还可以通过添加一个构建 docker 镜像步骤到您的 CI/CD 任务,并配置内置注册表登录,使用具有包写权限的访问令牌密钥来实现");
m.put("You have unverified <a wicket:id=\"hasUnverifiedLink\">email addresses</a>", "您有未验证的 <a wicket:id=\"hasUnverifiedLink\">电子邮件地址</a>");
m.put("You may also drop file/image to the input box, or paste image from clipboard", "您也可以将文件/图像拖到输入框中,或从剪贴板粘贴图像");
m.put("You may initialize the project by <a wicket:id=\"addFiles\" class=\"link-primary\">adding files</a>, <a wicket:id=\"setupBuildSpec\" class=\"link-primary\">setting up build spec</a>, or <a wicket:id=\"pushInstructions\" class=\"link-primary\">pushing an existing repository</a>",
@@ -3567,6 +3682,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("YouTrack Projects to Import", "要导入的 YouTrack 项目");
m.put("[Reset Password] Please Reset Your OneDev Password", "[重置密码] 请重置您的 OneDev 密码");
m.put("access [{0}]", "访问 [{0}]");
+ m.put("active", "活跃");
m.put("add another order", "添加另一个排序");
m.put("after specified date", "在指定日期之后");
m.put("and more", "更多");
@@ -3584,6 +3700,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("choose a color for this state", "选择一个颜色");
m.put("cmd-k to show command palette", "cmd-k 显示命令面板");
m.put("commit message contains", "提交信息包含");
+ m.put("commits", "提交");
m.put("committed by", "提交者是");
m.put("common", "公共");
m.put("common ancestor", "共同祖先");
@@ -3611,15 +3728,18 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("find issue by number", "通过编号查找工单");
m.put("find pull request by number", "通过编号查找合并请求");
m.put("find pull request with this number", "查找具有此编号的合并请求");
+ m.put("forked from <a wicket:id=\"forkedFrom\"></a>", "从 <a wicket:id=\"forkedFrom\"></a> 分叉");
m.put("found 1 build", "找到 1 个构建");
m.put("found 1 comment", "找到 1 条评论");
m.put("found 1 issue", "找到 1 个工单");
+ m.put("found 1 package", "找到 1 个包");
m.put("found 1 project", "找到 1 个项目");
m.put("found 1 pull request", "找到 1 个合并请求");
m.put("found 1 user", "找到 1 个用户");
m.put("found {0} builds", "找到 {0} 个构建");
m.put("found {0} comments", "找到 {0} 条评论");
m.put("found {0} issues", "找到 {0} 个工单");
+ m.put("found {0} packages", "找到 {0} 个包");
m.put("found {0} projects", "找到 {0} 个项目");
m.put("found {0} pull requests", "找到 {0} 个合并请求");
m.put("found {0} users", "找到 {0} 个用户");
@@ -3657,6 +3777,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("opened <span wicket:id=\"submitDate\"></span>", "于 <span wicket:id=\"submitDate\"></span> 创建");
m.put("or match another value", "或匹配另一个值");
m.put("outdated", "过时");
+ m.put("package", "包");
m.put("packages", "包");
m.put("personal", "个人");
m.put("pipeline", "流水线");
@@ -3678,6 +3799,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("time aggregation link", "时间聚合链接");
m.put("touching specified path", "涉及指定路径");
m.put("true", "真");
+ m.put("up to date", "最新");
m.put("value needs to be enclosed in brackets", "值需要用括号包围");
m.put("value needs to be enclosed in parenthesis", "值需要用括号包围");
m.put("value should be quoted", "值应该用引号包围");
@@ -3702,6 +3824,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("{0} commits behind of base branch", "{0} 个提交落后于基准分支");
m.put("{0} edited {1}", "{0} 编辑于 {1}");
m.put("{0} files", "{0} 个文件");
+ m.put("{0} forks", "{0} 个分叉");
m.put("{0} inaccessible activities", "{0} 个无权查看的活动");
m.put("{0} reviewed", "{0} 已审查");
m.put("{0} tags", "{0} 个标签");
@@ -3713,8 +3836,6 @@ 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("Invalid access token: {0}", "无效的访问令牌:{0}");
- m.put("No authorized job secret found (project: {0}, job secret: {1})", "未找到授权的任务密钥(项目:{0},任务密钥:{1})");
// Manually added keys
m.put("Create Administrator Account", "创建管理员账户");
@@ -3731,6 +3852,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("MERGED", "已合并");
m.put("DISCARDED", "已放弃");
m.put("Container Image(s)", "容器镜像");
+ m.put("Container Image", "容器镜像");
m.put("RubyGems(s)", "RubyGems");
m.put("NPM(s)", "NPM");
m.put("Maven(s)", "Maven");
@@ -3770,7 +3892,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("pull request and code review", "合并请求和代码评审");
m.put("Filter pull requests", "过滤合并请求");
m.put("Filter issues", "过滤工单");
- m.put("Filter issues", "过滤工单");
m.put("Add all commits from source branch to target branch with a merge commit", "将源分支的所有提交添加到目标分支,并创建合并提交");
m.put("Only create merge commit if target branch can not be fast-forwarded to source branch", "仅当目标分支不能 fast-forward 到源分支时才创建合并提交");
m.put("Squash all commits from source branch into a single commit in target branch", "将源分支的所有提交压缩成一个提交,并添加到目标分支");
diff --git a/server-ee b/server-ee
index cf088d6544..14fe637aba 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit cf088d654447e6cf1a9ce2490b7543584eaa5f0f
+Subproject commit 14fe637abaa1912d3a4b08b05648963083625fc3
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
index 98af463fda..e5997938df 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
@@ -1,14 +1,14 @@
<wicket:panel>
<div>
- <div class="font-size-lg font-weight-bolder mb-3">Login to OneDev docker registry</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Login to OneDev docker registry</wicket:t></div>
<div wicket:id="loginCommand"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Login user needs to have package write permission over the project below</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Login user needs to have package write permission over the project below</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then push image to desired repository under specified project</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then push image to desired repository under specified project</wicket:t></div>
<div wicket:id="pushCommand" class="mb-5"></div>
- <div>You can also achieve this by adding a build docker image step to your CI/CD job and configuring the built-in
- registry login with an access token secret that has package write permissions</div>
+ <div><wicket:t>You can also achieve this by adding a build docker image step to your CI/CD job and configuring the built-in
+ registry login with an access token secret that has package write permissions</wicket:t></div>
<div wicket:id="insecureRegistryNote" class="mt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.html b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.html
index 78168306db..c03ef1fe69 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.html
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerPackPanel.html
@@ -1,13 +1,13 @@
<wicket:panel>
<div>
- <b>Digest</b>
+ <b><wicket:t>Digest</wicket:t></b>
<div wicket:id="digest" class="text-monospace text-break font-size-sm mt-2"></div>
</div>
<div wicket:id="content"></div>
<div wicket:id="insecureRegistryNote" class="mt-4"></div>
<wicket:fragment wicket:id="multiArchFrag">
<div class="mt-4">
- <b>Pull Command</b>
+ <b><wicket:t>Pull Command</wicket:t></b>
<div class="mt-2">
<span wicket:id="pullCommand" class="text-monospace text-break font-size-sm"></span>
<a wicket:id="copyPullCommand"><wicket:svg href="copy" class="icon"/></a>
@@ -19,11 +19,11 @@
<wicket:fragment wicket:id="imageFrag">
<wicket:enclosure child="osArch">
<div class="mt-4">
- <b>OS/ARCH</b>
+ <b><wicket:t>OS/ARCH</wicket:t></b>
<div wicket:id="osArch" class="mt-2"></div>
</div>
<div class="mt-4">
- <b>Pull Command</b>
+ <b><wicket:t>Pull Command</wicket:t></b>
<div class="mt-2">
<span wicket:id="pullCommand" class="text-monospace text-break font-size-sm"></span>
<a wicket:id="copyPullCommand"><wicket:svg href="copy" class="icon"/></a>
@@ -32,7 +32,7 @@
</wicket:enclosure>
<wicket:enclosure child="pullArchCommand">
<div class="mt-4">
- <b>Arch Pull Command</b>
+ <b><wicket:t>Arch Pull Command</wicket:t></b>
<div class="mt-2">
<span wicket:id="pullArchCommand" class="text-monospace text-break font-size-sm"></span>
<a wicket:id="copyPullArchCommand"><wicket:svg href="copy" class="icon"/></a>
@@ -40,15 +40,15 @@
</div>
</wicket:enclosure>
<div class="mt-4">
- <b>Image Size</b>
+ <b><wicket:t>Image Size</wicket:t></b>
<div wicket:id="imageSize" class="mt-2"></div>
</div>
<div class="mt-4">
- <b>Image Manifest</b>
+ <b><wicket:t>Image Manifest</wicket:t></b>
<pre wicket:id="manifest" class="code text-break mt-2 mb-0"></pre>
</div>
<div wicket:id="labels" class="mt-4">
- <b>Image Labels</b>
+ <b><wicket:t>Image Labels</wicket:t></b>
<table class="table table-bordered mt-2 mb-0">
<tbody>
<tr wicket:id="labels">
@@ -61,7 +61,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="cacheFrag">
<div class="alert alert-light-info alert-notice mt-4 mb-0">
- <b>This is a layer cache. To use the cache, add below option to your docker buildx command</b>
+ <b><wicket:t>This is a layer cache. To use the cache, add below option to your docker buildx command</wicket:t></b>
<div class="mt-2">
<span wicket:id="cacheFromOption" class="text-monospace text-break font-size-sm"></span>
<a wicket:id="copyCacheFromOption"><wicket:svg href="copy" class="icon"/></a>
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/InsecureRegistryNotePanel.html b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/InsecureRegistryNotePanel.html
index 69b7fcb83a..54efce319d 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/InsecureRegistryNotePanel.html
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/InsecureRegistryNotePanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
<div class="font-size-sm">
- <b class="text-warning">WARNING: </b>
+ <b class="text-warning"><wicket:t>WARNING: </wicket:t></b>
<span class="text-muted">
- This server is currently accessed via http protocol,
- please configure your docker daemon or buildx builder to <a href="https://docs.onedev.io/tutorials/cicd/insecure-docker-registry" target="_blank">work with insecure registry</a>
+ <wicket:t>This server is currently accessed via http protocol,
+ please configure your docker daemon or buildx builder to <a href="https://docs.onedev.io/tutorials/cicd/insecure-docker-registry" target="_blank">work with insecure registry</a></wicket:t>
</span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.html b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.html
index 25f68b9f16..a4fb2403f8 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.html
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Edit <code>$HOME/.gem/credentials</code> to add a source</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Edit <code>$HOME/.gem/credentials</code> to add a source</wicket:t></div>
<div wicket:id="addSource"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Make sure the access token has package write permission over the project.
- Also make sure to run command <code>chmod 0600 $HOME/.gem/credentials</code> after creating the file</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the access token has package write permission over the project.
+ Also make sure to run command <code>chmod 0600 $HOME/.gem/credentials</code> after creating the file</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then push gem to the source</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then push gem to the source</wicket:t></div>
<div wicket:id="pushCommand" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to add source via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to add source via command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.java
index 95e436c4d0..24dad2254f 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemHelpPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.plugin.pack.gem;
import static io.onedev.server.plugin.pack.gem.GemPackService.SERVICE_ID;
+import static io.onedev.server.web.translation.Translation._T;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -34,8 +35,8 @@ public class GemHelpPanel extends Panel {
var jobCommands = "" +
"mkdir -p $HOME/.gem\n" +
"\n" +
- "# Use job token to tell OneDev the build publishing the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package write permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build publishing the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package write permission") + "\n\n" +
"cat << EOF > $HOME/.gem/credentials\n" +
"---\n" +
registryUrl + ": Bearer @job_token@:@secret:access-token@\n" +
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.html b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.html
index 4c6eccee47..de3dabd8bc 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.html
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.html
@@ -1,14 +1,14 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Run below commands to install this gem</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to install this gem</wicket:t></div>
<div wicket:id="install" class="mb-2"></div>
- <div class="text-muted font-size-sm mb-5">Make sure the account has package read permission over the project</div>
+ <div class="text-muted font-size-sm mb-5"><wicket:t>Make sure the account has package read permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, add this gem to Gemfile like below</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, add this gem to Gemfile like below</wicket:t></div>
<div wicket:id="gemfile" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then resolve dependency via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then resolve dependency via command step</wicket:t></div>
<div wicket:id="resolveDependencies" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">Gem Info</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Gem Info</wicket:t></div>
<div wicket:id="metainfo"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.java b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.java
index d67540181a..62e1e9b687 100644
--- a/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.java
+++ b/server-plugin/server-plugin-pack-gem/src/main/java/io/onedev/server/plugin/pack/gem/GemPackPanel.java
@@ -12,6 +12,7 @@ import org.apache.wicket.model.Model;
import java.net.MalformedURLException;
import java.net.URL;
+import static io.onedev.server.web.translation.Translation._T;
import static java.nio.charset.StandardCharsets.UTF_8;
public class GemPackPanel extends GenericPanel<Pack> {
@@ -44,8 +45,8 @@ public class GemPackPanel extends GenericPanel<Pack> {
add(new CodeSnippetPanel("gemfile", Model.of(gemfileContent)));
var resolveDependencyCommands = String.format("" +
- "# Use job token to tell OneDev the build using the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package read permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package read permission") + "\n\n" +
"bundle config set --global %s/%s/~rubygems/ @job_token@:@secret:access-token@\n" +
"bundle install", serverUrl, pack.getProject().getPath());
add(new CodeSnippetPanel("resolveDependencies", Model.of(resolveDependencyCommands)));
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.html b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.html
index 1413725d6e..7262e1254d 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.html
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.html
@@ -1,8 +1,8 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Push chart to the repository</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Push chart to the repository</wicket:t></div>
<div wicket:id="pushChart"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Make sure the user has package write permission over the project</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the user has package write permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to push chart to the repository via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to push chart to the repository via command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.java b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.java
index dc8360b895..41b1c8cd17 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.java
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmHelpPanel.java
@@ -3,6 +3,9 @@ package io.onedev.server.plugin.pack.helm;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -23,8 +26,8 @@ public class HelmHelpPanel extends Panel {
add(new CodeSnippetPanel("pushChart", Model.of("$ curl -u <onedev_account_name>:<onedev_password_or_access_token> -X POST --upload-file /path/to/chart.tgz " + registryUrl)));
add(new CodeSnippetPanel("jobCommands", Model.of("" +
- "# Use job token to tell OneDev the build pushing the chart\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package write permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build pushing the chart") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package write permission") + "\n\n" +
"curl -u @job_token@:@secret:access-token@ -X POST --upload-file /path/to/chart.tgz " + registryUrl)));
}
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.html b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.html
index 4cc28361cf..c9956596b2 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.html
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.html
@@ -1,15 +1,15 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Run below commands to use this chart</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to use this chart</wicket:t></div>
<div class="code mb-5">
<div wicket:id="addRepo" class="text-break font-size-sm mt-2"></div>
- <span class="text-muted font-size-sm">Make sure the account has package read permission over the project</span>
+ <span class="text-muted font-size-sm"><wicket:t>Make sure the account has package read permission over the project</wicket:t></span>
<div wicket:id="installChart" class="text-break font-size-sm mt-2"></div>
</div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to install chart via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to install chart via command step</wicket:t></div>
<div wicket:id="jobCommands" class="mb-5"></div>
<div class="bg-light rounded p-4">
- <h6 class="border-bottom pb-3">Chart Metadata</h6>
+ <h6 class="border-bottom pb-3"><wicket:t>Chart Metadata</wicket:t></h6>
<table class="table table-borderless">
<tbody>
<tr wicket:id="attributes">
diff --git a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.java b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.java
index a930755674..db7dc381a2 100644
--- a/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.java
+++ b/server-plugin/server-plugin-pack-helm/src/main/java/io/onedev/server/plugin/pack/helm/HelmPackPanel.java
@@ -1,5 +1,7 @@
package io.onedev.server.plugin.pack.helm;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -34,8 +36,8 @@ public class HelmPackPanel extends GenericPanel<Pack> {
@Override
protected String load() {
return "" +
- "# Use job token to tell OneDev the build using the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package read permission\n" +
+ "# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package read permission") + "\n" +
"helm install " + getPack().getName() + " --username @job_token@ --password @secret:access-token@ " + registryUrl + "/" + getPack().getName() + "-" +getPack().getVersion() + ".tgz";
}
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.html b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.html
index d7dae0c93a..bfe2e780fd 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.html
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.html
@@ -1,10 +1,10 @@
<wicket:panel>
<div>
- <div class="font-size-lg font-weight-bolder mb-3">1. Use below repositories in project pom.xml</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>1. Use below repositories in project pom.xml</wicket:t></div>
<div wicket:id="pom" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">2. Add below to <code>$HOME/.m2/settings.xml</code> if you want to deploy from command line</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>2. Add below to <code>$HOME/.m2/settings.xml</code> if you want to deploy from command line</wicket:t></div>
<div wicket:id="settings" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">3. For CI/CD job, it is more convenient to use a custom settings.xml, for instance via below code in a command step:</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>3. For CI/CD job, it is more convenient to use a custom settings.xml, for instance via below code in a command step:</wicket:t></div>
<div wicket:id="jobCommands"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java
index a0b1f99b18..e5a6450766 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenHelpPanel.java
@@ -1,18 +1,20 @@
package io.onedev.server.plugin.pack.maven;
-import com.google.common.io.Resources;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
+import static io.onedev.server.util.GroovyUtils.evalTemplate;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
-import static io.onedev.server.util.GroovyUtils.evalTemplate;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.io.Resources;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
public class MavenHelpPanel extends Panel {
@@ -36,14 +38,8 @@ public class MavenHelpPanel extends Panel {
URL tplUrl = Resources.getResource(MavenHelpPanel.class, "repositories.tpl");
String template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
add(new CodeSnippetPanel("pom", Model.of(evalTemplate(template, bindings))));
-
- tplUrl = Resources.getResource(MavenHelpPanel.class, "servers-and-mirrors.tpl");
- template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
- add(new CodeSnippetPanel("settings", Model.of(evalTemplate(template, bindings))));
-
- tplUrl = Resources.getResource(MavenHelpPanel.class, "job-commands.tpl");
- template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
- add(new CodeSnippetPanel("jobCommands", Model.of(evalTemplate(template, bindings))));
+ add(new CodeSnippetPanel("settings", Model.of(evalTemplate(MavenPackSupport.getServersAndMirrorsTemplate(), bindings))));
+ add(new CodeSnippetPanel("jobCommands", Model.of(evalTemplate(MavenPackSupport.getJobCommandsTemplate(), bindings))));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.html b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.html
index 52e9631826..a80b70b341 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.html
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.html
@@ -6,11 +6,11 @@
<table wicket:id="files" class="table"></table>
</wicket:fragment>
<wicket:fragment wicket:id="usageFrag">
- <div class="font-size-lg font-weight-bolder mb-3">1. To use this package, add below to project pom.xml</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>1. To use this package, add below to project pom.xml</wicket:t></div>
<div wicket:id="pom" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">2. Also add below to $HOME/.m2/settings.xml if you want to compile project from command line</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>2. Also add below to $HOME/.m2/settings.xml if you want to compile project from command line</wicket:t></div>
<div wicket:id="settings" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">3. For CI/CD job, it is more convenient to use a custom settings.xml, for instance via below code in a command step:</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>3. For CI/CD job, it is more convenient to use a custom settings.xml, for instance via below code in a command step:</wicket:t> </div>
<div wicket:id="jobCommands"></div>
</wicket:fragment>
<wicket:fragment wicket:id="fileFrag">
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java
index 207b66e793..262f6c2acd 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackPanel.java
@@ -1,16 +1,27 @@
package io.onedev.server.plugin.pack.maven;
-import com.google.common.io.Resources;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PackBlobManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Pack;
-import io.onedev.server.model.PackBlob;
-import io.onedev.server.model.PackBlobReference;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.util.LoadableDetachableDataProvider;
+import static io.onedev.server.plugin.pack.maven.MavenPackService.FILE_METADATA;
+import static io.onedev.server.plugin.pack.maven.MavenPackService.NONE;
+import static io.onedev.server.util.GroovyUtils.evalTemplate;
+import static io.onedev.server.web.translation.Translation._T;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.lang3.StringUtils.substringAfter;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
import org.apache.commons.io.FileUtils;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -32,21 +43,18 @@ import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.unbescape.html.HtmlEscape;
-import javax.ws.rs.core.MediaType;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
+import com.google.common.io.Resources;
-import static io.onedev.server.plugin.pack.maven.MavenPackService.FILE_METADATA;
-import static io.onedev.server.plugin.pack.maven.MavenPackService.NONE;
-import static io.onedev.server.util.GroovyUtils.evalTemplate;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.lang3.StringUtils.substringAfter;
-import static org.apache.commons.lang3.StringUtils.substringBefore;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PackBlobManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.PackBlob;
+import io.onedev.server.model.PackBlobReference;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
public class MavenPackPanel extends GenericPanel<Pack> {
@@ -72,7 +80,7 @@ public class MavenPackPanel extends GenericPanel<Pack> {
var bytes = readBlob(packBlob);
add(new CodeSnippetPanel("content", Model.of(new String(bytes, UTF_8))));
} else {
- add(new Label("content", "Plugin metadata not found")
+ add(new Label("content", _T("Plugin metadata not found"))
.add(AttributeAppender.append("class", "alert alert-notice alert-light-warning")));
}
} else {
@@ -128,16 +136,9 @@ public class MavenPackPanel extends GenericPanel<Pack> {
try {
var template = Resources.toString(tplUrl, UTF_8);
- usageFrag.add(new CodeSnippetPanel("pom",
- Model.of(evalTemplate(template, bindings))));
-
- tplUrl = Resources.getResource(MavenPackPanel.class, "servers-and-mirrors.tpl");
- template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
- usageFrag.add(new CodeSnippetPanel("settings", Model.of(evalTemplate(template, bindings))));
-
- tplUrl = Resources.getResource(MavenPackPanel.class, "job-commands.tpl");
- template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
- usageFrag.add(new CodeSnippetPanel("jobCommands", Model.of(evalTemplate(template, bindings))));
+ usageFrag.add(new CodeSnippetPanel("pom", Model.of(evalTemplate(template, bindings))));
+ usageFrag.add(new CodeSnippetPanel("settings", Model.of(evalTemplate(MavenPackSupport.getServersAndMirrorsTemplate(), bindings))));
+ usageFrag.add(new CodeSnippetPanel("jobCommands", Model.of(evalTemplate(MavenPackSupport.getJobCommandsTemplate(), bindings))));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -153,7 +154,7 @@ public class MavenPackPanel extends GenericPanel<Pack> {
List<IColumn<String, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<>(Model.of("Published File")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Published File"))) {
@Override
public void populateItem(Item<ICellPopulator<String>> cellItem,
@@ -196,7 +197,7 @@ public class MavenPackPanel extends GenericPanel<Pack> {
});
- columns.add(new AbstractColumn<>(Model.of("Size")) {
+ columns.add(new AbstractColumn<>(Model.of(_T("Size"))) {
public void populateItem(Item<ICellPopulator<String>> cellItem,
String componentId, IModel<String> rowModel) {
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackSupport.java b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackSupport.java
index 6fcde5c46e..cc482f424c 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackSupport.java
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/MavenPackSupport.java
@@ -1,15 +1,22 @@
package io.onedev.server.plugin.pack.maven;
+import static io.onedev.server.plugin.pack.maven.MavenPackService.NONE;
+import static io.onedev.server.web.translation.Translation._T;
+import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import com.google.common.io.Resources;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PackManager;
import io.onedev.server.model.Pack;
import io.onedev.server.model.Project;
import io.onedev.server.pack.PackSupport;
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import static io.onedev.server.plugin.pack.maven.MavenPackService.NONE;
-import static org.apache.commons.lang3.StringUtils.substringBeforeLast;
public class MavenPackSupport implements PackSupport {
@@ -60,4 +67,30 @@ public class MavenPackSupport implements PackSupport {
return new MavenHelpPanel(componentId, project.getPath());
}
+ public static String getJobCommandsTemplate() throws IOException {
+ var tplUrl = Resources.getResource(MavenPackSupport.class, "job-commands.tpl");
+ var template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
+ template = template.replace(
+ "maven:job-token-notice",
+ _T("Use job token as user name so that OneDev can know which build is ${permission.equals(\"write\")? \"deploying\": \"using\"} packages"));
+ template = template.replace(
+ "maven:access-token-notice",
+ _T("Job secret 'access-token' should be defined in project build setting as an access token with package ${permission} permission"));
+ template = template.replace(
+ "maven:allow-http-notice",
+ _T("Add below to allow accessing via http protocol in new Maven versions"));
+ return template;
+ }
+
+ public static String getServersAndMirrorsTemplate() throws IOException {
+ var tplUrl = Resources.getResource(MavenPackSupport.class, "servers-and-mirrors.tpl");
+ var template = Resources.toString(tplUrl, StandardCharsets.UTF_8);
+ template = template.replace(
+ "maven:has-permission-notice",
+ _T("Make sure the account has package ${permission} permission over the project"));
+ template = template.replace(
+ "maven:allow-http-notice",
+ _T("Add below to allow accessing via http protocol in new Maven versions"));
+ return template;
+ }
}
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/job-commands.tpl b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/job-commands.tpl
index 1c1a91a5ee..e0999079e6 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/job-commands.tpl
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/job-commands.tpl
@@ -3,16 +3,16 @@ cat << EOF > settings.xml
<servers>
<server>
<id>onedev</id>
- <!-- Use job token as user name so that OneDev can know which build is ${permission.equals("write")? "deploying": "using"} packages -->
+ <!-- maven:job-token-notice -->
<username>@job_token@</username>
- <!-- Job secret 'access-token' should be defined in project build setting as an access token with package ${permission} permission -->
+ <!-- maven:access-token-notice -->
<password>@secret:access-token@</password>
</server>
</servers>
<%
if (url.startsWith("http:") && permission.equals("read")) {
print """
- <!-- Add below to allow accessing via http protocol in new Maven versions -->
+ <!-- maven:allow-http-notice -->
<mirrors>
<mirror>
<id>maven-default-http-blocker</id>
diff --git a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/servers-and-mirrors.tpl b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/servers-and-mirrors.tpl
index 752cd0675a..77ec766863 100644
--- a/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/servers-and-mirrors.tpl
+++ b/server-plugin/server-plugin-pack-maven/src/main/java/io/onedev/server/plugin/pack/maven/servers-and-mirrors.tpl
@@ -1,7 +1,7 @@
<servers>
<server>
<id>onedev</id>
- <!-- Make sure the account has package ${permission} permission over the project -->
+ <!-- maven:has-permission-notice -->
<username>onedev_account_name</username>
<password>onedev_password_or_access_token</password>
</server>
@@ -9,7 +9,7 @@
<%
if (url.startsWith("http:") && permission.equals("read")) {
print """
-<!-- Add below to allow accessing via http protocol in new Maven versions -->
+<!-- maven:allow-http-notice -->
<mirrors>
<mirror>
<id>maven-default-http-blocker</id>
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.html b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.html
index 2cf8e3cb98..256f2ad171 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.html
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.html
@@ -1,13 +1,13 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Configure your scope to use below registry</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Configure your scope to use below registry</wicket:t></div>
<div wicket:id="scopeRegistry" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">And configure auth token of the registry</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>And configure auth token of the registry</wicket:t></div>
<div wicket:id="registryAuth"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Make sure the access token has package write permission over the project</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the access token has package write permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then publish package from project directory like below</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then publish package from project directory like below</wicket:t></div>
<div wicket:id="publishCommand" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to publish package via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to publish package via command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.java
index 829382516a..9d8e389bbf 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.java
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmHelpPanel.java
@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import static io.onedev.server.web.translation.Translation._T;
import static org.apache.commons.lang3.StringUtils.substringAfter;
public class NpmHelpPanel extends Panel {
@@ -33,10 +34,10 @@ public class NpmHelpPanel extends Panel {
protected String load() {
var registryUrl = getServerUrl() + "/" + projectPath + "/~npm/";
return "" +
- "# Use @@ to reference scope in job commands to avoid being interpreted as variable\n\n" +
+ "# " + _T("Use @@ to reference scope in job commands to avoid being interpreted as variable") + "\n\n" +
"npm config set @@myscope:registry " + registryUrl + "\n\n" +
- "# Use job token to tell OneDev the build publishing the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package write permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build publishing the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package write permission") + "\n\n" +
"npm config set -- '" + substringAfter(registryUrl, ":") + ":_authToken' \"@job_token@:@secret:access-token@\"\n\n" +
"npm publish";
}
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.html b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.html
index d9d26e5d1a..f84930670b 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.html
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.html
@@ -1,12 +1,12 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Run below commands to install this package</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to install this package</wicket:t></div>
<div class="code mb-5">
<div wicket:id="registryConfig" class="text-break font-size-sm mt-2"></div>
<div wicket:id="registryAuth" class="text-break font-size-sm mt-2"></div>
- <span class="text-muted font-size-sm">Make sure the access token has package read permission over the project</span>
+ <span class="text-muted font-size-sm"><wicket:t>Make sure the access token has package read permission over the project</wicket:t></span>
<div wicket:id="installPack" class="text-break font-size-sm mt-2"></div>
</div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below via a command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below via a command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
<wicket:enclosure child="readme">
diff --git a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.java b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.java
index e824ee0da7..d2f9783ea5 100644
--- a/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.java
+++ b/server-plugin/server-plugin-pack-npm/src/main/java/io/onedev/server/plugin/pack/npm/NpmPackPanel.java
@@ -15,6 +15,7 @@ import org.apache.wicket.model.Model;
import java.io.IOException;
+import static io.onedev.server.web.translation.Translation._T;
import static org.apache.commons.lang3.StringUtils.substringAfter;
import static org.apache.commons.lang3.StringUtils.substringBefore;
@@ -46,14 +47,14 @@ public class NpmPackPanel extends GenericPanel<Pack> {
if (getPack().getName().contains("/")) {
var scope = substringBefore(getPack().getName(), "/");
registryConfig = "" +
- "# Use @@ to reference scope in job commands to avoid being interpreted as variable\n" +
+ "# " + _T("Use @@ to reference scope in job commands to avoid being interpreted as variable") + "\n" +
"npm config set @" + scope + ":registry " + registryUrl + "\n\n";
} else {
registryConfig = "npm config set registry " + registryUrl + "\n\n";
}
return registryConfig +
- "# Use job token to tell OneDev the build using the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package read permission\n" +
+ "# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package read permission") + "\n" +
"npm config set -- '" + substringAfter(registryUrl, ":") + ":_authToken' \"@job_token@:@secret:access-token@\"\n\n" +
"npm install";
}
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.html b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.html
index 37127c8c9b..29d3663dc1 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.html
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.html
@@ -1,11 +1,11 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Add a package source like below</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Add a package source like below</wicket:t></div>
<div wicket:id="addSource"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Make sure the user has package write permission over the project</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the user has package write permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then push package to the source</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then push package to the source</wicket:t></div>
<div wicket:id="pushCommand" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to add package source via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to add package source via command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.java
index 969966f295..d0724556ed 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetHelpPanel.java
@@ -8,6 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import static io.onedev.server.plugin.pack.nuget.NugetPackService.SERVICE_ID;
+import static io.onedev.server.web.translation.Translation._T;
public class NugetHelpPanel extends Panel {
@@ -31,8 +32,8 @@ public class NugetHelpPanel extends Panel {
@Override
protected String load() {
return "" +
- "# Use job token to tell OneDev the build pushing the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package write permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build pushing the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package write permission") + "\n\n" +
"dotnet nuget add source --name onedev --username @job_token@ --password @secret:access-token@ --store-password-in-clear-text " + registryUrl;
}
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.html b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.html
index 58101bddf5..cecf3d112d 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.html
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.html
@@ -1,13 +1,13 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Run below commands to use this package</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to use this package</wicket:t></div>
<div class="code mb-5">
<div wicket:id="addSource" class="text-break font-size-sm mt-2"></div>
- <span class="text-muted font-size-sm">Make sure the account has package read permission over the project</span>
+ <span class="text-muted font-size-sm"><wicket:t>Make sure the account has package read permission over the project</wicket:t></span>
<div wicket:id="addPack" class="text-break font-size-sm mt-2"></div>
</div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to add package source via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to add package source via command step</wicket:t></div>
<div wicket:id="jobCommands" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">NuSpec</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>NuSpec</wicket:t></div>
<div wicket:id="nuspec"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.java b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.java
index 3e9cad5086..a7ef40f296 100644
--- a/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.java
+++ b/server-plugin/server-plugin-pack-nuget/src/main/java/io/onedev/server/plugin/pack/nuget/NugetPackPanel.java
@@ -9,6 +9,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.nio.charset.StandardCharsets;
public class NugetPackPanel extends GenericPanel<Pack> {
@@ -29,8 +31,8 @@ public class NugetPackPanel extends GenericPanel<Pack> {
@Override
protected String load() {
return "" +
- "# Use job token to tell OneDev the build using the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package read permission\n" +
+ "# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package read permission") + "\n" +
"dotnet nuget add source --name onedev --username @job_token@ --password @secret:access-token@ --store-password-in-clear-text " + registryUrl;
}
diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.html b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.html
index 6f83387aaa..dfef4a705c 100644
--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.html
+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.html
@@ -1,11 +1,11 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Edit <code>$HOME/.pypirc</code> to add a package repository like below</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Edit <code>$HOME/.pypirc</code> to add a package repository like below</wicket:t></div>
<div wicket:id="addRepository"></div>
- <div class="text-muted font-size-sm mt-2 mb-5">Make sure the user has package write permission over the project</div>
+ <div class="text-muted font-size-sm mt-2 mb-5"><wicket:t>Make sure the user has package write permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">Then upload package to the repository with twine</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Then upload package to the repository with twine</wicket:t></div>
<div wicket:id="uploadCommand" class="mb-5"></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, run below to add package repository via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, run below to add package repository via command step</wicket:t></div>
<div wicket:id="jobCommands"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java
index ee59bbcfb0..64d2b1e299 100644
--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java
+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiHelpPanel.java
@@ -3,6 +3,9 @@ package io.onedev.server.plugin.pack.pypi;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.web.component.codesnippet.CodeSnippetPanel;
+
+import static io.onedev.server.web.translation.Translation._T;
+
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -43,8 +46,8 @@ public class PypiHelpPanel extends Panel {
@Override
protected String load() {
return "" +
- "# Use job token to tell OneDev the build publishing the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package write permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build publishing the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package write permission") + "\n\n" +
"cat << EOF > $HOME/.pypirc\n" +
"[distutils]\n" +
"index-servers=\n" +
diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.html b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.html
index 9737f002df..62e80a977c 100644
--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.html
+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.html
@@ -1,21 +1,21 @@
<wicket:panel>
- <div class="font-size-lg font-weight-bolder mb-3">Run below commands to install this package</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>Run below commands to install this package</wicket:t></div>
<div wicket:id="install" class="code text-break font-size-sm mb-2"></div>
- <div class="text-muted font-size-sm mb-5">Make sure the account has package read permission over the project</div>
+ <div class="text-muted font-size-sm mb-5"><wicket:t>Make sure the account has package read permission over the project</wicket:t></div>
- <div class="font-size-lg font-weight-bolder mb-3">For CI/CD job, add this package to requirements.txt and
- run below to install the package via command step</div>
+ <div class="font-size-lg font-weight-bolder mb-3"><wicket:t>For CI/CD job, add this package to requirements.txt and
+ run below to install the package via command step</wicket:t></div>
<div wicket:id="jobCommands" class="text-break font-size-sm mb-5"></div>
<wicket:enclosure child="description">
<div class="bg-light rounded p-4 mb-5">
- <h6 class="border-bottom pb-3">Description</h6>
+ <h6 class="border-bottom pb-3"><wicket:t>Description</wicket:t></h6>
<div wicket:id="description"></div>
</div>
</wicket:enclosure>
<div class="bg-light rounded p-4">
- <h6 class="border-bottom pb-3">Meta Info</h6>
+ <h6 class="border-bottom pb-3"><wicket:t>Meta Info</wicket:t></h6>
<table class="table table-borderless">
<tbody>
<tr wicket:id="attributes">
diff --git a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java
index c048278358..ae06bd7298 100644
--- a/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java
+++ b/server-plugin/server-plugin-pack-pypi/src/main/java/io/onedev/server/plugin/pack/pypi/PypiPackPanel.java
@@ -15,6 +15,8 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import static io.onedev.server.web.translation.Translation._T;
+
import java.net.MalformedURLException;
import java.net.URL;
@@ -49,8 +51,8 @@ public class PypiPackPanel extends GenericPanel<Pack> {
indexUrl = protocol + "://@job_token@:@secret:access-token@@@" + UrlUtils.getServer(serverUrl)
+ "/" + getPack().getProject().getPath() + "/~" + PypiPackService.SERVICE_ID + "/simple/";
var jobCommands = "" +
- "# Use job token to tell OneDev the build using the package\n" +
- "# Job secret 'access-token' should be defined in project build setting as an access token with package read permission\n\n" +
+ "# " + _T("Use job token to tell OneDev the build using the package") + "\n" +
+ "# " + _T("Job secret 'access-token' should be defined in project build setting as an access token with package read permission") + "\n\n" +
"python3 -m pip install --extra-index-url " + indexUrl;
if (protocol.equals("http"))
jobCommands += " --trusted-host " + host;