diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index b375fad3f3c64c54a0fdb17fe67980cf46e63527..09622ac6192ce2351d96f0c206436910069a537f 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -543,6 +543,20 @@ public class Functions { return map.subMap(Integer.parseInt(to),Integer.parseInt(from)-1); } + /** + * Creates a sub map by using the given range (upper end inclusive). + */ + @Restricted(NoExternalUse.class) + public static SortedMap filterExcludingFrom(SortedMap map, String from, String to) { + if(from==null && to==null) return map; + if(to==null) + return map.headMap(Integer.parseInt(from)); + if(from==null) + return map.tailMap(Integer.parseInt(to)); + + return map.subMap(Integer.parseInt(to),Integer.parseInt(from)); + } + private static final SimpleFormatter formatter = new SimpleFormatter(); /** diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly index 26aeaf1c627b1885e7b3af6252abfa1ebd9a800d..62e3e894e7954b6511f4748bbb3fc43407b7d8ae 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly +++ b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly @@ -36,10 +36,17 @@ THE SOFTWARE.

${%Changes} - ${%from.label(from)} -  ${%to.label(to)} + + + ${%range.label(from, to)} + + + ${%from.label(from)} + ${%to.label(to)} + +

- + diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes.properties b/core/src/main/resources/hudson/model/AbstractProject/changes.properties index 0a353fc073294ee3e0afb6d9d87f35161d3066e4..704f8dac46e11019d1be5fcbc53e4256a7fd992a 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes.properties @@ -21,5 +21,6 @@ # THE SOFTWARE. changes.title={0} Changes -from.label=from #{0} -to.label=to #{0} \ No newline at end of file +from.label=since #{0} +to.label=up to #{0} +range.label=between #{0} and #{1} diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties index 62e5d9fb042e311ab1ddd7c6af513e835ecffce5..aa34c5954161b1a5992590b41a8ca497ef173322 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_da.properties @@ -23,4 +23,5 @@ Changes=\u00c6ndringer from.label=# fra #{0} to.label=# til #{0} +range.label=fra #{0} til #{1} changes.title=# {0} \u00c6ndringer diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties index 48613c9e054ecc24757d3fa2e02e16dea1d9232b..e2eedb1b4f29f10a7170336724d9896b921d250a 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_de.properties @@ -22,5 +22,6 @@ Changes=Änderungen changes.title=Änderungen in {0} -from.label=von #{0} +from.label=seit #{0} to.label=bis #{0} +range.label=zwischen #{0} und #{1} diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties index 58fbbca97d6a24fdd135ea9f1ea95b3579821dcb..b69f341e32090675d8049d58f15fe3744ba4e4e2 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_es.properties @@ -23,4 +23,5 @@ changes.title={0} Cambios from.label=desde #{0} to.label=hasta #{0} +range.label=desde #{0} hasta #{1} Changes=Cambios diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties index faa831ea94764cc55b5a4bdbb1fbb4045324aa8e..d118a3158a2b9d6ddc2b683f0cb7513d79236dee 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_fr.properties @@ -24,3 +24,4 @@ changes.title=Changements dans {0} Changes=Modifications from.label=de #{0} to.label=à #{0} +range.label=de #{0} à #{1} diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties index 11ca4887af78d6881905ec890b202b4ccea52f7f..c6457516f13fb6aff4952bafce0aa88003415136 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_ja.properties @@ -23,4 +23,5 @@ changes.title={0}\u306e\u5909\u66f4 Changes=\u5909\u66f4\u5c65\u6b74 from.label=#{0} \u304b\u3089 -to.label=#{0} \u307e\u3067 \ No newline at end of file +to.label=#{0} \u307e\u3067 +range.label=#{0} \u304b\u3089 #{1} \u307e\u3067 \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties index 0a322242aaeffec9ed13e31b25cbcc664d43e14d..1bf3c61ec6bc5d84b3e793415f4f67712a092d2a 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_lv.properties @@ -23,3 +23,4 @@ Changes=Izmai\u0146as from.label=no #{0} to.label=l\u012Bdz #{0} +range.label=no #{0} l\u012Bdz #{1} \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties index 61e6f418a723aca2e018d5629fc12b17c9df6642..427ebf3de5923926cebb60d4fa63aa901e2c290e 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_pt_BR.properties @@ -25,5 +25,6 @@ Changes=Mudan\u00e7as from.label=de #{0} # to #{0} to.label= para #{0} +range.label=de #{0} para #{1} # {0} Changes changes.title={0} Mudan\u00e7as diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties index 881ddd69eb6860677cb8a8c5972b9683894c058a..9ac01a770f122a6fdc081d1d184b5710952baa7a 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_ru.properties @@ -23,3 +23,4 @@ Changes=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f from.label=\u0441 #{0} to.label=\u0434\u043E #{0} +range.label=\u0441 #{0} \u0434\u043E #{1} \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties index 244c86996b12b06011839ce97f28b8d76bca79b7..678996f3ade906097778eb45a4a414c00beb4d51 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_tr.properties @@ -24,3 +24,4 @@ Changes=De\u011fi\u015fiklikler changes.title={0} degi\u015fiklik from.label=#{0}'dan to.label=#{0}'a +range.label=#{0}'dan #{1}'a \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties b/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties index 7b7c358fcf4af6accec119755b92e3621b2754c6..1e4364901d7500a1286eced25688359ed219ce6b 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/changes_zh_TW.properties @@ -25,3 +25,4 @@ changes.title={0} \u8b8a\u66f4 Changes=\u8b8a\u66f4 from.label=\u5f9e #{0} to.label=\u5230 #{0} +range.label=\u5f9e #{0} \u5230 #{1}