diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index bb0843a6b1..1713e4a0b5 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -28,11 +28,11 @@ idAB?> bug->title;?> - bug->severityAB?> + bug->abbr->severity?> priAB?> bug->deadline;?> - bug->statusAB;?> + bug->abbr->status;?> bug->search['fields']['toStory'] = $lang->bug->toStory; $config->bug->search['fields']['openedBy'] = $lang->bug->openedBy; $config->bug->search['fields']['closedBy'] = $lang->bug->closedBy; -$config->bug->search['fields']['lastEditedBy'] = $lang->bug->lastEditedByAB; +$config->bug->search['fields']['lastEditedBy'] = $lang->bug->abbr->lastEditedBy; $config->bug->search['fields']['mailto'] = $lang->bug->mailto; @@ -44,7 +44,7 @@ $config->bug->search['fields']['openedDate'] = $lang->bug->openedDate; $config->bug->search['fields']['assignedDate'] = $lang->bug->assignedDate; $config->bug->search['fields']['resolvedDate'] = $lang->bug->resolvedDate; $config->bug->search['fields']['closedDate'] = $lang->bug->closedDate; -$config->bug->search['fields']['lastEditedDate'] = $lang->bug->lastEditedDateAB; +$config->bug->search['fields']['lastEditedDate'] = $lang->bug->abbr->lastEditedDate; $config->bug->search['fields']['deadline'] = $lang->bug->deadline; $config->bug->search['fields']['activatedDate'] = $lang->bug->activatedDate; diff --git a/module/bug/config/table.php b/module/bug/config/table.php index 9c2aed29d1..5a9f38cbbc 100644 --- a/module/bug/config/table.php +++ b/module/bug/config/table.php @@ -29,7 +29,7 @@ $config->bug->dtable->fieldList['pri']['title'] = $lang->bug->pri; $config->bug->dtable->fieldList['pri']['type'] = 'pri'; $config->bug->dtable->fieldList['status']['name'] = 'status'; -$config->bug->dtable->fieldList['status']['title'] = $lang->bug->statusAB; +$config->bug->dtable->fieldList['status']['title'] = $lang->bug->abbr->status; $config->bug->dtable->fieldList['status']['type'] = 'status'; $config->bug->dtable->fieldList['status']['statusMap'] = $lang->bug->statusList; @@ -54,12 +54,12 @@ $config->bug->dtable->fieldList['plan']['title'] = $lang->bug->plan; $config->bug->dtable->fieldList['plan']['width'] = 120; $config->bug->dtable->fieldList['openedBy']['name'] = 'openedBy'; -$config->bug->dtable->fieldList['openedBy']['title'] = $lang->bug->openedByAB; +$config->bug->dtable->fieldList['openedBy']['title'] = $lang->bug->abbr->openedBy; $config->bug->dtable->fieldList['openedBy']['type'] = 'user'; $config->bug->dtable->fieldList['openedBy']['userMap'] = array(); $config->bug->dtable->fieldList['openedDate']['name'] = 'openedDate'; -$config->bug->dtable->fieldList['openedDate']['title'] = $lang->bug->openedDateAB; +$config->bug->dtable->fieldList['openedDate']['title'] = $lang->bug->abbr->openedDate; $config->bug->dtable->fieldList['openedDate']['type'] = 'date'; $config->bug->dtable->fieldList['openedBuild']['name'] = 'openedBuild'; @@ -92,7 +92,7 @@ $config->bug->dtable->fieldList['resolution']['title'] = $lang->bug->resolution; $config->bug->dtable->fieldList['resolution']['type'] = 'category'; $config->bug->dtable->fieldList['resolvedDate']['name'] = 'assignedDate'; -$config->bug->dtable->fieldList['resolvedDate']['title'] = $lang->bug->resolvedDateAB; +$config->bug->dtable->fieldList['resolvedDate']['title'] = $lang->bug->abbr->resolvedDate; $config->bug->dtable->fieldList['resolvedDate']['type'] = 'date'; $config->bug->dtable->fieldList['resolvedBuild']['name'] = 'resolvedBuild'; @@ -100,7 +100,7 @@ $config->bug->dtable->fieldList['resolvedBuild']['title'] = $lang->bug->resolved $config->bug->dtable->fieldList['resolvedBuild']['type'] = 'text'; $config->bug->dtable->fieldList['activatedCount']['name'] = 'activatedCount'; -$config->bug->dtable->fieldList['activatedCount']['title'] = $lang->bug->activatedCountAB; +$config->bug->dtable->fieldList['activatedCount']['title'] = $lang->bug->abbr->activatedCount; $config->bug->dtable->fieldList['activatedCount']['type'] = 'count'; $config->bug->dtable->fieldList['activatedDate']['name'] = 'activatedDate'; @@ -151,7 +151,7 @@ $config->bug->dtable->fieldList['lastEditedBy']['title'] = $lang->bug->lastEdite $config->bug->dtable->fieldList['lastEditedBy']['type'] = 'user'; $config->bug->dtable->fieldList['lastEditedDate']['name'] = 'lastEditedDate'; -$config->bug->dtable->fieldList['lastEditedDate']['title'] = $lang->bug->lastEditedDateAB; +$config->bug->dtable->fieldList['lastEditedDate']['title'] = $lang->bug->abbr->lastEditedDate; $config->bug->dtable->fieldList['lastEditedDate']['type'] = 'date'; $config->bug->dtable->fieldList['actions']['name'] = 'actions'; @@ -185,12 +185,12 @@ $config->bug->linkBugs->dtable->fieldList['title']['minWidth'] = '200'; $config->bug->linkBugs->dtable->fieldList['title']['link'] = helper::createLink('bug', 'view', "bugID={id}"); $config->bug->linkBugs->dtable->fieldList['status']['name'] = 'status'; -$config->bug->linkBugs->dtable->fieldList['status']['title'] = $lang->bug->statusAB; +$config->bug->linkBugs->dtable->fieldList['status']['title'] = $lang->bug->abbr->status; $config->bug->linkBugs->dtable->fieldList['status']['type'] = 'status'; $config->bug->linkBugs->dtable->fieldList['status']['statusMap'] = $lang->bug->statusList; $config->bug->linkBugs->dtable->fieldList['openedBy']['name'] = 'openedBy'; -$config->bug->linkBugs->dtable->fieldList['openedBy']['title'] = $lang->bug->openedByAB; +$config->bug->linkBugs->dtable->fieldList['openedBy']['title'] = $lang->bug->abbr->openedBy; $config->bug->linkBugs->dtable->fieldList['openedBy']['type'] = 'user'; $config->bug->linkBugs->dtable->fieldList['assignedTo']['name'] = 'assignedTo'; diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 6afde932e6..452885f9ec 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -16,7 +16,6 @@ $lang->bug->product = $lang->productCommon; $lang->bug->branch = 'Branch/Platform'; $lang->bug->productplan = 'Plan'; $lang->bug->module = 'Modul'; -$lang->bug->moduleAB = 'Modul'; $lang->bug->project = $lang->projectCommon; $lang->bug->execution = $lang->execution->common; $lang->bug->kanban = 'Kanban'; @@ -26,7 +25,6 @@ $lang->bug->color = 'Farbe des Titels'; $lang->bug->task = 'Aufgabe'; $lang->bug->title = 'Titel'; $lang->bug->severity = 'Schwere(S)'; -$lang->bug->severityAB = 'S'; $lang->bug->pri = 'Priorität(P)'; $lang->bug->type = 'Typ'; $lang->bug->os = 'OS'; @@ -43,37 +41,27 @@ $lang->bug->issueKey = 'Sonarqube Issue Key'; $lang->bug->repoType = 'Repo Type'; $lang->bug->steps = 'Reproduktionsschritte'; $lang->bug->status = 'Status'; -$lang->bug->statusAB = 'Status'; $lang->bug->subStatus = 'Sub Status'; $lang->bug->activatedCount = 'Aktiv'; -$lang->bug->activatedCountAB = 'Aktiv'; $lang->bug->activatedDate = 'Aktiv seit'; $lang->bug->confirmed = 'Bestätigt'; -$lang->bug->confirmedAB = 'C'; $lang->bug->toTask = 'In Aufgabe konvertieren'; $lang->bug->toStory = 'In Story konvertieren'; $lang->bug->feedbackBy = 'Discovered by'; $lang->bug->notifyEmail = 'Discoverer Email'; $lang->bug->mailto = 'Mail an'; $lang->bug->openedBy = 'Ersteller'; -$lang->bug->openedByAB = 'Reporter'; $lang->bug->openedDate = 'Erstellt am'; -$lang->bug->openedDateAB = 'Erstellt'; $lang->bug->openedBuild = 'Offenes Build'; $lang->bug->assignedTo = 'An'; $lang->bug->assignedToMe = 'AssignToMe'; $lang->bug->assignBug = 'Zugewisen an'; -$lang->bug->assignedToAB = 'An'; $lang->bug->assignedDate = 'Zugewisen am'; $lang->bug->resolvedBy = 'Gelöst'; -$lang->bug->resolvedByAB = 'Gelöst'; $lang->bug->resolution = 'Lösung'; -$lang->bug->resolutionAB = 'Lösung'; $lang->bug->resolvedBuild = 'Lösungs Build'; $lang->bug->resolvedDate = 'Gelöst am'; -$lang->bug->resolvedDateAB = 'Gelöst'; $lang->bug->deadline = 'Fällig am'; -$lang->bug->deadlineAB = 'Fällig'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Geschlossen von'; $lang->bug->closedDate = 'Geschlossen am'; @@ -87,8 +75,6 @@ $lang->bug->caseVersion = 'Fall Version'; $lang->bug->testtask = 'Request'; $lang->bug->files = 'Datei'; $lang->bug->keywords = 'Tags'; -$lang->bug->lastEditedByAB = 'Bearbeitet von'; -$lang->bug->lastEditedDateAB = 'Bearbeitet am'; $lang->bug->lastEditedDate = 'Bearbeitet am'; $lang->bug->fromCase = 'Von Fall'; $lang->bug->toCase = 'Zu Fall'; @@ -100,6 +86,25 @@ $lang->bug->nextStep = 'Next Step'; $lang->bug->noProject = "Haven’t chosen a {$lang->projectCommon} yet."; $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.'; +$lang->bug->abbr = new stdclass(); +$lang->bug->abbr->module = 'Modul'; +$lang->bug->abbr->severity = 'S'; +$lang->bug->abbr->status = 'Status'; +$lang->bug->abbr->activatedCount = 'Aktiv'; +$lang->bug->abbr->confirmed = 'C'; +$lang->bug->abbr->openedBy = 'Reporter'; +$lang->bug->abbr->openedDate = 'Erstellt'; +$lang->bug->abbr->assignedTo = 'An'; +$lang->bug->abbr->resolvedBy = 'Gelöst'; +$lang->bug->abbr->resolution = 'Lösung'; +$lang->bug->abbr->resolvedDate = 'Gelöst'; +$lang->bug->abbr->deadline = 'Fällig'; +$lang->bug->abbr->lastEditedBy = 'Bearbeitet von'; +$lang->bug->abbr->lastEditedDate = 'Bearbeitet am'; +$lang->bug->abbr->assignToMe = 'Mir zugeordnet'; +$lang->bug->abbr->openedByMe = 'Von mir erstellt'; +$lang->bug->abbr->resolvedByMe = 'Von mir gelöst'; + /* Method list. */ $lang->bug->index = 'Home'; $lang->bug->create = 'Bug erstellen'; @@ -161,10 +166,6 @@ $lang->bug->yesterdayResolved = 'Gestern gelöst '; $lang->bug->yesterdayConfirmed = 'Gestern bestätigt '; $lang->bug->yesterdayClosed = 'Gestern geschlossen '; -$lang->bug->assignToMeAB = 'Mir zugeordnet'; -$lang->bug->openedByMeAB = 'Von mir erstellt'; -$lang->bug->resolvedByMeAB = 'Von mir gelöst'; - $lang->bug->ditto = 'Dito'; $lang->bug->dittoNotice = "This bug is not linked to the same {$lang->productCommon} as the last one is!"; $lang->bug->noAssigned = 'Zuweisen'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index ffd2a268d8..7f5431e1e8 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -16,7 +16,6 @@ $lang->bug->product = $lang->productCommon; $lang->bug->branch = 'Branch/Platform'; $lang->bug->productplan = 'Plan'; $lang->bug->module = 'Module'; -$lang->bug->moduleAB = 'Module'; $lang->bug->project = $lang->projectCommon; $lang->bug->execution = $lang->execution->common; $lang->bug->kanban = 'Kanban'; @@ -26,7 +25,6 @@ $lang->bug->color = 'Color'; $lang->bug->task = 'Task'; $lang->bug->title = 'Title'; $lang->bug->severity = 'Severity'; -$lang->bug->severityAB = 'S'; $lang->bug->pri = 'Priority'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; @@ -43,37 +41,27 @@ $lang->bug->issueKey = 'Sonarqube Issue Key'; $lang->bug->repoType = 'Repo Type'; $lang->bug->steps = 'Repro Steps'; $lang->bug->status = 'Status'; -$lang->bug->statusAB = 'Status'; $lang->bug->subStatus = 'Sub Status'; $lang->bug->activatedCount = 'Activation'; -$lang->bug->activatedCountAB = 'Active'; $lang->bug->activatedDate = 'ActivatedDate'; $lang->bug->confirmed = 'Confirmed'; -$lang->bug->confirmedAB = 'C'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->feedbackBy = 'Discovered by'; $lang->bug->notifyEmail = 'Discoverer Email'; $lang->bug->mailto = 'Mailto'; $lang->bug->openedBy = 'ReportedBy'; -$lang->bug->openedByAB = 'Reporter'; $lang->bug->openedDate = 'ReportedDate'; -$lang->bug->openedDateAB = 'Reported'; $lang->bug->openedBuild = 'Open Build'; $lang->bug->assignedTo = 'AssignTo'; $lang->bug->assignedToMe = 'AssignToMe'; $lang->bug->assignBug = 'AssignedTo'; -$lang->bug->assignedToAB = 'AssignedTo'; $lang->bug->assignedDate = 'AssignedDate'; $lang->bug->resolvedBy = 'ResolvedBy'; -$lang->bug->resolvedByAB = 'ResolvedBy'; $lang->bug->resolution = 'Resolution'; -$lang->bug->resolutionAB = 'Resolution'; $lang->bug->resolvedBuild = 'Build'; $lang->bug->resolvedDate = 'Resolved'; -$lang->bug->resolvedDateAB = 'Resolved'; $lang->bug->deadline = 'Deadline'; -$lang->bug->deadlineAB = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'ClosedBy'; $lang->bug->closedDate = 'ClosedDate'; @@ -87,8 +75,6 @@ $lang->bug->caseVersion = 'Case Version'; $lang->bug->testtask = 'Request'; $lang->bug->files = 'Files'; $lang->bug->keywords = 'Tags'; -$lang->bug->lastEditedByAB = 'EditedBy'; -$lang->bug->lastEditedDateAB = 'EditedDate'; $lang->bug->lastEditedDate = 'EditedDate'; $lang->bug->fromCase = 'From Case'; $lang->bug->toCase = 'To Case'; @@ -100,6 +86,25 @@ $lang->bug->nextStep = 'Next Step'; $lang->bug->noProject = "Haven’t chosen a {$lang->projectCommon} yet."; $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.'; +$lang->bug->abbr = new stdclass(); +$lang->bug->abbr->module = 'Module'; +$lang->bug->abbr->severity = 'S'; +$lang->bug->abbr->status = 'Status'; +$lang->bug->abbr->activatedCount = 'Active'; +$lang->bug->abbr->confirmed = 'C'; +$lang->bug->abbr->openedBy = 'Reporter'; +$lang->bug->abbr->openedDate = 'Reported'; +$lang->bug->abbr->assignedTo = 'AssignedTo'; +$lang->bug->abbr->resolvedBy = 'ResolvedBy'; +$lang->bug->abbr->resolution = 'Resolution'; +$lang->bug->abbr->resolvedDate = 'Resolved'; +$lang->bug->abbr->deadline = 'Deadline'; +$lang->bug->abbr->lastEditedBy = 'EditedBy'; +$lang->bug->abbr->lastEditedDate = 'EditedDate'; +$lang->bug->abbr->assignToMe = 'AssignedToMe'; +$lang->bug->abbr->openedByMe = 'ReportedByMe'; +$lang->bug->abbr->resolvedByMe = 'ResolvedByMe'; + /* Method list. */ $lang->bug->index = 'Bug Home'; $lang->bug->create = 'Report Bug'; @@ -161,10 +166,6 @@ $lang->bug->yesterdayResolved = 'Bug Resolved Yesterday '; $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday '; $lang->bug->yesterdayClosed = 'Bug Closed Yesterday '; -$lang->bug->assignToMeAB = 'AssignedToMe'; -$lang->bug->openedByMeAB = 'ReportedByMe'; -$lang->bug->resolvedByMeAB = 'ResolvedByMe'; - $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = "This bug is not linked to the same {$lang->productCommon} as the last one is!"; $lang->bug->noAssigned = 'Unassigned'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 9389d62a89..2a6c11083b 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -16,7 +16,6 @@ $lang->bug->product = $lang->productCommon; $lang->bug->branch = 'Branche/Plateforme'; $lang->bug->productplan = 'Plan'; $lang->bug->module = 'Module'; -$lang->bug->moduleAB = 'Module'; $lang->bug->project = $lang->projectCommon; $lang->bug->execution = $lang->execution->common; $lang->bug->kanban = 'Kanban'; @@ -26,7 +25,6 @@ $lang->bug->color = 'Couleur'; $lang->bug->task = 'Tâche'; $lang->bug->title = 'Titre'; $lang->bug->severity = 'Sévérité'; -$lang->bug->severityAB = 'S'; $lang->bug->pri = 'Priorité'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; @@ -43,37 +41,27 @@ $lang->bug->issueKey = 'Sonarqube Issue Key'; $lang->bug->repoType = 'Repo Type'; $lang->bug->steps = 'Repro Steps'; $lang->bug->status = 'Statut'; -$lang->bug->statusAB = 'Statut'; $lang->bug->subStatus = 'Sous-Statut'; $lang->bug->activatedCount = 'Heures Activation'; -$lang->bug->activatedCountAB = 'Actif'; $lang->bug->activatedDate = 'Date Activation'; $lang->bug->confirmed = 'Confirmé'; -$lang->bug->confirmedAB = 'C'; $lang->bug->toTask = 'Convertir en Tâche'; $lang->bug->toStory = 'Convertir en Story'; $lang->bug->feedbackBy = 'Discovered by'; $lang->bug->notifyEmail = 'Discoverer Email'; $lang->bug->mailto = 'Mailto'; $lang->bug->openedBy = 'Signalé par'; -$lang->bug->openedByAB = 'Détecteur'; $lang->bug->openedDate = 'Date signalement'; -$lang->bug->openedDateAB = 'Signalé'; $lang->bug->openedBuild = 'Build ouverts'; $lang->bug->assignedTo = 'Bugs qui me sont affectés'; $lang->bug->assignedToMe = 'AssignToMe'; $lang->bug->assignBug = 'Affecter à'; -$lang->bug->assignedToAB = 'Affecté à'; $lang->bug->assignedDate = 'Date affectation'; $lang->bug->resolvedBy = 'Résolus par moi'; -$lang->bug->resolvedByAB = 'Résolu par'; $lang->bug->resolution = 'Résolution'; -$lang->bug->resolutionAB = 'Résolution'; $lang->bug->resolvedBuild = 'Build'; $lang->bug->resolvedDate = 'Date Correction'; -$lang->bug->resolvedDateAB = 'Date Correction'; $lang->bug->deadline = 'Date Butoir'; -$lang->bug->deadlineAB = 'Butoir'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Fermé par'; $lang->bug->closedDate = 'Date Fermeture'; @@ -87,8 +75,6 @@ $lang->bug->caseVersion = 'Version CasTest'; $lang->bug->testtask = 'Campagne'; $lang->bug->files = 'Fichiers'; $lang->bug->keywords = 'Tags'; -$lang->bug->lastEditedByAB = 'Edité par'; -$lang->bug->lastEditedDateAB = 'Date Modif'; $lang->bug->lastEditedDate = 'Date Modif'; $lang->bug->fromCase = 'du CasTest'; $lang->bug->toCase = 'vers CasTest'; @@ -100,6 +86,25 @@ $lang->bug->nextStep = 'Next Step'; $lang->bug->noProject = "Haven’t chosen a {$lang->projectCommon} yet."; $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.'; +$lang->bug->abbr = new stdclass(); +$lang->bug->abbr->module = 'Module'; +$lang->bug->abbr->severity = 'S'; +$lang->bug->abbr->status = 'Statut'; +$lang->bug->abbr->activatedCount = 'Actif'; +$lang->bug->abbr->confirmed = 'C'; +$lang->bug->abbr->openedBy = 'Détecteur'; +$lang->bug->abbr->openedDate = 'Signalé'; +$lang->bug->abbr->assignedTo = 'Affecté à'; +$lang->bug->abbr->resolvedBy = 'Résolu par'; +$lang->bug->abbr->resolution = 'Résolution'; +$lang->bug->abbr->resolvedDate = 'Date Correction'; +$lang->bug->abbr->deadline = 'Butoir'; +$lang->bug->abbr->lastEditedBy = 'Edité par'; +$lang->bug->abbr->lastEditedDate = 'Date Modif'; +$lang->bug->abbr->assignToMe = 'Affectés à Moi'; +$lang->bug->abbr->openedByMe = 'Signalés par Moi'; +$lang->bug->abbr->resolvedByMe = 'Résolus par Moi'; + /* Method list. */ $lang->bug->index = 'Accueil Bug'; $lang->bug->create = 'Signaler un Bug'; @@ -161,10 +166,6 @@ $lang->bug->yesterdayResolved = 'Bugs Résolus Hier '; $lang->bug->yesterdayConfirmed = 'Bugs Confirmés Hier '; $lang->bug->yesterdayClosed = 'Bugs Fermés Hier '; -$lang->bug->assignToMeAB = 'Affectés à Moi'; -$lang->bug->openedByMeAB = 'Signalés par Moi'; -$lang->bug->resolvedByMeAB = 'Résolus par Moi'; - $lang->bug->ditto = 'Idem'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; $lang->bug->noAssigned = 'Non affectés'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 01c2f6879a..36624db674 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -16,7 +16,6 @@ $lang->bug->product = $lang->productCommon; $lang->bug->branch = 'Branch/Platform'; $lang->bug->productplan = 'Kế hoạch'; $lang->bug->module = 'Module'; -$lang->bug->moduleAB = 'Module'; $lang->bug->project = 'Project'; $lang->bug->execution = $lang->execution->common; $lang->bug->story = 'Câu chuyện'; @@ -25,41 +24,30 @@ $lang->bug->color = 'Màu'; $lang->bug->task = 'Nhiệm vụ'; $lang->bug->title = 'Tiêu đề'; $lang->bug->severity = 'Mức độ'; -$lang->bug->severityAB = 'S'; $lang->bug->pri = 'Ưu tiên'; $lang->bug->type = 'Loại'; $lang->bug->os = 'OS'; $lang->bug->browser = 'Browser'; $lang->bug->steps = 'Các bước Repro'; $lang->bug->status = 'Tình trạng'; -$lang->bug->statusAB = 'Tình trạng'; $lang->bug->subStatus = 'Tình trạng con'; $lang->bug->activatedCount = 'Số lần kích hoạt'; -$lang->bug->activatedCountAB = 'Kích hoạt'; $lang->bug->activatedDate = 'Ngày kích hoạt'; $lang->bug->confirmed = 'Đã xác nhận'; -$lang->bug->confirmedAB = 'C'; $lang->bug->toTask = 'Chuyển thành nhiệm vụ'; $lang->bug->toStory = 'Chuyển thành câu chuyện'; $lang->bug->mailto = 'Mail tới'; $lang->bug->openedBy = 'Người báo cáo'; -$lang->bug->openedByAB = 'Người báo cáo'; $lang->bug->openedDate = 'Ngày báo cáo'; -$lang->bug->openedDateAB = 'Đã báo cáo'; $lang->bug->openedBuild = 'Mở bản dựng'; $lang->bug->assignedTo = 'Giao cho'; $lang->bug->assignBug = 'Giao cho'; -$lang->bug->assignedToAB = 'Giao cho'; $lang->bug->assignedDate = 'Ngày giao'; $lang->bug->resolvedBy = 'Người giải quyết'; -$lang->bug->resolvedByAB = 'Người giải quyết'; $lang->bug->resolution = 'Giải pháp'; -$lang->bug->resolutionAB = 'Giải pháp'; $lang->bug->resolvedBuild = 'Bản dựng'; $lang->bug->resolvedDate = 'Ngày giải quyết'; -$lang->bug->resolvedDateAB = 'Ngày giải quyết'; $lang->bug->deadline = 'Hạn chót'; -$lang->bug->deadlineAB = 'Hạn chót'; $lang->bug->plan = 'Kế hoạch'; $lang->bug->closedBy = 'Người đóng'; $lang->bug->closedDate = 'Ngày đóng'; @@ -73,14 +61,31 @@ $lang->bug->caseVersion = 'Phiên bản tình huống'; $lang->bug->testtask = 'Yêu cầu'; $lang->bug->files = 'Files'; $lang->bug->keywords = 'Tags'; -$lang->bug->lastEditedByAB = 'Người sửa'; -$lang->bug->lastEditedDateAB = 'Ngày sửa'; $lang->bug->lastEditedDate = 'Ngày sửa'; $lang->bug->fromCase = 'Từ tình huống'; $lang->bug->toCase = 'Tới tình huống'; $lang->bug->colorTag = 'Màu'; $lang->bug->fixedRate = 'Repair Rate'; +$lang->bug->abbr = new stdclass(); +$lang->bug->abbr->module = 'Module'; +$lang->bug->abbr->severity = 'S'; +$lang->bug->abbr->status = 'Tình trạng'; +$lang->bug->abbr->activatedCount = 'Kích hoạt'; +$lang->bug->abbr->confirmed = 'C'; +$lang->bug->abbr->openedBy = 'Người báo cáo'; +$lang->bug->abbr->openedDate = 'Đã báo cáo'; +$lang->bug->abbr->assignedTo = 'Giao cho'; +$lang->bug->abbr->resolvedBy = 'Người giải quyết'; +$lang->bug->abbr->resolution = 'Giải pháp'; +$lang->bug->abbr->resolvedDate = 'Ngày giải quyết'; +$lang->bug->abbr->deadline = 'Hạn chót'; +$lang->bug->abbr->lastEditedBy = 'Người sửa'; +$lang->bug->abbr->lastEditedDate = 'Ngày sửa'; +$lang->bug->abbr->assignToMe = 'Giao cho bạn'; +$lang->bug->abbr->openedByMe = 'Báo cáo bởi bạn'; +$lang->bug->abbr->resolvedByMe = 'Giải quyêt bởi bạn'; + /* Method list. */ $lang->bug->index = 'Trang Bug'; $lang->bug->create = 'Báo cáo Bug'; @@ -140,10 +145,6 @@ $lang->bug->yesterdayResolved = 'Giải quyết hôm qua '; $lang->bug->yesterdayConfirmed = 'Xác nhận hôm qua '; $lang->bug->yesterdayClosed = 'Đóng hôm qua '; -$lang->bug->assignToMeAB = 'Giao cho bạn'; -$lang->bug->openedByMeAB = 'Báo cáo bởi bạn'; -$lang->bug->resolvedByMeAB = 'Giải quyêt bởi bạn'; - $lang->bug->ditto = 'Như trên'; $lang->bug->dittoNotice = 'Bug này chưa được liên kết tới cùng sản phẩm bởi bởi vì nó là cuối cùng!'; $lang->bug->noAssigned = 'Chưa giao'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 44ced000dd..361a229bea 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -16,7 +16,6 @@ $lang->bug->product = '所属' . $lang->productCommon; $lang->bug->branch = '平台/分支'; $lang->bug->productplan = '所属' . '计划'; $lang->bug->module = '所属模块'; -$lang->bug->moduleAB = '模块'; $lang->bug->project = '所属' . $lang->projectCommon; $lang->bug->execution = '所属' . $lang->execution->common; $lang->bug->kanban = '所属看板'; @@ -26,7 +25,6 @@ $lang->bug->color = '标题颜色'; $lang->bug->task = '相关任务'; $lang->bug->title = 'Bug标题'; $lang->bug->severity = '严重程度'; -$lang->bug->severityAB = '级别'; $lang->bug->pri = '优先级'; $lang->bug->type = 'Bug类型'; $lang->bug->os = '操作系统'; @@ -43,38 +41,27 @@ $lang->bug->issueKey = 'Sonarqube问题键值'; $lang->bug->repoType = '版本库类型'; $lang->bug->steps = '重现步骤'; $lang->bug->status = 'Bug状态'; -$lang->bug->statusAB = '状态'; $lang->bug->subStatus = '子状态'; $lang->bug->activatedCount = '激活次数'; -$lang->bug->activatedCountAB = '激活次数'; $lang->bug->activatedDate = '激活日期'; $lang->bug->confirmed = '是否确认'; -$lang->bug->confirmedAB = '确认'; $lang->bug->toTask = '转任务'; $lang->bug->toStory = "转{$lang->SRCommon}"; $lang->bug->feedbackBy = '反馈者'; $lang->bug->notifyEmail = '通知邮箱'; $lang->bug->mailto = '抄送给'; $lang->bug->openedBy = '由谁创建'; -$lang->bug->openedByAB = '创建者'; $lang->bug->openedDate = '创建日期'; -$lang->bug->openedDateAB = '创建日期'; $lang->bug->openedBuild = '影响版本'; $lang->bug->assignedTo = '指派给'; $lang->bug->assignedToMe = '指派给我'; -$lang->bug->assignBug = '指派给'; -$lang->bug->assignedToAB = '指派给'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解决者'; -$lang->bug->resolvedByAB = '解决'; $lang->bug->resolution = '解决方案'; -$lang->bug->resolutionAB = '方案'; $lang->bug->resolvedBuild = '解决版本'; $lang->bug->resolvedDate = '解决日期'; -$lang->bug->resolvedDateAB = '解决日期'; $lang->bug->deadline = '截止日期'; -$lang->bug->deadlineAB = '截止'; -$lang->bug->plan = '所属' . '计划'; +$lang->bug->plan = '所属计划'; $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; $lang->bug->duplicateBug = '重复Bug'; @@ -87,8 +74,6 @@ $lang->bug->caseVersion = '用例版本'; $lang->bug->testtask = '测试单'; $lang->bug->files = '附件'; $lang->bug->keywords = '关键词'; -$lang->bug->lastEditedByAB = '修改者'; -$lang->bug->lastEditedDateAB = '修改日期'; $lang->bug->lastEditedDate = '修改日期'; $lang->bug->fromCase = '来源用例'; $lang->bug->toCase = '生成用例'; @@ -100,6 +85,25 @@ $lang->bug->nextStep = '下一步'; $lang->bug->noProject = "还没有选择{$lang->projectCommon}!"; $lang->bug->noExecution = "还没有选择{$lang->execution->common}!"; +$lang->bug->abbr = new stdclass(); +$lang->bug->abbr->module = '模块'; +$lang->bug->abbr->severity = '级别'; +$lang->bug->abbr->status = '状态'; +$lang->bug->abbr->activatedCount = '激活次数'; +$lang->bug->abbr->confirmed = '确认'; +$lang->bug->abbr->openedBy = '创建者'; +$lang->bug->abbr->openedDate = '创建日期'; +$lang->bug->abbr->assignedTo = '指派给'; +$lang->bug->abbr->resolvedBy = '解决'; +$lang->bug->abbr->resolution = '方案'; +$lang->bug->abbr->resolvedDate = '解决日期'; +$lang->bug->abbr->deadline = '截止'; +$lang->bug->abbr->lastEditedBy = '修改者'; +$lang->bug->abbr->lastEditedDate = '修改日期'; +$lang->bug->abbr->assignToMe = '指派给我'; +$lang->bug->abbr->openedByMe = '由我创建'; +$lang->bug->abbr->resolvedByMe = '由我解决'; + /* 方法列表。*/ $lang->bug->index = '首页'; $lang->bug->create = '提Bug'; @@ -161,10 +165,6 @@ $lang->bug->yesterdayResolved = '昨天解决Bug数'; $lang->bug->yesterdayConfirmed = '昨天确认'; $lang->bug->yesterdayClosed = '昨天关闭'; -$lang->bug->assignToMeAB = '指派给我'; -$lang->bug->openedByMeAB = '由我创建'; -$lang->bug->resolvedByMeAB = '由我解决'; - $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = "该bug与上一bug不属于同一{$lang->productCommon}!"; $lang->bug->noAssigned = '未指派'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 7e2bd0ce0d..bc63b67ca9 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -16,7 +16,6 @@ $lang->bug->product = '所屬' . $lang->productCommon; $lang->bug->branch = '分支/平台'; $lang->bug->productplan = '所屬' . '計劃'; $lang->bug->module = '所屬模組'; -$lang->bug->moduleAB = '模組'; $lang->bug->project = '所屬項目'; $lang->bug->execution = '所屬' . $lang->execution->common; $lang->bug->story = "相關需求"; @@ -25,7 +24,6 @@ $lang->bug->color = '標題顏色'; $lang->bug->task = '相關任務'; $lang->bug->title = 'Bug標題'; $lang->bug->severity = '嚴重程度'; -$lang->bug->severityAB = '級別'; $lang->bug->pri = '優先順序'; $lang->bug->type = 'Bug類型'; $lang->bug->os = '操作系統'; @@ -39,36 +37,26 @@ $lang->bug->v2 = '版本2'; $lang->bug->repoType = '版本庫類型'; $lang->bug->steps = '重現步驟'; $lang->bug->status = 'Bug狀態'; -$lang->bug->statusAB = '狀態'; $lang->bug->subStatus = '子狀態'; $lang->bug->activatedCount = '激活次數'; -$lang->bug->activatedCountAB = '激活次數'; $lang->bug->activatedDate = '激活日期'; $lang->bug->confirmed = '是否確認'; -$lang->bug->confirmedAB = '確認'; $lang->bug->toTask = '轉任務'; $lang->bug->toStory = "轉{$lang->SRCommon}"; $lang->bug->feedbackBy = '反饋者'; $lang->bug->notifyEmail = '通知郵箱'; $lang->bug->mailto = '抄送給'; $lang->bug->openedBy = '由誰創建'; -$lang->bug->openedByAB = '創建者'; $lang->bug->openedDate = '創建日期'; -$lang->bug->openedDateAB = '創建日期'; $lang->bug->openedBuild = '影響版本'; $lang->bug->assignedTo = '指派給'; $lang->bug->assignBug = '指派給'; -$lang->bug->assignedToAB = '指派給'; $lang->bug->assignedDate = '指派日期'; $lang->bug->resolvedBy = '解決者'; -$lang->bug->resolvedByAB = '解決'; $lang->bug->resolution = '解決方案'; -$lang->bug->resolutionAB = '方案'; $lang->bug->resolvedBuild = '解決版本'; $lang->bug->resolvedDate = '解決日期'; -$lang->bug->resolvedDateAB = '解決日期'; $lang->bug->deadline = '截止日期'; -$lang->bug->deadlineAB = '截止'; $lang->bug->plan = '所屬' . '計劃'; $lang->bug->closedBy = '由誰關閉'; $lang->bug->closedDate = '關閉日期'; @@ -82,8 +70,6 @@ $lang->bug->caseVersion = '用例版本'; $lang->bug->testtask = '測試單'; $lang->bug->files = '附件'; $lang->bug->keywords = '關鍵詞'; -$lang->bug->lastEditedByAB = '修改者'; -$lang->bug->lastEditedDateAB = '修改日期'; $lang->bug->lastEditedDate = '修改日期'; $lang->bug->fromCase = '來源用例'; $lang->bug->toCase = '生成用例'; @@ -150,10 +136,6 @@ $lang->bug->yesterdayResolved = '昨天解決Bug數'; $lang->bug->yesterdayConfirmed = '昨天確認'; $lang->bug->yesterdayClosed = '昨天關閉'; -$lang->bug->assignToMeAB = '指派給我'; -$lang->bug->openedByMeAB = '由我創建'; -$lang->bug->resolvedByMeAB = '由我解決'; - $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品!'; $lang->bug->noAssigned = '未指派'; diff --git a/module/bug/model.php b/module/bug/model.php index 0f54135b8f..440d280020 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2460,13 +2460,13 @@ class bugModel extends model if($this->app->tab == 'execution') $copyParams .= ',executionID={execution}'; $actions = array(); - $actions['confirm'] = array('icon' => 'ok', 'text' => $this->lang->bug->confirmedAB, 'url' => helper::createLink('bug', 'confirm', $defaultParams), 'data-toggle' => 'modal'); - $actions['assignTo'] = array('icon' => 'hand-right', 'text' => $this->lang->bug->assignTo, 'url' => helper::createLink('bug', 'assignTo', $defaultParams), 'data-toggle' => 'modal'); - $actions['resolve'] = array('icon' => 'checked', 'text' => $this->lang->bug->resolve, 'url' => helper::createLink('bug', 'resolve', $defaultParams), 'data-toggle' => 'modal'); - $actions['close'] = array('icon' => 'off', 'text' => $this->lang->bug->close, 'url' => helper::createLink('bug', 'close', $defaultParams), 'data-toggle' => 'modal'); - $actions['activate'] = array('icon' => 'magic', 'text' => $this->lang->bug->activate, 'url' => helper::createLink('bug', 'activate', $defaultParams), 'data-toggle' => 'modal'); - $actions['edit'] = array('icon' => 'edit', 'text' => $this->lang->bug->edit, 'url' => helper::createLink('bug', 'edit', $defaultParams)); - $actions['copy'] = array('icon' => 'copy', 'text' => $this->lang->bug->copy, 'url' => helper::createLink('bug', 'create', $copyParams)); + $actions['confirm'] = array('icon' => 'ok', 'text' => $this->lang->bug->abbr->confirmed, 'url' => helper::createLink('bug', 'confirm', $defaultParams), 'data-toggle' => 'modal'); + $actions['assignTo'] = array('icon' => 'hand-right', 'text' => $this->lang->bug->assignTo, 'url' => helper::createLink('bug', 'assignTo', $defaultParams), 'data-toggle' => 'modal'); + $actions['resolve'] = array('icon' => 'checked', 'text' => $this->lang->bug->resolve, 'url' => helper::createLink('bug', 'resolve', $defaultParams), 'data-toggle' => 'modal'); + $actions['close'] = array('icon' => 'off', 'text' => $this->lang->bug->close, 'url' => helper::createLink('bug', 'close', $defaultParams), 'data-toggle' => 'modal'); + $actions['activate'] = array('icon' => 'magic', 'text' => $this->lang->bug->activate, 'url' => helper::createLink('bug', 'activate', $defaultParams), 'data-toggle' => 'modal'); + $actions['edit'] = array('icon' => 'edit', 'text' => $this->lang->bug->edit, 'url' => helper::createLink('bug', 'edit', $defaultParams)); + $actions['copy'] = array('icon' => 'copy', 'text' => $this->lang->bug->copy, 'url' => helper::createLink('bug', 'create', $copyParams)); foreach($actions as $action => $actionData) { diff --git a/module/bug/ui/browse.html.php b/module/bug/ui/browse.html.php index 44a6c48cb7..0bcd7c7dcc 100644 --- a/module/bug/ui/browse.html.php +++ b/module/bug/ui/browse.html.php @@ -128,7 +128,7 @@ $footToolbar = array('items' => array array('caret' => 'up', 'btnType' => 'primary', 'url' => '#navActions', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start'), )), array('caret' => 'up', 'text' => $lang->product->branchName[$this->session->currentProductType], 'className' => $this->session->currentProductType == 'normal' ? 'hidden' : '' , 'btnType' => 'primary', 'url' => '#navBranch', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start'), - array('caret' => 'up', 'text' => $lang->bug->moduleAB, 'btnType' => 'primary', 'url' => '#navModule', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start'), + array('caret' => 'up', 'text' => $lang->bug->abbr->module, 'btnType' => 'primary', 'url' => '#navModule', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start'), array('caret' => 'up', 'text' => $lang->bug->assignedTo, 'btnType' => 'primary', 'url' => '#navAssignedTo','data-toggle' => 'dropdown'), )); diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index b590236835..8f3c952039 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -64,8 +64,8 @@ '>bug->os;?> '>bug->browser;?> '>bug->keywords;?> - '>bug->resolvedByAB;?> - '>bug->resolutionAB;?> + '>bug->abbr->resolvedBy;?> + '>bug->abbr->resolution;?> bug->getFlowExtendFields(); foreach($extendFields as $extendField) echo "{$extendField->name}"; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 8b6dc2fe96..457c46829c 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -372,7 +372,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow type == 'normal' or $branch !== 'all')):?>
- + 6;?>