Merge pull request #1539 from Shadow243/fixed-buttons-misalignments-and-msg-errors

kroky · web-flow · commit 577cf3af2a9f · 2025-06-09T12:07:05.000+03:00
Fixed buttons misalignments and msg errors
diff --git a/language/az.php b/language/az.php
@@ -411,7 +411,7 @@
     'Added SMTP server!' => 'SMTP server əlavə edilmişdir!',
     'Added repository' => 'Anbar əlavə edilmişdir',
     'Added server!' => 'Server əlavə edilmişdir',
-    'Are you sure?' => 'Siz əminsiniz?',
+    'Are you sure you want to delete this server?' => 'Siz əminsiniz?',
     'Could not find that repository/owner combination at github.com' => 'Github.com-da kombinasiya anbar/sahib tapılmamışdır',
     'Disable prompts when deleting' => 'Silinmə vaxtı sorğunu kəsmək',
     'Enable keyboard shortcuts' => 'Qaynar klavişləri qoşmaq',
diff --git a/language/de.php b/language/de.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'SMTP Server hinzugefügt',
     'Added repository' => 'Repository hinzugefügt',
     'Added server!' => 'Server hinzugefügt',
-    'Are you sure?' => 'Bist du dir sicher?',
+    'Are you sure you want to delete this server?' => 'Bist du dir sicher?',
     'Could not find that repository/owner combination at github.com' => 'Konnte die Repository/Besitzer Kombination auf GitHub.com nicht finden',
     'Disable prompts when deleting' => 'Meldungen deaktivieren bei Löschen',
     'Enable keyboard shortcuts' => 'Tastatur Shortcuts aktivieren',
diff --git a/language/en.php b/language/en.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => false,
     'Added repository' => false,
     'Added server!' => false,
-    'Are you sure?' => false,
+    'Are you sure you want to delete this server?' => false,
     'Could not find that repository/owner combination at github.com' => false,
     'Disable prompts when deleting' => false,
     'Enable keyboard shortcuts' => false,
diff --git a/language/es.php b/language/es.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'Añadido servidor SMTP',
     'Added repository' => 'Añadido repositorio',
     'Added server!' => 'Añadido servidor',
-    'Are you sure?' => '¿Está seguro?',
+    'Are you sure you want to delete this server?' => '¿Está seguro?',
     'Could not find that repository/owner combination at github.com' => 'No pude encontrar esa combinación de repositorio/propietario en github.com',
     'Disable prompts when deleting' => 'Desactivar peticiones al borrar',
     'Enable keyboard shortcuts' => 'Activar atajos de telcado',
diff --git a/language/et.php b/language/et.php
@@ -412,7 +412,7 @@
     'Added SMTP server!' => 'Lisasin SMTP serveri!',
     'Added repository' => 'Lisasin repositooriumi',
     'Added server!' => 'Lisasin serveri!',
-    'Are you sure?' => 'Kas oled kindel?',
+    'Are you sure you want to delete this server?' => 'Kas oled kindel?',
     'Could not find that repository/owner combination at github.com' => 'Ei leidnud github.com saidist seda repositooriumi/omaniku kombinatsiooni',
     'Disable prompts when deleting' => 'Kustutamisel ära küsi mult üle kas soovin kustutada',
     'Enable keyboard shortcuts' => 'Kasuta kiirklahve',
diff --git a/language/fa.php b/language/fa.php
@@ -444,7 +444,7 @@
     "Added SMTP server!"=>"سرور SMTP اضافه شد!",
     "Added repository"=>"مخزن اضافه شده است",
     "Added server!"=>"سرور اضافه شد!",
-    "Are you sure?"=>"مطمئنی؟",
+    "Are you sure you want to delete this server?"=>"مطمئنی؟",
     "Could not find that repository/owner combination at github.com"=>"آن ترکیب مخزن / مالک در github.com یافت نشد",
     "Disable prompts when deleting"=>"هنگام حذف ، درخواستها را غیرفعال کنید",
     "Enable keyboard shortcuts"=>"میانبرهای صفحه کلید را فعال کنید",
diff --git a/language/fr.php b/language/fr.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'Serveur SMTP ajouté !',
     'Added repository' => 'Dépôt ajouté',
     'Added server!' => 'Serveur ajouté !',
-    'Are you sure?' => 'Êtes-vous sûr ?',
+    'Are you sure you want to delete this server?' => 'Êtes-vous sûr ?',
     'Could not find that repository/owner combination at github.com' => 'Impossible de trouver cette combinaison dépôt/propriétaire sur github.com',
     'Disable prompts when deleting' => 'Désactiver la confirmation lors de la suppresion',
     'Enable keyboard shortcuts' => 'Activer les raccourcis clavier',
diff --git a/language/hu.php b/language/hu.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'SMTP kiszolgáló hozzáadva!',
     'Added repository' => 'Tároló hozzáadva',
     'Added server!' => 'Kiszolgáló hozzáadva!',
-    'Are you sure?' => 'Biztos benne?',
+    'Are you sure you want to delete this server?' => 'Biztos benne?',
     'Could not find that repository/owner combination at github.com' => 'Nem található az a tároló/tulajdonos a github.com-on',
     'Disable prompts when deleting' => 'Kérdések letiltása törléskor',
     'Enable keyboard shortcuts' => 'Gyorsbillentyűk engedélyezése',
diff --git a/language/id.php b/language/id.php
@@ -415,7 +415,7 @@
     'Added SMTP server!' => 'Server SMTP ditambahkan!',
     'Added repository' => 'Repositori ditambahkan!',
     'Added server!' => 'Server ditambahkan!',
-    'Are you sure?' => "Apakah Anda yakin?",
+    'Are you sure you want to delete this server?' => "Apakah Anda yakin?",
     'Could not find that repository/owner combination at github.com' => 'Tidak dapat menemukan kombinasi repositori/pemilik itu di github.com',
     'Disable prompts when deleting' => 'Nonaktifkan prompt saat menghapus',
     'Enable keyboard shortcuts' => 'Aktifkan pintasan papan ketik',
diff --git a/language/it.php b/language/it.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'Server SMTP aggiunto!',
     'Added repository' => 'Repository aggiunto',
     'Added server!' => 'Server aggiunto!',
-    'Are you sure?' => 'Sei sicuro?',
+    'Are you sure you want to delete this server?' => 'Sei sicuro?',
     'Could not find that repository/owner combination at github.com' => 'Impossibile trovare quella combinazione repository/proprietario su github.com',
     'Disable prompts when deleting' => 'Disabilita le richieste durante l\'eliminazione',
     'Enable keyboard shortcuts' => 'Abilita scorciatoie da tastiera',
diff --git a/language/ja.php b/language/ja.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => false,
     'Added repository' => false,
     'Added server!' => false,
-    'Are you sure?' => 'よろしいですか？',
+    'Are you sure you want to delete this server?' => 'よろしいですか？',
     'Could not find that repository/owner combination at github.com' => false,
     'Disable prompts when deleting' => '削除前の確認を無くす',
     'Enable keyboard shortcuts' => 'キーボードショートカットを有効にする',
diff --git a/language/nl.php b/language/nl.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => 'SMPT server toegevoegd',
     'Added repository' => 'Repository toegevoegd',
     'Added server!' => 'Server toegevoegd',
-    'Are you sure?' => 'Bent u zeker?',
+    'Are you sure you want to delete this server?' => 'Bent u zeker?',
     'Could not find that repository/owner combination at github.com' => 'Kan de repository/eigenaar combinatie niet vinden op github.com',
     'Disable prompts when deleting' => 'Meldingen uitzetten bij verwijderen',
     'Enable keyboard shortcuts' => 'Toetsenbord shortcuts aanzetten',
diff --git a/language/pt-BR.php b/language/pt-BR.php
@@ -407,7 +407,7 @@
     'Added SMTP server!' => 'Servidor SMTP Adicionado!',
     'Added repository' => 'Repositório Adicionado',
     'Added server!' => 'Servidor Adicionado!',
-    'Are you sure?' => 'Tem certeza?',
+    'Are you sure you want to delete this server?' => 'Tem certeza?',
     'Could not find that repository/owner combination at github.com' => 'Não foi possível localizar uma combinação de repositório/dono no github.com',
     'Disable prompts when deleting' => 'Desabilitar confirmações quando estiver removendo',
     'Enable keyboard shortcuts' => 'Habilitar atalhos de teclado',
diff --git a/language/ro.php b/language/ro.php
@@ -407,7 +407,7 @@
     'Added SMTP server!' => false,
     'Added repository' => false,
     'Added server!' => false,
-    'Are you sure?' => 'Sunteți sigur(ă)?',
+    'Are you sure you want to delete this server?' => 'Sunteți sigur(ă)?',
     'Could not find that repository/owner combination at github.com' => false,
     'Disable prompts when deleting' => 'Invalidează promptul la ștergere',
     'Enable keyboard shortcuts' => false,
diff --git a/language/ru.php b/language/ru.php
@@ -409,7 +409,7 @@
     'Added SMTP server!' => 'Добавлен SMTP сервер!',
     'Added repository' => 'Добавлен репозиторий',
     'Added server!' => 'Добавлен сервер',
