java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 10 +++++-----
12 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit 005d82b767039beae209071c7fc7362274a856ff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 16:30:25 2013 +0100
906345 - undo delete 'Server Delete' string
lost by 423cfc6255b7e6d52da35f7e543ec38cd99e04c9
+ reusing an unused message id
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 917ae8e..015149c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -9511,7 +9511,7 @@ Folgen Sie dieser URL für die vollständige Liste inaktiver Systeme:
<source>Schedule Package Verifications</source>
<target>Paketüberprüfungen planen</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Server löschen</target>
</trans-unit>
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 fe4b79c..9e4dc46 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
@@ -7523,6 +7523,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="ssm.package.verify.operationname">
<source>Schedule Package Verifications</source>
</trans-unit>
+ <trans-unit id="ssm.server.delete.operationname">
+ <source>Server Delete</source>
+ </trans-unit>
<trans-unit id="ssm.migrate.systems.confirmmessage">
<source>Systems Migrated</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index cb47516..5195e32 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -9511,7 +9511,7 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos:
<source>Schedule Package Verifications</source>
<target>Programar verificaciones de paquetes</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Borrar servidor</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index 0c121e6..7a9b8f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -9512,7 +9512,7 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs :
<source>Schedule Package Verifications</source>
<target>Planifier les vérifications de packages</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Supprimer le serveur</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 20a2148..179b32f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -9510,7 +9510,7 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat
<source>Schedule Package Verifications</source>
<target>Programma le verifiche dei pacchetti</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Cancella server</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 7ebb221..e6c8079 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -9509,7 +9509,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>パッケージ検証のスケジュール</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>サーバーの削除</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index ab23eb7..896797e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -9511,7 +9511,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>패키지 검증 스케줄 </target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>서버 삭제 </target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 355ba27..e308cbd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -9497,7 +9497,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>Programa das Verificações do Pacote</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Deleta o Servidor</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index ffdb591..af93d88 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -9507,7 +9507,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>Назначить проверку пакетов</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Удаление на сервере</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index 2000cae..c93fac0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -9511,7 +9511,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>调度软件包的验证</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>删除服务器</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 24097a7..9c7c785 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -9510,7 +9510,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>排程套件驗證</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>伺服器刪除</target>
</trans-unit>
commit de43bbedc64d83ed8c46ed1181dc279a99edfb05
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 16:01:55 2013 +0100
906345 - localize operation descriptions
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
index ed0ace2..6b33f87 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.db.datasource.WriteMode;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.manager.BaseManager;
@@ -147,20 +148,19 @@ public class SsmOperationManager extends BaseManager {
*
* @param user user under which to associate the operation; cannot be
* <code>null</code>
- * @param description high level description of what the operation is doing;
- * cannot be <code>null</code>
+ * @param messageId message id of operation description; cannot be <code>null</code>
* @param rhnSetLabel references a RhnSet with the server IDs to associate with the
* new operation; if this is <code>null</code> no mappings will
* be created at this time
* @return the id of the created operation
*/
- public static long createOperation(User user, String description,
+ public static long createOperation(User user, String messageId,
String rhnSetLabel) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
- if (description == null) {
+ if (messageId == null) {
throw new IllegalArgumentException("description cannot be null");
}
@@ -181,7 +181,7 @@ public class SsmOperationManager extends BaseManager {
params.clear();
params.put("op_id", operationId);
params.put("user_id", user.getId());
- params.put("description", description);
+ params.put("description", LocalizationService.getInstance().getMessage(messageId));
params.put("status", SsmOperationStatus.IN_PROGRESS.getText());
writeMode.executeUpdate(params);