Mohammed Shekha(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/6.1-opw-575725-msh into lp:openerp-web/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-575725-msh/+merge/110535
Hello,
Fixed the issue of Gantt view translation, here the label of month and tooltip
were not translated.
Month Label can easily be tranlated by overwriting gantt.shortMonthNames and
gantt.monthNames in gantt,js but for tooltip need to change library as there
was no other option.
Created a array of tooltip labels and overwrite it from gantt.js with _t.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-575725-msh/+merge/110535
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/6.1-opw-575725-msh.
=== modified file 'addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js'
--- addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2012-01-27 13:35:08 +0000
+++ addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2012-06-15 14:12:21 +0000
@@ -414,6 +414,7 @@
this.shortMonthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
this.monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+ this.tooltip_label = ["Start Date", "Duration", "Percent Complete", "EST", "Predecessor Task", "Child Tasks", "Parent Task"];
this._useShortMonthNames = true;
dhtmlxEventable(this);
@@ -3139,20 +3140,20 @@
//data of task
var tblInfo = this.Chart.divInfo.lastChild;
tblInfo.rows[0].cells[0].innerHTML = "<div style='font-family: Arial, Helvetica, Sans-serif; font-size: 12px; font-weight: bold; color: #688060; margin: 0 0 4px 0;'>" + this.TaskInfo.Name + "</div>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>EST: </span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
- // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete: </span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[3]+": </span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[1]+": </span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[2]+": </span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
//show predecessor task
if (this.predTask)
{
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Predecessor Task: </span>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[4]+": </span>";
tblInfo.rows[0].cells[0].innerHTML += "<span class='lt'>*" + this.TaskInfo.PredecessorTask.Name + "</span>";
}
//show child tasks
if (this.TaskInfo.ChildTasks.length != 0) {
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Child Tasks: </span>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[5]+": </span>";
for (var i = 0; i < this.TaskInfo.ChildTasks.length; i++)
{
tblInfo.rows[0].cells[0].innerHTML += (i == this.TaskInfo.ChildTasks.length - 1) ? ("<span class='lt'>*" + this.TaskInfo.ChildTasks[i].Name + "</span>") : ("<span class='lt'>*" + this.TaskInfo.ChildTasks[i].Name + "</span>");
@@ -3161,7 +3162,7 @@
//show parent task
if (this.TaskInfo.ParentTask) {
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Parent Task: </span>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[6]+": </span>";
tblInfo.rows[0].cells[0].innerHTML += "<span class='lt'>*" + this.TaskInfo.ParentTask.Name + "</span>";
}
@@ -3803,9 +3804,9 @@
var tblInfo = this.Chart.divInfo.lastChild;
tblInfo.rows[0].cells[0].innerHTML = "<div style='font-family: Arial, Helvetica, Sans-serif; font-size: 12px; font-weight: bold; color: #688060; margin:0 0 4px 0;'>" + this.Project.Name + "</div>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Start Date: </span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.Duration + " hours</span><br/>";
- // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete: </span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[0]+": </span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[1]+": </span><span class='ut'>" + this.Duration + " hours</span><br/>";
+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label[2]+": </span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
this.Chart.divInfo.style.cssText = "z-index:2;position: absolute;display: inline;";
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-01-27 16:06:45 +0000
+++ addons/web_gantt/static/src/js/gantt.js 2012-06-15 14:12:21 +0000
@@ -163,6 +163,9 @@
}
}
var gantt = new GanttChart();
+ gantt.shortMonthNames = [_t("Jan"), _t("Feb"), _t("Mar"), _t("Apr"), _t("May"), _t("Jun"), _t("Jul"), _t("Aug"), _t("Sep"), _t("Oct"), _t("Nov"), _t("Dec")];
+ gantt.monthNames = [_t("January"), _t("February"), _t("March"), _t("April"), _t("May"), _t("June"), _t("July"), _t("August"), _t("September"), _t("October"), _t("November"), _t("December")];
+ gantt.tooltip_label = [_t("Start Date"), _t("Duration"), _t("Percent Complete"), _t("EST"), _t("Predecessor Task"), _t("Child Tasks"), _t("Parent Task")];
_.each(_.compact(_.map(groups, function(e) {return generate_task_info(e, 0);})), function(project) {
gantt.addProject(project);
});
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
