diff --git a/module/project/control.php b/module/project/control.php index d3ef0da58d..66a2526d03 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -708,8 +708,10 @@ class project extends control $charts = $this->report->createJSChartFlot($project->name, $flotJSON, 900, 400); + /* Set a space when assemble the string for english. */ + $space = $this->app->getClientLang() == 'en' ? ' ' : ''; $dayList = array_fill(1, floor(count($dateList) / $this->config->project->maxBurnDay) + 5, ''); - foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . ($key + 1) . $this->lang->day; + foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . $space . ($key + 1) . $space . $this->lang->day; /* Assign. */ $this->view->title = $title; @@ -719,7 +721,7 @@ class project extends control $this->view->projectID = $projectID; $this->view->type = $type; $this->view->interval = $interval; - $this->view->dayList = array('full' => $this->lang->project->interval . 1 . $this->lang->day) + $dayList; + $this->view->dayList = array('full' => $this->lang->project->interval . $space . 1 . $space . $this->lang->day) + $dayList; $this->display(); } diff --git a/module/project/lang/en.php b/module/project/lang/en.php index eb4134ff28..b5e3ee7670 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -194,7 +194,7 @@ $lang->project->createTask = 'Create task'; $lang->project->goback = 'Go back'; $lang->project->linkProduct = 'Select product to link...'; $lang->project->noweekend = 'No weekend'; -$lang->project->widthweekend = 'Width weekend'; +$lang->project->withweekend = 'With weekend'; $lang->project->interval = 'Interval'; /* Report. */ diff --git a/module/report/model.php b/module/report/model.php index a1fa88516f..1fa7c53172 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -137,7 +137,14 @@ $(function () firstDay = month; } - title = tick.getFullYear() + '/' + month + '/' + tick.getDate(); + if(config.clientLang == 'en') + { + title = month + '/' + tick.getDate() + '/' + tick.getFullYear(); + } + else + { + title = tick.getFullYear() + '/' + month + '/' + tick.getDate(); + } if(ticks.length <= 30) dateTail = '/' + month; return '' + tick.getDate() + dateTail + '';