Merge pull request #732 from Project60/tsVariableStrings

Fix `ts()` calls with variable strings
Project60 · Aug 19, 2024 · 1aa047e · 1aa047e
2 parents 68a1f13 + 5f5eed6
commit 1aa047e
Show file tree

Hide file tree

Showing 3 changed files with 384 additions and 730 deletions.
diff --git a/CRM/Sepa/Logic/Format.php b/CRM/Sepa/Logic/Format.php
@@ -64,7 +64,7 @@ public static function loadFormatClass($fileFormatName) {
     if ($file && file_exists($file)) {
       require_once $file;
     } else {
-      throw new Exception(ts("Class format file '{$file}' not found."));
+      throw new Exception("Class format file '{$file}' not found.");
     }
     $format_class = 'CRM_Sepa_Logic_Format_'.$fileFormatName;
     return new $format_class($fileFormatName);

diff --git a/CRM/Sepa/Logic/Queue/Update.php b/CRM/Sepa/Logic/Queue/Update.php
@@ -98,13 +98,13 @@ protected function __construct($cmd, $mode, $creditor_id = NULL, $offset = NULL,
         break;
 
       case 'UPDATE':
-        $this->title = ts("Process {$this->mode} mandates (%1-%2)",
-          array(1 => $this->offset, 2 => $this->offset+$this->limit, 'domain' => 'org.project60.sepa'));
+        $this->title = ts("Process %1 mandates (%2-%3)",
+          array(1 => $this->mode, 2 => $this->offset, 3 => $this->offset+$this->limit, 'domain' => 'org.project60.sepa'));
         break;
 
       case 'CLEANUP':
-        $this->title = ts("Cleaning up {$this->mode} groups",
-          array(1 => $this->offset, 2 => $this->offset+$this->limit, 'domain' => 'org.project60.sepa'));
+        $this->title = ts("Cleaning up %1 groups",
+          array(1 => $this->mode, 'domain' => 'org.project60.sepa'));
         break;
 
       case 'FINISH':