From 5c4cb46b14e7f855b3bca9842fb21b982ec6d383 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Wed, 26 Jul 2023 19:44:43 +0800 Subject: [PATCH] * Refactor upgrade view of instance,adjust lang file of instance. --- config/zentaopms.php | 3 + module/action/config.php | 3 + module/action/lang/de.php | 347 ++++++++++++++------------- module/action/lang/en.php | 347 ++++++++++++++------------- module/action/lang/fr.php | 347 ++++++++++++++------------- module/action/lang/vi.php | 244 ++++++++++--------- module/action/lang/zh-cn.php | 348 +++++++++++++++------------- module/action/lang/zh-tw.php | 250 ++++++++++---------- module/action/model.php | 4 + module/common/lang/common.php | 1 + module/common/lang/de.php | 1 + module/common/lang/en.php | 1 + module/common/lang/fr.php | 1 + module/common/lang/vi.php | 1 + module/common/lang/zh-cn.php | 1 + module/common/lang/zh-tw.php | 1 + module/instance/config.php | 20 +- module/instance/control.php | 29 +-- module/instance/js/view.ui.js | 2 +- module/instance/model.php | 4 +- module/instance/ui/upgrade.html.php | 28 +++ module/space/config/dtable.php | 8 +- module/space/js/browse.ui.js | 52 ++--- module/space/ui/browse.html.php | 5 +- 24 files changed, 1094 insertions(+), 954 deletions(-) create mode 100644 module/instance/ui/upgrade.html.php diff --git a/config/zentaopms.php b/config/zentaopms.php index 2cbde59ba4..ef12c43326 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -556,6 +556,9 @@ $config->objectTables['pivot'] = TABLE_PIVOT; $config->objectTables['account'] = TABLE_ACCOUNT; $config->objectTables['serverroom'] = TABLE_SERVERROOM; $config->objectTables['host'] = TABLE_ZAHOST; +$config->objectTables['instance'] = TABLE_INSTANCE; +$config->objectTables['space'] = TABLE_SPACE; +$config->objectTables['solution'] = TABLE_SOLUTION; $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visions'); $config->disabledFeatures = ''; diff --git a/module/action/config.php b/module/action/config.php index 73b20a3f37..19064eed22 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -57,6 +57,9 @@ $config->action->objectNameFields['pivot'] = 'name'; $config->action->objectNameFields['serverroom'] = 'name'; $config->action->objectNameFields['account'] = 'name'; $config->action->objectNameFields['host'] = 'name'; +$config->action->objectNameFields['instance'] = 'name'; +$config->action->objectNameFields['space'] = 'name'; +$config->action->objectNameFields['solution'] = 'name'; $config->action->commonImgSize = 870; diff --git a/module/action/lang/de.php b/module/action/lang/de.php index d91d453b5f..9bee693ec6 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -314,171 +314,188 @@ $lang->action->desc->autorestore = '$date, restored by system.' . "\ $lang->action->desc->deleteexpiredbackup = '$date, deleted the expired automatic backups by system.' . "\n"; /* Used to display dynamic information. */ -$lang->action->label = new stdclass(); -$lang->action->label->install = 'install '; -$lang->action->label->revert = 'revert '; -$lang->action->label->created = 'created '; -$lang->action->label->opened = 'opened '; -$lang->action->label->openedbysystem = 'Opened by system '; -$lang->action->label->closedbysystem = 'Closed by system '; -$lang->action->label->added = 'added'; -$lang->action->label->changed = 'changed '; -$lang->action->label->edited = 'edited '; -$lang->action->label->assigned = 'assigned '; -$lang->action->label->closed = 'closed '; -$lang->action->label->deleted = 'deleted '; -$lang->action->label->deletedfile = 'deleted '; -$lang->action->label->editfile = 'edit '; -$lang->action->label->erased = 'erased '; -$lang->action->label->undeleted = 'restored '; -$lang->action->label->hidden = 'hid '; -$lang->action->label->commented = 'commented '; -$lang->action->label->communicated = 'communicated'; -$lang->action->label->activated = 'activated '; -$lang->action->label->blocked = 'blocked '; -$lang->action->label->resolved = 'resolved '; -$lang->action->label->reviewed = 'reviewed '; -$lang->action->label->recalled = 'recalled'; -$lang->action->label->recalledchange = 'undo changes'; -$lang->action->label->moved = 'moved '; -$lang->action->label->confirmed = 'Confirm Story'; -$lang->action->label->bugconfirmed = 'Confirmed'; -$lang->action->label->tostory = 'Convert to Story'; -$lang->action->label->frombug = 'Converted from Bug'; -$lang->action->label->fromlib = 'Import from library'; -$lang->action->label->totask = 'Convert to Task'; -$lang->action->label->converttotask = 'converted to Task '; -$lang->action->label->svncommited = 'SVN Commit'; -$lang->action->label->gitcommited = 'Git Commit'; -$lang->action->label->linked2plan = 'Link to Plan'; -$lang->action->label->unlinkedfromplan = 'Unlink'; -$lang->action->label->changestatus = 'Change Status'; -$lang->action->label->marked = 'marked'; -$lang->action->label->linked2execution = "Link {$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "Unlink {$lang->executionCommon}"; -$lang->action->label->linked2kanban = 'linked to kanban'; -$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "Unlink Build"; -$lang->action->label->linked2release = "Link Release"; -$lang->action->label->unlinkedfromrelease = "Unlink Release"; -$lang->action->label->linked2revision = "Link Revision"; -$lang->action->label->unlinkedfromrevision = "Unlink Revision"; -$lang->action->label->linkrelatedbug = "Link to Bug"; -$lang->action->label->unlinkrelatedbug = "Unlink"; -$lang->action->label->linkrelatedcase = "Link to Case"; -$lang->action->label->unlinkrelatedcase = "Unlink"; -$lang->action->label->linkrelatedstory = "Link to Story"; -$lang->action->label->unlinkrelatedstory = "Unlink"; -$lang->action->label->subdividestory = "Decompose Story"; -$lang->action->label->unlinkchildstory = "Unlink"; -$lang->action->label->started = 'started '; -$lang->action->label->restarted = 'continued '; -$lang->action->label->recordworkhour = 'recorded '; -$lang->action->label->editestimate = 'edited '; -$lang->action->label->canceled = 'cancelled '; -$lang->action->label->finished = 'finished '; -$lang->action->label->paused = 'paused '; -$lang->action->label->verified = 'verified '; -$lang->action->label->delayed = 'delayed '; -$lang->action->label->suspended = 'suspended '; -$lang->action->label->login = 'Login'; -$lang->action->label->logout = "Logout"; -$lang->action->label->notified = "Notified"; -$lang->action->label->deleteestimate = "deleted hours"; -$lang->action->label->linked2build = "linked "; -$lang->action->label->linked2bug = "linked "; -$lang->action->label->linked2testtask = "linked"; -$lang->action->label->unlinkedfromtesttask = "unlinked"; -$lang->action->label->linkchildtask = "linked a child task"; -$lang->action->label->unlinkchildrentask = "unlinked a child task"; -$lang->action->label->linkparenttask = "linked a parent task"; -$lang->action->label->unlinkparenttask = "unlink from parent task"; -$lang->action->label->batchcreate = "batch created tasks"; -$lang->action->label->createchildren = "create child tasks"; -$lang->action->label->managed = "managed"; -$lang->action->label->managedteam = "managed"; -$lang->action->label->managedwhitelist = "managed"; -$lang->action->label->deletechildrentask = "delete children task"; -$lang->action->label->createchildrenstory = "create child stories"; -$lang->action->label->linkchildstory = "linked a child story"; -$lang->action->label->unlinkchildrenstory = "unlinked a child story"; -$lang->action->label->linkparentstory = "linked a parent story"; -$lang->action->label->unlinkparentstory = "unlink from parent story"; -$lang->action->label->deletechildrenstory = "delete children story"; -$lang->action->label->tracked = 'tracked'; -$lang->action->label->hangup = 'hangup'; -$lang->action->label->run = 'run'; -$lang->action->label->estimated = 'estimated'; -$lang->action->label->reviewpassed = 'Pass'; -$lang->action->label->reviewrejected = 'Reject'; -$lang->action->label->reviewclarified = 'Clarify'; -$lang->action->label->commitsummary = 'Commit Summary'; -$lang->action->label->updatetrainee = 'Update Trainee'; -$lang->action->label->setdefaultbranch = 'Set default branch'; -$lang->action->label->syncprogram = 'start'; -$lang->action->label->syncproject = 'start'; -$lang->action->label->syncexecution = 'start'; -$lang->action->label->syncexecutionbychild = 'start'; -$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'Merge Request Linked'; -$lang->action->label->deletemr = 'Merge Request Unlinked'; -$lang->action->label->mergedmr = 'Merge Request Merged'; -$lang->action->label->compilepass = 'Compile Success'; -$lang->action->label->compilefail = 'Compile Fail'; -$lang->action->label->reopen = 'Reopen'; -$lang->action->label->approve = 'Passed'; -$lang->action->label->reject = 'Rejected'; -$lang->action->label->importfromgitlab = 'Issue associate created'; -$lang->action->label->archived = 'Archived'; -$lang->action->label->restore = 'Restore'; -$lang->action->label->mergedbranch = 'Merge Branch'; -$lang->action->label->startedbychild = 'started'; -$lang->action->label->finishedbychild = 'finished'; -$lang->action->label->closedbychild = 'closed'; -$lang->action->label->activatedbychild = 'activated'; -$lang->action->label->createchild = 'activated'; -$lang->action->label->executed = 'executed'; -$lang->action->label->importedcard = 'imported'; -$lang->action->label->importedproductplan = 'imported'; -$lang->action->label->importedrelease = 'imported'; -$lang->action->label->importedexecution = 'imported'; -$lang->action->label->importedbuild = 'imported'; -$lang->action->label->importedticket = 'imported'; -$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; -$lang->action->label->bind = 'bound'; -$lang->action->label->unbind = 'unbound'; -$lang->action->label->linkstory = 'link stories to'; -$lang->action->label->linkbug = 'link bugs to'; -$lang->action->label->unlinkstory = 'unlink stories from'; -$lang->action->label->unlinkbug = 'unlink bugs from'; -$lang->action->label->tolib = 'imported'; -$lang->action->label->updatetolib = 'updated'; -$lang->action->label->ganttmove = 'sorted'; -$lang->action->label->submitreview = 'submitted'; -$lang->action->label->suspend = 'suspended'; -$lang->action->label->resume = 'resumed'; -$lang->action->label->reboot = 'reboot'; -$lang->action->label->boot = 'boot'; -$lang->action->label->destroy = 'destroyed'; -$lang->action->label->getvnc = 'remote control'; -$lang->action->label->synctwins = 'synchronized changes'; -$lang->action->label->relieved = 'relieved'; -$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; -$lang->action->label->linkedrepo = 'Linked Code Repo'; -$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; -$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; -$lang->action->label->createdsnapshot = 'create snapshot'; -$lang->action->label->restoredsnapshot = 'create snapshot'; -$lang->action->label->editsnapshot = 'edit snapshot'; -$lang->action->label->deletesnapshot = 'deleted snapshot'; -$lang->action->label->saveddraft = 'save draft'; -$lang->action->label->releaseddoc = 'released'; -$lang->action->label->collected = 'collected'; -$lang->action->label->uncollected = 'uncollected'; -$lang->action->label->online = 'online'; -$lang->action->label->offline = 'offline'; -$lang->action->label->linkhost = 'link hosts to'; +$lang->action->label = new stdclass(); +$lang->action->label->install = 'install '; +$lang->action->label->uninstall = 'uninstall '; +$lang->action->label->upgrade = 'upgrade '; +$lang->action->label->start = 'start '; +$lang->action->label->stop = 'stop '; +$lang->action->label->editname = 'edit name '; +$lang->action->label->backup = 'backup '; +$lang->action->label->adjustmemory = 'adjust memory '; +$lang->action->label->enableldap = 'enable LDAP '; +$lang->action->label->disableldap = 'disable LDAP '; +$lang->action->label->enablesmtp = 'enable SMTP '; +$lang->action->label->disablesmtp = 'disable SMTP '; +$lang->action->label->tosenior = 'upgrade to senior '; +$lang->action->label->saveautobackupsettings = 'enable auto backup '; +$lang->action->label->closeautobackupsettings = 'disable auto backup '; +$lang->action->label->autobackup = 'auto backup by system '; +$lang->action->label->autorestore = 'auto restore by system '; +$lang->action->label->deleteexpiredbackup = 'delete expire backup by system '; +$lang->action->label->revert = 'revert '; +$lang->action->label->created = 'created '; +$lang->action->label->opened = 'opened '; +$lang->action->label->openedbysystem = 'Opened by system '; +$lang->action->label->closedbysystem = 'Closed by system '; +$lang->action->label->added = 'added'; +$lang->action->label->changed = 'changed '; +$lang->action->label->edited = 'edited '; +$lang->action->label->assigned = 'assigned '; +$lang->action->label->closed = 'closed '; +$lang->action->label->deleted = 'deleted '; +$lang->action->label->deletedfile = 'deleted '; +$lang->action->label->editfile = 'edit '; +$lang->action->label->erased = 'erased '; +$lang->action->label->undeleted = 'restored '; +$lang->action->label->hidden = 'hid '; +$lang->action->label->commented = 'commented '; +$lang->action->label->communicated = 'communicated'; +$lang->action->label->activated = 'activated '; +$lang->action->label->blocked = 'blocked '; +$lang->action->label->resolved = 'resolved '; +$lang->action->label->reviewed = 'reviewed '; +$lang->action->label->recalled = 'recalled'; +$lang->action->label->recalledchange = 'undo changes'; +$lang->action->label->moved = 'moved '; +$lang->action->label->confirmed = 'Confirm Story'; +$lang->action->label->bugconfirmed = 'Confirmed'; +$lang->action->label->tostory = 'Convert to Story'; +$lang->action->label->frombug = 'Converted from Bug'; +$lang->action->label->fromlib = 'Import from library'; +$lang->action->label->totask = 'Convert to Task'; +$lang->action->label->converttotask = 'converted to Task '; +$lang->action->label->svncommited = 'SVN Commit'; +$lang->action->label->gitcommited = 'Git Commit'; +$lang->action->label->linked2plan = 'Link to Plan'; +$lang->action->label->unlinkedfromplan = 'Unlink'; +$lang->action->label->changestatus = 'Change Status'; +$lang->action->label->marked = 'marked'; +$lang->action->label->linked2execution = "Link {$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "Unlink {$lang->executionCommon}"; +$lang->action->label->linked2kanban = 'linked to kanban'; +$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; +$lang->action->label->unlinkedfrombuild = "Unlink Build"; +$lang->action->label->linked2release = "Link Release"; +$lang->action->label->unlinkedfromrelease = "Unlink Release"; +$lang->action->label->linked2revision = "Link Revision"; +$lang->action->label->unlinkedfromrevision = "Unlink Revision"; +$lang->action->label->linkrelatedbug = "Link to Bug"; +$lang->action->label->unlinkrelatedbug = "Unlink"; +$lang->action->label->linkrelatedcase = "Link to Case"; +$lang->action->label->unlinkrelatedcase = "Unlink"; +$lang->action->label->linkrelatedstory = "Link to Story"; +$lang->action->label->unlinkrelatedstory = "Unlink"; +$lang->action->label->subdividestory = "Decompose Story"; +$lang->action->label->unlinkchildstory = "Unlink"; +$lang->action->label->started = 'started '; +$lang->action->label->restarted = 'continued '; +$lang->action->label->recordworkhour = 'recorded '; +$lang->action->label->editestimate = 'edited '; +$lang->action->label->canceled = 'cancelled '; +$lang->action->label->finished = 'finished '; +$lang->action->label->paused = 'paused '; +$lang->action->label->verified = 'verified '; +$lang->action->label->delayed = 'delayed '; +$lang->action->label->suspended = 'suspended '; +$lang->action->label->login = 'Login'; +$lang->action->label->logout = "Logout"; +$lang->action->label->notified = "Notified"; +$lang->action->label->deleteestimate = "deleted hours"; +$lang->action->label->linked2build = "linked "; +$lang->action->label->linked2bug = "linked "; +$lang->action->label->linked2testtask = "linked"; +$lang->action->label->unlinkedfromtesttask = "unlinked"; +$lang->action->label->linkchildtask = "linked a child task"; +$lang->action->label->unlinkchildrentask = "unlinked a child task"; +$lang->action->label->linkparenttask = "linked a parent task"; +$lang->action->label->unlinkparenttask = "unlink from parent task"; +$lang->action->label->batchcreate = "batch created tasks"; +$lang->action->label->createchildren = "create child tasks"; +$lang->action->label->managed = "managed"; +$lang->action->label->managedteam = "managed"; +$lang->action->label->managedwhitelist = "managed"; +$lang->action->label->deletechildrentask = "delete children task"; +$lang->action->label->createchildrenstory = "create child stories"; +$lang->action->label->linkchildstory = "linked a child story"; +$lang->action->label->unlinkchildrenstory = "unlinked a child story"; +$lang->action->label->linkparentstory = "linked a parent story"; +$lang->action->label->unlinkparentstory = "unlink from parent story"; +$lang->action->label->deletechildrenstory = "delete children story"; +$lang->action->label->tracked = 'tracked'; +$lang->action->label->hangup = 'hangup'; +$lang->action->label->run = 'run'; +$lang->action->label->estimated = 'estimated'; +$lang->action->label->reviewpassed = 'Pass'; +$lang->action->label->reviewrejected = 'Reject'; +$lang->action->label->reviewclarified = 'Clarify'; +$lang->action->label->commitsummary = 'Commit Summary'; +$lang->action->label->updatetrainee = 'Update Trainee'; +$lang->action->label->setdefaultbranch = 'Set default branch'; +$lang->action->label->syncprogram = 'start'; +$lang->action->label->syncproject = 'start'; +$lang->action->label->syncexecution = 'start'; +$lang->action->label->syncexecutionbychild = 'start'; +$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; +$lang->action->label->compilepass = 'Compile Success'; +$lang->action->label->compilefail = 'Compile Fail'; +$lang->action->label->reopen = 'Reopen'; +$lang->action->label->approve = 'Passed'; +$lang->action->label->reject = 'Rejected'; +$lang->action->label->importfromgitlab = 'Issue associate created'; +$lang->action->label->archived = 'Archived'; +$lang->action->label->restore = 'Restore'; +$lang->action->label->mergedbranch = 'Merge Branch'; +$lang->action->label->startedbychild = 'started'; +$lang->action->label->finishedbychild = 'finished'; +$lang->action->label->closedbychild = 'closed'; +$lang->action->label->activatedbychild = 'activated'; +$lang->action->label->createchild = 'activated'; +$lang->action->label->executed = 'executed'; +$lang->action->label->importedcard = 'imported'; +$lang->action->label->importedproductplan = 'imported'; +$lang->action->label->importedrelease = 'imported'; +$lang->action->label->importedexecution = 'imported'; +$lang->action->label->importedbuild = 'imported'; +$lang->action->label->importedticket = 'imported'; +$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; +$lang->action->label->bind = 'bound'; +$lang->action->label->unbind = 'unbound'; +$lang->action->label->linkstory = 'link stories to'; +$lang->action->label->linkbug = 'link bugs to'; +$lang->action->label->unlinkstory = 'unlink stories from'; +$lang->action->label->unlinkbug = 'unlink bugs from'; +$lang->action->label->tolib = 'imported'; +$lang->action->label->updatetolib = 'updated'; +$lang->action->label->ganttmove = 'sorted'; +$lang->action->label->submitreview = 'submitted'; +$lang->action->label->suspend = 'suspended'; +$lang->action->label->resume = 'resumed'; +$lang->action->label->reboot = 'reboot'; +$lang->action->label->boot = 'boot'; +$lang->action->label->destroy = 'destroyed'; +$lang->action->label->getvnc = 'remote control'; +$lang->action->label->synctwins = 'synchronized changes'; +$lang->action->label->relieved = 'relieved'; +$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; +$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; +$lang->action->label->createdsnapshot = 'create snapshot'; +$lang->action->label->restoredsnapshot = 'create snapshot'; +$lang->action->label->editsnapshot = 'edit snapshot'; +$lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; +$lang->action->label->online = 'online'; +$lang->action->label->offline = 'offline'; +$lang->action->label->linkhost = 'link hosts to'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index fc4cfb0b12..944e2f9d15 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -314,171 +314,188 @@ $lang->action->desc->autorestore = '$date, restored by system.' . "\ $lang->action->desc->deleteexpiredbackup = '$date, deleted the expired automatic backups by system.' . "\n"; /* Used to display dynamic information. */ -$lang->action->label = new stdclass(); -$lang->action->label->install = 'install '; -$lang->action->label->revert = 'revert '; -$lang->action->label->created = 'created '; -$lang->action->label->opened = 'opened '; -$lang->action->label->openedbysystem = 'Opened by system '; -$lang->action->label->closedbysystem = 'Closed by system '; -$lang->action->label->added = 'added'; -$lang->action->label->changed = 'changed '; -$lang->action->label->edited = 'edited '; -$lang->action->label->assigned = 'assigned '; -$lang->action->label->closed = 'closed '; -$lang->action->label->deleted = 'deleted '; -$lang->action->label->deletedfile = 'deleted '; -$lang->action->label->editfile = 'edited '; -$lang->action->label->erased = 'erased '; -$lang->action->label->undeleted = 'restored '; -$lang->action->label->hidden = 'hid '; -$lang->action->label->commented = 'commented '; -$lang->action->label->communicated = 'communicated'; -$lang->action->label->activated = 'activated '; -$lang->action->label->blocked = 'blocked '; -$lang->action->label->resolved = 'resolved '; -$lang->action->label->reviewed = 'reviewed '; -$lang->action->label->recalled = 'recalled'; -$lang->action->label->recalledchange = 'undo changes'; -$lang->action->label->moved = 'moved '; -$lang->action->label->confirmed = 'confirmed Story '; -$lang->action->label->bugconfirmed = 'confirmed'; -$lang->action->label->tostory = 'converted to Story '; -$lang->action->label->frombug = 'converted from Bug '; -$lang->action->label->fromlib = 'imported from Library '; -$lang->action->label->totask = 'converted to Task '; -$lang->action->label->converttotask = 'converted to Task '; -$lang->action->label->svncommited = 'committed SVN '; -$lang->action->label->gitcommited = 'committed Git '; -$lang->action->label->linked2plan = 'linked to Plan '; -$lang->action->label->unlinkedfromplan = 'unlinked from '; -$lang->action->label->changestatus = 'changed status'; -$lang->action->label->marked = 'marked'; -$lang->action->label->linked2execution = "linked to {$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "unlinked from {$lang->executionCommon}"; -$lang->action->label->linked2kanban = 'linked to kanban'; -$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "unlinked Build "; -$lang->action->label->linked2release = "linked Release "; -$lang->action->label->unlinkedfromrelease = "unlinked Release "; -$lang->action->label->linked2revision = "Link Revision"; -$lang->action->label->unlinkedfromrevision = "Unlink Revision"; -$lang->action->label->linkrelatedbug = "linked Bug "; -$lang->action->label->unlinkrelatedbug = "unlinked Bug "; -$lang->action->label->linkrelatedcase = "linked Case "; -$lang->action->label->unlinkrelatedcase = "unlinked Case "; -$lang->action->label->linkrelatedstory = "linked Story "; -$lang->action->label->unlinkrelatedstory = "unlinked Story "; -$lang->action->label->subdividestory = "decomposed Story "; -$lang->action->label->unlinkchildstory = "unlinked Story "; -$lang->action->label->started = 'started '; -$lang->action->label->restarted = 'continued '; -$lang->action->label->recordworkhour = 'recorded '; -$lang->action->label->editestimate = 'edited '; -$lang->action->label->canceled = 'cancelled '; -$lang->action->label->finished = 'finished '; -$lang->action->label->paused = 'paused '; -$lang->action->label->verified = 'verified '; -$lang->action->label->delayed = 'delayed '; -$lang->action->label->suspended = 'suspended '; -$lang->action->label->login = 'login'; -$lang->action->label->logout = "logout"; -$lang->action->label->notified = "Notified"; -$lang->action->label->deleteestimate = "deleted hours"; -$lang->action->label->linked2build = "linked "; -$lang->action->label->linked2bug = "linked "; -$lang->action->label->linked2testtask = "linked"; -$lang->action->label->unlinkedfromtesttask = "unlinked"; -$lang->action->label->linkchildtask = "linked a child task"; -$lang->action->label->unlinkchildrentask = "unlinked a child task"; -$lang->action->label->linkparenttask = "linked a parent task"; -$lang->action->label->unlinkparenttask = "unlink from parent task"; -$lang->action->label->batchcreate = "batch created tasks"; -$lang->action->label->createchildren = "create child tasks"; -$lang->action->label->managed = "managed"; -$lang->action->label->managedteam = "managed"; -$lang->action->label->managedwhitelist = "managed"; -$lang->action->label->deletechildrentask = "delete children task"; -$lang->action->label->createchildrenstory = "create child stories"; -$lang->action->label->linkchildstory = "linked a child story"; -$lang->action->label->unlinkchildrenstory = "unlinked a child story"; -$lang->action->label->linkparentstory = "linked a parent story"; -$lang->action->label->unlinkparentstory = "unlink from parent story"; -$lang->action->label->deletechildrenstory = "delete children story"; -$lang->action->label->tracked = 'tracked'; -$lang->action->label->hangup = 'hangup'; -$lang->action->label->run = 'run'; -$lang->action->label->estimated = 'estimated'; -$lang->action->label->reviewpassed = 'Pass'; -$lang->action->label->reviewrejected = 'Reject'; -$lang->action->label->reviewclarified = 'Clarify'; -$lang->action->label->commitsummary = 'Commit Summary'; -$lang->action->label->updatetrainee = 'Update Trainee'; -$lang->action->label->setdefaultbranch = 'Set default branch'; -$lang->action->label->syncprogram = 'start'; -$lang->action->label->syncproject = 'start'; -$lang->action->label->syncexecution = 'start'; -$lang->action->label->syncexecutionbychild = 'start'; -$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'Merge Request Linked'; -$lang->action->label->deletemr = 'Merge Request Unlinked'; -$lang->action->label->mergedmr = 'Merge Request Merged'; -$lang->action->label->compilepass = 'Compile Success'; -$lang->action->label->compilefail = 'Compile Fail'; -$lang->action->label->reopen = 'Reopen'; -$lang->action->label->approve = 'Passed'; -$lang->action->label->reject = 'Rejected'; -$lang->action->label->importfromgitlab = 'Issue associate created'; -$lang->action->label->archived = 'Archived'; -$lang->action->label->restore = 'Restore'; -$lang->action->label->mergedbranch = 'Merge Branch'; -$lang->action->label->startedbychild = 'started'; -$lang->action->label->finishedbychild = 'finished'; -$lang->action->label->closedbychild = 'closed'; -$lang->action->label->activatedbychild = 'activated'; -$lang->action->label->createchild = 'activated'; -$lang->action->label->executed = 'executed'; -$lang->action->label->importedcard = 'imported'; -$lang->action->label->importedproductplan = 'imported'; -$lang->action->label->importedrelease = 'imported'; -$lang->action->label->importedexecution = 'imported'; -$lang->action->label->importedbuild = 'imported'; -$lang->action->label->importedticket = 'imported'; -$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; -$lang->action->label->bind = 'bound'; -$lang->action->label->unbind = 'unbound'; -$lang->action->label->linkstory = 'link stories to'; -$lang->action->label->linkbug = 'link bugs to'; -$lang->action->label->unlinkstory = 'unlink stories from'; -$lang->action->label->unlinkbug = 'unlink bugs from'; -$lang->action->label->tolib = 'imported'; -$lang->action->label->updatetolib = 'updated'; -$lang->action->label->ganttmove = 'sorted'; -$lang->action->label->submitreview = 'submitted'; -$lang->action->label->suspend = 'suspended'; -$lang->action->label->resume = 'resumed'; -$lang->action->label->reboot = 'reboot'; -$lang->action->label->boot = 'boot'; -$lang->action->label->destroy = 'destroyed'; -$lang->action->label->getvnc = 'remote control'; -$lang->action->label->synctwins = 'synchronized changes'; -$lang->action->label->relieved = 'relieved'; -$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; -$lang->action->label->linkedrepo = 'Linked Code Repo'; -$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; -$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; -$lang->action->label->createdsnapshot = 'create snapshot'; -$lang->action->label->restoredsnapshot = 'create snapshot'; -$lang->action->label->editsnapshot = 'edit snapshot'; -$lang->action->label->deletesnapshot = 'deleted snapshot'; -$lang->action->label->saveddraft = 'save draft'; -$lang->action->label->releaseddoc = 'released'; -$lang->action->label->collected = 'collected'; -$lang->action->label->uncollected = 'uncollected'; -$lang->action->label->online = 'online'; -$lang->action->label->offline = 'offline'; -$lang->action->label->linkhost = 'link hosts to'; +$lang->action->label = new stdclass(); +$lang->action->label->install = 'install '; +$lang->action->label->uninstall = 'uninstall '; +$lang->action->label->upgrade = 'upgrade '; +$lang->action->label->start = 'start '; +$lang->action->label->stop = 'stop '; +$lang->action->label->editname = 'edit name '; +$lang->action->label->backup = 'backup '; +$lang->action->label->adjustmemory = 'adjust memory '; +$lang->action->label->enableldap = 'enable LDAP '; +$lang->action->label->disableldap = 'disable LDAP '; +$lang->action->label->enablesmtp = 'enable SMTP '; +$lang->action->label->disablesmtp = 'disable SMTP '; +$lang->action->label->tosenior = 'upgrade to senior '; +$lang->action->label->saveautobackupsettings = 'enable auto backup '; +$lang->action->label->closeautobackupsettings = 'disable auto backup '; +$lang->action->label->autobackup = 'auto backup by system '; +$lang->action->label->autorestore = 'auto restore by system '; +$lang->action->label->deleteexpiredbackup = 'delete expire backup by system '; +$lang->action->label->revert = 'revert '; +$lang->action->label->created = 'created '; +$lang->action->label->opened = 'opened '; +$lang->action->label->openedbysystem = 'Opened by system '; +$lang->action->label->closedbysystem = 'Closed by system '; +$lang->action->label->added = 'added'; +$lang->action->label->changed = 'changed '; +$lang->action->label->edited = 'edited '; +$lang->action->label->assigned = 'assigned '; +$lang->action->label->closed = 'closed '; +$lang->action->label->deleted = 'deleted '; +$lang->action->label->deletedfile = 'deleted '; +$lang->action->label->editfile = 'edited '; +$lang->action->label->erased = 'erased '; +$lang->action->label->undeleted = 'restored '; +$lang->action->label->hidden = 'hid '; +$lang->action->label->commented = 'commented '; +$lang->action->label->communicated = 'communicated'; +$lang->action->label->activated = 'activated '; +$lang->action->label->blocked = 'blocked '; +$lang->action->label->resolved = 'resolved '; +$lang->action->label->reviewed = 'reviewed '; +$lang->action->label->recalled = 'recalled'; +$lang->action->label->recalledchange = 'undo changes'; +$lang->action->label->moved = 'moved '; +$lang->action->label->confirmed = 'confirmed Story '; +$lang->action->label->bugconfirmed = 'confirmed'; +$lang->action->label->tostory = 'converted to Story '; +$lang->action->label->frombug = 'converted from Bug '; +$lang->action->label->fromlib = 'imported from Library '; +$lang->action->label->totask = 'converted to Task '; +$lang->action->label->converttotask = 'converted to Task '; +$lang->action->label->svncommited = 'committed SVN '; +$lang->action->label->gitcommited = 'committed Git '; +$lang->action->label->linked2plan = 'linked to Plan '; +$lang->action->label->unlinkedfromplan = 'unlinked from '; +$lang->action->label->changestatus = 'changed status'; +$lang->action->label->marked = 'marked'; +$lang->action->label->linked2execution = "linked to {$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "unlinked from {$lang->executionCommon}"; +$lang->action->label->linked2kanban = 'linked to kanban'; +$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; +$lang->action->label->unlinkedfrombuild = "unlinked Build "; +$lang->action->label->linked2release = "linked Release "; +$lang->action->label->unlinkedfromrelease = "unlinked Release "; +$lang->action->label->linked2revision = "Link Revision"; +$lang->action->label->unlinkedfromrevision = "Unlink Revision"; +$lang->action->label->linkrelatedbug = "linked Bug "; +$lang->action->label->unlinkrelatedbug = "unlinked Bug "; +$lang->action->label->linkrelatedcase = "linked Case "; +$lang->action->label->unlinkrelatedcase = "unlinked Case "; +$lang->action->label->linkrelatedstory = "linked Story "; +$lang->action->label->unlinkrelatedstory = "unlinked Story "; +$lang->action->label->subdividestory = "decomposed Story "; +$lang->action->label->unlinkchildstory = "unlinked Story "; +$lang->action->label->started = 'started '; +$lang->action->label->restarted = 'continued '; +$lang->action->label->recordworkhour = 'recorded '; +$lang->action->label->editestimate = 'edited '; +$lang->action->label->canceled = 'cancelled '; +$lang->action->label->finished = 'finished '; +$lang->action->label->paused = 'paused '; +$lang->action->label->verified = 'verified '; +$lang->action->label->delayed = 'delayed '; +$lang->action->label->suspended = 'suspended '; +$lang->action->label->login = 'login'; +$lang->action->label->logout = "logout"; +$lang->action->label->notified = "Notified"; +$lang->action->label->deleteestimate = "deleted hours"; +$lang->action->label->linked2build = "linked "; +$lang->action->label->linked2bug = "linked "; +$lang->action->label->linked2testtask = "linked"; +$lang->action->label->unlinkedfromtesttask = "unlinked"; +$lang->action->label->linkchildtask = "linked a child task"; +$lang->action->label->unlinkchildrentask = "unlinked a child task"; +$lang->action->label->linkparenttask = "linked a parent task"; +$lang->action->label->unlinkparenttask = "unlink from parent task"; +$lang->action->label->batchcreate = "batch created tasks"; +$lang->action->label->createchildren = "create child tasks"; +$lang->action->label->managed = "managed"; +$lang->action->label->managedteam = "managed"; +$lang->action->label->managedwhitelist = "managed"; +$lang->action->label->deletechildrentask = "delete children task"; +$lang->action->label->createchildrenstory = "create child stories"; +$lang->action->label->linkchildstory = "linked a child story"; +$lang->action->label->unlinkchildrenstory = "unlinked a child story"; +$lang->action->label->linkparentstory = "linked a parent story"; +$lang->action->label->unlinkparentstory = "unlink from parent story"; +$lang->action->label->deletechildrenstory = "delete children story"; +$lang->action->label->tracked = 'tracked'; +$lang->action->label->hangup = 'hangup'; +$lang->action->label->run = 'run'; +$lang->action->label->estimated = 'estimated'; +$lang->action->label->reviewpassed = 'Pass'; +$lang->action->label->reviewrejected = 'Reject'; +$lang->action->label->reviewclarified = 'Clarify'; +$lang->action->label->commitsummary = 'Commit Summary'; +$lang->action->label->updatetrainee = 'Update Trainee'; +$lang->action->label->setdefaultbranch = 'Set default branch'; +$lang->action->label->syncprogram = 'start'; +$lang->action->label->syncproject = 'start'; +$lang->action->label->syncexecution = 'start'; +$lang->action->label->syncexecutionbychild = 'start'; +$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; +$lang->action->label->compilepass = 'Compile Success'; +$lang->action->label->compilefail = 'Compile Fail'; +$lang->action->label->reopen = 'Reopen'; +$lang->action->label->approve = 'Passed'; +$lang->action->label->reject = 'Rejected'; +$lang->action->label->importfromgitlab = 'Issue associate created'; +$lang->action->label->archived = 'Archived'; +$lang->action->label->restore = 'Restore'; +$lang->action->label->mergedbranch = 'Merge Branch'; +$lang->action->label->startedbychild = 'started'; +$lang->action->label->finishedbychild = 'finished'; +$lang->action->label->closedbychild = 'closed'; +$lang->action->label->activatedbychild = 'activated'; +$lang->action->label->createchild = 'activated'; +$lang->action->label->executed = 'executed'; +$lang->action->label->importedcard = 'imported'; +$lang->action->label->importedproductplan = 'imported'; +$lang->action->label->importedrelease = 'imported'; +$lang->action->label->importedexecution = 'imported'; +$lang->action->label->importedbuild = 'imported'; +$lang->action->label->importedticket = 'imported'; +$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; +$lang->action->label->bind = 'bound'; +$lang->action->label->unbind = 'unbound'; +$lang->action->label->linkstory = 'link stories to'; +$lang->action->label->linkbug = 'link bugs to'; +$lang->action->label->unlinkstory = 'unlink stories from'; +$lang->action->label->unlinkbug = 'unlink bugs from'; +$lang->action->label->tolib = 'imported'; +$lang->action->label->updatetolib = 'updated'; +$lang->action->label->ganttmove = 'sorted'; +$lang->action->label->submitreview = 'submitted'; +$lang->action->label->suspend = 'suspended'; +$lang->action->label->resume = 'resumed'; +$lang->action->label->reboot = 'reboot'; +$lang->action->label->boot = 'boot'; +$lang->action->label->destroy = 'destroyed'; +$lang->action->label->getvnc = 'remote control'; +$lang->action->label->synctwins = 'synchronized changes'; +$lang->action->label->relieved = 'relieved'; +$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; +$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; +$lang->action->label->createdsnapshot = 'create snapshot'; +$lang->action->label->restoredsnapshot = 'create snapshot'; +$lang->action->label->editsnapshot = 'edit snapshot'; +$lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; +$lang->action->label->online = 'online'; +$lang->action->label->offline = 'offline'; +$lang->action->label->linkhost = 'link hosts to'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 4e1409a263..6190efcb8d 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -314,171 +314,188 @@ $lang->action->desc->autorestore = '$date, restored by system.' . "\ $lang->action->desc->deleteexpiredbackup = '$date, deleted the expired automatic backups by system.' . "\n"; /* Used to display dynamic information. */ -$lang->action->label = new stdclass(); -$lang->action->label->install = 'install '; -$lang->action->label->revert = 'revert '; -$lang->action->label->created = 'a créé '; -$lang->action->label->opened = 'a ouvert '; -$lang->action->label->openedbysystem = 'Opened by system '; -$lang->action->label->closedbysystem = 'Closed by system '; -$lang->action->label->added = 'ajouter'; -$lang->action->label->changed = 'a changé '; -$lang->action->label->edited = 'a édité '; -$lang->action->label->assigned = 'a affecté '; -$lang->action->label->closed = 'a fermé '; -$lang->action->label->deleted = 'a supprimé '; -$lang->action->label->deletedfile = 'a supprimé '; -$lang->action->label->editfile = 'a édité '; -$lang->action->label->erased = 'a détruit '; -$lang->action->label->undeleted = 'a restauré '; -$lang->action->label->hidden = 'a masqué '; -$lang->action->label->commented = 'a commenté '; -$lang->action->label->communicated = 'communicated'; -$lang->action->label->activated = 'a activé '; -$lang->action->label->blocked = 'a bloqué '; -$lang->action->label->resolved = 'a résolu '; -$lang->action->label->reviewed = 'a revu '; -$lang->action->label->recalled = 'recalled'; -$lang->action->label->recalledchange = 'undo changes'; -$lang->action->label->moved = 'a déplacé '; -$lang->action->label->confirmed = 'a confirmé Story '; -$lang->action->label->bugconfirmed = 'a confirmé le Bug '; -$lang->action->label->tostory = 'a converti en Story '; -$lang->action->label->frombug = 'a converti du Bug '; -$lang->action->label->fromlib = 'a importé de la Library '; -$lang->action->label->totask = 'a converti en Tâche '; -$lang->action->label->converttotask = 'converted to Task '; -$lang->action->label->svncommited = 'a committé SVN '; -$lang->action->label->gitcommited = 'a committé GIT '; -$lang->action->label->linked2plan = 'a raccordé au Plan '; -$lang->action->label->unlinkedfromplan = 'a extrait du plan '; -$lang->action->label->changestatus = 'a changé le statut '; -$lang->action->label->marked = 'a marqué'; -$lang->action->label->linked2execution = "a ajouté à {$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "a enlevé de {$lang->executionCommon}"; -$lang->action->label->linked2kanban = 'linked to kanban'; -$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "a enlevé du Build "; -$lang->action->label->linked2release = "a ajouté à une Release "; -$lang->action->label->unlinkedfromrelease = "a enlevé de la Release "; -$lang->action->label->linked2revision = "Link Revision"; -$lang->action->label->unlinkedfromrevision = "Unlink Revision"; -$lang->action->label->linkrelatedbug = "a lié à un Bug "; -$lang->action->label->unlinkrelatedbug = "a délié du Bug "; -$lang->action->label->linkrelatedcase = "a mis en relation avec un CasTest "; -$lang->action->label->unlinkrelatedcase = "a libéré du CasTest "; -$lang->action->label->linkrelatedstory = "a lié à une Story "; -$lang->action->label->unlinkrelatedstory = "a dégagé de la Story "; -$lang->action->label->subdividestory = "a décomposé la Story "; -$lang->action->label->unlinkchildstory = "a dissocié de la Story fille "; -$lang->action->label->started = 'a commencé '; -$lang->action->label->restarted = 'a continué '; -$lang->action->label->recordworkhour = 'a estimé '; -$lang->action->label->editestimate = 'a réestimé '; -$lang->action->label->canceled = 'a annulé '; -$lang->action->label->finished = 'a fini '; -$lang->action->label->paused = 'a stoppé '; -$lang->action->label->verified = 'a vérifié '; -$lang->action->label->delayed = 'a ajourné '; -$lang->action->label->suspended = 'a suspendu '; -$lang->action->label->login = "s'est Connecté"; -$lang->action->label->logout = "s'est Déconnecté"; -$lang->action->label->notified = "Notified"; -$lang->action->label->deleteestimate = "a remis à zéro "; -$lang->action->label->linked2build = "a ajouté au Build "; -$lang->action->label->linked2bug = "a lié au Bug "; -$lang->action->label->linked2testtask = "linked"; -$lang->action->label->unlinkedfromtesttask = "unlinked"; -$lang->action->label->linkchildtask = "a raccroché à une sous-tâche"; -$lang->action->label->unlinkchildrentask = "a décroché la sous-tâche"; -$lang->action->label->linkparenttask = "a raccroché à une tâche parent"; -$lang->action->label->unlinkparenttask = "a décroché de la tâche parent"; -$lang->action->label->batchcreate = "a créé tâches par lot"; -$lang->action->label->createchildren = "a créé sous-tâches par lot"; -$lang->action->label->managed = "a managé"; -$lang->action->label->managedteam = "managed"; -$lang->action->label->managedwhitelist = "managed"; -$lang->action->label->deletechildrentask = "a supprimé une sous-tâche"; -$lang->action->label->createchildrenstory = "a créé une sous-story"; -$lang->action->label->linkchildstory = "a raccroché à une sous-story"; -$lang->action->label->unlinkchildrenstory = "a décroché de la sous-story"; -$lang->action->label->linkparentstory = "a raccroché à une story parent"; -$lang->action->label->unlinkparentstory = "a décroché de la story parent"; -$lang->action->label->deletechildrenstory = "a supprimé la sous-story"; -$lang->action->label->tracked = 'tracked'; -$lang->action->label->hangup = 'hangup'; -$lang->action->label->run = 'run'; -$lang->action->label->estimated = 'estimated'; -$lang->action->label->reviewpassed = 'Pass'; -$lang->action->label->reviewrejected = 'Reject'; -$lang->action->label->reviewclarified = 'Clarify'; -$lang->action->label->commitsummary = 'Commit Summary'; -$lang->action->label->updatetrainee = 'Update Trainee'; -$lang->action->label->setdefaultbranch = 'Set default branch'; -$lang->action->label->syncprogram = 'start'; -$lang->action->label->syncproject = 'start'; -$lang->action->label->syncexecution = 'start'; -$lang->action->label->syncexecutionbychild = 'start'; -$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'Merge Request Linked'; -$lang->action->label->deletemr = 'Merge Request Unlinked'; -$lang->action->label->mergedmr = 'Merge Request Merged'; -$lang->action->label->compilepass = 'Compile Success'; -$lang->action->label->compilefail = 'Compile Fail'; -$lang->action->label->reopen = 'Reopen'; -$lang->action->label->approve = 'Passed'; -$lang->action->label->reject = 'Rejected'; -$lang->action->label->importfromgitlab = 'Issue associate created'; -$lang->action->label->archived = 'Archived'; -$lang->action->label->restore = 'Restore'; -$lang->action->label->mergedbranch = 'Merge Branch'; -$lang->action->label->startedbychild = 'started'; -$lang->action->label->finishedbychild = 'finished'; -$lang->action->label->closedbychild = 'closed'; -$lang->action->label->activatedbychild = 'activated'; -$lang->action->label->createchild = 'activated'; -$lang->action->label->executed = 'executed'; -$lang->action->label->importedcard = 'imported'; -$lang->action->label->importedproductplan = 'imported'; -$lang->action->label->importedrelease = 'imported'; -$lang->action->label->importedexecution = 'imported'; -$lang->action->label->importedbuild = 'imported'; -$lang->action->label->importedticket = 'imported'; -$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; -$lang->action->label->bind = 'bound'; -$lang->action->label->unbind = 'unbound'; -$lang->action->label->linkstory = 'link stories to'; -$lang->action->label->linkbug = 'link bugs to'; -$lang->action->label->unlinkstory = 'unlink stories from'; -$lang->action->label->unlinkbug = 'unlink bugs from'; -$lang->action->label->tolib = 'Importé'; -$lang->action->label->updatetolib = 'MàJ'; -$lang->action->label->ganttmove = 'sorted'; -$lang->action->label->submitreview = 'submitted'; -$lang->action->label->suspend = 'suspended'; -$lang->action->label->resume = 'resumed'; -$lang->action->label->reboot = 'reboot'; -$lang->action->label->boot = 'boot'; -$lang->action->label->destroy = 'destroyed'; -$lang->action->label->getvnc = 'remote control'; -$lang->action->label->synctwins = 'synchronized changes'; -$lang->action->label->relieved = 'relieved'; -$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; -$lang->action->label->linkedrepo = 'Linked Code Repo'; -$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; -$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; -$lang->action->label->createdsnapshot = 'create snapshot'; -$lang->action->label->restoredsnapshot = 'create snapshot'; -$lang->action->label->editsnapshot = 'edit snapshot'; -$lang->action->label->deletesnapshot = 'deleted snapshot'; -$lang->action->label->saveddraft = 'save draft'; -$lang->action->label->releaseddoc = 'released'; -$lang->action->label->collected = 'collected'; -$lang->action->label->uncollected = 'uncollected'; -$lang->action->label->online = 'online'; -$lang->action->label->offline = 'offline'; -$lang->action->label->linkhost = 'link hosts to'; +$lang->action->label = new stdclass(); +$lang->action->label->install = 'install '; +$lang->action->label->uninstall = 'uninstall '; +$lang->action->label->upgrade = 'upgrade '; +$lang->action->label->start = 'start '; +$lang->action->label->stop = 'stop '; +$lang->action->label->editname = 'edit name '; +$lang->action->label->backup = 'backup '; +$lang->action->label->adjustmemory = 'adjust memory '; +$lang->action->label->enableldap = 'enable LDAP '; +$lang->action->label->disableldap = 'disable LDAP '; +$lang->action->label->enablesmtp = 'enable SMTP '; +$lang->action->label->disablesmtp = 'disable SMTP '; +$lang->action->label->tosenior = 'upgrade to senior '; +$lang->action->label->saveautobackupsettings = 'enable auto backup '; +$lang->action->label->closeautobackupsettings = 'disable auto backup '; +$lang->action->label->autobackup = 'auto backup by system '; +$lang->action->label->autorestore = 'auto restore by system '; +$lang->action->label->deleteexpiredbackup = 'delete expire backup by system '; +$lang->action->label->revert = 'revert '; +$lang->action->label->created = 'a créé '; +$lang->action->label->opened = 'a ouvert '; +$lang->action->label->openedbysystem = 'Opened by system '; +$lang->action->label->closedbysystem = 'Closed by system '; +$lang->action->label->added = 'ajouter'; +$lang->action->label->changed = 'a changé '; +$lang->action->label->edited = 'a édité '; +$lang->action->label->assigned = 'a affecté '; +$lang->action->label->closed = 'a fermé '; +$lang->action->label->deleted = 'a supprimé '; +$lang->action->label->deletedfile = 'a supprimé '; +$lang->action->label->editfile = 'a édité '; +$lang->action->label->erased = 'a détruit '; +$lang->action->label->undeleted = 'a restauré '; +$lang->action->label->hidden = 'a masqué '; +$lang->action->label->commented = 'a commenté '; +$lang->action->label->communicated = 'communicated'; +$lang->action->label->activated = 'a activé '; +$lang->action->label->blocked = 'a bloqué '; +$lang->action->label->resolved = 'a résolu '; +$lang->action->label->reviewed = 'a revu '; +$lang->action->label->recalled = 'recalled'; +$lang->action->label->recalledchange = 'undo changes'; +$lang->action->label->moved = 'a déplacé '; +$lang->action->label->confirmed = 'a confirmé Story '; +$lang->action->label->bugconfirmed = 'a confirmé le Bug '; +$lang->action->label->tostory = 'a converti en Story '; +$lang->action->label->frombug = 'a converti du Bug '; +$lang->action->label->fromlib = 'a importé de la Library '; +$lang->action->label->totask = 'a converti en Tâche '; +$lang->action->label->converttotask = 'converted to Task '; +$lang->action->label->svncommited = 'a committé SVN '; +$lang->action->label->gitcommited = 'a committé GIT '; +$lang->action->label->linked2plan = 'a raccordé au Plan '; +$lang->action->label->unlinkedfromplan = 'a extrait du plan '; +$lang->action->label->changestatus = 'a changé le statut '; +$lang->action->label->marked = 'a marqué'; +$lang->action->label->linked2execution = "a ajouté à {$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "a enlevé de {$lang->executionCommon}"; +$lang->action->label->linked2kanban = 'linked to kanban'; +$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; +$lang->action->label->unlinkedfrombuild = "a enlevé du Build "; +$lang->action->label->linked2release = "a ajouté à une Release "; +$lang->action->label->unlinkedfromrelease = "a enlevé de la Release "; +$lang->action->label->linked2revision = "Link Revision"; +$lang->action->label->unlinkedfromrevision = "Unlink Revision"; +$lang->action->label->linkrelatedbug = "a lié à un Bug "; +$lang->action->label->unlinkrelatedbug = "a délié du Bug "; +$lang->action->label->linkrelatedcase = "a mis en relation avec un CasTest "; +$lang->action->label->unlinkrelatedcase = "a libéré du CasTest "; +$lang->action->label->linkrelatedstory = "a lié à une Story "; +$lang->action->label->unlinkrelatedstory = "a dégagé de la Story "; +$lang->action->label->subdividestory = "a décomposé la Story "; +$lang->action->label->unlinkchildstory = "a dissocié de la Story fille "; +$lang->action->label->started = 'a commencé '; +$lang->action->label->restarted = 'a continué '; +$lang->action->label->recordworkhour = 'a estimé '; +$lang->action->label->editestimate = 'a réestimé '; +$lang->action->label->canceled = 'a annulé '; +$lang->action->label->finished = 'a fini '; +$lang->action->label->paused = 'a stoppé '; +$lang->action->label->verified = 'a vérifié '; +$lang->action->label->delayed = 'a ajourné '; +$lang->action->label->suspended = 'a suspendu '; +$lang->action->label->login = "s'est Connecté"; +$lang->action->label->logout = "s'est Déconnecté"; +$lang->action->label->notified = "Notified"; +$lang->action->label->deleteestimate = "a remis à zéro "; +$lang->action->label->linked2build = "a ajouté au Build "; +$lang->action->label->linked2bug = "a lié au Bug "; +$lang->action->label->linked2testtask = "linked"; +$lang->action->label->unlinkedfromtesttask = "unlinked"; +$lang->action->label->linkchildtask = "a raccroché à une sous-tâche"; +$lang->action->label->unlinkchildrentask = "a décroché la sous-tâche"; +$lang->action->label->linkparenttask = "a raccroché à une tâche parent"; +$lang->action->label->unlinkparenttask = "a décroché de la tâche parent"; +$lang->action->label->batchcreate = "a créé tâches par lot"; +$lang->action->label->createchildren = "a créé sous-tâches par lot"; +$lang->action->label->managed = "a managé"; +$lang->action->label->managedteam = "managed"; +$lang->action->label->managedwhitelist = "managed"; +$lang->action->label->deletechildrentask = "a supprimé une sous-tâche"; +$lang->action->label->createchildrenstory = "a créé une sous-story"; +$lang->action->label->linkchildstory = "a raccroché à une sous-story"; +$lang->action->label->unlinkchildrenstory = "a décroché de la sous-story"; +$lang->action->label->linkparentstory = "a raccroché à une story parent"; +$lang->action->label->unlinkparentstory = "a décroché de la story parent"; +$lang->action->label->deletechildrenstory = "a supprimé la sous-story"; +$lang->action->label->tracked = 'tracked'; +$lang->action->label->hangup = 'hangup'; +$lang->action->label->run = 'run'; +$lang->action->label->estimated = 'estimated'; +$lang->action->label->reviewpassed = 'Pass'; +$lang->action->label->reviewrejected = 'Reject'; +$lang->action->label->reviewclarified = 'Clarify'; +$lang->action->label->commitsummary = 'Commit Summary'; +$lang->action->label->updatetrainee = 'Update Trainee'; +$lang->action->label->setdefaultbranch = 'Set default branch'; +$lang->action->label->syncprogram = 'start'; +$lang->action->label->syncproject = 'start'; +$lang->action->label->syncexecution = 'start'; +$lang->action->label->syncexecutionbychild = 'start'; +$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; +$lang->action->label->compilepass = 'Compile Success'; +$lang->action->label->compilefail = 'Compile Fail'; +$lang->action->label->reopen = 'Reopen'; +$lang->action->label->approve = 'Passed'; +$lang->action->label->reject = 'Rejected'; +$lang->action->label->importfromgitlab = 'Issue associate created'; +$lang->action->label->archived = 'Archived'; +$lang->action->label->restore = 'Restore'; +$lang->action->label->mergedbranch = 'Merge Branch'; +$lang->action->label->startedbychild = 'started'; +$lang->action->label->finishedbychild = 'finished'; +$lang->action->label->closedbychild = 'closed'; +$lang->action->label->activatedbychild = 'activated'; +$lang->action->label->createchild = 'activated'; +$lang->action->label->executed = 'executed'; +$lang->action->label->importedcard = 'imported'; +$lang->action->label->importedproductplan = 'imported'; +$lang->action->label->importedrelease = 'imported'; +$lang->action->label->importedexecution = 'imported'; +$lang->action->label->importedbuild = 'imported'; +$lang->action->label->importedticket = 'imported'; +$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; +$lang->action->label->bind = 'bound'; +$lang->action->label->unbind = 'unbound'; +$lang->action->label->linkstory = 'link stories to'; +$lang->action->label->linkbug = 'link bugs to'; +$lang->action->label->unlinkstory = 'unlink stories from'; +$lang->action->label->unlinkbug = 'unlink bugs from'; +$lang->action->label->tolib = 'Importé'; +$lang->action->label->updatetolib = 'MàJ'; +$lang->action->label->ganttmove = 'sorted'; +$lang->action->label->submitreview = 'submitted'; +$lang->action->label->suspend = 'suspended'; +$lang->action->label->resume = 'resumed'; +$lang->action->label->reboot = 'reboot'; +$lang->action->label->boot = 'boot'; +$lang->action->label->destroy = 'destroyed'; +$lang->action->label->getvnc = 'remote control'; +$lang->action->label->synctwins = 'synchronized changes'; +$lang->action->label->relieved = 'relieved'; +$lang->action->label->switchtolight = 'switch from ALM mode to light mode'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; +$lang->action->label->unlinkproduct = "Unlinked {$lang->productCommon}"; +$lang->action->label->createdsnapshot = 'create snapshot'; +$lang->action->label->restoredsnapshot = 'create snapshot'; +$lang->action->label->editsnapshot = 'edit snapshot'; +$lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; +$lang->action->label->online = 'online'; +$lang->action->label->offline = 'offline'; +$lang->action->label->linkhost = 'link hosts to'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php index a3c4229c6b..231f1c2923 100644 --- a/module/action/lang/vi.php +++ b/module/action/lang/vi.php @@ -239,119 +239,137 @@ $lang->action->desc->autorestore = '$date, restored by system.' . "\ $lang->action->desc->deleteexpiredbackup = '$date, deleted the expired automatic backups by system.' . "\n"; /* Used to display dynamic information. */ -$lang->action->label = new stdclass(); -$lang->action->label->created = 'created '; -$lang->action->label->opened = 'opened '; -$lang->action->label->openedbysystem = 'Opened by system '; -$lang->action->label->closedbysystem = 'Closed by system '; -$lang->action->label->added = 'added'; -$lang->action->label->changed = 'changed '; -$lang->action->label->edited = 'edited '; -$lang->action->label->assigned = 'assigned '; -$lang->action->label->closed = 'closed '; -$lang->action->label->deleted = 'deleted '; -$lang->action->label->deletedfile = 'deleted '; -$lang->action->label->editfile = 'edited '; -$lang->action->label->erased = 'erased '; -$lang->action->label->undeleted = 'restored '; -$lang->action->label->hidden = 'hid '; -$lang->action->label->commented = 'commented '; -$lang->action->label->communicated = 'communicated'; -$lang->action->label->activated = 'activated '; -$lang->action->label->blocked = 'blocked '; -$lang->action->label->resolved = 'resolved '; -$lang->action->label->reviewed = 'reviewed '; -$lang->action->label->recalled = 'recalled'; -$lang->action->label->recalledchange = 'undo changes'; -$lang->action->label->moved = 'moved '; -$lang->action->label->confirmed = 'confirmed Story '; -$lang->action->label->bugconfirmed = 'Đã xác nhận'; -$lang->action->label->tostory = 'converted tới Câu chuyện '; -$lang->action->label->frombug = 'converted từ Bug '; -$lang->action->label->fromlib = 'imported from Library '; -$lang->action->label->totask = 'converted to Task '; -$lang->action->label->svncommited = 'committed SVN '; -$lang->action->label->gitcommited = 'committed Git '; -$lang->action->label->linked2plan = 'linked cho kế hoạch '; -$lang->action->label->unlinkedfromplan = 'unlinked from '; -$lang->action->label->changestatus = 'changed status'; -$lang->action->label->marked = 'marked'; -$lang->action->label->linked2execution = "đã liên kết tới {$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "hủy liên kết từ {$lang->executionCommon}"; -$lang->action->label->linked2project = "Link Project"; -$lang->action->label->unlinkedfromproject = "Unlink Project"; -$lang->action->label->unlinkedfrombuild = "hủy liên kết Bản dựng "; -$lang->action->label->linked2release = "liên kết Phát hành "; -$lang->action->label->unlinkedfromrelease = "hủy liên kết Release "; -$lang->action->label->linked2revision = "Link Revision"; -$lang->action->label->unlinkedfromrevision = "Unlink Revision"; -$lang->action->label->linkrelatedbug = "linked Bug "; -$lang->action->label->unlinkrelatedbug = "hủy liên kết Bug "; -$lang->action->label->linkrelatedcase = "linked Case "; -$lang->action->label->unlinkrelatedcase = "hủy liên kết Case "; -$lang->action->label->linkrelatedstory = "linked Story "; -$lang->action->label->unlinkrelatedstory = "hủy liên kết Story "; -$lang->action->label->subdividestory = "decomposed Story "; -$lang->action->label->unlinkchildstory = "hủy liên kết Story "; -$lang->action->label->started = 'started '; -$lang->action->label->restarted = 'continued '; -$lang->action->label->recordworkhour = 'recorded '; -$lang->action->label->editestimate = 'edited '; -$lang->action->label->canceled = 'cancelled '; -$lang->action->label->finished = 'finished '; -$lang->action->label->paused = 'paused '; -$lang->action->label->verified = 'verified '; -$lang->action->label->delayed = 'delayed '; -$lang->action->label->suspended = 'suspended '; -$lang->action->label->login = 'login'; -$lang->action->label->logout = "logout"; -$lang->action->label->notified = "Notified"; -$lang->action->label->deleteestimate = "deleted "; -$lang->action->label->linked2build = "linked "; -$lang->action->label->linked2bug = "linked "; -$lang->action->label->linked2testtask = "linked"; -$lang->action->label->unlinkedfromtesttask = "unlinked"; -$lang->action->label->linkchildtask = "linked a child task"; -$lang->action->label->unlinkchildrentask = "hủy liên kết a child task"; -$lang->action->label->linkparenttask = "linked a nhiệm vụ cha"; -$lang->action->label->unlinkparenttask = "unlink from nhiệm vụ cha"; -$lang->action->label->batchcreate = "batch created tasks"; -$lang->action->label->createchildren = "create child tasks"; -$lang->action->label->managed = "managed"; -$lang->action->label->managedteam = "managed"; -$lang->action->label->managedwhitelist = "managed"; -$lang->action->label->deletechildrentask = "delete children task"; -$lang->action->label->createchildrenstory = "create child stories"; -$lang->action->label->linkchildstory = "linked a child story"; -$lang->action->label->unlinkchildrenstory = "hủy liên kết a child story"; -$lang->action->label->linkparentstory = "linked a parent story"; -$lang->action->label->unlinkparentstory = "unlink from parent story"; -$lang->action->label->deletechildrenstory = "delete children story"; -$lang->action->label->tracked = 'tracked'; -$lang->action->label->hangup = 'hangup'; -$lang->action->label->run = 'run'; -$lang->action->label->estimated = 'estimated'; -$lang->action->label->reviewpassed = 'Pass'; -$lang->action->label->reviewrejected = 'Reject'; -$lang->action->label->reviewclarified = 'Clarify'; -$lang->action->label->commitsummary = 'Commit Summary'; -$lang->action->label->updatetrainee = 'Update Trainee'; -$lang->action->label->syncprogram = 'start'; -$lang->action->label->syncproject = 'start'; -$lang->action->label->syncexecution = 'start'; -$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->submitreview = 'submitted'; -$lang->action->label->suspend = 'suspended'; -$lang->action->label->resume = 'resumed'; -$lang->action->label->reboot = 'reboot'; -$lang->action->label->boot = 'boot'; -$lang->action->label->destroy = 'destroyed'; -$lang->action->label->synctwins = 'synchronized changes'; -$lang->action->label->linkedrepo = 'Linked Code Repo'; -$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; -$lang->action->label->online = 'online'; -$lang->action->label->offline = 'offline'; -$lang->action->label->linkhost = 'link hosts to'; +$lang->action->label = new stdclass(); +$lang->action->label->install = 'install '; +$lang->action->label->uninstall = 'uninstall '; +$lang->action->label->upgrade = 'upgrade '; +$lang->action->label->start = 'start '; +$lang->action->label->stop = 'stop '; +$lang->action->label->editname = 'edit name '; +$lang->action->label->backup = 'backup '; +$lang->action->label->adjustmemory = 'adjust memory '; +$lang->action->label->enableldap = 'enable LDAP '; +$lang->action->label->disableldap = 'disable LDAP '; +$lang->action->label->enablesmtp = 'enable SMTP '; +$lang->action->label->disablesmtp = 'disable SMTP '; +$lang->action->label->tosenior = 'upgrade to senior '; +$lang->action->label->saveautobackupsettings = 'enable auto backup '; +$lang->action->label->closeautobackupsettings = 'disable auto backup '; +$lang->action->label->autobackup = 'auto backup by system '; +$lang->action->label->autorestore = 'auto restore by system '; +$lang->action->label->deleteexpiredbackup = 'delete expire backup by system '; +$lang->action->label->created = 'created '; +$lang->action->label->opened = 'opened '; +$lang->action->label->openedbysystem = 'Opened by system '; +$lang->action->label->closedbysystem = 'Closed by system '; +$lang->action->label->added = 'added'; +$lang->action->label->changed = 'changed '; +$lang->action->label->edited = 'edited '; +$lang->action->label->assigned = 'assigned '; +$lang->action->label->closed = 'closed '; +$lang->action->label->deleted = 'deleted '; +$lang->action->label->deletedfile = 'deleted '; +$lang->action->label->editfile = 'edited '; +$lang->action->label->erased = 'erased '; +$lang->action->label->undeleted = 'restored '; +$lang->action->label->hidden = 'hid '; +$lang->action->label->commented = 'commented '; +$lang->action->label->communicated = 'communicated'; +$lang->action->label->activated = 'activated '; +$lang->action->label->blocked = 'blocked '; +$lang->action->label->resolved = 'resolved '; +$lang->action->label->reviewed = 'reviewed '; +$lang->action->label->recalled = 'recalled'; +$lang->action->label->recalledchange = 'undo changes'; +$lang->action->label->moved = 'moved '; +$lang->action->label->confirmed = 'confirmed Story '; +$lang->action->label->bugconfirmed = 'Đã xác nhận'; +$lang->action->label->tostory = 'converted tới Câu chuyện '; +$lang->action->label->frombug = 'converted từ Bug '; +$lang->action->label->fromlib = 'imported from Library '; +$lang->action->label->totask = 'converted to Task '; +$lang->action->label->svncommited = 'committed SVN '; +$lang->action->label->gitcommited = 'committed Git '; +$lang->action->label->linked2plan = 'linked cho kế hoạch '; +$lang->action->label->unlinkedfromplan = 'unlinked from '; +$lang->action->label->changestatus = 'changed status'; +$lang->action->label->marked = 'marked'; +$lang->action->label->linked2execution = "đã liên kết tới {$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "hủy liên kết từ {$lang->executionCommon}"; +$lang->action->label->linked2project = "Link Project"; +$lang->action->label->unlinkedfromproject = "Unlink Project"; +$lang->action->label->unlinkedfrombuild = "hủy liên kết Bản dựng "; +$lang->action->label->linked2release = "liên kết Phát hành "; +$lang->action->label->unlinkedfromrelease = "hủy liên kết Release "; +$lang->action->label->linked2revision = "Link Revision"; +$lang->action->label->unlinkedfromrevision = "Unlink Revision"; +$lang->action->label->linkrelatedbug = "linked Bug "; +$lang->action->label->unlinkrelatedbug = "hủy liên kết Bug "; +$lang->action->label->linkrelatedcase = "linked Case "; +$lang->action->label->unlinkrelatedcase = "hủy liên kết Case "; +$lang->action->label->linkrelatedstory = "linked Story "; +$lang->action->label->unlinkrelatedstory = "hủy liên kết Story "; +$lang->action->label->subdividestory = "decomposed Story "; +$lang->action->label->unlinkchildstory = "hủy liên kết Story "; +$lang->action->label->started = 'started '; +$lang->action->label->restarted = 'continued '; +$lang->action->label->recordworkhour = 'recorded '; +$lang->action->label->editestimate = 'edited '; +$lang->action->label->canceled = 'cancelled '; +$lang->action->label->finished = 'finished '; +$lang->action->label->paused = 'paused '; +$lang->action->label->verified = 'verified '; +$lang->action->label->delayed = 'delayed '; +$lang->action->label->suspended = 'suspended '; +$lang->action->label->login = 'login'; +$lang->action->label->logout = "logout"; +$lang->action->label->notified = "Notified"; +$lang->action->label->deleteestimate = "deleted "; +$lang->action->label->linked2build = "linked "; +$lang->action->label->linked2bug = "linked "; +$lang->action->label->linked2testtask = "linked"; +$lang->action->label->unlinkedfromtesttask = "unlinked"; +$lang->action->label->linkchildtask = "linked a child task"; +$lang->action->label->unlinkchildrentask = "hủy liên kết a child task"; +$lang->action->label->linkparenttask = "linked a nhiệm vụ cha"; +$lang->action->label->unlinkparenttask = "unlink from nhiệm vụ cha"; +$lang->action->label->batchcreate = "batch created tasks"; +$lang->action->label->createchildren = "create child tasks"; +$lang->action->label->managed = "managed"; +$lang->action->label->managedteam = "managed"; +$lang->action->label->managedwhitelist = "managed"; +$lang->action->label->deletechildrentask = "delete children task"; +$lang->action->label->createchildrenstory = "create child stories"; +$lang->action->label->linkchildstory = "linked a child story"; +$lang->action->label->unlinkchildrenstory = "hủy liên kết a child story"; +$lang->action->label->linkparentstory = "linked a parent story"; +$lang->action->label->unlinkparentstory = "unlink from parent story"; +$lang->action->label->deletechildrenstory = "delete children story"; +$lang->action->label->tracked = 'tracked'; +$lang->action->label->hangup = 'hangup'; +$lang->action->label->run = 'run'; +$lang->action->label->estimated = 'estimated'; +$lang->action->label->reviewpassed = 'Pass'; +$lang->action->label->reviewrejected = 'Reject'; +$lang->action->label->reviewclarified = 'Clarify'; +$lang->action->label->commitsummary = 'Commit Summary'; +$lang->action->label->updatetrainee = 'Update Trainee'; +$lang->action->label->syncprogram = 'start'; +$lang->action->label->syncproject = 'start'; +$lang->action->label->syncexecution = 'start'; +$lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; +$lang->action->label->submitreview = 'submitted'; +$lang->action->label->suspend = 'suspended'; +$lang->action->label->resume = 'resumed'; +$lang->action->label->reboot = 'reboot'; +$lang->action->label->boot = 'boot'; +$lang->action->label->destroy = 'destroyed'; +$lang->action->label->synctwins = 'synchronized changes'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; +$lang->action->label->online = 'online'; +$lang->action->label->offline = 'offline'; +$lang->action->label->linkhost = 'link hosts to'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 69a6580225..ad783334d5 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -314,171 +314,188 @@ $lang->action->desc->autorestore = '$date, 系统执行了自动还 $lang->action->desc->deleteexpiredbackup = '$date, 系统删除了过期的自动备份。' . "\n"; /* 用来显示动态信息。*/ -$lang->action->label = new stdclass(); -$lang->action->label->install = '安装了'; -$lang->action->label->revert = '还原了'; -$lang->action->label->created = '创建了'; -$lang->action->label->opened = '创建了'; -$lang->action->label->openedbysystem = '系统创建了'; -$lang->action->label->closedbysystem = '系统关闭了'; -$lang->action->label->added = '添加了'; -$lang->action->label->changed = '变更了'; -$lang->action->label->edited = '编辑了'; -$lang->action->label->assigned = '指派了'; -$lang->action->label->closed = '关闭了'; -$lang->action->label->deleted = '删除了'; -$lang->action->label->deletedfile = '删除了附件'; -$lang->action->label->editfile = '编辑了附件'; -$lang->action->label->erased = '删除了'; -$lang->action->label->undeleted = '还原了'; -$lang->action->label->hidden = '隐藏了'; -$lang->action->label->commented = '评论了'; -$lang->action->label->communicated = '沟通了'; -$lang->action->label->activated = '激活了'; -$lang->action->label->blocked = '阻塞了'; -$lang->action->label->resolved = '解决了'; -$lang->action->label->reviewed = '评审了'; -$lang->action->label->recalled = '撤销了评审'; -$lang->action->label->recalledchange = '撤销了变更'; -$lang->action->label->moved = '移动了'; -$lang->action->label->confirmed = "确认了{$lang->SRCommon}"; -$lang->action->label->bugconfirmed = '确认了'; -$lang->action->label->tostory = "转了{$lang->SRCommon}"; -$lang->action->label->frombug = "转了{$lang->SRCommon}"; -$lang->action->label->fromlib = '从用例库导入'; -$lang->action->label->totask = '转了任务'; -$lang->action->label->converttotask = '转了任务'; -$lang->action->label->svncommited = '提交了代码'; -$lang->action->label->gitcommited = '提交了代码'; -$lang->action->label->linked2plan = "关联了计划"; -$lang->action->label->unlinkedfromplan = "移除了计划"; -$lang->action->label->changestatus = '修改了状态'; -$lang->action->label->marked = '编辑了'; -$lang->action->label->linked2execution = "关联了{$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "移除了{$lang->executionCommon}"; -$lang->action->label->linked2kanban = '关联了看板'; -$lang->action->label->linked2project = "关联了{$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "移除了{$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "移除了版本"; -$lang->action->label->linked2release = "关联了发布"; -$lang->action->label->unlinkedfromrelease = "移除了发布"; -$lang->action->label->linked2revision = "关联了代码提交"; -$lang->action->label->unlinkedfromrevision = "取消关联了代码提交"; -$lang->action->label->linkrelatedbug = "关联了相关Bug"; -$lang->action->label->unlinkrelatedbug = "移除了相关Bug"; -$lang->action->label->linkrelatedcase = "关联了相关用例"; -$lang->action->label->unlinkrelatedcase = "移除了相关用例"; -$lang->action->label->linkrelatedstory = "关联了相关{$lang->SRCommon}"; -$lang->action->label->unlinkrelatedstory = "移除了相关{$lang->SRCommon}"; -$lang->action->label->subdividestory = "细分了{$lang->SRCommon}"; -$lang->action->label->unlinkchildstory = "移除了细分{$lang->SRCommon}"; -$lang->action->label->started = '开始了'; -$lang->action->label->restarted = '继续了'; -$lang->action->label->recordworkhour = '记录了工时'; -$lang->action->label->editestimate = '编辑了工时'; -$lang->action->label->canceled = '取消了'; -$lang->action->label->finished = '完成了'; -$lang->action->label->paused = '暂停了'; -$lang->action->label->verified = '验收了'; -$lang->action->label->delayed = '延期了'; -$lang->action->label->suspended = '挂起了'; -$lang->action->label->login = '登录系统'; -$lang->action->label->logout = "退出登录"; -$lang->action->label->notified = "通知了"; -$lang->action->label->deleteestimate = "删除了工时"; -$lang->action->label->linked2build = "关联了"; -$lang->action->label->linked2bug = "关联了"; -$lang->action->label->linked2testtask = "关联了"; -$lang->action->label->unlinkedfromtesttask = "移除了"; -$lang->action->label->linkchildtask = "关联了子任务"; -$lang->action->label->unlinkchildrentask = "取消关联了子任务"; -$lang->action->label->linkparenttask = "关联到了父任务"; -$lang->action->label->unlinkparenttask = "从父任务取消关联了"; -$lang->action->label->batchcreate = "批量创建了任务"; -$lang->action->label->createchildren = "创建了子任务"; -$lang->action->label->managed = "维护了"; -$lang->action->label->managedteam = "维护了"; -$lang->action->label->managedwhitelist = "维护了"; -$lang->action->label->deletechildrentask = "删除了子任务"; -$lang->action->label->createchildrenstory = "创建了子需求"; -$lang->action->label->linkchildstory = "关联了子需求"; -$lang->action->label->unlinkchildrenstory = "取消关联了子需求"; -$lang->action->label->linkparentstory = "关联到了父需求"; -$lang->action->label->unlinkparentstory = "从父需求取消关联了"; -$lang->action->label->deletechildrenstory = "删除了子需求"; -$lang->action->label->tracked = '跟踪了'; -$lang->action->label->hangup = '挂起了'; -$lang->action->label->run = '执行了'; -$lang->action->label->estimated = '估算了'; -$lang->action->label->reviewpassed = '确认通过'; -$lang->action->label->reviewrejected = '拒绝了'; -$lang->action->label->reviewclarified = '有待明确'; -$lang->action->label->commitsummary = '提交了培训总结'; -$lang->action->label->updatetrainee = '更新了培训人员'; -$lang->action->label->setdefaultbranch = '设置了默认分支'; -$lang->action->label->syncprogram = '开始了'; -$lang->action->label->syncproject = '开始了'; -$lang->action->label->syncexecution = '开始了'; -$lang->action->label->syncexecutionbychild = '开始了'; -$lang->action->label->startProgram = "（因{$lang->projectCommon}开始而启动项目集）"; -$lang->action->label->createmr = '合并请求关联了'; -$lang->action->label->deletemr = '合并请求取消了'; -$lang->action->label->mergedmr = '合并请求合并了'; -$lang->action->label->compilepass = '构建成功'; -$lang->action->label->compilefail = '构建失败'; -$lang->action->label->reopen = '重新打开了'; -$lang->action->label->approve = '通过了'; -$lang->action->label->reject = '拒绝了'; -$lang->action->label->importfromgitlab = '从Gitlab关联创建了'; -$lang->action->label->archived = '归档了'; -$lang->action->label->restore = '还原了'; -$lang->action->label->mergedbranch = '合并了分支'; -$lang->action->label->startedbychild = '开始了'; -$lang->action->label->finishedbychild = '完成了'; -$lang->action->label->closedbychild = '关闭了'; -$lang->action->label->activatedbychild = '激活了'; -$lang->action->label->createchild = '激活了'; -$lang->action->label->executed = '执行了'; -$lang->action->label->importedcard = '导入了'; -$lang->action->label->importedproductplan = '导入了'; -$lang->action->label->importedrelease = '导入了'; -$lang->action->label->importedexecution = '导入了'; -$lang->action->label->importedbuild = '导入了'; -$lang->action->label->importedticket = '导入了'; -$lang->action->label->fromsonarqube = '由SonarQube问题创建了'; -$lang->action->label->bind = '绑定了'; -$lang->action->label->unbind = '取消绑定了'; -$lang->action->label->linkstory = '关联需求到了'; -$lang->action->label->linkbug = '关联BUG到了'; -$lang->action->label->unlinkstory = '移除了需求从'; -$lang->action->label->unlinkbug = '移除了BUG从'; -$lang->action->label->tolib = '导入了'; -$lang->action->label->updatetolib = '更新了'; -$lang->action->label->ganttmove = '排序了'; -$lang->action->label->submitreview = '提交了评审'; -$lang->action->label->suspend = '休眠了'; -$lang->action->label->resume = '恢复了'; -$lang->action->label->reboot = '重启了'; -$lang->action->label->boot = '启动了'; -$lang->action->label->destroy = '关闭了'; -$lang->action->label->getvnc = '远程操控了'; -$lang->action->label->synctwins = '同步修改了'; -$lang->action->label->relieved = '解除了'; -$lang->action->label->switchtolight = '从全生命周期管理模式切换为轻量管理模式'; -$lang->action->label->linkedrepo = '关联代码库到'; -$lang->action->label->unlinkedrepo = "取消了{$lang->projectCommon}与代码库的关联"; -$lang->action->label->unlinkproduct = "取消了与{$lang->productCommon}的关联"; -$lang->action->label->createdsnapshot = '创建了快照'; -$lang->action->label->restoredsnapshot = '还原了快照'; -$lang->action->label->editsnapshot = '编辑了快照'; -$lang->action->label->deletesnapshot = '编辑了快照'; -$lang->action->label->saveddraft = '存为草稿'; -$lang->action->label->releaseddoc = '发布了'; -$lang->action->label->collected = '收藏了'; -$lang->action->label->uncollected = '取消收藏了'; -$lang->action->label->online = '上架了'; -$lang->action->label->offline = '下架了'; -$lang->action->label->linkhost = '主机关联到'; +$lang->action->label = new stdclass(); +$lang->action->label->install = '安装了'; +$lang->action->label->uninstall = '卸载了'; +$lang->action->label->upgrade = '升级了'; +$lang->action->label->start = '启动了'; +$lang->action->label->stop = '关闭了'; +$lang->action->label->editname = '修改了名称'; +$lang->action->label->backup = '备份了'; +$lang->action->label->adjustmemory = '调整了内存'; +$lang->action->label->enableldap = '启用了LDAP'; +$lang->action->label->disableldap = '禁用了LDAP'; +$lang->action->label->enablesmtp = '启用了SMTP'; +$lang->action->label->disablesmtp = '禁用了SMTP'; +$lang->action->label->tosenior = '升级了高级版'; +$lang->action->label->saveautobackupsettings = '开启了自动备份'; +$lang->action->label->closeautobackupsettings = '关闭了自动备份'; +$lang->action->label->autobackup = '系统执行了自动备份'; +$lang->action->label->autorestore = '系统执行了自动还原'; +$lang->action->label->deleteexpiredbackup = '系统删除了过期的自动备份'; +$lang->action->label->revert = '还原了'; +$lang->action->label->created = '创建了'; +$lang->action->label->opened = '创建了'; +$lang->action->label->openedbysystem = '系统创建了'; +$lang->action->label->closedbysystem = '系统关闭了'; +$lang->action->label->added = '添加了'; +$lang->action->label->changed = '变更了'; +$lang->action->label->edited = '编辑了'; +$lang->action->label->assigned = '指派了'; +$lang->action->label->closed = '关闭了'; +$lang->action->label->deleted = '删除了'; +$lang->action->label->deletedfile = '删除了附件'; +$lang->action->label->editfile = '编辑了附件'; +$lang->action->label->erased = '删除了'; +$lang->action->label->undeleted = '还原了'; +$lang->action->label->hidden = '隐藏了'; +$lang->action->label->commented = '评论了'; +$lang->action->label->communicated = '沟通了'; +$lang->action->label->activated = '激活了'; +$lang->action->label->blocked = '阻塞了'; +$lang->action->label->resolved = '解决了'; +$lang->action->label->reviewed = '评审了'; +$lang->action->label->recalled = '撤销了评审'; +$lang->action->label->recalledchange = '撤销了变更'; +$lang->action->label->moved = '移动了'; +$lang->action->label->confirmed = "确认了{$lang->SRCommon}"; +$lang->action->label->bugconfirmed = '确认了'; +$lang->action->label->tostory = "转了{$lang->SRCommon}"; +$lang->action->label->frombug = "转了{$lang->SRCommon}"; +$lang->action->label->fromlib = '从用例库导入'; +$lang->action->label->totask = '转了任务'; +$lang->action->label->converttotask = '转了任务'; +$lang->action->label->svncommited = '提交了代码'; +$lang->action->label->gitcommited = '提交了代码'; +$lang->action->label->linked2plan = "关联了计划"; +$lang->action->label->unlinkedfromplan = "移除了计划"; +$lang->action->label->changestatus = '修改了状态'; +$lang->action->label->marked = '编辑了'; +$lang->action->label->linked2execution = "关联了{$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "移除了{$lang->executionCommon}"; +$lang->action->label->linked2kanban = '关联了看板'; +$lang->action->label->linked2project = "关联了{$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "移除了{$lang->projectCommon}"; +$lang->action->label->unlinkedfrombuild = "移除了版本"; +$lang->action->label->linked2release = "关联了发布"; +$lang->action->label->unlinkedfromrelease = "移除了发布"; +$lang->action->label->linked2revision = "关联了代码提交"; +$lang->action->label->unlinkedfromrevision = "取消关联了代码提交"; +$lang->action->label->linkrelatedbug = "关联了相关Bug"; +$lang->action->label->unlinkrelatedbug = "移除了相关Bug"; +$lang->action->label->linkrelatedcase = "关联了相关用例"; +$lang->action->label->unlinkrelatedcase = "移除了相关用例"; +$lang->action->label->linkrelatedstory = "关联了相关{$lang->SRCommon}"; +$lang->action->label->unlinkrelatedstory = "移除了相关{$lang->SRCommon}"; +$lang->action->label->subdividestory = "细分了{$lang->SRCommon}"; +$lang->action->label->unlinkchildstory = "移除了细分{$lang->SRCommon}"; +$lang->action->label->started = '开始了'; +$lang->action->label->restarted = '继续了'; +$lang->action->label->recordworkhour = '记录了工时'; +$lang->action->label->editestimate = '编辑了工时'; +$lang->action->label->canceled = '取消了'; +$lang->action->label->finished = '完成了'; +$lang->action->label->paused = '暂停了'; +$lang->action->label->verified = '验收了'; +$lang->action->label->delayed = '延期了'; +$lang->action->label->suspended = '挂起了'; +$lang->action->label->login = '登录系统'; +$lang->action->label->logout = "退出登录"; +$lang->action->label->notified = "通知了"; +$lang->action->label->deleteestimate = "删除了工时"; +$lang->action->label->linked2build = "关联了"; +$lang->action->label->linked2bug = "关联了"; +$lang->action->label->linked2testtask = "关联了"; +$lang->action->label->unlinkedfromtesttask = "移除了"; +$lang->action->label->linkchildtask = "关联了子任务"; +$lang->action->label->unlinkchildrentask = "取消关联了子任务"; +$lang->action->label->linkparenttask = "关联到了父任务"; +$lang->action->label->unlinkparenttask = "从父任务取消关联了"; +$lang->action->label->batchcreate = "批量创建了任务"; +$lang->action->label->createchildren = "创建了子任务"; +$lang->action->label->managed = "维护了"; +$lang->action->label->managedteam = "维护了"; +$lang->action->label->managedwhitelist = "维护了"; +$lang->action->label->deletechildrentask = "删除了子任务"; +$lang->action->label->createchildrenstory = "创建了子需求"; +$lang->action->label->linkchildstory = "关联了子需求"; +$lang->action->label->unlinkchildrenstory = "取消关联了子需求"; +$lang->action->label->linkparentstory = "关联到了父需求"; +$lang->action->label->unlinkparentstory = "从父需求取消关联了"; +$lang->action->label->deletechildrenstory = "删除了子需求"; +$lang->action->label->tracked = '跟踪了'; +$lang->action->label->hangup = '挂起了'; +$lang->action->label->run = '执行了'; +$lang->action->label->estimated = '估算了'; +$lang->action->label->reviewpassed = '确认通过'; +$lang->action->label->reviewrejected = '拒绝了'; +$lang->action->label->reviewclarified = '有待明确'; +$lang->action->label->commitsummary = '提交了培训总结'; +$lang->action->label->updatetrainee = '更新了培训人员'; +$lang->action->label->setdefaultbranch = '设置了默认分支'; +$lang->action->label->syncprogram = '开始了'; +$lang->action->label->syncproject = '开始了'; +$lang->action->label->syncexecution = '开始了'; +$lang->action->label->syncexecutionbychild = '开始了'; +$lang->action->label->startProgram = "（因{$lang->projectCommon}开始而启动项目集）"; +$lang->action->label->createmr = '合并请求关联了'; +$lang->action->label->deletemr = '合并请求取消了'; +$lang->action->label->mergedmr = '合并请求合并了'; +$lang->action->label->compilepass = '构建成功'; +$lang->action->label->compilefail = '构建失败'; +$lang->action->label->reopen = '重新打开了'; +$lang->action->label->approve = '通过了'; +$lang->action->label->reject = '拒绝了'; +$lang->action->label->importfromgitlab = '从Gitlab关联创建了'; +$lang->action->label->archived = '归档了'; +$lang->action->label->restore = '还原了'; +$lang->action->label->mergedbranch = '合并了分支'; +$lang->action->label->startedbychild = '开始了'; +$lang->action->label->finishedbychild = '完成了'; +$lang->action->label->closedbychild = '关闭了'; +$lang->action->label->activatedbychild = '激活了'; +$lang->action->label->createchild = '激活了'; +$lang->action->label->executed = '执行了'; +$lang->action->label->importedcard = '导入了'; +$lang->action->label->importedproductplan = '导入了'; +$lang->action->label->importedrelease = '导入了'; +$lang->action->label->importedexecution = '导入了'; +$lang->action->label->importedbuild = '导入了'; +$lang->action->label->importedticket = '导入了'; +$lang->action->label->fromsonarqube = '由SonarQube问题创建了'; +$lang->action->label->bind = '绑定了'; +$lang->action->label->unbind = '取消绑定了'; +$lang->action->label->linkstory = '关联需求到了'; +$lang->action->label->linkbug = '关联BUG到了'; +$lang->action->label->unlinkstory = '移除了需求从'; +$lang->action->label->unlinkbug = '移除了BUG从'; +$lang->action->label->tolib = '导入了'; +$lang->action->label->updatetolib = '更新了'; +$lang->action->label->ganttmove = '排序了'; +$lang->action->label->submitreview = '提交了评审'; +$lang->action->label->suspend = '休眠了'; +$lang->action->label->resume = '恢复了'; +$lang->action->label->reboot = '重启了'; +$lang->action->label->boot = '启动了'; +$lang->action->label->destroy = '关闭了'; +$lang->action->label->getvnc = '远程操控了'; +$lang->action->label->synctwins = '同步修改了'; +$lang->action->label->relieved = '解除了'; +$lang->action->label->switchtolight = '从全生命周期管理模式切换为轻量管理模式'; +$lang->action->label->linkedrepo = '关联代码库到'; +$lang->action->label->unlinkedrepo = "取消了{$lang->projectCommon}与代码库的关联"; +$lang->action->label->unlinkproduct = "取消了与{$lang->productCommon}的关联"; +$lang->action->label->createdsnapshot = '创建了快照'; +$lang->action->label->restoredsnapshot = '还原了快照'; +$lang->action->label->editsnapshot = '编辑了快照'; +$lang->action->label->deletesnapshot = '编辑了快照'; +$lang->action->label->saveddraft = '存为草稿'; +$lang->action->label->releaseddoc = '发布了'; +$lang->action->label->collected = '收藏了'; +$lang->action->label->uncollected = '取消收藏了'; +$lang->action->label->online = '上架了'; +$lang->action->label->offline = '下架了'; +$lang->action->label->linkhost = '主机关联到'; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass(); @@ -820,6 +837,7 @@ $lang->action->label->chartgroup = '分组'; $lang->action->label->serverroom = '机房|serverroom|browse|'; $lang->action->label->host = '主机|host|view|id=%s'; $lang->action->label->account = "账号|account|view|id=%s"; +$lang->action->label->instance = '应用|instance|view|id=%s'; /* Object type. */ $lang->action->search = new stdclass(); diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index f6b79e8350..1e6ecb59da 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -247,122 +247,140 @@ $lang->action->desc->autorestore = '$date, 系统执行了自动还 $lang->action->desc->deleteexpiredbackup = '$date, 系统删除了过期的自动备份。' . "\n"; /* 用來顯示動態信息。*/ -$lang->action->label = new stdclass(); -$lang->action->label->created = '創建'; -$lang->action->label->opened = '創建'; -$lang->action->label->openedbysystem = '系統創建'; -$lang->action->label->closedbysystem = '系統關閉'; -$lang->action->label->added = '添加'; -$lang->action->label->changed = '變更了'; -$lang->action->label->edited = '編輯了'; -$lang->action->label->assigned = '指派了'; -$lang->action->label->closed = '關閉了'; -$lang->action->label->deleted = '刪除了'; -$lang->action->label->deletedfile = '刪除附件'; -$lang->action->label->editfile = '編輯附件'; -$lang->action->label->erased = '刪除了'; -$lang->action->label->undeleted = '還原了'; -$lang->action->label->hidden = '隱藏了'; -$lang->action->label->commented = '評論了'; -$lang->action->label->communicated = '溝通了'; -$lang->action->label->activated = '激活了'; -$lang->action->label->blocked = '阻塞了'; -$lang->action->label->resolved = '解決了'; -$lang->action->label->reviewed = '評審了'; -$lang->action->label->recalled = '撤銷評審'; -$lang->action->label->moved = '移動了'; -$lang->action->label->confirmed = "確認了{$lang->SRCommon}"; -$lang->action->label->bugconfirmed = '確認了'; -$lang->action->label->tostory = "轉{$lang->SRCommon}"; -$lang->action->label->frombug = "轉{$lang->SRCommon}"; -$lang->action->label->fromlib = '從用例庫導入'; -$lang->action->label->totask = '轉任務'; -$lang->action->label->svncommited = '提交代碼'; -$lang->action->label->gitcommited = '提交代碼'; -$lang->action->label->linked2plan = "關聯計劃"; -$lang->action->label->unlinkedfromplan = "移除計劃"; -$lang->action->label->changestatus = '修改狀態'; -$lang->action->label->marked = '編輯了'; -$lang->action->label->linked2execution = "關聯{$lang->executionCommon}"; -$lang->action->label->unlinkedfromexecution = "移除{$lang->executionCommon}"; -$lang->action->label->linked2project = "關聯項目"; -$lang->action->label->unlinkedfromproject = "移除項目"; -$lang->action->label->unlinkedfrombuild = "移除版本"; -$lang->action->label->linked2release = "關聯發佈"; -$lang->action->label->unlinkedfromrelease = "移除發佈"; -$lang->action->label->linkrelatedbug = "關聯了相關Bug"; -$lang->action->label->unlinkrelatedbug = "移除了相關Bug"; -$lang->action->label->linkrelatedcase = "關聯了相關用例"; -$lang->action->label->unlinkrelatedcase = "移除了相關用例"; -$lang->action->label->linkrelatedstory = "關聯了相關{$lang->SRCommon}"; -$lang->action->label->unlinkrelatedstory = "移除了相關{$lang->SRCommon}"; -$lang->action->label->subdividestory = "細分了{$lang->SRCommon}"; -$lang->action->label->unlinkchildstory = "移除了細分{$lang->SRCommon}"; -$lang->action->label->started = '開始了'; -$lang->action->label->restarted = '繼續了'; -$lang->action->label->recordworkhour = '記錄了工時'; -$lang->action->label->editestimate = '編輯了工時'; -$lang->action->label->canceled = '取消了'; -$lang->action->label->finished = '完成了'; -$lang->action->label->paused = '暫停了'; -$lang->action->label->verified = '驗收了'; -$lang->action->label->delayed = '延期'; -$lang->action->label->suspended = '掛起'; -$lang->action->label->login = '登錄系統'; -$lang->action->label->logout = "退出登錄"; -$lang->action->label->notified = "通知了"; -$lang->action->label->deleteestimate = "刪除了工時"; -$lang->action->label->linked2build = "關聯了"; -$lang->action->label->linked2bug = "關聯了"; -$lang->action->label->linked2testtask = "關聯了"; -$lang->action->label->unlinkedfromtesttask = "移除了"; -$lang->action->label->linkchildtask = "關聯子任務"; -$lang->action->label->unlinkchildrentask = "取消關聯子任務"; -$lang->action->label->linkparenttask = "關聯到父任務"; -$lang->action->label->unlinkparenttask = "從父任務取消關聯"; -$lang->action->label->batchcreate = "批量創建任務"; -$lang->action->label->createchildren = "創建子任務"; -$lang->action->label->managed = "維護"; -$lang->action->label->managedteam = "維護了"; -$lang->action->label->managedwhitelist = "維護了"; -$lang->action->label->deletechildrentask = "刪除子任務"; -$lang->action->label->createchildrenstory = "創建子需求"; -$lang->action->label->linkchildstory = "關聯子需求"; -$lang->action->label->unlinkchildrenstory = "取消關聯子需求"; -$lang->action->label->linkparentstory = "關聯到父需求"; -$lang->action->label->unlinkparentstory = "從父需求取消關聯"; -$lang->action->label->deletechildrenstory = "刪除子需求"; -$lang->action->label->tracked = '跟蹤了'; -$lang->action->label->hangup = '掛起了'; -$lang->action->label->run = '執行了'; -$lang->action->label->estimated = '估算了'; -$lang->action->label->reviewpassed = '確認通過'; -$lang->action->label->reviewrejected = '拒絶'; -$lang->action->label->reviewclarified = '有待明確'; -$lang->action->label->commitsummary = '提交培訓總結'; -$lang->action->label->updatetrainee = '更新培訓人員'; -$lang->action->label->setdefaultbranch = '設置了預設分支'; -$lang->action->label->syncprogram = '開始了'; -$lang->action->label->syncproject = '開始了'; -$lang->action->label->syncexecution = '開始了'; -$lang->action->label->startProgram = '（因項目開始而啟動項目集）'; -$lang->action->label->createmr = '合併請求關聯了'; -$lang->action->label->deletemr = '合併請求取消了'; -$lang->action->label->mergedmr = '合併請求合併了'; -$lang->action->label->compilepass = '構建成功'; -$lang->action->label->compilefail = '構建失敗'; -$lang->action->label->reopen = '重新打開'; -$lang->action->label->approve = '通過了'; -$lang->action->label->reject = '拒絶了'; -$lang->action->label->importfromgitlab = '從Gitlab關聯創建了'; -$lang->action->label->archived = '歸檔了'; -$lang->action->label->restore = '還原了'; -$lang->action->label->mergedbranch = '合併分支'; -$lang->action->label->linkedrepo = '關聯代碼庫到'; -$lang->action->label->unlinkedrepo = '取消了項目与代碼庫的關聯'; -$lang->action->label->online = '上架了'; -$lang->action->label->offline = '下架了'; -$lang->action->label->linkhost = '主机关联到'; +$lang->action->label = new stdclass(); +$lang->action->label->install = '安装了'; +$lang->action->label->uninstall = '卸载了'; +$lang->action->label->upgrade = '升级了'; +$lang->action->label->start = '启动了'; +$lang->action->label->stop = '关闭了'; +$lang->action->label->editname = '修改了名称'; +$lang->action->label->backup = '备份了'; +$lang->action->label->adjustmemory = '调整了内存'; +$lang->action->label->enableldap = '启用了LDAP'; +$lang->action->label->disableldap = '禁用了LDAP'; +$lang->action->label->enablesmtp = '启用了SMTP'; +$lang->action->label->disablesmtp = '禁用了SMTP'; +$lang->action->label->tosenior = '升级了高级版'; +$lang->action->label->saveautobackupsettings = '开启了自动备份'; +$lang->action->label->closeautobackupsettings = '关闭了自动备份'; +$lang->action->label->autobackup = '系统执行了自动备份'; +$lang->action->label->autorestore = '系统执行了自动还原'; +$lang->action->label->deleteexpiredbackup = '系统删除了过期的自动备份'; +$lang->action->label->created = '創建'; +$lang->action->label->opened = '創建'; +$lang->action->label->openedbysystem = '系統創建'; +$lang->action->label->closedbysystem = '系統關閉'; +$lang->action->label->added = '添加'; +$lang->action->label->changed = '變更了'; +$lang->action->label->edited = '編輯了'; +$lang->action->label->assigned = '指派了'; +$lang->action->label->closed = '關閉了'; +$lang->action->label->deleted = '刪除了'; +$lang->action->label->deletedfile = '刪除附件'; +$lang->action->label->editfile = '編輯附件'; +$lang->action->label->erased = '刪除了'; +$lang->action->label->undeleted = '還原了'; +$lang->action->label->hidden = '隱藏了'; +$lang->action->label->commented = '評論了'; +$lang->action->label->communicated = '溝通了'; +$lang->action->label->activated = '激活了'; +$lang->action->label->blocked = '阻塞了'; +$lang->action->label->resolved = '解決了'; +$lang->action->label->reviewed = '評審了'; +$lang->action->label->recalled = '撤銷評審'; +$lang->action->label->moved = '移動了'; +$lang->action->label->confirmed = "確認了{$lang->SRCommon}"; +$lang->action->label->bugconfirmed = '確認了'; +$lang->action->label->tostory = "轉{$lang->SRCommon}"; +$lang->action->label->frombug = "轉{$lang->SRCommon}"; +$lang->action->label->fromlib = '從用例庫導入'; +$lang->action->label->totask = '轉任務'; +$lang->action->label->svncommited = '提交代碼'; +$lang->action->label->gitcommited = '提交代碼'; +$lang->action->label->linked2plan = "關聯計劃"; +$lang->action->label->unlinkedfromplan = "移除計劃"; +$lang->action->label->changestatus = '修改狀態'; +$lang->action->label->marked = '編輯了'; +$lang->action->label->linked2execution = "關聯{$lang->executionCommon}"; +$lang->action->label->unlinkedfromexecution = "移除{$lang->executionCommon}"; +$lang->action->label->linked2project = "關聯項目"; +$lang->action->label->unlinkedfromproject = "移除項目"; +$lang->action->label->unlinkedfrombuild = "移除版本"; +$lang->action->label->linked2release = "關聯發佈"; +$lang->action->label->unlinkedfromrelease = "移除發佈"; +$lang->action->label->linkrelatedbug = "關聯了相關Bug"; +$lang->action->label->unlinkrelatedbug = "移除了相關Bug"; +$lang->action->label->linkrelatedcase = "關聯了相關用例"; +$lang->action->label->unlinkrelatedcase = "移除了相關用例"; +$lang->action->label->linkrelatedstory = "關聯了相關{$lang->SRCommon}"; +$lang->action->label->unlinkrelatedstory = "移除了相關{$lang->SRCommon}"; +$lang->action->label->subdividestory = "細分了{$lang->SRCommon}"; +$lang->action->label->unlinkchildstory = "移除了細分{$lang->SRCommon}"; +$lang->action->label->started = '開始了'; +$lang->action->label->restarted = '繼續了'; +$lang->action->label->recordworkhour = '記錄了工時'; +$lang->action->label->editestimate = '編輯了工時'; +$lang->action->label->canceled = '取消了'; +$lang->action->label->finished = '完成了'; +$lang->action->label->paused = '暫停了'; +$lang->action->label->verified = '驗收了'; +$lang->action->label->delayed = '延期'; +$lang->action->label->suspended = '掛起'; +$lang->action->label->login = '登錄系統'; +$lang->action->label->logout = "退出登錄"; +$lang->action->label->notified = "通知了"; +$lang->action->label->deleteestimate = "刪除了工時"; +$lang->action->label->linked2build = "關聯了"; +$lang->action->label->linked2bug = "關聯了"; +$lang->action->label->linked2testtask = "關聯了"; +$lang->action->label->unlinkedfromtesttask = "移除了"; +$lang->action->label->linkchildtask = "關聯子任務"; +$lang->action->label->unlinkchildrentask = "取消關聯子任務"; +$lang->action->label->linkparenttask = "關聯到父任務"; +$lang->action->label->unlinkparenttask = "從父任務取消關聯"; +$lang->action->label->batchcreate = "批量創建任務"; +$lang->action->label->createchildren = "創建子任務"; +$lang->action->label->managed = "維護"; +$lang->action->label->managedteam = "維護了"; +$lang->action->label->managedwhitelist = "維護了"; +$lang->action->label->deletechildrentask = "刪除子任務"; +$lang->action->label->createchildrenstory = "創建子需求"; +$lang->action->label->linkchildstory = "關聯子需求"; +$lang->action->label->unlinkchildrenstory = "取消關聯子需求"; +$lang->action->label->linkparentstory = "關聯到父需求"; +$lang->action->label->unlinkparentstory = "從父需求取消關聯"; +$lang->action->label->deletechildrenstory = "刪除子需求"; +$lang->action->label->tracked = '跟蹤了'; +$lang->action->label->hangup = '掛起了'; +$lang->action->label->run = '執行了'; +$lang->action->label->estimated = '估算了'; +$lang->action->label->reviewpassed = '確認通過'; +$lang->action->label->reviewrejected = '拒絶'; +$lang->action->label->reviewclarified = '有待明確'; +$lang->action->label->commitsummary = '提交培訓總結'; +$lang->action->label->updatetrainee = '更新培訓人員'; +$lang->action->label->setdefaultbranch = '設置了預設分支'; +$lang->action->label->syncprogram = '開始了'; +$lang->action->label->syncproject = '開始了'; +$lang->action->label->syncexecution = '開始了'; +$lang->action->label->startProgram = '（因項目開始而啟動項目集）'; +$lang->action->label->createmr = '合併請求關聯了'; +$lang->action->label->deletemr = '合併請求取消了'; +$lang->action->label->mergedmr = '合併請求合併了'; +$lang->action->label->compilepass = '構建成功'; +$lang->action->label->compilefail = '構建失敗'; +$lang->action->label->reopen = '重新打開'; +$lang->action->label->approve = '通過了'; +$lang->action->label->reject = '拒絶了'; +$lang->action->label->importfromgitlab = '從Gitlab關聯創建了'; +$lang->action->label->archived = '歸檔了'; +$lang->action->label->restore = '還原了'; +$lang->action->label->mergedbranch = '合併分支'; +$lang->action->label->linkedrepo = '關聯代碼庫到'; +$lang->action->label->unlinkedrepo = '取消了項目与代碼庫的關聯'; +$lang->action->label->online = '上架了'; +$lang->action->label->offline = '下架了'; +$lang->action->label->linkhost = '主机关联到'; /* 動態信息按照對象分組 */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/model.php b/module/action/model.php index 65c9afc67a..5df79fa752 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -940,6 +940,10 @@ class actionModel extends model $action->extra = ''; if(!empty($extra->result->code) && $extra->result->code != 200 && !empty($extra->result->message)) $action->comment = $extra->result->message; + if(is_string($extra->result) && $extra->result != 'fail') + { + $action->comment = "\n" . $extra->message; + } } } elseif(isset($this->lang->action->desc->$actionType)) diff --git a/module/common/lang/common.php b/module/common/lang/common.php index 21783a0558..ca156ff1e3 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -98,6 +98,7 @@ $lang->contact = new stdclass(); $lang->dimension = new stdclass(); $lang->space = new stdclass(); $lang->store = new stdclass(); +$lang->instance = new stdclass(); $lang->CNE = new stdclass(); $lang->account = new stdclass(); $lang->ops = new stdclass(); diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 0cde890530..dc2070b030 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -238,6 +238,7 @@ $lang->zahost->common = 'ZAhost'; $lang->zanode->common = 'ZAnode'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; +$lang->instance->common = 'Instance'; $lang->programstakeholder->common = 'Stakeholder'; $lang->featureswitch->common = 'Features On/Off'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d8974b5d47..de72306c81 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -241,6 +241,7 @@ $lang->zanode->common = 'ZAnode'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; $lang->space->common = 'Services'; +$lang->instance->common = 'Instance'; $lang->programstakeholder->common = 'Stakeholder'; $lang->featureswitch->common = 'Features On/Off'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index bbb7875c63..69ec3d2b7d 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -238,6 +238,7 @@ $lang->zahost->common = 'ZAhost'; $lang->zanode->common = 'ZAnode'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; +$lang->instance->common = 'Instance'; $lang->programstakeholder->common = 'Stakeholder'; $lang->featureswitch->common = 'Features On/Off'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 4977382de6..aec40e2097 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -248,6 +248,7 @@ $lang->devops->provider = 'IDC Provider'; $lang->devops->cpuBrand = 'CPU Brand'; $lang->devops->city = 'IDC Location'; $lang->devops->os = 'OS Version'; +$lang->instance->common = 'Instance'; $lang->searchTips = ''; $lang->searchAB = 'Tìm ki?m'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 8330657ef2..a4db07896e 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -242,6 +242,7 @@ $lang->dimension->common = '维度'; $lang->contact->common = '联系人'; $lang->space->common = '服务管理'; $lang->store->common = '应用市场'; +$lang->instance->common = '应用'; $lang->programstakeholder->common = '干系人'; $lang->featureswitch->common = '功能开关'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 5da602ec1a..8a719d8df2 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -169,6 +169,7 @@ $lang->build->common = '版本'; $lang->testreport->common = '測試報告'; $lang->automation->common = '自動化：'; $lang->zahost->common = '宿主機'; +$lang->instance->common = '应用'; $lang->team->common = '團隊'; $lang->user->common = '用戶'; $lang->custom->common = '自定義'; diff --git a/module/instance/config.php b/module/instance/config.php index fbb4db9dc9..d3ea3a4320 100644 --- a/module/instance/config.php +++ b/module/instance/config.php @@ -24,27 +24,35 @@ $app->loadLang('space'); $config->instance->actionList['start']['icon'] = 'play'; $config->instance->actionList['start']['className'] = 'ajax-submit'; $config->instance->actionList['start']['hint'] = $lang->instance->start; +$config->instance->actionList['start']['text'] = $lang->instance->start; $config->instance->actionList['start']['url'] = array('module' => 'instance', 'method' => 'ajaxStart', 'params' => 'id={id}'); $config->instance->actionList['stop']['icon'] = 'off'; $config->instance->actionList['stop']['className'] = 'ajax-submit'; $config->instance->actionList['stop']['hint'] = $lang->instance->stop; +$config->instance->actionList['stop']['text'] = $lang->instance->stop; $config->instance->actionList['stop']['data-confirm'] = $lang->instance->notices['confirmStop']; $config->instance->actionList['stop']['url'] = array('module' => 'instance', 'method' => 'ajaxStop', 'params' => 'id={id}'); $config->instance->actionList['uninstall']['icon'] = 'trash'; $config->instance->actionList['uninstall']['hint'] = $lang->instance->uninstall; -$config->instance->actionList['uninstall']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&type={type}'); +$config->instance->actionList['uninstall']['text'] = $lang->instance->uninstall; +$config->instance->actionList['uninstall']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}'); $config->instance->actionList['visit']['icon'] = 'menu-my'; $config->instance->actionList['visit']['hint'] = $lang->instance->visit; -$config->instance->actionList['visit']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&type={type}'); +$config->instance->actionList['visit']['text'] = $lang->instance->visit; +$config->instance->actionList['visit']['target'] = '_blank'; +$config->instance->actionList['visit']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}'); -$config->instance->actionList['upgrade']['icon'] = 'refresh'; -$config->instance->actionList['upgrade']['hint'] = $lang->instance->upgrade; -$config->instance->actionList['upgrade']['url'] = helper::createLink('instance', 'upgrade', "id={id}"); +$config->instance->actionList['upgrade']['icon'] = 'refresh'; +$config->instance->actionList['upgrade']['data-toggle'] = 'modal'; +$config->instance->actionList['upgrade']['data-size'] = 'sm'; +$config->instance->actionList['upgrade']['text'] = $lang->instance->upgrade; +$config->instance->actionList['upgrade']['hint'] = $lang->instance->upgrade; +$config->instance->actionList['upgrade']['url'] = helper::createLink('instance', 'upgrade', "id={id}"); $config->instance->actions = new stdclass(); $config->instance->actions->view = array(); -$config->instance->actions->view['mainActions'] = array('start', 'stop', 'upgrade'); +$config->instance->actions->view['mainActions'] = array('visit', 'start', 'stop', 'upgrade'); $config->instance->actions->view['suffixActions'] = array('uninstall'); \ No newline at end of file diff --git a/module/instance/control.php b/module/instance/control.php index 484ae86c7a..cc5584e9ac 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -303,10 +303,13 @@ class instance extends control { $instance = $this->instance->getByID($id); $instance->latestVersion = $this->store->appLatestVersion($instance->appID, $instance->version); + $instance->latestVersion = new stdClass(); + $instance->latestVersion->version = 4.4; + $instance->latestVersion->app_version = 4.5; if($_POST) { - if(empty($instance->latestVersion)) $this->send(array('result' => 'fail', 'message' => $this->lang->instance->noHigherVersion)); + if(empty($instance->latestVersion)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->noHigherVersion, 'closeModal' => true)); $postData = fixer::input('post')->get(); @@ -317,11 +320,11 @@ class instance extends control { $logExtra['result'] = 'fail'; $this->action->create('instance', $instance->id, 'upgrade', '', json_encode($logExtra)); - $this->send(array('result' => 'fail', 'message' => $this->lang->instance->notices['upgradeFail'])); + return $this->send(array('result' => 'fail', 'message' => !empty($logExtra['message']) ? $logExtra['message'] : $this->lang->instance->notices['upgradeFail'], 'closeModal' => true)); } $this->action->create('instance', $instance->id, 'upgrade', '', json_encode($logExtra)); - $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['upgradeSuccess'], 'locate' => $this->createLink('space', 'browse'), 'target' => '_self')); + return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['upgradeSuccess'], 'load' => $this->createLink('instance', 'view', "id=$id"))); } $this->view->title = $this->lang->instance->upgrade . $instance->name; @@ -339,7 +342,7 @@ class instance extends control * @access public * @return void */ - public function visit(int $id, int $externalID): void + public function visit(int $id, int $externalID = 0): void { if(!$externalID) { @@ -456,24 +459,6 @@ class instance extends control $this->display(); } - /** - * 刷新应用状态。 - * Refresh status of an instance. - * - * @param int $instanceID - * @access public - * @return void - */ - public function ajaxRefresh($instanceID) - { - $instance = $this->instance->getByID($instanceID); - if(empty($instance)) return $this->send(array('status' => '')); - - $instance = $this->instance->freshStatus($instance); - - return $this->send(array('status' => $instance->status)); - } - /** * Uninstall app instance. * diff --git a/module/instance/js/view.ui.js b/module/instance/js/view.ui.js index b3d81c330f..4f6061d9ff 100644 --- a/module/instance/js/view.ui.js +++ b/module/instance/js/view.ui.js @@ -39,5 +39,5 @@ window.afterPageUpdate = function() target: '#instanceInfoContainer', }); } - }, 1000); + }, 5000); } diff --git a/module/instance/model.php b/module/instance/model.php index 276687f2e4..b711faec27 100644 --- a/module/instance/model.php +++ b/module/instance/model.php @@ -474,7 +474,7 @@ class InstanceModel extends model case 'uninstall': return !in_array($instance->status, array('destroying')); case 'visit': - return $instance->status == 'running' or $instance->status == 'upgrading'; + return $instance->status == 'running'; default: return false; } @@ -2049,7 +2049,7 @@ class InstanceModel extends model if($action == 'stop') return empty($instance->type) ? $this->canDo('stop', $instance) : false; if($action == 'uninstall') return empty($instance->solution) && $this->canDo('uninstall', $instance); if($action == 'visit') return empty($instance->type) ? ($instance->domain && $this->canDo('visit', $instance)) : true; - if($action == 'upgrade') return !empty($instance->latestVersion); + if($action == 'upgrade') return true || !empty($instance->latestVersion); if($action == 'bindUser') return empty($instance->type) ? false : true; if($action == 'edit') return empty($instance->type) ? false : true; diff --git a/module/instance/ui/upgrade.html.php b/module/instance/ui/upgrade.html.php new file mode 100644 index 0000000000..31ad0c7503 --- /dev/null +++ b/module/instance/ui/upgrade.html.php @@ -0,0 +1,28 @@ + + * @package instance + * @link https://www.zentao.net + */ + +namespace zin; + +formPanel +( + set::id('instanceSettingForm'), + set::title(''), + set::actions(array('submit')), + set::submitBtnText($lang->instance->upgrade), + set::cancelBtnText($lang->cancel), + span + ( + setClass('p-5'), + $lang->instance->notices['confirmUpgrade'] + ), + input(set::type('hidden'), set::name('confirm'), set::value('yes')) +); diff --git a/module/space/config/dtable.php b/module/space/config/dtable.php index 9ab90a3eac..a42a7f4d5d 100644 --- a/module/space/config/dtable.php +++ b/module/space/config/dtable.php @@ -57,9 +57,11 @@ $config->space->dtable->fieldList['actions']['list']['visit']['hint'] = $lang- $config->space->dtable->fieldList['actions']['list']['visit']['url'] = array('module' => 'instance', 'method' => 'visit', 'params' => 'id={id}&externalID={externalID}'); $config->space->dtable->fieldList['actions']['list']['visit']['target'] = '_blank'; -$config->space->dtable->fieldList['actions']['list']['upgrade']['icon'] = 'refresh'; -$config->space->dtable->fieldList['actions']['list']['upgrade']['hint'] = $lang->space->upgrade; -$config->space->dtable->fieldList['actions']['list']['upgrade']['url'] = helper::createLink('instance', 'upgrade', "id={id}"); +$config->space->dtable->fieldList['actions']['list']['upgrade']['icon'] = 'refresh'; +$config->space->dtable->fieldList['actions']['list']['upgrade']['data-toggle'] = 'modal'; +$config->space->dtable->fieldList['actions']['list']['upgrade']['data-size'] = 'sm'; +$config->space->dtable->fieldList['actions']['list']['upgrade']['hint'] = $lang->space->upgrade; +$config->space->dtable->fieldList['actions']['list']['upgrade']['url'] = helper::createLink('instance', 'upgrade', "id={id}"); $config->space->dtable->fieldList['actions']['list']['edit']['icon'] = 'edit'; $config->space->dtable->fieldList['actions']['list']['edit']['hint'] = $lang->edit; diff --git a/module/space/js/browse.ui.js b/module/space/js/browse.ui.js index 85dbf54a1e..13320d2935 100644 --- a/module/space/js/browse.ui.js +++ b/module/space/js/browse.ui.js @@ -32,42 +32,34 @@ window.renderInstanceList = function (result, {col, row, value}) return result; } -var refreshTimes = 0; +var timer = null; window.afterPageUpdate = function() { - if(refreshTimes > 0) return; - setTimeout(function() + if(timer) return; + const postData = new FormData(); + idList.forEach(function(id) { - refreshTimes++; - $.each(instances, function(index, instance) - { - if(!instance.externalID) refreshStatus(instance, index); - }); - - }, 1000); -} - -/** - * 刷新应用状态。 - * Refresh status of an instance. - * - * @param object instance - * @param int index - * @access public - * @return void - */ -function refreshStatus(instance, index) -{ - setTimeout(function() + postData.append('idList[]', id) + }); + timer = setInterval(function() { $.ajaxSubmit({ - url: $.createLink('instance', 'ajaxRefresh', 'instanceID=' + instance.id), - method: 'GET', + url: $.createLink('instance', 'ajaxStatus'), + method: 'POST', + data:postData, onComplete: function(res) { - if(res.status != instance.status) loadPage(); + if(res.result != 'success') return; + $.each(res.data, function(index, instance) + { + if(statusMap[instance.id] != instance.status) + { + clearInterval(timer); + statusMap[instance.id] = instance.status; + loadPage(); + } + }); } }); - - }, 500 * index); -} \ No newline at end of file + }, 5000); +} diff --git a/module/space/ui/browse.html.php b/module/space/ui/browse.html.php index 4db83f1328..bec3a0d0af 100644 --- a/module/space/ui/browse.html.php +++ b/module/space/ui/browse.html.php @@ -10,7 +10,10 @@ declare(strict_types=1); */ namespace zin; -jsVar('instances', $instances); +$statusMap = array(); +foreach($instances as $instance) if(!$instance->externalID) $statusMap[$instance->id] = $instance->status; +jsVar('statusMap', $statusMap); +jsVar('idList', array_keys($statusMap)); $instances = initTableData($instances, $config->space->dtable->fieldList, $this->instance);