diff --git a/public_html/css/default/base.css b/public_html/css/default/base.css index 736fd495..c81b470c 100644 --- a/public_html/css/default/base.css +++ b/public_html/css/default/base.css @@ -355,20 +355,20 @@ input[type='submit'].LSview_search { /* ********************* - * Fatal error + * Error page ********************* */ -#fatal_error { +#error { margin: auto; max-width: 80%; text-align: center; } -#fatal_error h1 { +#error h1 { border: none; } -#fatal_error pre { +#error pre { color: #111; text-align: left; background-color: #eee; @@ -380,7 +380,7 @@ input[type='submit'].LSview_search { border: 1px solid #ccc; } -#fatal_error pre em { +#error pre em { border-radius: 6px; background-color: #60B7D4; font-family: sans-serif; diff --git a/public_html/includes/class/class.LStemplate.php b/public_html/includes/class/class.LStemplate.php index ef921a85..be68cce8 100644 --- a/public_html/includes/class/class.LStemplate.php +++ b/public_html/includes/class/class.LStemplate.php @@ -382,8 +382,10 @@ class LStemplate { * @retval void **/ public static function fatal_error($error=null) { - self :: $_smarty -> assign('fatal_error', $error); - self :: $_smarty -> display("ls:fatal_error.tpl"); + self :: $_smarty -> assign('pagetitle', _("A fatal error occured.")); + self :: $_smarty -> assign('error', _("A fatal error occured. If problem persist, please contact support.")); + self :: $_smarty -> assign('details', $error); + self :: $_smarty -> display("ls:error.tpl"); exit(); } diff --git a/public_html/includes/class/class.LSurl.php b/public_html/includes/class/class.LSurl.php index 0754501e..42126f84 100644 --- a/public_html/includes/class/class.LSurl.php +++ b/public_html/includes/class/class.LSurl.php @@ -218,7 +218,8 @@ class LSurl { * @retval void **/ public static function error_404($request=null) { - LSsession :: setTemplate('error_404.tpl'); + LStemplate :: assign('error', _("The requested page was not found.")); + LSsession :: setTemplate('error.tpl'); LSsession :: displayTemplate(); } diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index 7f7f1751..dd19e436 100644 Binary files a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo and b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo differ diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 93743b20..8caf861d 100644 --- a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-05-04 18:25+0200\n" +"PO-Revision-Date: 2020-05-05 13:01+0200\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -458,11 +458,11 @@ msgstr "Confirmez-vous votre choix ?" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSconfirmBox.php:37 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsmoothbox.php:39 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1359 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1367 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:529 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1109 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1213 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:568 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1148 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1252 msgid "Validate" msgstr "Valider" @@ -525,8 +525,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:890 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1048 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:929 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1087 msgid "Modify" msgstr "Modifier" @@ -579,21 +579,21 @@ msgstr "Maintenant." msgid "Today." msgstr "Aujourd'hui." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:94 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:93 msgid "LStemplate : compile directory is not writable (dir : %{dir})" msgstr "" "LStemplate : Le dossier de compilation n'est pas accessible en écriture " "(dossier : %{dir})" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:113 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:112 msgid "LStemplate : Can't load Smarty 2 support file" msgstr "LStemplate : Impossible de charger le fichier de support de Smarty 2" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:120 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:119 msgid "LStemplate : Can't load Smarty 3 support file" msgstr "LStemplate : Impossible de charger le fichier de support de Smarty 3" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:124 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:123 msgid "LStemplate : Smarty version not recognized." msgstr "LStemplate : Version de Smarty non reconnue." @@ -602,20 +602,30 @@ msgid "LStemplate : Can't load Smarty." msgstr "" "LStemplate : Impossible de charger le moteur de gestion de template Smarty." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:317 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:353 msgid "Smarty - An exception occured displaying template '%{template}'" msgstr "" "Smarty - Un erreur est survenue en affichant le modèle de page '%{template}'." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:337 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:373 msgid "Smarty - An exception occured fetching template '%{template}'" msgstr "Smarty - Un erreur est survenue en générant le modèle '%{template}'." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:444 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:385 +msgid "A fatal error occured." +msgstr "Une erreur fatale est survenue." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:386 +msgid "A fatal error occured. If problem persist, please contact support." +msgstr "" +"Une erreur irrécupérable est survenue. Si le problème persiste, merci de " +"contacter le support." + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:485 msgid "LStemplate : Template %{file} not found." msgstr "LStemplate : le template %{file} est introuvable." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:447 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:488 msgid "" "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "callable." @@ -623,7 +633,7 @@ msgstr "" "LStemplate : Échec d'exécution du déclencheur %{callable} lors de événement " "%{event} : il n'est pas un callable." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:450 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:491 msgid "" "LStemplate : Error during the execution of the trigger %{callable} on event " "%{event}." @@ -789,81 +799,81 @@ msgstr "" msgid "Clear" msgstr "Nettoyer" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1299 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1307 msgid "Connection" msgstr "Connexion" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1309 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1348 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1317 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1356 msgid "LDAP server" msgstr "Serveur LDAP" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1319 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2464 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:630 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1327 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2478 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:669 msgid "Level" msgstr "Niveau" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1320 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1358 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1328 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1366 msgid "Identifier" msgstr "Identifiant" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1321 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1329 msgid "Password" msgstr "Mot de passe" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1322 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1330 msgid "Connect" msgstr "Se connecter" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1323 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1331 msgid "Forgot your password ?" msgstr "Mot de passe perdu ?" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1341 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1349 msgid "Recovery of your credentials" msgstr "Récupération de votre mot de passe" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1360 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368 msgid "Back" msgstr "Retour" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1363 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1371 msgid "Please fill the identifier field to proceed recovery procedure" msgstr "" "Merci d'entrer votre identifiant pour poursuivre la procédure de récupération" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1376 msgid "" "An email has been sent to %{mail}. Please follow the instructions on it." msgstr "" "Un e-mail vient de vous être envoyé à l'adresse %{mail}. Merci de suivre les " "indications qu'il contient." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1377 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1385 msgid "Your new password has been sent to %{mail}." msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1522 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1536 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:146 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:384 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:423 msgid "Refresh" msgstr "Rafraîchir" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1538 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1552 msgid "Language" msgstr "Langue" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1560 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1574 msgid "Connected as" msgstr "Connecté en tant que" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2610 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2624 msgid "LSsession : The constant %{const} is not defined." msgstr "LSsession : La constante %{const} n'est pas définie." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2613 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2627 msgid "" "LSsession : The %{addon} support is uncertain. Verify system compatibility " "and the add-on configuration." @@ -871,52 +881,52 @@ msgstr "" "LSsession : Le support %{addon} est incertain. Vérifiez la compatibilité du " "système et la configuration de l'add-on." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2616 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2630 msgid "" "LSsession : LDAP server's configuration data are invalid. Can't connect." msgstr "" "LSsession : Les données de configuration du serveur LDAP sont invalide. " "Impossible de s'y connecter." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2619 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2633 msgid "LSsession : Failed to load LSobject type %{type} : unknon type." msgstr "" "LSsession : Impossible de charger le type d'LSobject %{type} : type inconnu." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2622 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2636 msgid "LSsession : Failed to load LSclass %{class}." msgstr "LSsession : Impossible de charger la LSclass %{class}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2625 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2639 msgid "LSsession : Login or password incorrect." msgstr "LSsession : Identifiant ou mot de passe incorrects." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2628 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2642 msgid "LSsession : Impossible to identify you : Duplication of identities." msgstr "LSsession : Impossible de vous identifier : Duplication d'identité." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2631 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2645 msgid "LSsession : Can't load class of authentification (%{class})." msgstr "" "LSsession : Impossible de charger la classe d'authentification (%{class})." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2634 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2648 msgid "LSsession : Can't connect to LDAP server." msgstr "LSsession : Impossible de se connecter au serveur LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2637 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2651 msgid "LSsession : Impossible to authenticate you." msgstr "LSsession : Impossible de vous identifier." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2640 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2654 msgid "LSsession : Your are not authorized to do this action." msgstr "LSsession : Vous n'êtes pas autorisé à faire cette action." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2643 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2657 msgid "LSsession : Some informations are missing to display this page." msgstr "LSsession : Des informations sont manquant pour afficher cette page." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2646 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2660 msgid "" "LSsession : The function of the custom action %{name} does not exists or is " "not configured." @@ -924,24 +934,24 @@ msgstr "" "LSsearch : La fonction de l'action personnalisée %{name} n'existe pas ou " "n'est pas configurée." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2649 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2663 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth." msgstr "" "LSsession : Erreur en récupérant les identifiants LDAP de l'utilisateur " "depuis LSauth." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2652 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2666 msgid "" "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials." msgstr "" "LSsession : Impossible de se reconnecter au serveur LDAP avec les " "identifiants de l'utilisateur." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2655 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2669 msgid "LSsession : No import/export format define for this object type." msgstr "LSsession : Aucun format d'entrée/sortie définie pour ce type d'objet." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2658 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2672 msgid "" "LSsession : Error during creation of list of levels. Contact administrators. " "(Code : %{code})" @@ -949,13 +959,13 @@ msgstr "" "LSsession : Erreur durant la création de la liste des niveaux. Contacter les " "administrateurs. (Code : %{type})" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2661 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2675 msgid "LSsession : The password recovery is disabled for this LDAP server." msgstr "" "LSsession : La récupération de mot de passe est désactivée pour ce serveur " "LDAP." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2664 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2678 msgid "" "LSsession : Some informations are missing to recover your password. Contact " "administrators." @@ -963,7 +973,7 @@ msgstr "" "LSsession : Des informations sont manques pour pouvoir récupérer votre mot " "de passe. Contacter les administrateurs." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2667 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2681 msgid "" "LSsession : Error during password recovery. Contact administrators.(Step : " "%{step})" @@ -971,26 +981,26 @@ msgstr "" "LSsession : Erreur durant la récupération de votre mot de passe. Contacter " "les administrateurs. (Etape : %{step})" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2670 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2684 msgid "" "LSsession : call function %{func} do not provided from LSaddon %{addon}." msgstr "" "LSsession : la fonction %{func} n'est pas fournie par le LSaddon %{addon}." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2673 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2687 msgid "LSsession : problem during initialisation." msgstr "LSsession : Problème durant l'initialisation." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2676 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2690 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist." msgstr "" "LSsession : la fonction de vue %{func} du LSaddon %{addon} n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2679 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2693 msgid "LSsession : invalid related object's DN pass in parameter." msgstr "LSsession : DN d'objet en relation incorrect dans les paramètres." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2682 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2696 msgid "" "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please " "upgrade it." @@ -998,7 +1008,7 @@ msgstr "" "LSsession : le LSaddon %{addon} utilise toujours l'ancien type d'URL de " "vues. Merci de le mettre à jour." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2685 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2699 msgid "" "LSsession : You have been redirect from an old-style URL %{url}. Please " "upgrade this link." @@ -1006,7 +1016,7 @@ msgstr "" "LSsession : Vous avez été redirigé depuis une ancienne URL %{url}. Merci de " "le mettre à jour ce lien." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2688 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2702 msgid "" "LSsession : You still seen use LSsession :: redirect() in your custom code. " "Please upgrade it and use LSurl :: redirect()." @@ -1351,8 +1361,8 @@ msgstr "Attention" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:906 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1040 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:945 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1079 msgid "Delete" msgstr "Supprimer" @@ -1362,8 +1372,8 @@ msgid "No object." msgstr "Aucun objet." #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:371 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:845 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:410 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:884 msgid "New" msgstr "Nouveau" @@ -1531,14 +1541,14 @@ msgid "No field." msgstr "Aucun champ." #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:203 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:525 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:564 msgid "Do you really want to execute custom action %{title} on this search ?" msgstr "" "Êtes-vous vraiment sûre de vouloir exécuter l'action personnalisée %{title} " "sur cette recherche ?" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:209 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1207 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1246 msgid "" "Do you really want to execute custom action %{customAction} on " "%{objectname} ?" @@ -1641,6 +1651,10 @@ msgstr "Impossible de déterminer l'URL demandée." msgid "Fail to determine the requested URL (loop detected)." msgstr "Impossible de déterminer l'URL demandée (boucle détectée)." +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSurl.php:221 +msgid "The requested page was not found." +msgstr "La page demandée est introuvable." + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSattr_html_date.php:43 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSattr_html_select_list.php:63 msgid "Invalid value" @@ -1872,8 +1886,6 @@ msgid "The uploaded file size exceeds the limit accepted by the server." msgstr "La taille du fichier envoyé dépasse la limite acceptée par le serveur." #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_image.php:136 -#, fuzzy -#| msgid "The uploaded file size exceeds the limit accepted by the HTML form.)" msgid "The uploaded file size exceeds the limit accepted by the HTML form." msgstr "" "La taille du fichier envoyé dépasse la limite acceptée par le formulaire " @@ -2035,12 +2047,12 @@ msgid "Unknown error : %{error}" msgstr "Erreur inconnu : %{error}" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1032 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1071 msgid "View" msgstr "Voir" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:898 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:937 msgid "Copy" msgstr "Copier" @@ -2070,71 +2082,71 @@ msgstr "Accueil" msgid "You must provide pattern for global search." msgstr "Vous devez fournir un mot clé pour les recherches globales." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:377 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:721 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:416 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:760 msgid "Import" msgstr "Importer" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:389 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:428 msgid "Reset" msgstr "Réinitialiser" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:427 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:627 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:466 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:666 #: templates/default/global_search.tpl:7 msgid "Search" msgstr "Rechercher" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:428 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:628 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:467 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:667 msgid "Approximative search" msgstr "Recherche approximative" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:429 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:629 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:468 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:668 msgid "Recursive search" msgstr "Recherche récursive" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:506 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:545 msgid "" "The custom action %{title} have been successfully execute on this search." msgstr "" "L'action personnalisée %{title} a été correctement exécutée sur cette " "recherche." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:843 msgid "Data entry form" msgstr "Masque de saisie" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:810 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:849 msgid "Object has been added." msgstr "L'objet a été ajouté." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:937 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:976 msgid "My account" msgstr "Mon compte" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:990 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1029 msgid "The object has been partially modified." msgstr "L'objet a été partiellement modifié." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:993 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1032 msgid "The object has been modified successfully." msgstr "L'objet a bien été modifié." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1097 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1136 msgid "%{objectname} has been successfully deleted." msgstr "%{objectname} a bien été supprimé." -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1106 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1145 msgid "Deleting : %{objectname}" msgstr "Suppression : %{objectname}" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1107 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1146 msgid "Do you really want to delete %{displayName} ?" msgstr "Voulez-vous vraiment supprimer %{displayName} ?" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1181 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1220 msgid "" "The custom action %{customAction} have been successfully execute on " "%{objectname}." @@ -2155,17 +2167,11 @@ msgstr "[pas une chaîne de caractères]" msgid "Folder not found" msgstr "Dossier introuvable" -#: templates/default/fatal_error.tpl:20 -msgid "A fatal error occured. If problem persist, please contact support." -msgstr "" -"Une erreur irrécupérable est survenue. Si le problème persiste, merci de " -"contacter le support." - #: templates/default/LSaccessRightsMatrixView.tpl:17 msgid "Attributes / Profiles" msgstr "Attributs / Profils" -#: templates/default/fatal_error.tpl:24 +#: templates/default/error.tpl:22 msgid "Details" msgstr "Détails" @@ -2241,10 +2247,6 @@ msgstr "Relations / Profils" msgid "Result" msgstr "Résultat" -#: templates/default/error_404.tpl:20 -msgid "The requested page was not found." -msgstr "La page demandée est introuvable." - #: templates/default/LSaccessRightsMatrixView.tpl:48 msgid "Their relations with other objects" msgstr "Leurs relations avec les autres objets" diff --git a/public_html/lang/ldapsaisie.pot b/public_html/lang/ldapsaisie.pot index 34a9e636..fbdffe11 100644 --- a/public_html/lang/ldapsaisie.pot +++ b/public_html/lang/ldapsaisie.pot @@ -379,11 +379,11 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSconfirmBox.php:37 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsmoothbox.php:39 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1359 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1367 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:68 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:529 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1109 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1213 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:568 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1148 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1252 msgid "Validate" msgstr "" @@ -438,8 +438,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:68 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_supannLabeledValue.php:62 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:167 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:890 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1048 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:929 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1087 msgid "Modify" msgstr "" @@ -492,19 +492,19 @@ msgstr "" msgid "Today." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:94 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:93 msgid "LStemplate : compile directory is not writable (dir : %{dir})" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:113 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:112 msgid "LStemplate : Can't load Smarty 2 support file" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:120 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:119 msgid "LStemplate : Can't load Smarty 3 support file" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:124 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:123 msgid "LStemplate : Smarty version not recognized." msgstr "" @@ -512,25 +512,33 @@ msgstr "" msgid "LStemplate : Can't load Smarty." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:317 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:353 msgid "Smarty - An exception occured displaying template '%{template}'" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:337 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:373 msgid "Smarty - An exception occured fetching template '%{template}'" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:444 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:385 +msgid "A fatal error occured." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:386 +msgid "A fatal error occured. If problem persist, please contact support." +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:485 msgid "LStemplate : Template %{file} not found." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:447 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:488 msgid "" "LStemplate : Fail to execute trigger %{callable} on event %{event} : is not " "callable." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:450 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LStemplate.php:491 msgid "" "LStemplate : Error during the execution of the trigger %{callable} on event " "%{event}." @@ -659,195 +667,195 @@ msgstr "" msgid "Clear" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1299 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1307 msgid "Connection" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1309 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1348 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1317 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1356 msgid "LDAP server" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1319 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2464 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:630 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1327 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2478 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:669 msgid "Level" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1320 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1358 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1328 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1366 msgid "Identifier" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1321 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1329 msgid "Password" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1322 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1330 msgid "Connect" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1323 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1331 msgid "Forgot your password ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1341 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1349 msgid "Recovery of your credentials" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1360 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368 msgid "Back" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1363 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1371 msgid "Please fill the identifier field to proceed recovery procedure" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1368 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1376 msgid "" "An email has been sent to %{mail}. Please follow the instructions on it." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1377 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1385 msgid "Your new password has been sent to %{mail}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1522 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1536 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:146 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:384 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:423 msgid "Refresh" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1538 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1552 msgid "Language" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1560 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:1574 msgid "Connected as" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2610 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2624 msgid "LSsession : The constant %{const} is not defined." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2613 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2627 msgid "" "LSsession : The %{addon} support is uncertain. Verify system compatibility " "and the add-on configuration." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2616 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2630 msgid "" "LSsession : LDAP server's configuration data are invalid. Can't connect." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2619 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2633 msgid "LSsession : Failed to load LSobject type %{type} : unknon type." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2622 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2636 msgid "LSsession : Failed to load LSclass %{class}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2625 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2639 msgid "LSsession : Login or password incorrect." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2628 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2642 msgid "LSsession : Impossible to identify you : Duplication of identities." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2631 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2645 msgid "LSsession : Can't load class of authentification (%{class})." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2634 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2648 msgid "LSsession : Can't connect to LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2637 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2651 msgid "LSsession : Impossible to authenticate you." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2640 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2654 msgid "LSsession : Your are not authorized to do this action." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2643 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2657 msgid "LSsession : Some informations are missing to display this page." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2646 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2660 msgid "" "LSsession : The function of the custom action %{name} does not exists or is " "not configured." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2649 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2663 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2652 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2666 msgid "" "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2655 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2669 msgid "LSsession : No import/export format define for this object type." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2658 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2672 msgid "" "LSsession : Error during creation of list of levels. Contact administrators. " "(Code : %{code})" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2661 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2675 msgid "LSsession : The password recovery is disabled for this LDAP server." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2664 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2678 msgid "" "LSsession : Some informations are missing to recover your password. Contact " "administrators." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2667 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2681 msgid "" "LSsession : Error during password recovery. Contact administrators.(Step : " "%{step})" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2670 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2684 msgid "" "LSsession : call function %{func} do not provided from LSaddon %{addon}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2673 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2687 msgid "LSsession : problem during initialisation." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2676 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2690 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2679 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2693 msgid "LSsession : invalid related object's DN pass in parameter." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2682 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2696 msgid "" "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please " "upgrade it." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2685 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2699 msgid "" "LSsession : You have been redirect from an old-style URL %{url}. Please " "upgrade this link." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2688 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsession.php:2702 msgid "" "LSsession : You still seen use LSsession :: redirect() in your custom code. " "Please upgrade it and use LSurl :: redirect()." @@ -1129,8 +1137,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:69 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSformElement_select_object.php:85 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:183 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:906 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1040 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:945 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1079 msgid "Delete" msgstr "" @@ -1140,8 +1148,8 @@ msgid "No object." msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSrelation.php:267 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:371 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:845 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:410 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:884 msgid "New" msgstr "" @@ -1279,12 +1287,12 @@ msgid "No field." msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:203 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:525 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:564 msgid "Do you really want to execute custom action %{title} on this search ?" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSform.php:209 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1207 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1246 msgid "" "Do you really want to execute custom action %{customAction} on " "%{objectname} ?" @@ -1376,6 +1384,10 @@ msgstr "" msgid "Fail to determine the requested URL (loop detected)." msgstr "" +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSurl.php:221 +msgid "The requested page was not found." +msgstr "" + #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSattr_html_date.php:43 #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSattr_html_select_list.php:63 msgid "Invalid value" @@ -1725,12 +1737,12 @@ msgid "Unknown error : %{error}" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:159 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1032 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1071 msgid "View" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/class/class.LSsearchEntry.php:175 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:898 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:937 msgid "Copy" msgstr "" @@ -1756,69 +1768,69 @@ msgstr "" msgid "You must provide pattern for global search." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:377 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:721 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:416 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:760 msgid "Import" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:389 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:428 msgid "Reset" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:427 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:627 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:466 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:666 #: templates/default/global_search.tpl:7 msgid "Search" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:428 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:628 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:467 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:667 msgid "Approximative search" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:429 -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:629 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:468 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:668 msgid "Recursive search" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:506 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:545 msgid "" "The custom action %{title} have been successfully execute on this search." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:843 msgid "Data entry form" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:810 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:849 msgid "Object has been added." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:937 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:976 msgid "My account" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:990 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1029 msgid "The object has been partially modified." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:993 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1032 msgid "The object has been modified successfully." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1097 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1136 msgid "%{objectname} has been successfully deleted." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1106 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1145 msgid "Deleting : %{objectname}" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1107 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1146 msgid "Do you really want to delete %{displayName} ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1181 +#: /home/brenard/dev/ldapsaisie_clean3/public_html/includes/routes.php:1220 msgid "" "The custom action %{customAction} have been successfully execute on " "%{objectname}." @@ -1837,15 +1849,11 @@ msgstr "" msgid "Folder not found" msgstr "" -#: templates/default/fatal_error.tpl:20 -msgid "A fatal error occured. If problem persist, please contact support." -msgstr "" - #: templates/default/LSaccessRightsMatrixView.tpl:17 msgid "Attributes / Profiles" msgstr "" -#: templates/default/fatal_error.tpl:24 +#: templates/default/error.tpl:22 msgid "Details" msgstr "" @@ -1921,10 +1929,6 @@ msgstr "" msgid "Result" msgstr "" -#: templates/default/error_404.tpl:20 -msgid "The requested page was not found." -msgstr "" - #: templates/default/LSaccessRightsMatrixView.tpl:48 msgid "Their relations with other objects" msgstr "" diff --git a/public_html/templates/default/fatal_error.tpl b/public_html/templates/default/error.tpl similarity index 74% rename from public_html/templates/default/fatal_error.tpl rename to public_html/templates/default/error.tpl index 0b666260..9e3a22a3 100644 --- a/public_html/templates/default/fatal_error.tpl +++ b/public_html/templates/default/error.tpl @@ -3,7 +3,7 @@ - LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} + LdapSaisie - {if isset($pagetitle) && $pagetitle}{$pagetitle|escape:"htmlall"}{else}{$error}{/if} @@ -14,13 +14,13 @@ {include file='ls:LSdefault.tpl'} -
-

{tr msg="A fatal error occured. If problem persist, please contact support."}

+
+

{$error}

-{if $fatal_error} +{if isset($details)} 
 {tr msg="Details"} :
-{$fatal_error}

+{$details}

 {/if}
diff --git a/public_html/templates/default/error_404.tpl b/public_html/templates/default/error_404.tpl deleted file mode 100644 index c742d063..00000000 --- a/public_html/templates/default/error_404.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - LdapSaisie{if $pagetitle != ''} - {$pagetitle|escape:"htmlall"}{/if} - - - - - {include file='ls:LSsession_css.tpl'} - - - -{include file='ls:LSdefault.tpl'} - -
-

{tr msg="The requested page was not found."}

-
- -{include file='ls:LSsession_js.tpl'} - -