[TikiWiki-commits] [Git][tikiwiki/tiki][master] [TRA] Cypht: update error messages to use translation function

Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
11e274f0 by Steven Ngesera at 2025-11-12T12:02:42+00:00
[TRA] Cypht: update error messages to use translation function

- - - - -


4 changed files:

- lib/cypht/modules/tiki/calendar_modules.php
- lib/cypht/modules/tiki/functions.php
- lib/cypht/modules/tiki/general_modules.php
- lib/cypht/modules/tiki/tracker_modules.php


Changes:

=====================================
lib/cypht/modules/tiki/calendar_modules.php
=====================================
@@ -244,19 +244,19 @@ class Hm_Handler_add_to_calendar extends Hm_Handler_Module
 
         list($success, $form) = $this->process_form(['calendar_id']);
         if (! $success) {
-            Hm_Msgs::add("No calendar selected", "warning");
+            Hm_Msgs::add(tr("No calendar selected"), "warning");
             return;
         }
 
         $calendar = TikiLib::lib('calendar')->get_calendar($form['calendar_id']);
         if (! $calendar) {
-            Hm_Msgs::add("Selected calendar is unavailable", "danger");
+            Hm_Msgs::add(tr("Selected calendar is unavailable"), "danger");
             return;
         }
 
         $perms = Perms::get('calendar', $form['calendar_id']);
         if (! $perms->add_events) {
-            Hm_Msgs::add("Insufficient permissions to create the event in the selected calendar", "danger");
+            Hm_Msgs::add(tr("Insufficient permissions to create the event in the selected calendar"), "danger");
             return;
         }
 
@@ -306,13 +306,13 @@ class Hm_Handler_update_in_calendar extends Hm_Handler_Module
         $existing = TikiLib::lib('calendar')->find_by_uid(null, $data['uid']);
 
         if (! $existing) {
-            Hm_Msgs::add("Existing event could not be found in your calendar", "danger");
+            Hm_Msgs::add(tr("Existing event could not be found in your calendar"), "danger");
             return;
         }
 
         $perms = Perms::get('event', $existing['calitemId']);
         if (! $perms->change_events) {
-            Hm_Msgs::add("Insufficient permissions to update the event in the calendar", "danger");
+            Hm_Msgs::add(tr("Insufficient permissions to update the event in the calendar"), "danger");
             return;
         }
 


