java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 9 +++++++- java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 2 + java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 ++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 11 ++++++++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 ------ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 +++- java/spacewalk-java.spec | 11 +++++++++- rel-eng/packages/spacewalk-java | 2 - 22 files changed, 41 insertions(+), 111 deletions(-)
New commits: commit 9da7d8763bbe1982c2cfc3290d3cdc476cf36c62 Author: Tomas Lestach tlestach@redhat.com Date: Fri Mar 16 17:55:26 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f7e6b62..65cbf31 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.17 +Version: 1.8.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -593,6 +593,15 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Fri Mar 16 2012 Tomas Lestach tlestach@redhat.com 1.8.18-1 +- 803353 - do not link documentation if not available (tlestach@redhat.com) +- 803353 - do not link documentation if not available (tlestach@redhat.com) +- 800364 - hide documetation link (tlestach@redhat.com) +- 803644 - fix ISE (tlestach@redhat.com) +- fix checkstyle issue (tlestach@redhat.com) +- get rid of gsbase (tlestach@redhat.com) +- 726114 - update createOrUpradePath api documentation (tlestach@redhat.com) + * Fri Mar 16 2012 Michael Mraka michael.mraka@redhat.com 1.8.17-1 - require checkstyle only if we run it
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 48111c5..afa6b1e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.17-1 java/ +1.8.18-1 java/
commit 8296d298c62ca9970aab39b5ff366885840e68d4 Author: Tomas Lestach tlestach@redhat.com Date: Fri Mar 16 17:48:34 2012 +0100
803353 - do not link documentation if not available
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java index 1262262..32f0005 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; @@ -282,9 +283,15 @@ public class SystemDetailsEditAction extends RhnAction { } if (e instanceof VirtualizationEntitlement) { log.debug("adding virt msg"); - createSuccessMessage(request, + if (ConfigDefaults.get().isDocAvailable()) { + createSuccessMessage(request, "system.entitle.addedvirtualization", "/rhn/help/reference/en-US/ch-virtualization.jsp"); + } + else { + createSuccessMessage(request, + "system.entitle.addedvirtualization.nodoc", null); + } } } } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 18dc4fb..b3d4c77 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -7263,6 +7263,13 @@ Follow this url to see the full list of inactive systems: </context-group> </trans-unit>
+ <trans-unit id="system.entitle.addedvirtualization.nodoc"> +<source>Since you added a Virtualization entitlement to the system we also performed some extra steps to ensure your system will be able to manage virtual guests better.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/Overview.do</context> + </context-group> + </trans-unit> + <trans-unit id="system.entitle.alreadyvirt"> <source>A system can have either the Virtualization or Virtualization Platform entitlement but not both.</source> <context-group name="ctx">
commit f205ffeb04e219faf9d5595063ea4808700268ba Author: Tomas Lestach tlestach@redhat.com Date: Fri Mar 16 17:26:36 2012 +0100
803353 - do not link documentation if not available
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java index ef07d49..fc6ce5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; @@ -119,6 +120,7 @@ public class SystemOverviewAction extends RhnAction {
request.setAttribute("unentitled", Boolean.valueOf(s.getEntitlements().isEmpty())); request.setAttribute("systemInactive", Boolean.valueOf(s.isInactive())); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); request.setAttribute("criticalErrataCount", criticalErrataCount); request.setAttribute("nonCriticalErrataCount", nonCriticalErrataCount); request.setAttribute("upgradablePackagesCount", upgradablePackagesCount); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 5d44845..c5223e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -16815,13 +16815,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">প্যাকেজ: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>সিস্টেমটি @@PRODUCT_NAME@@-র সাথে সংযোগ স্থাপন করছে না</strong> (<a href="{0}">অতিরিক্ত তথ্য</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 921118c..3549e97 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -16868,13 +16868,6 @@ Baumpfad, Kickstart-RPM, Basis-Channel und Installer-Generation sollten immer ü </context-group> <target><strong><a href="{0}">Pakete: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>System meldet sich nicht bei @@PRODUCT_NAME@@ an</strong> (<a href="{0}">weitere Info</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index e1b9307..364d865 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -17364,8 +17364,15 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> </trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> + <trans-unit id="sdc.details.overview.inactive1"> + <source><strong>System not checking in with @@PRODUCT_NAME@@</strong></source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/details/Overview.do</context> + </context-group> + </trans-unit> + + <trans-unit id="sdc.details.overview.inactive2"> + <source> (<a href="{0}">more info</a>)</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/details/Overview.do</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index e52c289..ae1fe62 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -16864,13 +16864,6 @@ La ruta del ábol, el RPM Kickstart, el canal base y la generación del instalad </context-group> <target><strong><a href="{0}">Paquetes: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>El sistema no se está conectando con @@PRODUCT_NAME@@</strong> (<a href="{0}">mayor información</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index cebe4d4..209ce2f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -16866,13 +16866,6 @@ Le chemin d'arborescence, le RPM Kickstart, le canal de base, et la génération </context-group> <target><strong><a href="{0}">Paquetages : </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>Système non connecté à @@PRODUCT_NAME@@</strong> (<a href="{0}">plus d'informations</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index f570c20..e240280 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">પેકેજો: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>સિસ્ટમ @@PRODUCT_NAME@@ માં ચકાસી રહી નથી</strong> (<a href="{0}">વધુ જાણકારી</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 3e2816a..d864979 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">संकुल: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>सिस्टम इसे @@PRODUCT_NAME@@ के साथ चेक नहीं कर रहा है</strong> (<a href="{0}">अधिक सूचना</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 16870f7..864f416 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -16814,13 +16814,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">Pacchetti: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>Il sistema non esegue il check in con @@PRODUCT_NAME@@</strong> (<a href="{0}">maggiori informazioni</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index dafdf9d..20bd1e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -16847,13 +16847,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">パッケージ: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>システムが @@PRODUCT_NAME@@ にチェックインしていません</strong> (<a href="{0}">詳細</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 24e9f06..5a4f96c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -16810,13 +16810,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">패키지: </a></strong> {1} </target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>@@PRODUCT_NAME@@을 사용하여 시스템을 접속할 수 없음</strong> (<a href="{0}">자세한 정보</a>) </target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index ac222a8..cc8ebe6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -16816,13 +16816,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">ਪੈਕੇਜ: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>ਸਿਸਟਮ @@PRODUCT_NAME@@ ਤੇ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ</strong> (<a href="{0}">ਵਧੇਰੇ ਜਾਣਕਾਰੀ</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index e608fe7..14521df 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -16858,13 +16858,6 @@ O Caminho de Árvore, Kickstart RPM, Canal de Base e a Geração do Instalador d </context-group> <target><strong><a href="{0}">Pacotes: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>Sistema não está fazendo o check in com o @@PRODUCT_NAME@@</strong> (<a href="{0}">mais info</a>) </target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index a7b8a29..7f49d26 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -16811,13 +16811,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">Пакеты: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>Система не авторизуется в @@PRODUCT_NAME@@</strong> (<a href="{0}">Подробнее...</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index b29aa16..95188f2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">தொகுப்புகள்: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>@@PRODUCT_NAME@@உடன் சரிபார்க்காத கணினி</strong> (<a href="{0}">கூடுதல் தகவல்</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index e258a4a..f571711 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -16860,13 +16860,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">Packages: </a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>系统没有检入 @@PRODUCT_NAME@@</strong>(<a href="{0}">更多信息</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index e56349d..4bb36f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -16812,13 +16812,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><strong><a href="{0}">套件:</a></strong> {1}</target></trans-unit>
- <trans-unit id="sdc.details.overview.inactive"> - <source><strong>System not checking in with @@PRODUCT_NAME@@</strong> (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target><strong>系統未登錄於 @@PRODUCT_NAME@@ 之中</strong>(<a href="{0}">更多資訊</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source><strong>System not entitled</strong> (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index be05d58..40d220b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -17,7 +17,10 @@ </c:when>
<c:when test="${systemInactive}"> - <img src="/img/icon_checkin.gif"/> <bean:message key="sdc.details.overview.inactive" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + <img src="/img/icon_checkin.gif"/> <bean:message key="sdc.details.overview.inactive1"/> + <c:if test="${documentation == 'true'}"> + <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + </c:if> </c:when>
<c:when test="${hasUpdates}">
spacewalk-commits@lists.fedorahosted.org