From 7fbf7c1fe308c9eaaf759b0517e09a6579a527ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Mon, 30 May 2016 09:48:10 +0200 Subject: [PATCH] =?UTF-8?q?State=20label=20name=20as=20well=20in=20order?= =?UTF-8?q?=20to=20disambiguate=20when=20used=20from=20Form=E2=80=A6=20(#2?= =?UTF-8?q?349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * State label name as well in order to disambiguate when used from FormValidation#aggregate --- core/src/main/java/hudson/model/AbstractProject.java | 2 +- core/src/main/resources/hudson/model/Messages.properties | 2 +- core/src/main/resources/hudson/model/Messages_bg.properties | 4 ++-- core/src/main/resources/hudson/model/Messages_lt.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d8b4851da9..8ebf64026b 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -2098,7 +2098,7 @@ public abstract class AbstractProject

,R extends A } } return FormValidation.okWithMarkup(Messages.AbstractProject_LabelLink( - j.getRootUrl(), l.getUrl(), l.getNodes().size(), l.getClouds().size()) + j.getRootUrl(), Util.escape(l.getName()), l.getUrl(), l.getNodes().size(), l.getClouds().size()) ); } diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 3e99de7cc1..bdda893e28 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -74,7 +74,7 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\ AbstractProject.AssignedLabelString.NoMatch=\ There's no agent/cloud that matches this assignment AbstractProject.CustomWorkspaceEmpty=Custom workspace is empty. -AbstractProject.LabelLink=Label is serviced by {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds} +AbstractProject.LabelLink=Label {1} is serviced by {3,choice,0#no nodes|1#1 node|1<{3} nodes}{4,choice,0#|1# and 1 cloud|1< and {4} clouds} Api.MultipleMatch=XPath "{0}" matched {1} nodes. \ Create XPath that only matches one, or use the "wrapper" query parameter to wrap them all under a root element. diff --git a/core/src/main/resources/hudson/model/Messages_bg.properties b/core/src/main/resources/hudson/model/Messages_bg.properties index 1262f9fad6..c4a98daf7b 100644 --- a/core/src/main/resources/hudson/model/Messages_bg.properties +++ b/core/src/main/resources/hudson/model/Messages_bg.properties @@ -106,8 +106,8 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\ AbstractProject.CustomWorkspaceEmpty=\ \u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u043e\u0442\u043e \u0440\u0430\u0431\u043e\u0442\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e \u0435 \u043f\u0440\u0430\u0437\u043d\u043e. AbstractProject.LabelLink=\ - \u0415\u0442\u0438\u043a\u0435\u0442\u044a\u0442 \u0441\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0432\u0430 \u043e\u0442\ - {2,choice,0#\u043d\u0438\u043a\u043e\u043b\u043a\u043e \u043c\u0430\u0448\u0438\u043d\u0438|1#1 \u043c\u0430\u0448\u0438\u043d\u0430|1<{2} \u043c\u0430\u0448\u0438\u043d\u0438}{3,choice,0#|1# \u0438 1 \u043e\u0431\u043b\u0430\u043a|1< \u0438 {3} \u043e\u0431\u043b\u0430\u043a\u0430} + \u0415\u0442\u0438\u043a\u0435\u0442\u044a\u0442 {1} \u0441\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0432\u0430 \u043e\u0442\ + {3,choice,0#\u043d\u0438\u043a\u043e\u043b\u043a\u043e \u043c\u0430\u0448\u0438\u043d\u0438|1#1 \u043c\u0430\u0448\u0438\u043d\u0430|1<{3} \u043c\u0430\u0448\u0438\u043d\u0438}{4,choice,0#|1# \u0438 1 \u043e\u0431\u043b\u0430\u043a|1< \u0438 {4} \u043e\u0431\u043b\u0430\u043a\u0430} Api.MultipleMatch=\ \u0418\u0437\u0440\u0430\u0437\u044a\u0442 \u0447\u0440\u0435\u0437 XPath \u201e{0}\u201c \u043e\u0442\u0433\u043e\u0432\u0430\u0440\u044f \u043d\u0430 {1} \u043c\u0430\u0448\u0438\u043d\u0438. \u0417\u0430\u0434\u0430\u0439\u0442\u0435 \u0438\u0437\u0440\u0430\u0437, \u043a\u043e\u0439\u0442\u043e \u0434\u0430 diff --git a/core/src/main/resources/hudson/model/Messages_lt.properties b/core/src/main/resources/hudson/model/Messages_lt.properties index 4cb96beb1e..af3069ef3e 100644 --- a/core/src/main/resources/hudson/model/Messages_lt.properties +++ b/core/src/main/resources/hudson/model/Messages_lt.properties @@ -50,7 +50,7 @@ AbstractProject.AssignedLabelString.InvalidBooleanExpression=\ AbstractProject.AssignedLabelString.NoMatch=\ N\u0117ra \u0161io priskyrimo atitinkan\u010dio agento/debesies AbstractProject.CustomWorkspaceEmpty=Savas darbalaukis tu\u0161\u010dias. -AbstractProject.LabelLink=Etiket\u0119 aptarnauja {2,choice,0#no nodes|1#1 node|1<{2} nodes}{3,choice,0#|1# and 1 cloud|1< and {3} clouds} +AbstractProject.LabelLink=Etiket\u0119 {1} aptarnauja {3,choice,0#no nodes|1#1 node|1<{3} nodes}{4,choice,0#|1# and 1 cloud|1< and {4} clouds} Api.MultipleMatch=XPath "{0}" atitiko {1} mazgus. \ Sukurkite XPath, kuris atitinka tik vien\u0105 mazg\u0105 arba naudokite \u201eapgaubiant\u012f\u201c u\u017eklausos parametr\u0105, kuris visus juos apgaubt\u0173 po \u0161akniniu elementu. -- GitLab