From b35355c103e55884b20c638955cc819c5bd45d7c Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Fri, 19 Apr 2024 13:09:54 +0200 Subject: [PATCH] QuickBaseForm: Replace method `translate` with trait The trait provides translatePlural method. --- application/forms/CleanupNodeForm.php | 13 ++++++------- library/Businessprocess/Web/Form/QuickBaseForm.php | 12 +++--------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/application/forms/CleanupNodeForm.php b/application/forms/CleanupNodeForm.php index b4a7ad3d..6ce421a3 100644 --- a/application/forms/CleanupNodeForm.php +++ b/application/forms/CleanupNodeForm.php @@ -56,14 +56,13 @@ public function onSuccess() $changes->deleteNode($node); } - $count = count($nodesToCleanup); - if ($count === 1) { - $successMsg = sprintf($this->translate('Successfully removed missing node %s'), $nodeName); - } else { - $successMsg = sprintf($this->translate('Successfully removed %d missing nodes'), $count); - } - $this->setSuccessMessage($successMsg); + $count = count($nodesToCleanup); + $this->setSuccessMessage($this->translatePlural( + sprintf('Successfully removed missing node %s', $nodeName), + sprintf('Successfully removed %d missing nodes', $count), + $count + )); unset($changes); diff --git a/library/Businessprocess/Web/Form/QuickBaseForm.php b/library/Businessprocess/Web/Form/QuickBaseForm.php index 36d134fd..2eb0db85 100644 --- a/library/Businessprocess/Web/Form/QuickBaseForm.php +++ b/library/Businessprocess/Web/Form/QuickBaseForm.php @@ -5,10 +5,13 @@ use Icinga\Application\Icinga; use Icinga\Application\Modules\Module; use ipl\Html\ValidHtml; +use ipl\I18n\Translation; use Zend_Form; abstract class QuickBaseForm extends Zend_Form implements ValidHtml { + use Translation; + /** * The Icinga module this form belongs to. Usually only set if the * form is initialized through the FormLoader @@ -154,13 +157,4 @@ protected function valueIsEmpty($value) return strlen($value) === 0; } - - public function translate($string) - { - if ($this->icingaModuleName === null) { - return t($string); - } else { - return mt($this->icingaModuleName, $string); - } - } }