=====================================
lib/cypht/modules/tiki/functions.php
=====================================
@@ -26,13 +26,13 @@ if (! hm_exists('tiki_parse_message')) {
 
         $field = $trk->get_field_info($fieldId);
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
 
         $item = $trk->get_item_info($itemId);
         if (! $item) {
-            Hm_Msgs::add('Tracker item not found', 'danger');
+            Hm_Msgs::add(tr('Tracker item not found'), 'danger');
             return;
         }
         $item[$field['fieldId']] = $trk->get_item_value(null, $item['itemId'], $field['fieldId']);
@@ -41,7 +41,7 @@ if (! hm_exists('tiki_parse_message')) {
         $data = $handler->getFieldData();
 
         if (! isset($data['emails']) || ! is_array($data['emails'])) {
-            Hm_Msgs::add('Tracker field storage is broken or you are using the wrong field type', 'danger');
+            Hm_Msgs::add(tr('Tracker field storage is broken or you are using the wrong field type'), 'danger');
             return;
         }
 
@@ -66,12 +66,12 @@ if (! hm_exists('tiki_parse_message')) {
         }
 
         if (! $email) {
-            Hm_Msgs::add('Email not found in related tracker item', 'warning');
+            Hm_Msgs::add(tr('Email not found in related tracker item'), 'warning');
             return;
         }
 
         if (empty($email['message_raw'])) {
-            Hm_Msgs::add('Email could not be parsed', 'warning');
+            Hm_Msgs::add(tr('Email could not be parsed'), 'warning');
             return;
         }
 
@@ -312,7 +312,7 @@ if (! hm_exists('tiki_send_email_through_cypht')) {
         // smtp server details
         $smtp_details = Hm_SMTP_List::dump($smtp_id, true);
         if (! $smtp_details) {
-            Hm_Msgs::add('Could not use the configured SMTP server', 'danger');
+            Hm_Msgs::add(tr('Could not use the configured SMTP server'), 'danger');
             return false;
         }
 
@@ -328,7 +328,7 @@ if (! hm_exists('tiki_send_email_through_cypht')) {
         // try to connect
         $smtp = Hm_SMTP_List::connect($smtp_id, false);
         if (! $smtp->authed()) {
-            Hm_Msgs::add("Failed to authenticate to the SMTP server", "danger");
+            Hm_Msgs::add(tr("Failed to authenticate to the SMTP server"), "danger");
             return false;
         }
 
@@ -342,14 +342,14 @@ if (! hm_exists('tiki_send_email_through_cypht')) {
         // get smtp recipients
         $recipients = $mime->get_recipient_addresses();
         if (empty($recipients)) {
-            Hm_Msgs::add("No valid receipts found", "warning");
+            Hm_Msgs::add(tr("No valid receipts found"), "warning");
             return false;
         }
 
         // send the message
         $err_msg = $smtp->send_message($from, $recipients, $mime->get_mime_msg());
         if ($err_msg) {
-            Hm_Msgs::add(sprintf("%s", $err_msg, "danger"));
+            Hm_Msgs::add(sprintf("%s", $err_msg), "danger");
             return false;
         }
 


=====================================
lib/cypht/modules/tiki/general_modules.php
=====================================
@@ -81,7 +81,7 @@ class Hm_Handler_add_file_attachment extends Hm_Handler_Module
                 'size' => $tikifile->filesize
             ];
             if (! attach_file($tikifile->getContents(), $file, $this->config->get('attachment_dir'), $draft_id, $this)) {
-                Hm_Msgs::add('An error occurred attaching the file gallery file.', 'danger');
+                Hm_Msgs::add(tr('An error occurred attaching the file gallery file.'), 'danger');
             }
         }
     }


=====================================
lib/cypht/modules/tiki/tracker_modules.php
=====================================
@@ -110,7 +110,7 @@ class Hm_Handler_move_to_tracker extends Hm_Handler_Module
             $folder = hex2bin($matches[2]);
             $mailbox = Hm_IMAP_List::get_connected_mailbox($imap_server_id, $this->cache);
             if (! $mailbox->authed()) {
-                Hm_Msgs::add('Could not authenticate with mail server', 'danger');
+                Hm_Msgs::add(tr('Could not authenticate with mail server'), 'danger');
                 return;
             }
 
@@ -122,7 +122,7 @@ class Hm_Handler_move_to_tracker extends Hm_Handler_Module
         } elseif (preg_match("/^tracker_folder_/", $form['list_path'], $matches)) {
             $email = tiki_parse_message($form['list_path'], $msg_ids[0]);
             if (! $email) {
-                Hm_Msgs::add('Message could not be loaded', 'danger');
+                Hm_Msgs::add(tr('Message could not be loaded'), 'danger');
                 return;
             }
             if (isset($form['folder']) && $form['folder'] != 'archive') {
@@ -190,7 +190,7 @@ class Hm_Handler_move_to_tracker extends Hm_Handler_Module
                 bind_tracker_item_update_event($mailbox, $folder, $form, $ids);
             }
         } else {
-            Hm_Msgs::add('Message from this source could not be moved', 'danger');
+            Hm_Msgs::add(tr('Message from this source could not be moved'), 'danger');
             return;
         }
 
@@ -198,13 +198,13 @@ class Hm_Handler_move_to_tracker extends Hm_Handler_Module
         $item = $trk->get_item_info($form['tracker_item_id']);
 
         if (! $item) {
-            Hm_Msgs::add('Tracker item not found', 'danger');
+            Hm_Msgs::add(tr('Tracker item not found'), 'danger');
             return;
         }
 
         $field = $trk->get_field_info($form['tracker_field_id']);
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
 
@@ -239,12 +239,12 @@ class Hm_Handler_move_to_tracker extends Hm_Handler_Module
 
         $total_msg_ids = count($msg_ids);
         if ($errors > 0 && $errors < $total_msg_ids) {
-            Hm_Msgs::add('Some messages moved');
+            Hm_Msgs::add(tr('Some messages moved'));
         } elseif ($total_msg_ids == $errors) {
-            Hm_Msgs::add('Unable to move/copy selected messages', 'danger');
+            Hm_Msgs::add(tr('Unable to move/copy selected messages'), 'danger');
             return;
         } else {
-            Hm_Msgs::add('Messages moved');
+            Hm_Msgs::add(tr('Messages moved'));
         }
     }
 }
