From 1b3db6bbd3e736e8e0ec6f02eac730dc2a286a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Cort=C3=A9s=20Cano?= <38475681+TrapoSAMA@users.noreply.github.com> Date: Fri, 3 Jul 2026 13:35:16 -0400 Subject: [PATCH] Improve Spanish labels and domain quota text (#1051) Changes: * Improve Spanish translations for mail, DKIM, logs, quota and Backup MX labels. * Use a shorter domain-list quota label while keeping the full domain quota label in edit forms. * Keep hidden domain-list values available in the domain tooltip without reusing form labels. * Add explicit labels for max mailbox quota and unmanaged quota state. Thanks @TrapoSAMA --- languages/en.lang | 2 ++ languages/es.lang | 80 +++++++++++++++++++++-------------------- model/DomainHandler.php | 9 +++-- templates/list.tpl | 13 +++++-- 4 files changed, 57 insertions(+), 47 deletions(-) diff --git a/languages/en.lang b/languages/en.lang index 6e614bb4..35aff8bf 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -358,6 +358,8 @@ $PALANG['pAdminMenu_virtual'] = 'Virtual'; $PALANG['pAdminMenu_backup'] = 'Backup'; $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins'; $PALANG['pAdminMenu_create_admin'] = 'New Admin'; +$PALANG['pAdminList_domain_maxquota'] = 'Max Mailbox Quota'; +$PALANG['quota_not_managed'] = 'Not Managed'; $PALANG['pAdminMenu_create_domain'] = 'New Domain'; $PALANG['pAdminList_admin_count'] = 'Domains'; diff --git a/languages/es.lang b/languages/es.lang index 537e5257..a2bae21e 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -51,15 +51,15 @@ $PALANG['pMenu_overview'] = 'Resumen'; $PALANG['add_alias'] = 'Añadir alias'; $PALANG['add_alias_domain'] = 'Añadir alias de dominio'; $PALANG['add_mailbox'] = 'Añadir buzón'; -$PALANG['pMenu_fetchmail'] = 'Obtener Emails'; +$PALANG['pMenu_fetchmail'] = 'Recibir correo'; $PALANG['pMenu_fetchmail_menu'] = 'Recibir correo'; -$PALANG['pMenu_sendmail'] = 'Enviar e-mail'; -$PALANG['pMenu_sendmail_menu'] = 'Enviar'; -$PALANG['pMenu_dkim'] = 'Domain Keys'; # XXX +$PALANG['pMenu_sendmail'] = 'Enviar'; +$PALANG['pMenu_sendmail_menu'] = 'Enviar correo'; +$PALANG['pMenu_dkim'] = 'Claves DKIM'; $PALANG['pMenu_dkim_menu'] = 'DKIM'; -$PALANG['pMenu_dkim_signing'] = 'Signing Table'; # XXX +$PALANG['pMenu_dkim_signing'] = 'Tabla de firmas'; $PALANG['pMenu_password'] = 'Contraseña'; -$PALANG['pMenu_viewlog'] = 'Ver Logs'; +$PALANG['pMenu_viewlog'] = 'Ver logs'; $PALANG['pMenu_logout'] = 'Salir'; $PALANG['pMain_welcome'] = '¡Bienvenido a Postfix Admin!'; @@ -105,7 +105,7 @@ $PALANG['domain'] = 'Dominio'; $PALANG['search_domains'] = 'Buscar dominios...'; $PALANG['pOverview_get_alias_domains'] = 'Alias de Dominios'; $PALANG['mailboxes'] = 'Buzones'; -$PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)'; +$PALANG['pOverview_get_quota'] = 'Cuota Buzón'; $PALANG['pDelete_delete_error'] = 'Imposible borrar el registro '; $PALANG['pDelete_delete_success'] = '%s borrado.'; @@ -257,32 +257,32 @@ $PALANG['pSendmail_body'] = 'Cuerpo'; $PALANG['pSendmail_button'] = 'Enviar mensaje'; $PALANG['pSendmail_result_error'] = '¡Imposible enviar el e-mail! a (%s)'; $PALANG['pSendmail_result_success'] = '¡Email enviado! a (%s)'; -$PALANG['pDkim_new_key'] = 'Add Domain Key'; # XXX -$PALANG['pDkim_new_sign'] = 'Add Sign Table Entry'; # XXX -$PALANG['pDkim_edit_key'] = 'Edit Domain Key'; # XXX -$PALANG['pDkim_edit_sign'] = 'Edit Sign Table Entry'; # XXX -$PALANG['pDkim_field_selector'] = 'Selector'; # XXX -$PALANG['pDkim_field_pkey'] = 'Private Key'; # XXX -$PALANG['pDkim_field_pub'] = 'Public Key'; # XXX -$PALANG['pDkim_field_author'] = 'Author'; # XXX -$PALANG['pDkim_field_dkim_id'] = 'Domain Key'; # XXX -$PALANG['pDkim_field_selector_desc'] = 'Defines the name of the selector to be used when signing messages'; # XXX -$PALANG['pDkim_field_domain_desc'] = 'Defines the domain which will use this key for signing'; # XXX -$PALANG['pDkim_field_pkey_desc'] = 'PEM-formatted private key to be used for signing all messages'; # XXX -$PALANG['pDkim_field_pub_desc'] = 'PEM-formatted public key'; # XXX -$PALANG['pDkim_field_author_desc'] = 'Author that will use this key for signing. Can be either mailbox or domain, with mailbox taking precedence.'; # XXX -$PALANG['pDkim_field_dkim_id_desc'] = 'Domain Key that this author will use'; # XXX -$PALANG['dkim_already_exists'] = 'This Domain Key has already been added!'; # XXX -$PALANG['dkim_does_not_exist'] = 'This Domain Key does not exist!'; # XXX -$PALANG['dkim_signing_already_exists'] = 'This Domain Signing Entry already exsits!'; # XXX -$PALANG['dkim_signing_does_not_exist'] = 'This Domain Signing Entry does not exist!'; # XXX -$PALANG['pViewlog_action_create_dkim_entry'] = 'create domain key entry'; # XXX -$PALANG['pViewlog_action_edit_dkim_entry'] = 'edit domain key entry'; # XXX -$PALANG['pViewlog_action_delete_dkim_entry'] = 'delete domain key entry'; # XXX -$PALANG['pViewlog_action_create_dkim_signing_entry'] = 'create domain signing entry'; # XXX -$PALANG['pViewlog_action_edit_dkim_signing_entry'] = 'edit domain signing entry'; # XXX -$PALANG['pViewlog_action_delete_dkim_signing_entry'] = 'delete domain signing entry'; # XXX -$PALANG['pMain_dkim'] = 'Add a Domain Key for use with OpenDKIM.'; # XXX +$PALANG['pDkim_new_key'] = 'Agregar clave DKIM'; +$PALANG['pDkim_new_sign'] = 'Agregar entrada de firma'; +$PALANG['pDkim_edit_key'] = 'Editar clave DKIM'; +$PALANG['pDkim_edit_sign'] = 'Editar entrada de firma'; +$PALANG['pDkim_field_selector'] = 'Selector'; +$PALANG['pDkim_field_pkey'] = 'Clave privada'; +$PALANG['pDkim_field_pub'] = 'Clave pública'; +$PALANG['pDkim_field_author'] = 'Autor'; +$PALANG['pDkim_field_dkim_id'] = 'Clave DKIM'; +$PALANG['pDkim_field_selector_desc'] = 'Define el selector usado para firmar mensajes'; +$PALANG['pDkim_field_domain_desc'] = 'Define el dominio que usará esta clave para firmar'; +$PALANG['pDkim_field_pkey_desc'] = 'Clave privada PEM usada para firmar mensajes'; +$PALANG['pDkim_field_pub_desc'] = 'Clave pública PEM'; +$PALANG['pDkim_field_author_desc'] = 'Autor que usará esta clave para firmar. Puede ser buzón o dominio; el buzón tiene prioridad.'; +$PALANG['pDkim_field_dkim_id_desc'] = 'Clave DKIM que usará este autor'; +$PALANG['dkim_already_exists'] = 'Esta clave DKIM ya existe.'; +$PALANG['dkim_does_not_exist'] = 'Esta clave DKIM no existe.'; +$PALANG['dkim_signing_already_exists'] = 'Esta entrada de firma DKIM ya existe.'; +$PALANG['dkim_signing_does_not_exist'] = 'Esta entrada de firma DKIM no existe.'; +$PALANG['pViewlog_action_create_dkim_entry'] = 'crear clave DKIM'; +$PALANG['pViewlog_action_edit_dkim_entry'] = 'editar clave DKIM'; +$PALANG['pViewlog_action_delete_dkim_entry'] = 'borrar clave DKIM'; +$PALANG['pViewlog_action_create_dkim_signing_entry'] = 'crear entrada de firma DKIM'; +$PALANG['pViewlog_action_edit_dkim_signing_entry'] = 'editar entrada de firma DKIM'; +$PALANG['pViewlog_action_delete_dkim_signing_entry'] = 'borrar entrada de firma DKIM'; +$PALANG['pMain_dkim'] = 'Agregar clave DKIM para OpenDKIM.'; $PALANG['pAdminMenu_list_admin'] = 'Lista de administradores'; $PALANG['pAdminMenu_admin'] = 'Administradores'; @@ -299,9 +299,11 @@ $PALANG['pAdminList_admin_count'] = 'Dominios'; $PALANG['description'] = 'Descripción'; $PALANG['aliases'] = 'Alias'; -$PALANG['pAdminList_domain_quota'] = 'Cuota de dominio (MB)'; # XXX -$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX +$PALANG['pAdminList_domain_quota'] = 'Cuota Total'; +$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; $PALANG['last_modified'] = 'Última Modificación'; +$PALANG['pAdminList_domain_maxquota'] = 'Cuota Buzón máxima'; +$PALANG['quota_not_managed'] = 'Sin Cuota Gestionada'; $PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio'; @@ -326,12 +328,12 @@ $PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain $PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deshabilitar | 0 = ilimitado'; -$PALANG['pAdminEdit_domain_maxquota'] = 'Cuota máxima'; +$PALANG['pAdminEdit_domain_maxquota'] = 'Cuota Buzón máxima (MB)'; $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = deshabilitar | 0 = ilimitado'; -$PALANG['pAdminEdit_domain_quota'] = 'Cuota de dominio'; # XXX +$PALANG['pAdminEdit_domain_quota'] = 'Cuota de Dominio Total (MB)'; # XXX $PALANG['transport'] = 'Transporte'; # XXX check text - should be 'Transport' $PALANG['pAdminEdit_domain_transport_text'] = 'Definir transporte'; # XXX -$PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX +$PALANG['pAdminEdit_domain_backupmx'] = 'Backup MX'; $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio'; @@ -526,7 +528,7 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Registro de cambio'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'No se pudo recuperar la versión desde GitHub. Revisa si el servidor tiene acceso a la api.github.com.'; # XXX -$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Dominio:Selector'; $PALANG['pDkim_field_description'] = 'Descripción'; # XXX $PALANG['session_expired_title'] = 'Sesión expirada'; $PALANG['session_expired_message'] = 'El token de la página ya no es válido. Vuelve e intenta nuevamente.'; diff --git a/model/DomainHandler.php b/model/DomainHandler.php index b2324256..e03da45e 100644 --- a/model/DomainHandler.php +++ b/model/DomainHandler.php @@ -43,14 +43,13 @@ class DomainHandler extends PFAHandler $pwexp = min($super, Config::intbool('password_expiration')); $show_maxquota = $quota; $show_pwexp = $pwexp; - $maxquota_label = 'pOverview_get_quota'; $pwexp_label = 'password_expiration'; if (Config::bool('domain_list_hide_maxquota')) { - $maxquota_label = ''; + $show_maxquota = 0; } if (Config::bool('domain_list_hide_password_expiry')) { - $pwexp_label = ''; + $show_pwexp = 0; } $query_used_domainquota = 'round(coalesce(__total_quota/' . intval(Config::read('quota_multiplier')) . ',0))'; @@ -116,13 +115,13 @@ class DomainHandler extends PFAHandler 'mailboxes_quot' => self::pacol(0, 0, 1, 'quot', 'mailboxes' , '' , 0, array(), 0, 0, db_quota_text('__mailbox_count', 'mailboxes', 'mailboxes_quot')), '_mailboxes_quot_percent' => self::pacol(0, 0, 1, 'vnum', '' , '' , 0, array(), 0, 0, db_quota_percent('__mailbox_count', 'mailboxes', '_mailboxes_quot_percent')), - 'maxquota' => self::pacol($editquota,$editquota,$show_maxquota, 'num', $maxquota_label , 'pAdminEdit_domain_maxquota_text' , Config::read('maxquota')), + 'maxquota' => self::pacol($editquota,$editquota,$show_maxquota, 'num', 'pAdminEdit_domain_maxquota', 'pAdminEdit_domain_maxquota_text' , Config::read('maxquota')), # Domain quota 'quota' => self::pacol($edit_dom_q,$edit_dom_q, 0, 'num', 'pAdminEdit_domain_quota' , 'pAdminEdit_domain_maxquota_text' , $domain_quota_default), 'total_quota' => self::pacol(0, 0, 1, 'vnum', '' , '' , '', array(), 0, 0, "$query_used_domainquota AS total_quota" /*extrafrom*//* already in mailbox_count */), 'total_quota_used' => self::pacol(0, 0, 1, 'vnum', '' , '' , '', array(), 0, 0, "$query_display_domainquota AS total_quota_used" /*extrafrom*//* already in mailbox_count */), - 'total_quot' => self::pacol(0, 0, $dom_q, 'quot', 'pAdminEdit_domain_quota' , '' , 0, array(), 0, 0, db_quota_text($query_used_domainquota, 'quota', 'total_quot')), + 'total_quot' => self::pacol(0, 0, $dom_q, 'quot', 'pAdminList_domain_quota' , '' , 0, array(), 0, 0, db_quota_text($query_used_domainquota, 'quota', 'total_quot')), '_total_quot_percent' => self::pacol(0, 0, $dom_q, 'vnum', '' , '' , 0, array(), 0, 0, db_quota_percent($query_display_domainquota, 'quota', '_total_quot_percent')), 'transport' => self::pacol($transp, $transp,$transp,'enum', 'transport' , 'pAdminEdit_domain_transport_text' , Config::read('transport_default') , diff --git a/templates/list.tpl b/templates/list.tpl index beffd261..be4087de 100644 --- a/templates/list.tpl +++ b/templates/list.tpl @@ -65,10 +65,17 @@ {assign "linkto" "{$field.linkto|replace:'%s':{$item.$id_field|escape:url}}"} {* TODO: use label field instead *} {assign "linktitle" ""} {if $table == 'domain' && $key == 'domain'} - {if isset($struct.maxquota) && $struct.maxquota.label == '' && isset($item.maxquota)} - {assign "linktitle" "{$PALANG.pOverview_get_quota}: {$item.maxquota} MB"} + {if isset($struct.maxquota) && $struct.maxquota.display_in_list == 0 && isset($item.maxquota)} + {if $item.maxquota < 0} + {assign "maxquota_text" "{$PALANG.quota_not_managed}"} + {elseif $item.maxquota == 0} + {assign "maxquota_text" "{$PALANG.pOverview_unlimited}"} + {else} + {assign "maxquota_text" "{$item.maxquota} MB"} + {/if} + {assign "linktitle" "{$PALANG.pAdminList_domain_maxquota}: {$maxquota_text}"} {/if} - {if isset($struct.password_expiry) && $struct.password_expiry.label == '' && isset($item.password_expiry)} + {if isset($struct.password_expiry) && $struct.password_expiry.display_in_list == 0 && isset($item.password_expiry)} {if $linktitle != ''}{assign "linktitle" "{$linktitle} "}{/if} {assign "linktitle" "{$linktitle}{$PALANG.password_expiration}: {$item.password_expiry}"} {/if}