diff --git a/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql b/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql new file mode 100644 index 0000000000..16f0b04aa8 --- /dev/null +++ b/migration/i1.0a-release/oracle/201212211710_IDEMPIERE-294.sql.sql @@ -0,0 +1,12 @@ +-- Dec 21, 2012 7:16:06 AM EST +-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Acknowledge',200130,'U','263e6f73-5932-4e07-979f-1482319a6409','Acknowledge','Y',TO_DATE('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS')) +; + +-- Dec 21, 2012 7:16:06 AM EST +-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201212211710_IDEMPIERE-294.sql') FROM dual +; \ No newline at end of file diff --git a/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql b/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql new file mode 100644 index 0000000000..590af5dde9 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201212211710_IDEMPIERE-294.sql @@ -0,0 +1,12 @@ +-- Dec 21, 2012 7:16:06 AM EST +-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Acknowledge',200130,'U','263e6f73-5932-4e07-979f-1482319a6409','Acknowledge','Y',TO_TIMESTAMP('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-12-21 07:16:05','YYYY-MM-DD HH24:MI:SS')) +; + +-- Dec 21, 2012 7:16:06 AM EST +-- IDEMPIERE-294 Create a mechanism to broadcast messages to clients +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200130 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201212211710_IDEMPIERE-294.sql') FROM dual +; \ No newline at end of file diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java index d91eb2d7d0..07ec7a4988 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java @@ -29,6 +29,7 @@ import org.compiere.model.MNote; import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; +import org.compiere.util.Msg; import org.idempiere.broadcast.IBroadcastMsgPopup; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; @@ -89,7 +90,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup } private void init() { - setTitle("Message"); + setTitle(Msg.getMsg(Env.getCtx(),"Message")); Borderlayout layout = new Borderlayout(); this.appendChild(layout); addEventListener("onFocus", this); @@ -172,7 +173,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup acknowledged.setParent(rightCell); acknowledged.setVisible(false); //acknowledged.setHflex("6"); - acknowledged.setLabel("Acknowledge"); + acknowledged.setLabel(Msg.getMsg(Env.getCtx(),"Acknowledge")); acknowledged.addEventListener("onClick", this); }