@@ -351,12 +351,12 @@ class Hm_Handler_tiki_save_sent extends Hm_Handler_Module
         $trk = TikiLib::lib('trk');
         $item = $trk->get_item_info($itemId);
         if (! $item) {
-            Hm_Msgs::add('Tracker item not found', 'danger');
+            Hm_Msgs::add(tr('Tracker item not found'), 'danger');
             return;
         }
         $field = $trk->get_field_info($fieldId);
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
         $field['value'] = [
@@ -403,12 +403,12 @@ class Hm_Handler_tiki_delete_draft extends Hm_Handler_Module
         $trk = TikiLib::lib('trk');
         $item = $trk->get_item_info($itemId);
         if (! $item) {
-            Hm_Msgs::add('Could not delete the saved draft. (Tracker item was not found)', 'danger');
+            Hm_Msgs::add(tr('Could not delete the saved draft. (Tracker item was not found)'), 'danger');
             return;
         }
         $field = $trk->get_field_info($fieldId);
         if (! $field) {
-            Hm_Msgs::add('Could not delete the saved draft. (Tracker field not found)', 'danger');
+            Hm_Msgs::add(tr('Could not delete the saved draft. (Tracker field not found)'), 'danger');
             return;
         }
         $field['value'] = [
@@ -442,20 +442,20 @@ class Hm_Handler_tiki_presave_draft extends Hm_Handler_Module
 
             $item = $trk->get_item_info($itemId);
             if (! $item) {
-                Hm_Msgs::add('Could not save draft to tracker item because the item was not found. id: ' . $itemId, 'warning');
+                Hm_Msgs::add(tr('Could not save draft to tracker item because the item was not found. id: ') . $itemId, 'warning');
                 return;
             }
 
             $field = $trk->get_field_info($fieldId);
             if (! $field) {
-                Hm_Msgs::add('Could not save draft to tracker item because the field was not found.', 'warning');
+                Hm_Msgs::add(tr('Could not save draft to tracker item because the field was not found.'), 'warning');
                 return;
             }
 
             $fieldHandler = Tracker_Definition::get($item['trackerId'])->getFieldFactory()->getHandler($field);
 
             if (! $fieldHandler->getTrackerFieldInstance()->getOption('useFolders')) {
-                Hm_Msgs::add('Could not save draft to tracker item because folders are not configured for the current field.', 'warning');
+                Hm_Msgs::add(tr('Could not save draft to tracker item because folders are not configured for the current field.'), 'warning');
                 return;
             }
             $this->out('save_draft_to_imap', false);
@@ -486,18 +486,18 @@ class Hm_Handler_tiki_save_draft extends Hm_Handler_Module
         $trk = TikiLib::lib('trk');
         $item = $trk->get_item_info($itemId);
         if (! $item) {
-            Hm_Msgs::add('Tracker item not found', 'danger');
+            Hm_Msgs::add(tr('Tracker item not found'), 'danger');
             return;
         }
         $field = $trk->get_field_info($fieldId);
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
 
         $fieldHandler = Tracker_Definition::get($item['trackerId'])->getFieldFactory()->getHandler($field);
         if (! $fieldHandler->getTrackerFieldInstance()->getOption('useFolders')) {
-            Hm_Msgs::add('Configure folders for this tracker field to save drafts', 'danger');
+            Hm_Msgs::add(tr('Configure folders for this tracker field to save drafts'), 'danger');
             return;
         }
 
@@ -536,7 +536,7 @@ class Hm_Handler_tiki_save_draft extends Hm_Handler_Module
         ]);
 
         if ($this->request->post['draft_notice']) {
-            Hm_Msgs::add('Draft saved');
+            Hm_Msgs::add(tr('Draft saved'));
         }
     }
 }
@@ -558,7 +558,7 @@ class Hm_Handler_tiki_compose_from_draft extends Hm_Handler_Module
         $field = $trk->get_field_info($fieldId);
 
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
 
