QuickBaseForm: Replace method translate with trait

The trait provides translatePlural method.
Icinga · Apr 19, 2024 · 8082f7d · 8082f7d
1 parent d85fdd7
commit 8082f7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/application/forms/CleanupNodeForm.php b/application/forms/CleanupNodeForm.php
@@ -56,14 +56,14 @@ 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(
+            'Successfully removed missing node %s',
+            'Successfully removed %d missing nodes',
+            $count,
+            $count > 1 ? $count : $nodeName
+        ));
 
         unset($changes);
 

diff --git 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);
-        }
-    }
 }