From db7d9edd07097e7fe597b6a64404e361d3abb9ba Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 30 Jun 2022 01:41:25 +0000 Subject: [PATCH 1/4] fixbug_lang --- module/bug/css/browse.css | 1 + module/common/lang/de.php | 2 +- module/product/lang/en.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index f28860922b..7a2518c139 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -34,3 +34,4 @@ body {margin-bottom: 25px;} .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.3);} .btn-group button.dropdown-toggle.btn-primary {padding:6px;} #bugForm tbody tr td .label {max-width: 100px; text-overflow: unset;} +[lang^='de'] th.c-confirmed {width: 100px !important;} diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 14e01b3443..2baf6cd3cf 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -353,7 +353,7 @@ $lang->setLang = 'Language Setting'; /* Theme style. */ $lang->theme = 'Theme'; -$lang->themes['default'] = 'ZenTao Blau (Standard)'; +$lang->themes['default'] = 'Standard'; $lang->themes['blue'] = 'Young Blue'; $lang->themes['green'] = 'Grün'; $lang->themes['red'] = 'Rot'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 5c30a03101..51e72a2513 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -208,7 +208,6 @@ $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; $lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; -$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['more'] = $lang->more; @@ -218,6 +217,7 @@ $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed; $lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed']; $lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe; +$lang->product->moreSelects['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe; $lang->product->moreSelects['activestory'] = $lang->product->activeStory; $lang->product->moreSelects['changedstory'] = $lang->product->changedStory; From c0a04777e5ceb3c8ce7f90a13570697fb8354983 Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 30 Jun 2022 01:55:33 +0000 Subject: [PATCH 2/4] fixbug_lang --- module/product/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 51e72a2513..ec8f1e6c14 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -207,7 +207,6 @@ $lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon; $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; -$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; $lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['more'] = $lang->more; @@ -216,6 +215,7 @@ $lang->product->featureBar['all']['all'] = $lang->product->allProduct; $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed; $lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed']; +$lang->product->moreSelects['openedbyme'] = $lang->product->openedByMe; $lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe; $lang->product->moreSelects['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe; From eb1d78fd117f02d91e8d2fd79c90039f1968ce69 Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 30 Jun 2022 06:45:58 +0000 Subject: [PATCH 3/4] fixbug_lang --- module/execution/lang/fr.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 2c882fcda4..637420a487 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -284,16 +284,19 @@ $lang->execution->taskKanban = 'Task Kanban'; $lang->execution->RDKanban = 'Research & Development Kanban'; /* Group browsing. */ -$lang->execution->allTasks = 'Voir Toutes'; +$lang->execution->allTasks = 'Toutes'; $lang->execution->assignedToMe = 'à Moi'; -$lang->execution->myInvolved = "Où j'ai participé"; -$lang->execution->assignedByMe = 'AssignedByMe'; +$lang->execution->myInvolved = "Ma part"; +$lang->execution->assignedByMe = 'Assignée par moi'; $lang->execution->statusSelects[''] = 'Plus...'; $lang->execution->statusSelects['wait'] = 'En Attente'; $lang->execution->statusSelects['doing'] = 'En Cours'; $lang->execution->statusSelects['undone'] = 'Non terminées'; +$lang->execution->statusSelects['myinvolved'] = $lang->execution->myInvolved; $lang->execution->statusSelects['finishedbyme'] = 'Terminées par moi'; +$lang->execution->statusSelects['assignedbyme'] = $lang->execution->assignedByMe; +$lang->execution->statusSelects['needconfirm'] = 'A confirmer'; $lang->execution->statusSelects['done'] = 'Faites'; $lang->execution->statusSelects['closed'] = 'Fermées'; $lang->execution->statusSelects['cancel'] = 'Annulées'; @@ -476,9 +479,6 @@ $lang->execution->typeList['kanban'] = 'Kanban'; $lang->execution->featureBar['task']['all'] = $lang->execution->allTasks; $lang->execution->featureBar['task']['unclosed'] = $lang->execution->unclosed; $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assignedToMe; -$lang->execution->featureBar['task']['myinvolved'] = $lang->execution->myInvolved; -$lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe; -$lang->execution->featureBar['task']['needconfirm'] = 'A confirmer'; $lang->execution->featureBar['task']['status'] = $lang->execution->statusSelects['']; $lang->execution->featureBar['all']['all'] = $lang->execution->all; From 6f72eb53cedaf55a79bbdcb19a68ccc69d63265a Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 30 Jun 2022 06:51:28 +0000 Subject: [PATCH 4/4] fixbug_lang --- module/bug/lang/fr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 68341def99..e04e481637 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -425,7 +425,6 @@ $lang->bug->placeholder->newBuildName = 'Nom Nouv Build'; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; -$lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe; $lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe; $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe; @@ -433,6 +432,7 @@ $lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved; $lang->bug->featureBar['browse']['more'] = $lang->more; $lang->bug->moreSelects['assignedbyme'] = $lang->bug->assignedByMe; +$lang->bug->moreSelects['openedbyme'] = $lang->bug->openedByMe; $lang->bug->moreSelects['unconfirmed'] = $lang->bug->unconfirmed; $lang->bug->moreSelects['assigntonull'] = $lang->bug->assignToNull; $lang->bug->moreSelects['longlifebugs'] = $lang->bug->longLifeBugs;