From bf744e6810390756f6aa8218550d88658fdc05f9 Mon Sep 17 00:00:00 2001 From: loannis Date: Mon, 15 Nov 2021 08:15:57 +0200 Subject: [PATCH] Limit badge usage to suspended state only --- app/resources/locales/en_US/default.po | 13 ++----------- app/templates/Standard/index.php | 6 +++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/app/resources/locales/en_US/default.po b/app/resources/locales/en_US/default.po index f9047c138..65863da87 100644 --- a/app/resources/locales/en_US/default.po +++ b/app/resources/locales/en_US/default.po @@ -146,19 +146,13 @@ msgstr "{0,plural,=1{Pending Request} other{Pending Requests}}" msgid "match.en.ConfidenceModeEnum.C" msgstr "Canonical" -msgid "match.en.ConfidenceModeEnum.C.warn.level" -msgstr "Light" - msgid "match.en.ConfidenceModeEnum.P" msgstr "Potential" -msgid "match.en.ConfidenceModeEnum.P.warn.level" -msgstr "Light" - msgid "match.en.ConfidenceModeEnum.S" msgstr "Suspended" -msgid "match.en.ConfidenceModeEnum.S.warn.level" +msgid "match.en.ConfidenceModeEnum.S.badge" msgstr "Danger" msgid "match.en.PermissionEnum.A" @@ -206,13 +200,10 @@ msgstr "Substring" msgid "match.en.StatusEnum.A" msgstr "Active" -msgid "match.en.StatusEnum.A.warn.level" -msgstr "Light" - msgid "match.en.StatusEnum.S" msgstr "Suspended" -msgid "match.en.StatusEnum.S.warn.level" +msgid "match.en.StatusEnum.S.badge" msgstr "Danger" ### Error Messages diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index 854b791f5..801e49b36 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -187,11 +187,11 @@ function _column_key($modelsName, $c, $tz=null) { break; case 'enum': if($entity->$col) { - $warning_level = __('match.en.'.$cfg['class'].'.'.$entity->$col . '.warn.level'); + $badge_color_class = __('match.en.'.$cfg['class'].'.'.$entity->$col . '.badge'); $title = __('match.en.'.$cfg['class'].'.'.$entity->$col); - if(!empty($warning_level) && strpos($warning_level, '.warn.level') === false) { - print $this->Badge->badgeIt($title, $this->Badge->getBadgeColor($warning_level)); + if(!empty($badge_color_class) && strpos($badge_color_class, '.badge') === false) { + print $this->Badge->badgeIt($title, $this->Badge->getBadgeColor($badge_color_class)); } else { print $title; }