@@ -606,13 +606,13 @@ class Hm_Handler_tiki_archive_replied extends Hm_Handler_Module
         $trk = TikiLib::lib('trk');
         $item = $trk->get_item_info($itemId);
         if (! $item) {
-            Hm_Msgs::add('Tracker item not found', 'danger');
+            Hm_Msgs::add(tr('Tracker item not found'), 'danger');
             return;
         }
 
         $field = $trk->get_field_info($fieldId);
         if (! $field) {
-            Hm_Msgs::add('Tracker field not found', 'danger');
+            Hm_Msgs::add(tr('Tracker field not found'), 'danger');
             return;
         }
 
@@ -646,13 +646,13 @@ class Hm_Handler_tiki_delete_message extends Hm_Handler_Module
             $trk = TikiLib::lib('trk');
             $item = $trk->get_item_info($itemId);
             if (! $item) {
-                Hm_Msgs::add('Tracker item not found', 'danger');
+                Hm_Msgs::add(tr('Tracker item not found'), 'danger');
                 $this->out('delete_error', true);
                 return;
             }
             $field = $trk->get_field_info($fieldId);
             if (! $field) {
-                Hm_Msgs::add('Tracker field not found', 'danger');
+                Hm_Msgs::add(tr('Tracker field not found'), 'danger');
                 $this->out('delete_error', true);
                 return;
             }
@@ -662,7 +662,7 @@ class Hm_Handler_tiki_delete_message extends Hm_Handler_Module
             $trk->replace_item($item['trackerId'], $item['itemId'], [
                 'data' => [$field]
             ]);
-            Hm_Msgs::add('Message deleted');
+            Hm_Msgs::add(tr('Message deleted'));
             $this->out('delete_error', false);
         }
     }
@@ -689,13 +689,13 @@ class Hm_Handler_tiki_archive_message extends Hm_Handler_Module
             $trk = TikiLib::lib('trk');
             $item = $trk->get_item_info($itemId);
             if (! $item) {
-                Hm_Msgs::add('Tracker item not found', 'danger');
+                Hm_Msgs::add(tr('Tracker item not found'), 'danger');
                 $this->out('archive_error', true);
                 return;
             }
             $field = $trk->get_field_info($fieldId);
             if (! $field) {
-                Hm_Msgs::add('Tracker field not found', 'danger');
+                Hm_Msgs::add(tr('Tracker field not found'), 'danger');
                 $this->out('archive_error', true);
                 return;
             }
@@ -705,7 +705,7 @@ class Hm_Handler_tiki_archive_message extends Hm_Handler_Module
             $trk->replace_item($item['trackerId'], $item['itemId'], [
                 'data' => [$field]
             ]);
-            Hm_Msgs::add('Message archived');
+            Hm_Msgs::add(tr('Message archived'));
             $this->out('archive_error', false);
         }
     }
@@ -920,7 +920,7 @@ class Hm_Handler_tiki_download_message extends Hm_Handler_Module
                 echo $part->getContent();
                 Hm_Functions::cease();
             }
-            Hm_Msgs::add('An Error occurred trying to download the message', 'danger');
+            Hm_Msgs::add(tr('An Error occurred trying to download the message'), 'danger');
         }
     }
 }
@@ -951,11 +951,11 @@ class Hm_Handler_tiki_process_move extends Hm_Handler_Module
                 }
             }
             if ($moved == 0) {
-                Hm_Msgs::add('Unable to move/copy selected messages', 'danger');
+                Hm_Msgs::add(tr('Unable to move/copy selected messages'), 'danger');
             } elseif ($form['imap_move_action'] == 'move') {
-                Hm_Msgs::add($moved == 1 ? 'Message moved' : $moved . ' messages moved');
+                Hm_Msgs::add($moved == 1 ? tr('Message moved') : $moved . ' ' . tr('messages moved'));
             } else {
-                Hm_Msgs::add($moved == 1 ? 'Message copied' : $moved . ' messages copied');
+                Hm_Msgs::add($moved == 1 ? tr('Message copied') : $moved . ' ' . tr('messages copied'));
             }
             $this->out('move_count', $moved);
         }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/11e274f08df9a476e3af8b5a1b34b9e27b64adc2

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/11e274f08df9a476e3af8b5a1b34b9e27b64adc2
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs