From a8e2ecc343d93576e18d7284af042a1870dedf55 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 25 Aug 2020 17:31:50 +0200 Subject: [PATCH] Translate LSerror message at formating/diplaying time It's permit to be sure to translate message in the right user language, even if its context isn't loaded at error emission time. --- doc/contrib/contrib.docbook | 18 ++--- .../LSaddons.LSaccessRightsMatrixView.php | 2 +- src/includes/addons/LSaddons.asterisk.php | 8 +-- .../LSaddons.exportSearchResultAsCSV.php | 12 ++-- src/includes/addons/LSaddons.ftp.php | 16 ++--- src/includes/addons/LSaddons.mail.php | 8 +-- src/includes/addons/LSaddons.maildir.php | 12 ++-- src/includes/addons/LSaddons.mailquota.php | 10 +-- src/includes/addons/LSaddons.phpldapadmin.php | 2 +- src/includes/addons/LSaddons.posix.php | 6 +- src/includes/addons/LSaddons.samba.php | 14 ++-- src/includes/addons/LSaddons.ssh.php | 18 ++--- src/includes/addons/LSaddons.supann.php | 10 +-- src/includes/class/class.LSattr_html.php | 4 +- .../class/class.LSattr_html_select_list.php | 10 +-- .../class/class.LSattr_html_select_object.php | 12 ++-- .../class/class.LSattr_ldap_password.php | 4 +- src/includes/class/class.LSattribute.php | 18 ++--- src/includes/class/class.LSauth.php | 14 ++-- src/includes/class/class.LSauthMethod_CAS.php | 4 +- .../class/class.LSauthMethod_HTTP.php | 2 +- .../class/class.LSauthMethod_anonymous.php | 2 +- src/includes/class/class.LScli.php | 4 +- src/includes/class/class.LSerror.php | 4 +- src/includes/class/class.LSform.php | 18 ++--- .../class/class.LSformElement_password.php | 10 +-- .../class.LSformElement_postaladdress.php | 2 +- .../class.LSformElement_valueWithUnit.php | 2 +- src/includes/class/class.LSformRule.php | 2 +- .../class/class.LSformRule_callable.php | 2 +- src/includes/class/class.LSformRule_date.php | 2 +- .../class.LSformRule_differentPassword.php | 10 +-- .../class/class.LSformRule_inarray.php | 2 +- .../class/class.LSformRule_password.php | 2 +- src/includes/class/class.LSformRule_regex.php | 2 +- src/includes/class/class.LSimport.php | 8 +-- src/includes/class/class.LSioFormat.php | 2 +- src/includes/class/class.LSldap.php | 14 ++-- src/includes/class/class.LSldapObject.php | 70 +++++++++---------- src/includes/class/class.LSlog.php | 2 +- src/includes/class/class.LSrelation.php | 16 ++--- src/includes/class/class.LSsearch.php | 34 ++++----- src/includes/class/class.LSsearchEntry.php | 2 +- src/includes/class/class.LSsession.php | 54 +++++++------- src/includes/class/class.LStemplate.php | 6 +- 45 files changed, 238 insertions(+), 238 deletions(-) diff --git a/doc/contrib/contrib.docbook b/doc/contrib/contrib.docbook index bcf2108b..827c7f1e 100644 --- a/doc/contrib/contrib.docbook +++ b/doc/contrib/contrib.docbook @@ -35,20 +35,20 @@ // Support LSerror :: defineError('MYADDON_SUPPORT_01', - _("MYADDON Support : first support error...") + ___("MYADDON Support : first support error...") ); LSerror :: defineError('MYADDON_SUPPORT_02', - _("MYADDON Support : second support error...") + ___("MYADDON Support : second support error...") ); // Autres erreurs LSerror :: defineError('MYADDON_01', - _("MYADDON_01 : an error : %{msg}.") + ___("MYADDON_01 : an error : %{msg}.") ); LSerror :: defineError('MYADDON_02', - _("MYADDON_02 : an other error : %{msg}") + ___("MYADDON_02 : an other error : %{msg}") ); // Constantes @@ -58,7 +58,7 @@ define('LS_MYADDON_CONST01',XXXXXXXX); /** * Verify support of my addon by LdapSaisie - * + * * @author My Name * * @retval boolean true if my addon is totaly supported, false in other cases @@ -96,11 +96,11 @@ function LSaddon_myaddon_support() { /** * Ma première fonction. - * + * * Ce qu'elle fait. - * + * * @author My Name - * + * * @retval [type valeur retournée] [Signification de la valeur retournée] **/ function myaddon_first_function($arg1,$arg2) { @@ -116,5 +116,5 @@ function myaddon_first_function($arg1,$arg2) { - + diff --git a/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php b/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php index b87f1186..ef447a3e 100644 --- a/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php +++ b/src/includes/addons/LSaddons.LSaccessRightsMatrixView.php @@ -23,7 +23,7 @@ // Support LSerror :: defineError('LSACCESSRIGHTSMATRIXVIEW_SUPPORT_01', - _("Access Right Matrix Support : The global array %{array} is not defined.") + ___("Access Right Matrix Support : The global array %{array} is not defined.") ); /** diff --git a/src/includes/addons/LSaddons.asterisk.php b/src/includes/addons/LSaddons.asterisk.php index 7f04f892..725776ac 100644 --- a/src/includes/addons/LSaddons.asterisk.php +++ b/src/includes/addons/LSaddons.asterisk.php @@ -24,16 +24,16 @@ // Support LSerror :: defineError('ASTERISK_SUPPORT_01', - _("Asterisk Support : The constant %{const} is not defined.") + ___("Asterisk Support : The constant %{const} is not defined.") ); LSerror :: defineError('ASTERISK_01', - _("Asterisk : The function %{function} only work with %{objectName}.") + ___("Asterisk : The function %{function} only work with %{objectName}.") ); LSerror :: defineError('ASTERISK_02', - _("Asterisk : The attribute %{dependency} is missing. Unable to generate MD5 hashed password.") + ___("Asterisk : The attribute %{dependency} is missing. Unable to generate MD5 hashed password.") ); LSerror :: defineError('ASTERISK_03', - _("Asterisk : Clear password not availlable. Unable to generate MD5 hashed password.") + ___("Asterisk : Clear password not availlable. Unable to generate MD5 hashed password.") ); /** diff --git a/src/includes/addons/LSaddons.exportSearchResultAsCSV.php b/src/includes/addons/LSaddons.exportSearchResultAsCSV.php index 3b42d27e..5f99afda 100644 --- a/src/includes/addons/LSaddons.exportSearchResultAsCSV.php +++ b/src/includes/addons/LSaddons.exportSearchResultAsCSV.php @@ -24,24 +24,24 @@ // Support LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_SUPPORT_01', - _("ExportSearchResultAsCSV Support : function fputcsv is not available.") + ___("ExportSearchResultAsCSV Support : function fputcsv is not available.") ); LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_SUPPORT_02', - _("ExportSearchResultAsCSV Support : The constant %{const} is not defined..") + ___("ExportSearchResultAsCSV Support : The constant %{const} is not defined..") ); // Autres erreurs LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_00', - _("ExportSearchResultAsCSV Error : An error occured generating CSV outfile memory space.") + ___("ExportSearchResultAsCSV Error : An error occured generating CSV outfile memory space.") ); LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_01', - _("ExportSearchResultAsCSV Error : An error occured executing the search.") + ___("ExportSearchResultAsCSV Error : An error occured executing the search.") ); LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_02', - _("ExportSearchResultAsCSV Error : An error occured writing CSV header.") + ___("ExportSearchResultAsCSV Error : An error occured writing CSV header.") ); LSerror :: defineError('LS_EXPORTSEARCHRESULTASCSV_03', - _("ExportSearchResultAsCSV Error : An error occured writing a CSV row.") + ___("ExportSearchResultAsCSV Error : An error occured writing a CSV row.") ); diff --git a/src/includes/addons/LSaddons.ftp.php b/src/includes/addons/LSaddons.ftp.php index 868007cc..e057c98a 100644 --- a/src/includes/addons/LSaddons.ftp.php +++ b/src/includes/addons/LSaddons.ftp.php @@ -24,33 +24,33 @@ // Support LSerror :: defineError('FTP_SUPPORT_01', - _("FTP Support : Pear::Net_FTP is missing.") + ___("FTP Support : Pear::Net_FTP is missing.") ); LSerror :: defineError('FTP_SUPPORT_02', - _("FTP Support : The constant %{const} is not defined.") + ___("FTP Support : The constant %{const} is not defined.") ); // Autres erreurs LSerror :: defineError('FTP_00', - _("Net_FTP Error : %{msg}") + ___("Net_FTP Error : %{msg}") ); LSerror :: defineError('FTP_01', - _("FTP Support : Unable to connect to FTP Server (Step : %{step}).") + ___("FTP Support : Unable to connect to FTP Server (Step : %{step}).") ); LSerror :: defineError('FTP_02', - _("FTP Support : Unable to make directory %{dir} on the remote server.") + ___("FTP Support : Unable to make directory %{dir} on the remote server.") ); LSerror :: defineError('FTP_03', - _("FTP Support : Unable to delete directory %{dir} on the remote server.") + ___("FTP Support : Unable to delete directory %{dir} on the remote server.") ); LSerror :: defineError('FTP_04', - _("FTP Support : Unable to modify rights on the directory %{dir} on the remote server.") + ___("FTP Support : Unable to modify rights on the directory %{dir} on the remote server.") ); LSerror :: defineError('FTP_05', - _("FTP Support : Unable to rename folder from %{old} to %{new} on the remote server.") + ___("FTP Support : Unable to rename folder from %{old} to %{new} on the remote server.") ); /** diff --git a/src/includes/addons/LSaddons.mail.php b/src/includes/addons/LSaddons.mail.php index 2f61cd35..4fa7a634 100644 --- a/src/includes/addons/LSaddons.mail.php +++ b/src/includes/addons/LSaddons.mail.php @@ -24,19 +24,19 @@ // Support LSerror :: defineError('MAIL_SUPPORT_01', - _("MAIL Support : Pear::MAIL is missing.") + ___("MAIL Support : Pear::MAIL is missing.") ); LSerror :: defineError('MAIL_SUPPORT_02', - _("MAIL Support : Pear::MAIL_MIME is missing.") + ___("MAIL Support : Pear::MAIL_MIME is missing.") ); // Autres erreurs LSerror :: defineError('MAIL_00', - _("MAIL Error : %{msg}") + ___("MAIL Error : %{msg}") ); LSerror :: defineError('MAIL_01', - _("MAIL : Error sending your email") + ___("MAIL : Error sending your email") ); /** diff --git a/src/includes/addons/LSaddons.maildir.php b/src/includes/addons/LSaddons.maildir.php index 33cb5fd3..19176279 100644 --- a/src/includes/addons/LSaddons.maildir.php +++ b/src/includes/addons/LSaddons.maildir.php @@ -24,24 +24,24 @@ // Support LSerror :: defineError('MAILDIR_SUPPORT_01', - _("MAILDIR Support : Unable to load LSaddon::FTP.") + ___("MAILDIR Support : Unable to load LSaddon::FTP.") ); LSerror :: defineError('MAILDIR_SUPPORT_02', - _("MAILDIR Support : The constant %{const} is not defined.") + ___("MAILDIR Support : The constant %{const} is not defined.") ); // Autres erreurs LSerror :: defineError('MAILDIR_01', - _("MAILDIR : Error creating maildir on the remote server.") + ___("MAILDIR : Error creating maildir on the remote server.") ); LSerror :: defineError('MAILDIR_02', - _("MAILDIR : Error deleting the maildir on the remote server.") + ___("MAILDIR : Error deleting the maildir on the remote server.") ); LSerror :: defineError('MAILDIR_03', - _("MAILDIR : Error renaming the maildir on the remote server.") + ___("MAILDIR : Error renaming the maildir on the remote server.") ); LSerror :: defineError('MAILDIR_04', - _("MAILDIR : Error retrieving remote path of the maildir.") + ___("MAILDIR : Error retrieving remote path of the maildir.") ); /** diff --git a/src/includes/addons/LSaddons.mailquota.php b/src/includes/addons/LSaddons.mailquota.php index 71a6a512..2d06f987 100644 --- a/src/includes/addons/LSaddons.mailquota.php +++ b/src/includes/addons/LSaddons.mailquota.php @@ -24,21 +24,21 @@ // Support LSerror :: defineError('MAILQUOTA_SUPPORT_01', - __("MAILQUOTA Support : The constant %{const} is not defined.") + ___("MAILQUOTA Support : The constant %{const} is not defined.") ); LSerror :: defineError('MAILQUOTA_SUPPORT_02', - _("MAILQUOTA Support : The IMAP PHP module is not available.") + ___("MAILQUOTA Support : The IMAP PHP module is not available.") ); // Other errors LSerror :: defineError('MAILQUOTA_01', - __("MAILQUOTA : Fail to connect on IMAP server : %{error}") + ___("MAILQUOTA : Fail to connect on IMAP server : %{error}") ); LSerror :: defineError('MAILQUOTA_02', - __("MAILQUOTA : Unexpected error occured retreiving mailbox quota usage.") + ___("MAILQUOTA : Unexpected error occured retreiving mailbox quota usage.") ); LSerror :: defineError('MAILQUOTA_03', - __("MAILQUOTA : Fail to compose IMAP mailbox username.") + ___("MAILQUOTA : Fail to compose IMAP mailbox username.") ); /** diff --git a/src/includes/addons/LSaddons.phpldapadmin.php b/src/includes/addons/LSaddons.phpldapadmin.php index 78918aff..eb031d4a 100644 --- a/src/includes/addons/LSaddons.phpldapadmin.php +++ b/src/includes/addons/LSaddons.phpldapadmin.php @@ -24,7 +24,7 @@ // Support LSerror :: defineError('PHPLDAPADMIN_SUPPORT_01', - __("PhpLdapAdmin Support : The constant %{const} is not defined.") + ___("PhpLdapAdmin Support : The constant %{const} is not defined.") ); diff --git a/src/includes/addons/LSaddons.posix.php b/src/includes/addons/LSaddons.posix.php index e3b3c19e..ef3c2308 100644 --- a/src/includes/addons/LSaddons.posix.php +++ b/src/includes/addons/LSaddons.posix.php @@ -24,16 +24,16 @@ // Support LSerror :: defineError('POSIX_SUPPORT_01', - _("POSIX Support : The constant %{const} is not defined.") + ___("POSIX Support : The constant %{const} is not defined.") ); LSerror :: defineError('POSIX_SUPPORT_02', - _("POSIX Support : Unable to load LSaddon::FTP.") + ___("POSIX Support : Unable to load LSaddon::FTP.") ); // Autres erreurs LSerror :: defineError('POSIX_01', - _("POSIX : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") + ___("POSIX : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") ); /** diff --git a/src/includes/addons/LSaddons.samba.php b/src/includes/addons/LSaddons.samba.php index a8c64f52..93856488 100644 --- a/src/includes/addons/LSaddons.samba.php +++ b/src/includes/addons/LSaddons.samba.php @@ -24,28 +24,28 @@ // Support LSerror :: defineError('SAMBA_SUPPORT_01', - _("SAMBA Support : Unable to load smbHash class.") + ___("SAMBA Support : Unable to load smbHash class.") ); LSerror :: defineError('SAMBA_SUPPORT_02', - _("SAMBA Support : The constant %{const} is not defined.") + ___("SAMBA Support : The constant %{const} is not defined.") ); LSerror :: defineError('SAMBA_SUPPORT_03', - _("SAMBA Support : The constants LS_SAMBA_SID_BASE_USER and LS_SAMBA_SID_BASE_GROUP must'nt have the same parity to keep SambaSID's unicity.") + ___("SAMBA Support : The constants LS_SAMBA_SID_BASE_USER and LS_SAMBA_SID_BASE_GROUP must'nt have the same parity to keep SambaSID's unicity.") ); // Autres erreurs LSerror :: defineError('SAMBA_01', - _("SAMBA Support : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") + ___("SAMBA Support : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") ); LSerror :: defineError('SAMBA_02', - _("SAMBA Support : Can't get the sambaDomain object.") + ___("SAMBA Support : Can't get the sambaDomain object.") ); LSerror :: defineError('SAMBA_03', - _("SAMBA Support : Error modifying the sambaDomain object.") + ___("SAMBA Support : Error modifying the sambaDomain object.") ); LSerror :: defineError('SAMBA_04', - _("SAMBA Support : The %{attr} of the sambaDomain object is incorrect.") + ___("SAMBA Support : The %{attr} of the sambaDomain object is incorrect.") ); // CONSTANTES diff --git a/src/includes/addons/LSaddons.ssh.php b/src/includes/addons/LSaddons.ssh.php index 5b389fc7..531112e4 100644 --- a/src/includes/addons/LSaddons.ssh.php +++ b/src/includes/addons/LSaddons.ssh.php @@ -28,35 +28,35 @@ use phpseclib\Crypt\RSA; // Support LSerror :: defineError('SSH_SUPPORT_01', - _("SSH Support : PhpSecLib is missing.") + ___("SSH Support : PhpSecLib is missing.") ); LSerror :: defineError('SSH_SUPPORT_02', - _("SSH Support : The constant %{const} is not defined.") + ___("SSH Support : The constant %{const} is not defined.") ); // Autres erreurs LSerror :: defineError('SSH_01', - _("SSH : Invalid connection paramater : %{param} parameter is missing.") + ___("SSH : Invalid connection paramater : %{param} parameter is missing.") ); LSerror :: defineError('SSH_02', - _("SSH : Authentication key file not found (or not accessible, file path : '%{path}')") + ___("SSH : Authentication key file not found (or not accessible, file path : '%{path}')") ); LSerror :: defineError('SSH_03', - _("SSH : Fail to load authentication key (%{path}).") + ___("SSH : Fail to load authentication key (%{path}).") ); LSerror :: defineError('SSH_04', - _("SSH : Unable to connect to SSH Server (%{host}:%{port}).") + ___("SSH : Unable to connect to SSH Server (%{host}:%{port}).") ); LSerror :: defineError('SSH_05', - _("SSH : Unable to make directory %{dir} on the remote server.") + ___("SSH : Unable to make directory %{dir} on the remote server.") ); LSerror :: defineError('SSH_06', - _("SSH : Unable to delete directory %{dir} on the remote server.") + ___("SSH : Unable to delete directory %{dir} on the remote server.") ); LSerror :: defineError('SSH_07', - _("SSH : Unable to rename folder from %{old} to %{new} on the remote server.") + ___("SSH : Unable to rename folder from %{old} to %{new} on the remote server.") ); /** diff --git a/src/includes/addons/LSaddons.supann.php b/src/includes/addons/LSaddons.supann.php index 98d77331..40213d48 100644 --- a/src/includes/addons/LSaddons.supann.php +++ b/src/includes/addons/LSaddons.supann.php @@ -24,21 +24,21 @@ // Support LSerror :: defineError('SUPANN_SUPPORT_01', - _("SUPANN Support : The constant %{const} is not defined.") + ___("SUPANN Support : The constant %{const} is not defined.") ); LSerror :: defineError('SUPANN_SUPPORT_02', - _("SUPANN Support : The LSobject type %{type} does not exist. Can't work with entities..") + ___("SUPANN Support : The LSobject type %{type} does not exist. Can't work with entities..") ); LSerror :: defineError('SUPANN_SUPPORT_03', - _("SUPANN Support : The global array %{array} is not defined.") + ___("SUPANN Support : The global array %{array} is not defined.") ); // Autres erreurs LSerror :: defineError('SUPANN_01', - _("SUPANN Support : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") + ___("SUPANN Support : The attribute %{dependency} is missing. Unable to forge the attribute %{attr}.") ); LSerror :: defineError('SUPANN_02', - _("SUPANN Support : Can't get the basedn of entities. Unable to forge the attribute %{attr}.") + ___("SUPANN Support : Can't get the basedn of entities. Unable to forge the attribute %{attr}.") ); /** diff --git a/src/includes/class/class.LSattr_html.php b/src/includes/class/class.LSattr_html.php index 71fc4968..3bc316dd 100644 --- a/src/includes/class/class.LSattr_html.php +++ b/src/includes/class/class.LSattr_html.php @@ -132,9 +132,9 @@ class LSattr_html extends LSlog_staticLoggerClass { * Error Codes */ LSerror :: defineError('LSattr_html_01', -_("LSattr_html : The method addToForm() of the HTML type of the attribute %{attr} is not defined.") +___("LSattr_html : The method addToForm() of the HTML type of the attribute %{attr} is not defined.") ); // 02 : not yet used LSerror :: defineError('LSattr_html_03', -_("LSattr_html_%{type} : Multiple data are not supported for this field type.") +___("LSattr_html_%{type} : Multiple data are not supported for this field type.") ); diff --git a/src/includes/class/class.LSattr_html_select_list.php b/src/includes/class/class.LSattr_html_select_list.php index a0071807..cfcf160f 100644 --- a/src/includes/class/class.LSattr_html_select_list.php +++ b/src/includes/class/class.LSattr_html_select_list.php @@ -399,17 +399,17 @@ class LSattr_html_select_list extends LSattr_html{ * Error Codes */ LSerror :: defineError('LSattr_html_select_list_01', -_("LSattr_html_select_list : Configuration data are missing to generate the select list of the attribute %{attr}.") +___("LSattr_html_select_list : Configuration data are missing to generate the select list of the attribute %{attr}.") ); LSerror :: defineError('LSattr_html_select_list_02', -_("LSattr_html_select_list : Invalid attribute %{attr} reference as OTHER_ATTRIBUTE possible values.") +___("LSattr_html_select_list : Invalid attribute %{attr} reference as OTHER_ATTRIBUTE possible values.") ); LSerror :: defineError('LSattr_html_select_list_03', -_("LSattr_html_select_list : Attribute %{attr} referenced as OTHER_ATTRIBUTE possible values is not a jsonCompositeAttribute.") +___("LSattr_html_select_list : Attribute %{attr} referenced as OTHER_ATTRIBUTE possible values is not a jsonCompositeAttribute.") ); LSerror :: defineError('LSattr_html_select_list_04', -_("LSattr_html_select_list : Fail to decode the following attribute %{attr} value as JSON : %{value}") +___("LSattr_html_select_list : Fail to decode the following attribute %{attr} value as JSON : %{value}") ); LSerror :: defineError('LSattr_html_select_list_05', -_("LSattr_html_select_list : No component %{component} found in the following attribute %{attr} JSON value : %{value}") +___("LSattr_html_select_list : No component %{component} found in the following attribute %{attr} JSON value : %{value}") ); diff --git a/src/includes/class/class.LSattr_html_select_object.php b/src/includes/class/class.LSattr_html_select_object.php index 07309793..66489a56 100644 --- a/src/includes/class/class.LSattr_html_select_object.php +++ b/src/includes/class/class.LSattr_html_select_object.php @@ -399,20 +399,20 @@ class LSattr_html_select_object extends LSattr_html{ * Error Codes */ LSerror :: defineError('LSattr_html_select_object_01', -_("LSattr_html_select_object : parameter '%{parameter}' is missing (attribute : %{attr}).") +___("LSattr_html_select_object : parameter '%{parameter}' is missing (attribute : %{attr}).") ); LSerror :: defineError('LSattr_html_select_object_02', -_("LSattr_html_select_object : the value of the parameter value_attribute in the configuration of the attribute %{attr} is incorrect. Object %{object_type} have no attribute %{value_attribute}.") +___("LSattr_html_select_object : the value of the parameter value_attribute in the configuration of the attribute %{attr} is incorrect. Object %{object_type} have no attribute %{value_attribute}.") ); LSerror :: defineError('LSattr_html_select_object_03', -_("LSattr_html_select_object : more than one object returned corresponding to value %{val} of attribute %{attr}.") +___("LSattr_html_select_object : more than one object returned corresponding to value %{val} of attribute %{attr}.") ); LSerror :: defineError('LSattr_html_select_object_04', -_("LSattr_html_select_object : selection of object type %{type} is configured multiple time for attribute %{attr}.") +___("LSattr_html_select_object : selection of object type %{type} is configured multiple time for attribute %{attr}.") ); LSerror :: defineError('LSattr_html_select_object_05', -_("LSattr_html_select_object : the value '%{value}' seem to be duplicated in values of the attribute %{attr}.") +___("LSattr_html_select_object : the value '%{value}' seem to be duplicated in values of the attribute %{attr}.") ); LSerror :: defineError('LSattr_html_select_object_06', -_("LSattr_html_select_object : selected object %{name} has no attribute %{attr} value, you can't select it.") +___("LSattr_html_select_object : selected object %{name} has no attribute %{attr} value, you can't select it.") ); diff --git a/src/includes/class/class.LSattr_ldap_password.php b/src/includes/class/class.LSattr_ldap_password.php index 50f8c837..27706834 100644 --- a/src/includes/class/class.LSattr_ldap_password.php +++ b/src/includes/class/class.LSattr_ldap_password.php @@ -370,8 +370,8 @@ class LSattr_ldap_password extends LSattr_ldap { * Error Codes **/ LSerror :: defineError('LSattr_ldap_password_01', -_("LSattr_ldap_password : Encoding type %{type} is not supported. This password will be stored in clear text.") +___("LSattr_ldap_password : Encoding type %{type} is not supported. This password will be stored in clear text.") ); LSerror :: defineError('LSattr_ldap_password_02', -_("LSattr_ldap_password : Encoding function %{function} is not callable. This password will be stored in clear text.") +___("LSattr_ldap_password : Encoding function %{function} is not callable. This password will be stored in clear text.") ); diff --git a/src/includes/class/class.LSattribute.php b/src/includes/class/class.LSattribute.php index d15cecbe..c9e8a5c5 100644 --- a/src/includes/class/class.LSattribute.php +++ b/src/includes/class/class.LSattribute.php @@ -727,29 +727,29 @@ class LSattribute extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSattribute_01', - _("LSattribute : Attribute %{attr} : LDAP or HTML types unknow (LDAP = %{ldap} & HTML = %{html}).") + ___("LSattribute : Attribute %{attr} : LDAP or HTML types unknow (LDAP = %{ldap} & HTML = %{html}).") ); LSerror :: defineError('LSattribute_02', - _("LSattribute : The function %{func} to display the attribute %{attr} is unknow.") + ___("LSattribute : The function %{func} to display the attribute %{attr} is unknow.") ); LSerror :: defineError('LSattribute_03', - _("LSattribute : The rule %{rule} to validate the attribute %{attr} is unknow.") + ___("LSattribute : The rule %{rule} to validate the attribute %{attr} is unknow.") ); LSerror :: defineError('LSattribute_04', - _("LSattribute : Configuration data to verify the attribute %{attr} are incorrect.") + ___("LSattribute : Configuration data to verify the attribute %{attr} are incorrect.") ); LSerror :: defineError('LSattribute_05', - _("LSattribute : The function %{func} to save the attribute %{attr} is unknow.") + ___("LSattribute : The function %{func} to save the attribute %{attr} is unknow.") ); LSerror :: defineError('LSattribute_06', - _("LSattribute : The value of the attribute %{attr} can't be generated.") + ___("LSattribute : The value of the attribute %{attr} can't be generated.") ); LSerror :: defineError('LSattribute_07', - _("LSattribute : Generation of the attribute %{attr} failed.") + ___("LSattribute : Generation of the attribute %{attr} failed.") ); LSerror :: defineError('LSattribute_08', - _("LSattribute : Generation of the attribute %{attr} did not return a correct value.") + ___("LSattribute : Generation of the attribute %{attr} did not return a correct value.") ); LSerror :: defineError('LSattribute_09', - _("LSattribute : The attr_%{type} of the attribute %{name} is not yet defined.") + ___("LSattribute : The attr_%{type} of the attribute %{name} is not yet defined.") ); diff --git a/src/includes/class/class.LSauth.php b/src/includes/class/class.LSauth.php index 3f77e3b0..3ded7a2c 100644 --- a/src/includes/class/class.LSauth.php +++ b/src/includes/class/class.LSauth.php @@ -279,23 +279,23 @@ class LSauth extends LSlog_staticLoggerClass { * Error Codes */ LSerror :: defineError('LSauth_01', -_("LSauth : Login or password incorrect.") +___("LSauth : Login or password incorrect.") ); LSerror :: defineError('LSauth_02', -_("LSauth : Impossible to identify you : Duplication of identities.") +___("LSauth : Impossible to identify you : Duplication of identities.") ); LSerror :: defineError('LSauth_03', -_("LSauth : Could not load type of identifiable objects %{type}.") +___("LSauth : Could not load type of identifiable objects %{type}.") ); LSerror :: defineError('LSauth_04', -_("LSauth : Can't load authentication method %{method}.") +___("LSauth : Can't load authentication method %{method}.") ); LSerror :: defineError('LSauth_05', -_("LSauth : Failed to build the authentication provider %{method}.") +___("LSauth : Failed to build the authentication provider %{method}.") ); LSerror :: defineError('LSauth_06', -_("LSauth : Not correctly initialized.") +___("LSauth : Not correctly initialized.") ); LSerror :: defineError('LSauth_07', -_("LSauth : Failed to get authentication informations from provider.") +___("LSauth : Failed to get authentication informations from provider.") ); diff --git a/src/includes/class/class.LSauthMethod_CAS.php b/src/includes/class/class.LSauthMethod_CAS.php index 2e3f5d02..31a14f52 100644 --- a/src/includes/class/class.LSauthMethod_CAS.php +++ b/src/includes/class/class.LSauthMethod_CAS.php @@ -137,8 +137,8 @@ class LSauthMethod_CAS extends LSauthMethod { * Error Codes */ LSerror :: defineError('LSauthMethod_CAS_01', -_("LSauthMethod_CAS : Failed to load phpCAS.") +___("LSauthMethod_CAS : Failed to load phpCAS.") ); LSerror :: defineError('LSauthMethod_CAS_02', -_("LSauthMethod_CAS : Please check your configuration : you must configure CAS server SSL certificate validation using one of the following constant : LSAUTH_CAS_SERVER_SSL_CACERT or LSAUTH_CAS_SERVER_NO_SSL_VALIDATION") +___("LSauthMethod_CAS : Please check your configuration : you must configure CAS server SSL certificate validation using one of the following constant : LSAUTH_CAS_SERVER_SSL_CACERT or LSAUTH_CAS_SERVER_NO_SSL_VALIDATION") ); diff --git a/src/includes/class/class.LSauthMethod_HTTP.php b/src/includes/class/class.LSauthMethod_HTTP.php index a6c0bcc9..8201a333 100644 --- a/src/includes/class/class.LSauthMethod_HTTP.php +++ b/src/includes/class/class.LSauthMethod_HTTP.php @@ -133,5 +133,5 @@ class LSauthMethod_HTTP extends LSauthMethod_basic { * Error Codes */ LSerror :: defineError('LSauthMethod_HTTP_01', -_("LSauthMethod_HTTP : the %{var} environnement variable is missing.") +___("LSauthMethod_HTTP : the %{var} environnement variable is missing.") ); diff --git a/src/includes/class/class.LSauthMethod_anonymous.php b/src/includes/class/class.LSauthMethod_anonymous.php index 2dd355e4..2cd7eabb 100644 --- a/src/includes/class/class.LSauthMethod_anonymous.php +++ b/src/includes/class/class.LSauthMethod_anonymous.php @@ -66,5 +66,5 @@ class LSauthMethod_anonymous extends LSauthMethod { * Error Codes */ LSerror :: defineError('LSauthMethod_anonymous_01', -_("LSauthMethod_anonymous : You must define the LSAUTHMETHOD_ANONYMOUS_USER contant in the configuration file.") +___("LSauthMethod_anonymous : You must define the LSAUTHMETHOD_ANONYMOUS_USER contant in the configuration file.") ); diff --git a/src/includes/class/class.LScli.php b/src/includes/class/class.LScli.php index 14ee15df..fcc9c509 100644 --- a/src/includes/class/class.LScli.php +++ b/src/includes/class/class.LScli.php @@ -775,10 +775,10 @@ class LScli extends LSlog_staticLoggerClass { * Error Codes */ LSerror :: defineError('LScli_01', -_("LScli : The CLI command '%{command}' already exists.") +___("LScli : The CLI command '%{command}' already exists.") ); LSerror :: defineError('LScli_02', -_("LScli : The CLI command '%{command}' handler is not callable.") +___("LScli : The CLI command '%{command}' handler is not callable.") ); /* diff --git a/src/includes/class/class.LSerror.php b/src/includes/class/class.LSerror.php index 4bb31b49..42f126fa 100644 --- a/src/includes/class/class.LSerror.php +++ b/src/includes/class/class.LSerror.php @@ -143,7 +143,7 @@ class LSerror { */ private static function formatError($code=null, $message=null, $escape=True, $escape_method=null) { if ($code && array_key_exists($code, self :: $_errorCodes)) { - $message = getFData(self :: $_errorCodes[$code]['msg'], $message); + $message = getFData(__(self :: $_errorCodes[$code]['msg']), $message); if (!self :: $_errorCodes[$code]['escape'] === false) $escape = false; } @@ -206,4 +206,4 @@ class LSerror { /* * Error Codes */ -LSerror :: defineError(-1,_("Unknown error : %{error}")); +LSerror :: defineError(-1, ___("Unknown error : %{error}")); diff --git a/src/includes/class/class.LSform.php b/src/includes/class/class.LSform.php index 393483b5..5ef18f4a 100644 --- a/src/includes/class/class.LSform.php +++ b/src/includes/class/class.LSform.php @@ -824,30 +824,30 @@ class LSform extends LSlog_staticLoggerClass { * Error Codes */ LSerror :: defineError('LSform_01', -_("LSform : Error during the recovery of the values of the form.") +___("LSform : Error during the recovery of the values of the form.") ); LSerror :: defineError('LSform_02', -_("LSform : Error durring the recovery of the value of the field '%{element}'.") +___("LSform : Error durring the recovery of the value of the field '%{element}'.") ); // No longer used /*LSerror :: defineError(203, -_("LSform : Data of the field %{element} are not validate.") +___("LSform : Data of the field %{element} are not validate.") );*/ LSerror :: defineError('LSform_04', -_("LSform : The field %{element} doesn't exist.") +___("LSform : The field %{element} doesn't exist.") ); LSerror :: defineError('LSform_05', -_("LSfom : Field type unknow (%{type}).") +___("LSfom : Field type unknow (%{type}).") ); LSerror :: defineError('LSform_06', -_("LSform : Error during the creation of the element '%{element}'.") +___("LSform : Error during the creation of the element '%{element}'.") ); LSerror :: defineError('LSform_07', -_("LSform : The data entry form %{name} doesn't exist.") +___("LSform : The data entry form %{name} doesn't exist.") ); LSerror :: defineError('LSform_08', -_("LSform : The data entry form %{name} is not correctly configured.") +___("LSform : The data entry form %{name} is not correctly configured.") ); LSerror :: defineError('LSform_09', -_("LSform : The element %{name}, listed as displayed in data entry form configuration, doesn't exist.") +___("LSform : The element %{name}, listed as displayed in data entry form configuration, doesn't exist.") ); diff --git a/src/includes/class/class.LSformElement_password.php b/src/includes/class/class.LSformElement_password.php index 95085239..8c41b777 100644 --- a/src/includes/class/class.LSformElement_password.php +++ b/src/includes/class/class.LSformElement_password.php @@ -420,17 +420,17 @@ class LSformElement_password extends LSformElement { * Error Codes */ LSerror :: defineError('LSformElement_password_01', -_("LSformElement_password : No valid contact mail address available : Can't send new password.") +___("LSformElement_password : No valid contact mail address available : Can't send new password.") ); LSerror :: defineError('LSformElement_password_02', -_("LSformElement_password : Fail to send new password by email to %{mail}.") +___("LSformElement_password : Fail to send new password by email to %{mail}.") ); LSerror :: defineError('LSformElement_password_03', -_("LSformElement_password : Fail to exec pwgen. Check it's correctly installed.") +___("LSformElement_password : Fail to exec pwgen. Check it's correctly installed.") ); LSerror :: defineError('LSformElement_password_04', -_("LSformElement_password : Fail to determine witch e-mail attribute to use to send new password : get_mail_attr_function parameter not refer to a valid function.") +___("LSformElement_password : Fail to determine witch e-mail attribute to use to send new password : get_mail_attr_function parameter not refer to a valid function.") ); LSerror :: defineError('LSformElement_password_05', -_("LSformElement_password : Fail to determine witch e-mail attribute to use to send new password : get_mail_attr_function throwed an exception : %{msg}") +___("LSformElement_password : Fail to determine witch e-mail attribute to use to send new password : get_mail_attr_function throwed an exception : %{msg}") ); diff --git a/src/includes/class/class.LSformElement_postaladdress.php b/src/includes/class/class.LSformElement_postaladdress.php index 2b2d8d09..af021854 100644 --- a/src/includes/class/class.LSformElement_postaladdress.php +++ b/src/includes/class/class.LSformElement_postaladdress.php @@ -86,5 +86,5 @@ function LSformElement_postaladdress__generate_pattern($LSformElement) { } LSerror :: defineError('LSformElement_postaladdress_01', -_("LSformElement_postaladdress : Map URL pattern generate function is not callabled (%{function}).") +___("LSformElement_postaladdress : Map URL pattern generate function is not callabled (%{function}).") ); diff --git a/src/includes/class/class.LSformElement_valueWithUnit.php b/src/includes/class/class.LSformElement_valueWithUnit.php index 230f8b9c..f96f3ba2 100644 --- a/src/includes/class/class.LSformElement_valueWithUnit.php +++ b/src/includes/class/class.LSformElement_valueWithUnit.php @@ -202,5 +202,5 @@ class LSformElement_valueWithUnit extends LSformElement { * Error Codes */ LSerror :: defineError('LSformElement_valueWithUnit_01', -_("LSformElement_valueWithUnit : Units configuration data are missing for the attribute %{attr}.") +___("LSformElement_valueWithUnit : Units configuration data are missing for the attribute %{attr}.") ); diff --git a/src/includes/class/class.LSformRule.php b/src/includes/class/class.LSformRule.php index 2d3995b5..a091578a 100644 --- a/src/includes/class/class.LSformRule.php +++ b/src/includes/class/class.LSformRule.php @@ -48,5 +48,5 @@ class LSformRule extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSformRule_01', -_("LSformRule_%{type} : Parameter %{param} is not found.") +___("LSformRule_%{type} : Parameter %{param} is not found.") ); diff --git a/src/includes/class/class.LSformRule_callable.php b/src/includes/class/class.LSformRule_callable.php index 747f5dbd..e37dd6b3 100644 --- a/src/includes/class/class.LSformRule_callable.php +++ b/src/includes/class/class.LSformRule_callable.php @@ -63,5 +63,5 @@ class LSformRule_callable extends LSformRule { * Error codes */ LSerror :: defineError('LSformRule_callable_01', -_("LSformRule_callable : The given callable option is not callable") +___("LSformRule_callable : The given callable option is not callable") ); diff --git a/src/includes/class/class.LSformRule_date.php b/src/includes/class/class.LSformRule_date.php index 19b8d57a..4caa1463 100644 --- a/src/includes/class/class.LSformRule_date.php +++ b/src/includes/class/class.LSformRule_date.php @@ -59,5 +59,5 @@ class LSformRule_date extends LSformRule { * Error Codes */ LSerror :: defineError('LSformRule_date_01', -_("LSformRule_date : No date format specify.") +___("LSformRule_date : No date format specify.") ); diff --git a/src/includes/class/class.LSformRule_differentPassword.php b/src/includes/class/class.LSformRule_differentPassword.php index da221234..37ec05b9 100644 --- a/src/includes/class/class.LSformRule_differentPassword.php +++ b/src/includes/class/class.LSformRule_differentPassword.php @@ -91,17 +91,17 @@ class LSformRule_differentPassword extends LSformRule { * Error Codes */ LSerror :: defineError('LSformRule_differentPassword_01', -_("LSformRule_differentPassword : Other password attribute is not configured.") +___("LSformRule_differentPassword : Other password attribute is not configured.") ); LSerror :: defineError('LSformRule_differentPassword_02', -_("LSformRule_differentPassword : Fail to load LSattr_ldap :: password class.") +___("LSformRule_differentPassword : Fail to load LSattr_ldap :: password class.") ); LSerror :: defineError('LSformRule_differentPassword_03', -_("LSformRule_differentPassword : The other password attribute %{attr} does not exist.") +___("LSformRule_differentPassword : The other password attribute %{attr} does not exist.") ); LSerror :: defineError('LSformRule_differentPassword_04', -_("LSformRule_differentPassword : The other password attribute could not be the same of the current one.") +___("LSformRule_differentPassword : The other password attribute could not be the same of the current one.") ); LSerror :: defineError('LSformRule_differentPassword_05', -_("LSformRule_differentPassword : The other password attributes must use LSattr_ldap :: password. It's not the case of the attribure %{attr}.") +___("LSformRule_differentPassword : The other password attributes must use LSattr_ldap :: password. It's not the case of the attribure %{attr}.") ); diff --git a/src/includes/class/class.LSformRule_inarray.php b/src/includes/class/class.LSformRule_inarray.php index 4e3e424c..d249a968 100644 --- a/src/includes/class/class.LSformRule_inarray.php +++ b/src/includes/class/class.LSformRule_inarray.php @@ -54,5 +54,5 @@ class LSformRule_inarray extends LSformRule { * Error Codes */ LSerror :: defineError('LSformRule_inarray_01', -_("LSformRule_inarray : Possible values has not been configured to validate data.") +___("LSformRule_inarray : Possible values has not been configured to validate data.") ); diff --git a/src/includes/class/class.LSformRule_password.php b/src/includes/class/class.LSformRule_password.php index 05e0ab99..e4b925cf 100644 --- a/src/includes/class/class.LSformRule_password.php +++ b/src/includes/class/class.LSformRule_password.php @@ -101,5 +101,5 @@ class LSformRule_password extends LSformRule { * Error Codes */ LSerror :: defineError('LSformRule_password_01', -_("LSformRule_password : Invalid regex configured : %{regex}. You must use PCRE (begining by '/' caracter).") +___("LSformRule_password : Invalid regex configured : %{regex}. You must use PCRE (begining by '/' caracter).") ); diff --git a/src/includes/class/class.LSformRule_regex.php b/src/includes/class/class.LSformRule_regex.php index a5fce4e7..31431714 100644 --- a/src/includes/class/class.LSformRule_regex.php +++ b/src/includes/class/class.LSformRule_regex.php @@ -59,5 +59,5 @@ class LSformRule_regex extends LSformRule { * Error Codes */ LSerror :: defineError('LSformRule_regex_01', -_("LSformRule_regex : Regex has not been configured to validate data.") +___("LSformRule_regex : Regex has not been configured to validate data.") ); diff --git a/src/includes/class/class.LSimport.php b/src/includes/class/class.LSimport.php index be025834..40a84410 100644 --- a/src/includes/class/class.LSimport.php +++ b/src/includes/class/class.LSimport.php @@ -317,14 +317,14 @@ LStemplate :: registerFunction('LSimport_implodeValues','LSimport_implodeValues' LSerror :: defineError('LSimport_01', -_("LSimport : Post data not found or not completed.") +___("LSimport : Post data not found or not completed.") ); LSerror :: defineError('LSimport_02', -_("LSimport : object type invalid.") +___("LSimport : object type invalid.") ); LSerror :: defineError('LSimport_03', -_("LSimport : input/output format %{format} invalid.") +___("LSimport : input/output format %{format} invalid.") ); LSerror :: defineError('LSimport_04', -_("LSimport : Fail to initialize input/output driver") +___("LSimport : Fail to initialize input/output driver") ); diff --git a/src/includes/class/class.LSioFormat.php b/src/includes/class/class.LSioFormat.php index a7de79b2..56f33e93 100644 --- a/src/includes/class/class.LSioFormat.php +++ b/src/includes/class/class.LSioFormat.php @@ -89,5 +89,5 @@ class LSioFormat { } LSerror :: defineError('LSioFormat_01', -_("LSioFormat : IOformat driver %{driver} invalid or unavailable.") +___("LSioFormat : IOformat driver %{driver} invalid or unavailable.") ); diff --git a/src/includes/class/class.LSldap.php b/src/includes/class/class.LSldap.php index 5005bc47..c1c44d6d 100644 --- a/src/includes/class/class.LSldap.php +++ b/src/includes/class/class.LSldap.php @@ -501,23 +501,23 @@ class LSldap extends LSlog_staticLoggerClass { * Error Codes */ LSerror :: defineError('LSldap_01', - _("LSldap : Error during the LDAP server connection (%{msg}).") + ___("LSldap : Error during the LDAP server connection (%{msg}).") ); LSerror :: defineError('LSldap_02', - _("LSldap : Error during the LDAP search (%{msg}).") + ___("LSldap : Error during the LDAP search (%{msg}).") ); LSerror :: defineError('LSldap_03', - _("LSldap : Object type unknown.") + ___("LSldap : Object type unknown.") ); LSerror :: defineError('LSldap_04', - _("LSldap : Error while fetching the LDAP entry.") + ___("LSldap : Error while fetching the LDAP entry.") ); LSerror :: defineError('LSldap_05', - _("LSldap : Error while changing the LDAP entry (DN : %{dn}).") + ___("LSldap : Error while changing the LDAP entry (DN : %{dn}).") ); LSerror :: defineError('LSldap_06', - _("LSldap : Error while deleting empty attributes.") + ___("LSldap : Error while deleting empty attributes.") ); LSerror :: defineError('LSldap_07', - _("LSldap : Error while changing the DN of the object.") + ___("LSldap : Error while changing the DN of the object.") ); diff --git a/src/includes/class/class.LSldapObject.php b/src/includes/class/class.LSldapObject.php index 4f1447a1..16391bfa 100644 --- a/src/includes/class/class.LSldapObject.php +++ b/src/includes/class/class.LSldapObject.php @@ -2859,122 +2859,122 @@ class LSldapObject extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSldapObject_01', -_("LSldapObject : Object type unknown.") +___("LSldapObject : Object type unknown.") ); LSerror :: defineError('LSldapObject_02', -_("LSldapObject : Update form is not defined for the object %{obj}.") +___("LSldapObject : Update form is not defined for the object %{obj}.") ); LSerror :: defineError('LSldapObject_03', -_("LSldapObject : No form exists for the object %{obj}.") +___("LSldapObject : No form exists for the object %{obj}.") ); LSerror :: defineError('LSldapObject_04', -_("LSldapObject : The function %{func} to validate the attribute %{attr} the object %{obj} is unknow.") +___("LSldapObject : The function %{func} to validate the attribute %{attr} the object %{obj} is unknow.") ); LSerror :: defineError('LSldapObject_05', -_("LSldapObject : Configuration data are missing to validate the attribute %{attr} of the object %{obj}.") +___("LSldapObject : Configuration data are missing to validate the attribute %{attr} of the object %{obj}.") ); LSerror :: defineError('LSldapObject_06', -_("LSldapObject : The function %{func} to be executed on the object event %{event} doesn't exist.") +___("LSldapObject : The function %{func} to be executed on the object event %{event} doesn't exist.") ); LSerror :: defineError('LSldapObject_07', -_("LSldapObject : The %{func} execution on the object event %{event} failed.") +___("LSldapObject : The %{func} execution on the object event %{event} failed.") ); LSerror :: defineError('LSldapObject_08', -_("LSldapObject : Class %{class}, which method %{meth} to be executed on the object event %{event}, doesn't exist.") +___("LSldapObject : Class %{class}, which method %{meth} to be executed on the object event %{event}, doesn't exist.") ); LSerror :: defineError('LSldapObject_09', -_("LSldapObject : Method %{meth} within %{class} class to be executed on object event %{event}, doesn't exist.") +___("LSldapObject : Method %{meth} within %{class} class to be executed on object event %{event}, doesn't exist.") ); LSerror :: defineError('LSldapObject_10', -_("LSldapObject : Error during execute %{meth} method within %{class} class, to be executed on object event %{event}.") +___("LSldapObject : Error during execute %{meth} method within %{class} class, to be executed on object event %{event}.") ); LSerror :: defineError('LSldapObject_11', -_("LSldapObject : Some configuration data of the object type %{obj} are missing to generate the DN of the new object.") +___("LSldapObject : Some configuration data of the object type %{obj} are missing to generate the DN of the new object.") ); LSerror :: defineError('LSldapObject_12', -_("LSldapObject : The attibute %{attr} of the object is not yet defined. Can't generate DN.") +___("LSldapObject : The attibute %{attr} of the object is not yet defined. Can't generate DN.") ); LSerror :: defineError('LSldapObject_13', -_("LSldapObject : Without DN, the object could not be changed.") +___("LSldapObject : Without DN, the object could not be changed.") ); LSerror :: defineError('LSldapObject_14', -_("LSldapObject : The attribute %{attr_depend} depending on the attribute %{attr} doesn't exist.") +___("LSldapObject : The attribute %{attr_depend} depending on the attribute %{attr} doesn't exist.") ); LSerror :: defineError('LSldapObject_15', -_("LSldapObject : Error during deleting the object %{objectname}.") +___("LSldapObject : Error during deleting the object %{objectname}.") ); LSerror :: defineError('LSldapObject_16', -_("LSldapObject : Error during actions to be executed before renaming the objet.") +___("LSldapObject : Error during actions to be executed before renaming the objet.") ); LSerror :: defineError('LSldapObject_17', -_("LSldapObject : Error during actions to be executed after renaming the objet.") +___("LSldapObject : Error during actions to be executed after renaming the objet.") ); LSerror :: defineError('LSldapObject_18', -_("LSldapObject : Error during actions to be executed before deleting the objet.") +___("LSldapObject : Error during actions to be executed before deleting the objet.") ); LSerror :: defineError('LSldapObject_19', -_("LSldapObject : Error during actions to be executed after deleting the objet.") +___("LSldapObject : Error during actions to be executed after deleting the objet.") ); LSerror :: defineError('LSldapObject_20', -_("LSldapObject : Error during the actions to be executed before creating the object.") +___("LSldapObject : Error during the actions to be executed before creating the object.") ); LSerror :: defineError('LSldapObject_21', -_("LSldapObject : Error during the actions to be executed after creating the object. It was created anyway.") +___("LSldapObject : Error during the actions to be executed after creating the object. It was created anyway.") ); LSerror :: defineError('LSldapObject_22', -_("LSldapObject : The function %{func} to be executed before creating the object doesn't exist.") +___("LSldapObject : The function %{func} to be executed before creating the object doesn't exist.") ); LSerror :: defineError('LSldapObject_23', -_("LSldapObject : Error executing the function %{func} to be execute after deleting the object.") +___("LSldapObject : Error executing the function %{func} to be execute after deleting the object.") ); LSerror :: defineError('LSldapObject_24', -_("LSldapObject : The function %{func} to be executed after deleting the object doesn't exist.") +___("LSldapObject : The function %{func} to be executed after deleting the object doesn't exist.") ); LSerror :: defineError('LSldapObject_25', -_("LSldapObject : Error executing the function %{func} to be execute after creating the object.") +___("LSldapObject : Error executing the function %{func} to be execute after creating the object.") ); LSerror :: defineError('LSldapObject_26', -_("LSldapObject : %{func} function, to be executed on object event %{event}, doesn't exist.") +___("LSldapObject : %{func} function, to be executed on object event %{event}, doesn't exist.") ); LSerror :: defineError('LSldapObject_27', -_("LSldapObject : Error during the execution of %{func} function on object event %{event}.") +___("LSldapObject : Error during the execution of %{func} function on object event %{event}.") ); LSerror :: defineError('LSldapObject_28', -_("LSldapObject : %{meth} method, to be executed on object event %{event}, doesn't exist.") +___("LSldapObject : %{meth} method, to be executed on object event %{event}, doesn't exist.") ); LSerror :: defineError('LSldapObject_29', -_("LSldapObject : Error during execution of %{meth} method on object event %{event}.") +___("LSldapObject : Error during execution of %{meth} method on object event %{event}.") ); LSerror :: defineError('LSldapObject_30', -_("LSldapObject : Error during generate LDAP filter for %{LSobject}.") +___("LSldapObject : Error during generate LDAP filter for %{LSobject}.") ); LSerror :: defineError('LSldapObject_31', -_("LSldapObject : Error during execution of the custom action %{customAction} on %{objectname}.") +___("LSldapObject : Error during execution of the custom action %{customAction} on %{objectname}.") ); LSerror :: defineError('LSldapObject_32', -_("LSldapObject : Fail to retrieve container DN.") +___("LSldapObject : Fail to retrieve container DN.") ); LSerror :: defineError('LSldapObject_33', -_("LSldapObject : The function %{func} to generate container DN is not callable.") +___("LSldapObject : The function %{func} to generate container DN is not callable.") ); LSerror :: defineError('LSldapObject_34', -_("LSldapObject : Error during generating container DN : %{error}") +___("LSldapObject : Error during generating container DN : %{error}") ); // LSrelation LSerror :: defineError('LSrelations_05', -_("LSrelation : Some parameters are missing in the call of methods to handle standard relations (Method : %{meth}).") +___("LSrelation : Some parameters are missing in the call of methods to handle standard relations (Method : %{meth}).") ); // LScli diff --git a/src/includes/class/class.LSlog.php b/src/includes/class/class.LSlog.php index d6143ff1..c23f4d65 100644 --- a/src/includes/class/class.LSlog.php +++ b/src/includes/class/class.LSlog.php @@ -475,5 +475,5 @@ class LSlog { * Error Codes */ LSerror :: defineError('LSlog_01', -_("LSlog : Fail to load logging handler %{handler}.") +___("LSlog : Fail to load logging handler %{handler}.") ); diff --git a/src/includes/class/class.LSrelation.php b/src/includes/class/class.LSrelation.php index 4079f1fc..0798a0c2 100644 --- a/src/includes/class/class.LSrelation.php +++ b/src/includes/class/class.LSrelation.php @@ -951,26 +951,26 @@ class LSrelation extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSrelations_01', -_("LSrelation : Invalid parameter '%{parameter}' of the relation %{relation}: objects %{LSobject} have no function '%{function}'.") +___("LSrelation : Invalid parameter '%{parameter}' of the relation %{relation}: objects %{LSobject} have no function '%{function}'.") ); LSerror :: defineError('LSrelations_02', -_("LSrelation : Relation %{relation} of object type %{LSobject} unknown.") +___("LSrelation : Relation %{relation} of object type %{LSobject} unknown.") ); LSerror :: defineError('LSrelations_03', -_("LSrelation : Error during relation update of the relation %{relation}.") +___("LSrelation : Error during relation update of the relation %{relation}.") ); LSerror :: defineError('LSrelations_04', -_("LSrelation : Object type %{LSobject} unknown (Relation : %{relation}).") +___("LSrelation : Object type %{LSobject} unknown (Relation : %{relation}).") ); LSerror :: defineError('LSrelations_05', -_("LSrelation : Incomplete configuration for LSrelation %{relation} of object type %{LSobject} for action : %{action}.") +___("LSrelation : Incomplete configuration for LSrelation %{relation} of object type %{LSobject} for action : %{action}.") ); LSerror :: defineError('LSrelations_06', -_("LSrelation : Invalid editable attribute for LSrelation %{relation} with LSobject %{LSobject}.") +___("LSrelation : Invalid editable attribute for LSrelation %{relation} with LSobject %{LSobject}.") ); LSerror :: defineError('LSrelations_07', -_("LSrelation : The configuration parameter '%{parameter}' of the relation %{relation} of %{LSobject} is missing.") +___("LSrelation : The configuration parameter '%{parameter}' of the relation %{relation} of %{LSobject} is missing.") ); LSerror :: defineError('LSrelations_08', -_("LSrelation : The configuration parameter '%{parameter}' of the relation %{relation} of %{LSobject} is invalid.") +___("LSrelation : The configuration parameter '%{parameter}' of the relation %{relation} of %{LSobject} is invalid.") ); diff --git a/src/includes/class/class.LSsearch.php b/src/includes/class/class.LSsearch.php index fb92a99f..5b3a6fbc 100644 --- a/src/includes/class/class.LSsearch.php +++ b/src/includes/class/class.LSsearch.php @@ -1696,55 +1696,55 @@ class LSsearch extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSsearch_01', -_("LSsearch : Invalid filter : %{filter}.") +___("LSsearch : Invalid filter : %{filter}.") ); LSerror :: defineError('LSsearch_02', -_("LSsearch : Invalid basedn : %{basedn}.") +___("LSsearch : Invalid basedn : %{basedn}.") ); LSerror :: defineError('LSsearch_03', -_("LSsearch : Invalid value for %{param} parameter.") +___("LSsearch : Invalid value for %{param} parameter.") ); LSerror :: defineError('LSsearch_04', -_("LSsearch : Invalid size limit. Must be an integer greater or equal to 0.") +___("LSsearch : Invalid size limit. Must be an integer greater or equal to 0.") ); LSerror :: defineError('LSsearch_05', -_("LSsearch : Invalid parameter %{attr}. Must be an boolean.") +___("LSsearch : Invalid parameter %{attr}. Must be an boolean.") ); LSerror :: defineError('LSsearch_06', -_("LSsearch : Invalid parameter attributes. Must be an string or an array of strings.") +___("LSsearch : Invalid parameter attributes. Must be an string or an array of strings.") ); LSerror :: defineError('LSsearch_07', -_("LSsearch : Can't build attributes list for make filter.") +___("LSsearch : Can't build attributes list for make filter.") ); LSerror :: defineError('LSsearch_08', -_("LSsearch : Error building filter with attribute '%{attr}' and pattern '%{pattern}'") +___("LSsearch : Error building filter with attribute '%{attr}' and pattern '%{pattern}'") ); LSerror :: defineError('LSsearch_09', -_("LSsearch : Error combining filters.") +___("LSsearch : Error combining filters.") ); LSerror :: defineError('LSsearch_10', -_("LSsearch : Invalid pattern.") +___("LSsearch : Invalid pattern.") ); LSerror :: defineError('LSsearch_11', -_("LSsearch : Invalid attribute %{attr} in parameters.") +___("LSsearch : Invalid attribute %{attr} in parameters.") ); LSerror :: defineError('LSsearch_12', -_("LSsearch : Error during the search.") +___("LSsearch : Error during the search.") ); LSerror :: defineError('LSsearch_13', -_("LSsearch : Error sorting the search.") +___("LSsearch : Error sorting the search.") ); LSerror :: defineError('LSsearch_14', -_("LSsearch : The function of the custum information %{name} is not callable.") +___("LSsearch : The function of the custum information %{name} is not callable.") ); LSerror :: defineError('LSsearch_15', -_("LSsearch : Invalid predefinedFilter for LSobject type %{type} : %{label} (filter : %{filter}).") +___("LSsearch : Invalid predefinedFilter for LSobject type %{type} : %{label} (filter : %{filter}).") ); LSerror :: defineError('LSsearch_16', -_("LSsearch : Error during execution of the custom action %{customAction}.") +___("LSsearch : Error during execution of the custom action %{customAction}.") ); LSerror :: defineError('LSsearch_17', -_("LSsearch : Invalid search pattern.") +___("LSsearch : Invalid search pattern.") ); // LScli diff --git a/src/includes/class/class.LSsearchEntry.php b/src/includes/class/class.LSsearchEntry.php index 9a02f3af..5dd714a2 100644 --- a/src/includes/class/class.LSsearchEntry.php +++ b/src/includes/class/class.LSsearchEntry.php @@ -269,5 +269,5 @@ class LSsearchEntry extends LSlog_staticLoggerClass { * Error Codes **/ LSerror :: defineError('LSsearchEntry_01', -_("LSsearchEntry : Invalid formaterFunction %{func} for extraDisplayedColumns %{column}.") +___("LSsearchEntry : Invalid formaterFunction %{func} for extraDisplayedColumns %{column}.") ); diff --git a/src/includes/class/class.LSsession.php b/src/includes/class/class.LSsession.php index d13bb346..98f7b369 100644 --- a/src/includes/class/class.LSsession.php +++ b/src/includes/class/class.LSsession.php @@ -2780,85 +2780,85 @@ class LSsession { * Error Codes */ LSerror :: defineError('LSsession_01', - _("LSsession : The constant %{const} is not defined.") + ___("LSsession : The constant %{const} is not defined.") ); LSerror :: defineError('LSsession_02', - _("LSsession : The %{addon} support is uncertain. Verify system compatibility and the add-on configuration.") + ___("LSsession : The %{addon} support is uncertain. Verify system compatibility and the add-on configuration.") ); LSerror :: defineError('LSsession_03', - _("LSsession : LDAP server's configuration data are invalid. Can't connect.") + ___("LSsession : LDAP server's configuration data are invalid. Can't connect.") ); LSerror :: defineError('LSsession_04', - _("LSsession : Failed to load LSobject type %{type} : unknon type.") + ___("LSsession : Failed to load LSobject type %{type} : unknon type.") ); LSerror :: defineError('LSsession_05', - _("LSsession : Failed to load LSclass %{class}.") + ___("LSsession : Failed to load LSclass %{class}.") ); LSerror :: defineError('LSsession_06', - _("LSsession : Login or password incorrect.") + ___("LSsession : Login or password incorrect.") ); LSerror :: defineError('LSsession_07', - _("LSsession : Impossible to identify you : Duplication of identities.") + ___("LSsession : Impossible to identify you : Duplication of identities.") ); LSerror :: defineError('LSsession_08', - _("LSsession : Can't load class of authentification (%{class}).") + ___("LSsession : Can't load class of authentification (%{class}).") ); LSerror :: defineError('LSsession_09', - _("LSsession : Can't connect to LDAP server.") + ___("LSsession : Can't connect to LDAP server.") ); LSerror :: defineError('LSsession_10', - _("LSsession : Impossible to authenticate you.") + ___("LSsession : Impossible to authenticate you.") ); LSerror :: defineError('LSsession_11', - _("LSsession : Your are not authorized to do this action.") + ___("LSsession : Your are not authorized to do this action.") ); LSerror :: defineError('LSsession_12', - _("LSsession : Some informations are missing to display this page.") + ___("LSsession : Some informations are missing to display this page.") ); LSerror :: defineError('LSsession_13', - _("LSsession : The function of the custom action %{name} does not exists or is not configured.") + ___("LSsession : The function of the custom action %{name} does not exists or is not configured.") ); LSerror :: defineError('LSsession_14', - _("LSsession : Fail to retreive user's LDAP credentials from LSauth.") + ___("LSsession : Fail to retreive user's LDAP credentials from LSauth.") ); LSerror :: defineError('LSsession_15', - _("LSsession : Fail to reconnect to LDAP server with user's LDAP credentials.") + ___("LSsession : Fail to reconnect to LDAP server with user's LDAP credentials.") ); LSerror :: defineError('LSsession_16', - _("LSsession : No import/export format define for this object type.") + ___("LSsession : No import/export format define for this object type.") ); LSerror :: defineError('LSsession_17', - _("LSsession : Error during creation of list of levels. Contact administrators. (Code : %{code})") + ___("LSsession : Error during creation of list of levels. Contact administrators. (Code : %{code})") ); LSerror :: defineError('LSsession_18', - _("LSsession : The password recovery is disabled for this LDAP server.") + ___("LSsession : The password recovery is disabled for this LDAP server.") ); LSerror :: defineError('LSsession_19', - _("LSsession : Some informations are missing to recover your password. Contact administrators.") + ___("LSsession : Some informations are missing to recover your password. Contact administrators.") ); LSerror :: defineError('LSsession_20', - _("LSsession : Error during password recovery. Contact administrators.(Step : %{step})") + ___("LSsession : Error during password recovery. Contact administrators.(Step : %{step})") ); LSerror :: defineError('LSsession_21', - _("LSsession : call function %{func} do not provided from LSaddon %{addon}.") + ___("LSsession : call function %{func} do not provided from LSaddon %{addon}.") ); LSerror :: defineError('LSsession_22', - _("LSsession : problem during initialisation.") + ___("LSsession : problem during initialisation.") ); LSerror :: defineError('LSsession_23', - _("LSsession : view function %{func} for LSaddon %{addon} doet not exist.") + ___("LSsession : view function %{func} for LSaddon %{addon} doet not exist.") ); LSerror :: defineError('LSsession_24', - _("LSsession : invalid related object's DN pass in parameter.") + ___("LSsession : invalid related object's DN pass in parameter.") ); LSerror :: defineError('LSsession_25', - _("LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please upgrade it.") + ___("LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please upgrade it.") ); LSerror :: defineError('LSsession_26', - _("LSsession : You have been redirect from an old-style URL %{url}. Please upgrade this link.") + ___("LSsession : You have been redirect from an old-style URL %{url}. Please upgrade this link.") ); LSerror :: defineError('LSsession_27', - _("LSsession : You always seem to use %{old} in your custom code: Please upgrade it and use %{new}.
\nContext:\n%{context}
") + ___("LSsession : You always seem to use %{old} in your custom code: Please upgrade it and use %{new}.
\nContext:\n%{context}
") ); } diff --git a/src/includes/class/class.LStemplate.php b/src/includes/class/class.LStemplate.php index 6fe56225..d581bf07 100644 --- a/src/includes/class/class.LStemplate.php +++ b/src/includes/class/class.LStemplate.php @@ -654,11 +654,11 @@ function LStemplate_smarty_var_dump($params, &$smarty) { // Errors LSerror :: defineError('LStemplate_01', -_("LStemplate : Template %{file} not found.") +___("LStemplate : Template %{file} not found.") ); LSerror :: defineError('LStemplate_02', -_("LStemplate : Fail to execute trigger %{callable} on event %{event} : is not callable.") +___("LStemplate : Fail to execute trigger %{callable} on event %{event} : is not callable.") ); LSerror :: defineError('LStemplate_03', -_("LStemplate : Error during the execution of the trigger %{callable} on event %{event}.") +___("LStemplate : Error during the execution of the trigger %{callable} on event %{event}.") );