-    'Are you sure?' => 'Вы уверены?',
+    'Are you sure you want to delete this server?' => 'Вы уверены?',
     'Could not find that repository/owner combination at github.com' => 'Не найдена комбинация репозиторий/владелец на github.com',
     'Disable prompts when deleting' => 'Отключить запрос при удалении',
     'Enable keyboard shortcuts' => 'Включить горячии клавиши',
diff --git a/language/zh-Hans.php b/language/zh-Hans.php
@@ -426,7 +426,7 @@
     'Added SMTP server!' => '请添加 SMTP 服务器',
     'Added repository' => '添加存储库',
     'Added server!' => '请添加服务器！',
-    'Are you sure?' => '确定吗?',
+    'Are you sure you want to delete this server?' => '确定吗?',
     'Could not find that repository/owner combination at github.com' => '无法在 Github 查找到用户名的相关仓库',
     'Disable prompts when deleting' => '删除前无需确认',
     'Enable keyboard shortcuts' => '启用键盘快捷键',
diff --git a/language/zh-TW.php b/language/zh-TW.php
@@ -408,7 +408,7 @@
     'Added SMTP server!' => '已新增 SMTP 伺服器！',
     'Added repository' => '已新增儲存庫',
     'Added server!' => '已新增伺服器！',
-    'Are you sure?' => '您確定嗎？',
+    'Are you sure you want to delete this server?' => '您確定嗎？',
     'Could not find that repository/owner combination at github.com' => '在 github.com 上找不到該儲存庫/擁有者的組合',
     'Disable prompts when deleting' => '刪除時停用提示',
     'Enable keyboard shortcuts' => '啟用鍵盤快捷鍵',
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
@@ -120,14 +120,13 @@ function message_list_meta($input, $output_mod) {
         $since = DEFAULT_SINCE;
     }
     $date = sprintf('%s', mb_strtolower($output_mod->trans($times[$since])));
-    $max = sprintf($output_mod->trans('sources@%d each'), $limit);
+    $max = sprintf($output_mod->trans('%d items per source'), $limit);
 
     return '<div class="list_meta d-flex align-items-center fs-6">'.
         $date.
-        '<b>-</b>'.
+        '<b> :</b>'.
         '<span class="src_count"></span> '.$max.
