The Unified and Autonomous Development Platform
chore: Minor UI text improvement
Robin Shenfed71edbd681
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 8d68a68437..39d2b06338 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -136,8 +136,7 @@ public class Job implements NamedElement, Validatable {return new ArrayList<>();}- @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", description="Optionally specify executor for this job. " +- "Leave empty to use first matching executor (or use auto-discovered executor if no executors are defined)")+ @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", description="Optionally specify executor for this job")@Interpolative(literalSuggester="suggestJobExecutors", variableSuggester="suggestVariables")public String getJobExecutor() {return jobExecutor;@@ -152,7 +151,7 @@ public class Job implements NamedElement, Validatable {if (OneDev.getInstance(SettingManager.class).getJobExecutors().isEmpty())return _T("Auto-discovered executor");else- return _T("First matching executor");+ return _T("First applicable executor");}@SuppressWarnings("unused")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.htmlindex 48d059ecf3..87e3d8e5d2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html@@ -3,10 +3,10 @@<div class="body"><div wicket:id="jobExecutorSetting"><div wicket:id="withExecutors" class="alert alert-info mb-5">- <wicket:t>For a particular job, the first matching executor will be used</wicket:t>+ <wicket:t>For a particular job, the first applicable executor will be used</wicket:t></div><div wicket:id="withoutExecutors" class="alert alert-info mb-5">- <wicket:t>No executors defined. Jobs will use auto-discovered executors</wicket:t>+ <wicket:t>No executors defined. Jobs will use auto-discovered executor</wicket:t></div><ul class="list-unstyled"><li wicket:id="executors" class="executor mb-5"><div wicket:id="executor"></div></li>