From 14d7bbc8e37469ef0a3ecdd31aca7f5a153c3203 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Sat, 13 Apr 2013 21:07:16 -0500 Subject: [PATCH] IDEMPIERE-788 Add translation support for popup request window from dashboard calendar --- .../oracle/201304041108_IDEMPIERE-788.sql | 113 ++++++++++++++++++ .../postgresql/201304041108_IDEMPIERE-788.sql | 113 ++++++++++++++++++ .../webui/dashboard/CalendarWindow.java | 21 ++-- org.adempiere.ui.zk/calendar.zul | 42 ++++--- 4 files changed, 268 insertions(+), 21 deletions(-) create mode 100644 migration/i1.0a-release/oracle/201304041108_IDEMPIERE-788.sql create mode 100644 migration/i1.0a-release/postgresql/201304041108_IDEMPIERE-788.sql diff --git a/migration/i1.0a-release/oracle/201304041108_IDEMPIERE-788.sql b/migration/i1.0a-release/oracle/201304041108_IDEMPIERE-788.sql new file mode 100644 index 0000000000..a6db08e124 --- /dev/null +++ b/migration/i1.0a-release/oracle/201304041108_IDEMPIERE-788.sql @@ -0,0 +1,113 @@ +-- Apr 4, 2013 10:56:47 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Switch Time Zone',200159,'D','8539c2e0-cd62-4370-9ae2-0feec520d6ef','SwitchTimeZone','Y',TO_DATE('2013-04-04 10:56:46','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 10:56:46','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 10:56:47 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200159 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) +; + +-- Apr 4, 2013 10:57:12 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Monday',200160,'D','9f4120cb-22aa-4f16-9e86-1a27cb66b820','Monday','Y',TO_DATE('2013-04-04 10:57:11','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 10:57:11','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 10:57:12 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200160 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) +; + +-- Apr 4, 2013 11:02:30 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Tuesday',200161,'D','8acbe969-a354-4772-89ce-9ba0ead46a2b','Tuesday','Y',TO_DATE('2013-04-04 11:02:29','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:02:29','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:02:30 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200161 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) +; + +-- Apr 4, 2013 11:02:50 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Wednesday',200162,'D','209709d6-bb75-4a20-8e69-e5e93d95ef7f','Wednesday','Y',TO_DATE('2013-04-04 11:02:50','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:02:50','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:02:50 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200162 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) +; + +-- Apr 4, 2013 11:03:14 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Thursday',200163,'D','11fcd2a1-9512-4517-8d20-aa3bfc0b198f','Thursday','Y',TO_DATE('2013-04-04 11:03:13','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:03:13','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:14 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200163 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) +; + +-- Apr 4, 2013 11:03:35 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Friday',200164,'D','2024cad8-556d-481e-8aae-ed4681187f87','Friday','Y',TO_DATE('2013-04-04 11:03:34','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:03:34','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:35 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200164 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) +; + +-- Apr 4, 2013 11:03:58 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Saturday',200165,'D','bab8bdc5-a283-4173-9385-9dc2de4044ae','Saturday','Y',TO_DATE('2013-04-04 11:03:57','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:03:57','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:58 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200165 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) +; + +-- Apr 4, 2013 11:04:16 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Sunday',200166,'D','a586e26e-9daf-4aff-8a53-973bd95817ce','Sunday','Y',TO_DATE('2013-04-04 11:04:16','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:04:16','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:16 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200166 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) +; + +-- Apr 4, 2013 11:04:39 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','5 Days',200167,'D','7b5a1228-284b-47c1-a3c0-bb1899b8cd60','5Days','Y',TO_DATE('2013-04-04 11:04:38','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:04:38','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:39 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200167 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) +; + +-- Apr 4, 2013 11:04:59 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Events Analysis',200168,'D','730ed6ed-ba76-4b8c-8d13-7ab27f8ad603','EventsAnalysis','Y',TO_DATE('2013-04-04 11:04:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:04:58','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:59 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200168 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) +; + +-- Apr 4, 2013 11:05:27 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','First Day of Week',200169,'D','98506145-5a38-4cf2-bde0-11cbff6a4ced','FirstDayofWeek','Y',TO_DATE('2013-04-04 11:05:26','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-04-04 11:05:26','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:05:27 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200169 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('201304041108_IDEMPIERE-788.sql') FROM dual +; + diff --git a/migration/i1.0a-release/postgresql/201304041108_IDEMPIERE-788.sql b/migration/i1.0a-release/postgresql/201304041108_IDEMPIERE-788.sql new file mode 100644 index 0000000000..8490875da0 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201304041108_IDEMPIERE-788.sql @@ -0,0 +1,113 @@ +-- Apr 4, 2013 10:56:47 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Switch Time Zone',200159,'D','8539c2e0-cd62-4370-9ae2-0feec520d6ef','SwitchTimeZone','Y',TO_TIMESTAMP('2013-04-04 10:56:46','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 10:56:46','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 10:56:47 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200159 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) +; + +-- Apr 4, 2013 10:57:12 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Monday',200160,'D','9f4120cb-22aa-4f16-9e86-1a27cb66b820','Monday','Y',TO_TIMESTAMP('2013-04-04 10:57:11','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 10:57:11','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 10:57:12 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200160 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) +; + +-- Apr 4, 2013 11:02:30 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Tuesday',200161,'D','8acbe969-a354-4772-89ce-9ba0ead46a2b','Tuesday','Y',TO_TIMESTAMP('2013-04-04 11:02:29','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:02:29','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:02:30 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200161 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) +; + +-- Apr 4, 2013 11:02:50 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Wednesday',200162,'D','209709d6-bb75-4a20-8e69-e5e93d95ef7f','Wednesday','Y',TO_TIMESTAMP('2013-04-04 11:02:50','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:02:50','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:02:50 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200162 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) +; + +-- Apr 4, 2013 11:03:14 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Thursday',200163,'D','11fcd2a1-9512-4517-8d20-aa3bfc0b198f','Thursday','Y',TO_TIMESTAMP('2013-04-04 11:03:13','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:03:13','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:14 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200163 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) +; + +-- Apr 4, 2013 11:03:35 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Friday',200164,'D','2024cad8-556d-481e-8aae-ed4681187f87','Friday','Y',TO_TIMESTAMP('2013-04-04 11:03:34','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:03:34','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:35 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200164 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) +; + +-- Apr 4, 2013 11:03:58 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Saturday',200165,'D','bab8bdc5-a283-4173-9385-9dc2de4044ae','Saturday','Y',TO_TIMESTAMP('2013-04-04 11:03:57','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:03:57','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:03:58 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200165 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) +; + +-- Apr 4, 2013 11:04:16 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Sunday',200166,'D','a586e26e-9daf-4aff-8a53-973bd95817ce','Sunday','Y',TO_TIMESTAMP('2013-04-04 11:04:16','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:04:16','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:16 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200166 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) +; + +-- Apr 4, 2013 11:04:39 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','5 Days',200167,'D','7b5a1228-284b-47c1-a3c0-bb1899b8cd60','5Days','Y',TO_TIMESTAMP('2013-04-04 11:04:38','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:04:38','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:39 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200167 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) +; + +-- Apr 4, 2013 11:04:59 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Events Analysis',200168,'D','730ed6ed-ba76-4b8c-8d13-7ab27f8ad603','EventsAnalysis','Y',TO_TIMESTAMP('2013-04-04 11:04:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:04:58','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:04:59 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200168 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) +; + +-- Apr 4, 2013 11:05:27 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','First Day of Week',200169,'D','98506145-5a38-4cf2-bde0-11cbff6a4ced','FirstDayofWeek','Y',TO_TIMESTAMP('2013-04-04 11:05:26','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-04-04 11:05:26','YYYY-MM-DD HH24:MI:SS'),0) +; + +-- Apr 4, 2013 11:05:27 AM COT +-- IDEMPIERE-788 , Translation support for dashboard calendar +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200169 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('201304041108_IDEMPIERE-788.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java index 7ab630a94f..9d1f496238 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java @@ -25,12 +25,14 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.TimeZone; import org.adempiere.webui.component.Window; import org.adempiere.webui.session.SessionManager; import org.compiere.model.X_R_RequestType; import org.compiere.util.Env; +import org.compiere.util.Msg; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.encoders.EncoderUtil; @@ -93,8 +95,8 @@ public class CalendarWindow extends Window implements EventListener { super(); this.scm = scm; - - setTitle("Calendar"); + Properties ctx = Env.getCtx(); + setTitle(Msg.getMsg(ctx,"Calendar")); setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED); Component component = Executions.createComponents("calendar.zul", this, null); @@ -116,7 +118,7 @@ public class CalendarWindow extends Window implements EventListener { lbxRequestTypes = (Listbox) component.getFellow("lbxRequestTypes"); lbxRequestTypes.addEventListener(Events.ON_SELECT, this); - lbxRequestTypes.appendItem("(Show All)", "0"); + lbxRequestTypes.appendItem(Msg.getMsg(ctx,"ShowAll"), "0"); ArrayList types = DPCalendar.getRequestTypes(Env.getCtx()); for(X_R_RequestType type : types) lbxRequestTypes.appendItem(type.getName(), type.getR_RequestType_ID() + ""); @@ -147,6 +149,11 @@ public class CalendarWindow extends Window implements EventListener { lbxFDOW.addEventListener(Events.ON_SELECT, this); lbxFDOW.addEventListener(Events.ON_CREATE, this); + String[] days = {"Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"}; + for (String day : days) { + lbxFDOW.appendItem(Msg.getMsg(Env.getCtx(),day), day); + } + divTabDay = component.getFellow("divTabDay"); divTabDay.addEventListener("onUpdateView", this); @@ -204,7 +211,7 @@ public class CalendarWindow extends Window implements EventListener { } else if (type.equals("onUpdateView")) { String text = String.valueOf(e.getData()); - int days = "Day".equals(text) ? 1: "5 Days".equals(text) ? 5: "Week".equals(text) ? 7: 0; + int days = Msg.getMsg(Env.getCtx(),"Day").equals(text) ? 1: Msg.getMsg(Env.getCtx(),"5Days").equals(text) ? 5: Msg.getMsg(Env.getCtx(),"Week").equals(text) ? 7: 0; divTabClicked(days); } else if (type.equals(Events.ON_SELECT)) { @@ -224,7 +231,7 @@ public class CalendarWindow extends Window implements EventListener { syncModel(); } else if (e.getTarget() == lbxFDOW) { - calendars.setFirstDayOfWeek(lbxFDOW.getSelectedItem().getLabel()); + calendars.setFirstDayOfWeek(lbxFDOW.getSelectedItem().getValue().toString()); syncModel(); } } @@ -312,7 +319,7 @@ public class CalendarWindow extends Window implements EventListener { pieDataset.setValue(name == null ? "" : name, new Double(size > 0 ? value.doubleValue()/size*100 : 0)); } - JFreeChart chart = ChartFactory.createPieChart3D("Events Analysis", pieDataset, true, true, true); + JFreeChart chart = ChartFactory.createPieChart3D(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true); PiePlot3D plot = (PiePlot3D) chart.getPlot(); plot.setForegroundAlpha(0.5f); BufferedImage bi = chart.createBufferedImage(600, 250); @@ -341,7 +348,7 @@ public class CalendarWindow extends Window implements EventListener { for (int i = cnt - 1; i >=0; i--) lbxRequestTypes.removeItemAt(i); - lbxRequestTypes.appendItem("(Show All)", "0"); + lbxRequestTypes.appendItem(Msg.getMsg(Env.getCtx(),"ShowAll"), "0"); ArrayList types = DPCalendar.getRequestTypes(Env.getCtx()); for(X_R_RequestType requestType : types) { diff --git a/org.adempiere.ui.zk/calendar.zul b/org.adempiere.ui.zk/calendar.zul index e2ffd38939..69a6ce7122 100644 --- a/org.adempiere.ui.zk/calendar.zul +++ b/org.adempiere.ui.zk/calendar.zul @@ -2,6 +2,22 @@ +