From 9e6b18bcc6ba70d44e44a4628ab444926df4922b Mon Sep 17 00:00:00 2001 From: sjeffen Date: Mon, 12 Aug 2019 08:44:49 +0200 Subject: [PATCH] IDEMPIERE-4024 cpherp missing part of help suggestion translation --- .../i6.2z/oracle/201908141837_IDEMPIERE-4024.sql | 15 +++++++++++++++ .../postgresql/201908141837_IDEMPIERE-4024.sql | 12 ++++++++++++ .../webui/window/WCtxHelpSuggestion.java | 4 ++-- .../adempiere/webui/window/WFieldSuggestion.java | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 migration/i6.2z/oracle/201908141837_IDEMPIERE-4024.sql create mode 100644 migration/i6.2z/postgresql/201908141837_IDEMPIERE-4024.sql diff --git a/migration/i6.2z/oracle/201908141837_IDEMPIERE-4024.sql b/migration/i6.2z/oracle/201908141837_IDEMPIERE-4024.sql new file mode 100644 index 0000000000..844a88198a --- /dev/null +++ b/migration/i6.2z/oracle/201908141837_IDEMPIERE-4024.sql @@ -0,0 +1,15 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Comments: Help suggestion IDEMPIERE-4024 +-- 12. aug. 2019 08.41.41 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Your changes have been saved',0,0,'Y',TO_DATE('2019-08-12 08:41:41','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-08-12 08:41:41','YYYY-MM-DD HH24:MI:SS'),100,200535,'Your changes have been saved','D','626593d4-d1eb-41d8-bdc6-1f65f186aea6') +; + +-- 12. aug. 2019 08.42.09 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Your suggestions have been submitted for review',0,0,'Y',TO_DATE('2019-08-12 08:42:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-08-12 08:42:08','YYYY-MM-DD HH24:MI:SS'),100,200536,'Your suggestions have been submitted for review','D','f0808e07-6b87-4f7d-9b27-bd73ed66046a') +; + +SELECT register_migration_script('201908141837_IDEMPIERE-4024.sql') FROM dual +; + diff --git a/migration/i6.2z/postgresql/201908141837_IDEMPIERE-4024.sql b/migration/i6.2z/postgresql/201908141837_IDEMPIERE-4024.sql new file mode 100644 index 0000000000..b764392d17 --- /dev/null +++ b/migration/i6.2z/postgresql/201908141837_IDEMPIERE-4024.sql @@ -0,0 +1,12 @@ +-- Comments: Help suggestion IDEMPIERE-4024 +-- 12. aug. 2019 08.41.41 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Your changes have been saved',0,0,'Y',TO_TIMESTAMP('2019-08-12 08:41:41','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-08-12 08:41:41','YYYY-MM-DD HH24:MI:SS'),100,200535,'Your changes have been saved','D','626593d4-d1eb-41d8-bdc6-1f65f186aea6') +; + +-- 12. aug. 2019 08.42.09 CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Your suggestions have been submitted for review',0,0,'Y',TO_TIMESTAMP('2019-08-12 08:42:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-08-12 08:42:08','YYYY-MM-DD HH24:MI:SS'),100,200536,'Your suggestions have been submitted for review','D','f0808e07-6b87-4f7d-9b27-bd73ed66046a') +; + +SELECT register_migration_script('201908141837_IDEMPIERE-4024.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java index b12d9e29fe..e4f04ee14e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java @@ -175,9 +175,9 @@ public class WCtxHelpSuggestion extends Window implements EventListener { onSave0(trx); trx.commit(true); if (ctxHelpMsg != null && ctxHelpMsg.getAD_Client_ID() == Env.getAD_Client_ID(Env.getCtx())) { - FDialog.info(0, this, "Your changes have been saved."); + FDialog.info(0, this, Msg.getMsg(Env.getCtx(), "Your changes have been saved.")); } else { - FDialog.info(0, this, "Your suggestions have been submitted for review"); + FDialog.info(0, this, Msg.getMsg(Env.getCtx(),"Your suggestions have been submitted for review")); } } catch (Exception e) { trx.rollback(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java index 1e33f47f05..9768ab5aaa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java @@ -153,7 +153,7 @@ public class WFieldSuggestion extends Window implements EventListener { suggestion.setProcessed(false); suggestion.saveEx(); - FDialog.info(0, this, "Your suggestions have been submitted for review"); + FDialog.info(0, this, Msg.getMsg(Env.getCtx(),"Your suggestions have been submitted for review")); this.detach(); } }