-        '<b>-</b>'.
-        '<span class="total"></span> '.$output_mod->trans('total').'</div>';
+        '</div>';
 }}
 
 /**
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
@@ -635,7 +635,7 @@ protected function output() {
             format_data_sources($this->get('data_sources', array()), $this);
 
         if (!$this->get('disable_delete_prompt', DEFAULT_DISABLE_DELETE_PROMPT)) {
-            $res .= 'var hm_delete_prompt = function() { return confirm("'.$this->trans('Are you sure you wanto to delete this server?').'"); };';
+            $res .= 'var hm_delete_prompt = function() { return confirm("'.$this->trans('Are you sure you want to delete this server? ').'"); };';
         }
         else {
             $res .= 'var hm_delete_prompt = function() { return true; };';
diff --git a/modules/nux/functions.php b/modules/nux/functions.php
@@ -106,7 +106,7 @@ function credentials_form($details, $mod)
         $res .= '<div class="form-floating mb-3">';
         $res .= '<input type="password" class="form-control nux_password" id="nux_password" name="nux_password" placeholder="' . $mod->trans('E-Mail Password') . '">';
         $res .= '<label for="nux_password">' . $mod->trans('E-mail Password') . '</label></div>';
-        $res .= '<div class="d-flex flex-column flex-md-row gap-3 mt-3">';
+        $res .= '<div class="d-flex flex-md-row gap-3 mt-3">';
         // Connect Button
         $res .= '<input type="button" class="nux_submit px-5 btn btn-primary w-100 w-md-auto" value="' . $mod->trans('Connect') . '">';
 
diff --git a/modules/profiles/modules.php b/modules/profiles/modules.php
@@ -213,7 +213,7 @@ protected function output() {
  */
 class Hm_Output_compose_signature_button extends Hm_Output_Module {
     protected function output() {
-        return '<input type="hidden" value="'.$this->trans('You need at least one configured profile to sign messages').'" id="sign_msg" />'.
+        return '<input type="hidden" value="'.$this->trans('You need at least one profile with a signature to sign messages. Please configure a signature in your profile settings.').'" id="sign_msg" />'.
             '<input class="compose_sign btn btn-light float-end mt-3 me-2 border" type="button" value="'.$this->trans('Sign').'" />';
     }
 }
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
@@ -1193,7 +1193,7 @@ protected function output() {
                     (!$html ? '<label for="compose_body">'.$this->trans('Message').'</label>': '').
                 '</div>';
                 if($this->get('enable_compose_delivery_receipt_setting')) {
-                    $res .= '<div class="form-check mb-3"><input value="0" name="compose_delivery_receipt" id="compose_delivery_receipt" type="checkbox" class="form-check-input" /><label for="compose_delivery_receipt" class="form-check-label">'.$this->trans('Request a delivery receipt').'</label></div>';
+                    $res .= '<div class="form-check mb-3"><input value="1" name="compose_delivery_receipt" id="compose_delivery_receipt" type="checkbox" class="form-check-input" checked/><label for="compose_delivery_receipt" class="form-check-label">'.$this->trans('Request a delivery receipt').'</label></div>';
                 }
         if ($html == 2) {
             $res .= '<link href="'.WEB_ROOT.'modules/smtp/assets/markdown/editor.css" rel="stylesheet" />'.
diff --git a/tests/phpunit/modules/core/message_list_functions.php b/tests/phpunit/modules/core/message_list_functions.php
@@ -29,9 +29,9 @@ public function test_get_message_list_settings() {
     public function test_get_message_list_meta() {
         $mod = new Hm_Output_Test(array('foo' => 'bar', 'bar' => 'foo'), array('bar'));
         $this->assertEquals('', message_list_meta(array(), $mod));
-        $this->assertEquals('<div class="list_meta d-flex align-items-center fs-6">last 7 days<b>-</b><span class="src_count"></span> sources@20 each<b>-</b><span class="total"></span> total</div>', message_list_meta(array('list_meta' => 'foo', 'message_list_since' => '-1 week'), $mod));
-        $this->assertEquals('<div class="list_meta d-flex align-items-center fs-6">last 7 days<b>-</b><span class="src_count"></span> sources@5 each<b>-</b><span class="total"></span> total</div>', message_list_meta(array('list_meta' => 'foo', 'per_source_limit' => 5), $mod));
-        $this->assertEquals('<div class="list_meta d-flex align-items-center fs-6">last 7 days<b>-</b><span class="src_count"></span> sources@5 each<b>-</b><span class="total"></span> total</div>', message_list_meta(array('list_meta' => 'foo', 'per_source_limit' => 5, 'message_list_since' => '-1 week'), $mod));
+        $this->assertEquals('<div class="list_meta fs-6">last 7 days<b> :</b><span class="src_count"></span> 20 items per source</div>', message_list_meta(array('list_meta' => 'foo', 'message_list_since' => '-1 week'), $mod));
+        $this->assertEquals('<div class="list_meta fs-6">last 7 days<b> :</b><span class="src_count"></span> 5 items per source</div>', message_list_meta(array('list_meta' => 'foo', 'per_source_limit' => 5), $mod));
+        $this->assertEquals('<div class="list_meta fs-6">last 7 days<b> :</b><span class="src_count"></span> 5 items per source</div>', message_list_meta(array('list_meta' => 'foo', 'per_source_limit' => 5, 'message_list_since' => '-1 week'), $mod));
     }
     /**
      * @preserveGlobalState disabled
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
@@ -435,7 +435,7 @@ public function test_js_data() {
         $this->assertStringStartsWith('<script type="text/javascript" id="data-store">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\\"bi bi-star-half\\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return true; };', implode($res->output_response));
         $test->handler_response = array();
         $res = $test->run();
-        $this->assertStringStartsWith('<script type="text/javascript" id="data-store">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\\"bi bi-star-half\\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return confirm("Are you sure you wanto to delete this server?"); };', implode($res->output_response));
+        $this->assertStringStartsWith('<script type="text/javascript" id="data-store">var globals = {};var hm_is_logged = function () { return 0; };var hm_empty_folder = function() { return "So alone"; };var hm_mobile = function() { return 0; };var hm_debug = function() { return "0"; };var hm_mailto = function() { return 0; };var hm_page_name = function() { return ""; };var hm_language_direction = function() { return "ltr"; };var hm_list_path = function() { return ""; };var hm_list_parent = function() { return ""; };var hm_msg_uid = function() { return Hm_Utils.get_from_global("msg_uid", ""); };var hm_encrypt_ajax_requests = function() { return ""; };var hm_encrypt_local_storage = function() { return ""; };var hm_web_root_path = function() { return ""; };var hm_flag_image_src = function() { return "<i class=\\"bi bi-star-half\\"></i>"; };var hm_check_dirty_flag = function() { return 0; };var hm_data_sources = function() { return []; };var hm_delete_prompt = function() { return confirm("Are you sure you want to delete this server? "); };', implode($res->output_response));
     }
     /**
      * @preserveGlobalState disabled
