diff --git a/framework/control.class.php b/framework/control.class.php index 131d4dad8a..0415ebb1ab 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -41,7 +41,7 @@ class control extends baseControl $mainViewFile = $modulePath . 'view' . DS . $this->devicePrefix . $methodName . '.' . $viewType . '.php'; /* If the main view file doesn't exist, set the device prefix to empty and reset the main view file. */ - if(!file_exists($mainViewFile)) + if(!file_exists($mainViewFile) and $this->app->clientDevice != 'mobile') { $originalPrefix = $this->devicePrefix; $this->devicePrefix = ''; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 4ce5575661..6b7c5d0bea 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -27,7 +27,7 @@ $lang->login = 'Login'; $lang->help = 'Help'; $lang->aboutZenTao = 'ZenTao'; $lang->profile = 'Profile'; -$lang->changePassword = 'Password'; +$lang->changePassword = 'Change Password'; $lang->runInfo = "
Welcome to the System Conversion Wizard, this program will assist you to convert data to ZenTao.
+There are risks in the conversion, so it is strongly recommended that you back up your databse and relavant files before conversion, and make sure that no one is using either system. EOT; $lang->convert->setConfig = 'Source Config'; @@ -31,7 +31,7 @@ $lang->convert->mustSelectSource = "You must select a source system."; $lang->convert->direction = "{$lang->projectCommon} converted to"; $lang->convert->questionTypeOfRedmine = 'Type in Redmine'; -$lang->convert->aimTypeOfZentao = 'Convert to Type in Zentao'; +$lang->convert->aimTypeOfZentao = 'Convert to Type in ZenTao'; $lang->convert->directionList['bug'] = 'Bug'; $lang->convert->directionList['task'] = 'Task'; @@ -51,17 +51,17 @@ $lang->convert->dbPort = 'Server Port'; $lang->convert->dbUser = 'Database User Name'; $lang->convert->dbPassword = 'Database Password'; $lang->convert->dbName = 'Database used in %s'; -$lang->convert->dbCharset = '%s Database Code'; +$lang->convert->dbCharset = '%s Database Coding'; $lang->convert->dbPrefix = '%s Table Prefix'; -$lang->convert->installPath = '%s Installed path'; +$lang->convert->installPath = '%s Installation Root Directory'; $lang->convert->checkDB = 'Database'; $lang->convert->checkTable = 'Table'; -$lang->convert->checkPath = 'Installed Path'; +$lang->convert->checkPath = 'Installation Path'; $lang->convert->execute = 'Convert'; $lang->convert->item = 'Item Converted'; -$lang->convert->count = 'Count'; +$lang->convert->count = 'No.'; $lang->convert->info = 'Info'; $lang->convert->bugfree = new stdclass(); diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 23dd843cb6..3b8d6066f6 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -1,7 +1,7 @@ cron->common = 'Scheduled Task'; +$lang->cron->common = 'Cron'; $lang->cron->index = 'Home'; -$lang->cron->list = 'Tasks'; +$lang->cron->list = 'Task'; $lang->cron->create = 'Add'; $lang->cron->edit = 'Edit'; $lang->cron->delete = 'Delete'; @@ -17,7 +17,7 @@ $lang->cron->dow = 'Week'; $lang->cron->command = 'Command'; $lang->cron->status = 'Status'; $lang->cron->type = 'Type'; -$lang->cron->remark = 'Remark'; +$lang->cron->remark = 'Comment'; $lang->cron->lastTime = 'Last Executed'; $lang->cron->turnonList['1'] = 'On'; @@ -33,11 +33,11 @@ $lang->cron->typeList['system'] = 'System Command'; $lang->cron->toggleList['start'] = 'Activate'; $lang->cron->toggleList['stop'] = 'Deactivate'; -$lang->cron->confirmDelete = 'Do you want to delete the Scheduled Task?'; -$lang->cron->confirmTurnon = 'Do you want to truncoff the Cron?'; +$lang->cron->confirmDelete = 'Do you want to delete the cron?'; +$lang->cron->confirmTurnon = 'Do you want to turn off the Cron?'; $lang->cron->introduction = <<This function need to be improved, so it is turned off by default.
+Cron is to perform scheduled actions, such as update burndown chart, backup, etc.
+Features of Cron need to be improved, so it is turned off by default.
EOD; $lang->cron->confirmOpen = <<