diff --git a/trunk/includes/js/LSconfirmBox.js b/trunk/includes/js/LSconfirmBox.js index f11051d4..4333cdb8 100644 --- a/trunk/includes/js/LSconfirmBox.js +++ b/trunk/includes/js/LSconfirmBox.js @@ -16,7 +16,7 @@ var LSconfirmBox = new Class({ this.title.set('html',this._options.title); } else { - this.title.set('html','Comfirmation'); + this.title.set('html','Confirmation'); }; this.title.injectInside(this.box) @@ -31,7 +31,7 @@ var LSconfirmBox = new Class({ this.text.set('html',this._options.text); } else { - this.text.set('html','You comfirm your choice ?'); + this.text.set('html','You confirm your choice ?'); } this.text.injectInside(this.box); diff --git a/trunk/includes/js/LSdefault.js b/trunk/includes/js/LSdefault.js index c94f0f9b..cb3f60f4 100644 --- a/trunk/includes/js/LSdefault.js +++ b/trunk/includes/js/LSdefault.js @@ -126,7 +126,7 @@ var LSdefault = new Class({ return true; } else { - LSdebug('retour non-interprétable'); + LSdebug('Non computable return value'); this.loadingImgHide(); return; } diff --git a/trunk/includes/js/LSform.js b/trunk/includes/js/LSform.js index e2841ca4..20c11f08 100644 --- a/trunk/includes/js/LSform.js +++ b/trunk/includes/js/LSform.js @@ -138,7 +138,7 @@ var LSform = new Class({ this._modules[fieldType].reinitialize(li); } catch(e) { - LSdebug('Pas de reinitialise pour ' + fieldType); + LSdebug('No reinitialize for ' + fieldType); } } }, diff --git a/trunk/includes/js/LSformElement_select_object_field.js b/trunk/includes/js/LSformElement_select_object_field.js index 5046976d..36080f4a 100644 --- a/trunk/includes/js/LSformElement_select_object_field.js +++ b/trunk/includes/js/LSformElement_select_object_field.js @@ -10,7 +10,7 @@ var LSformElement_select_object_field = new Class({ }, initializeLSformElement_select_object: function() { - // Class du UL + // Class of UL if (this.params.multiple) { this.ul.addClass('LSformElement_select_object_edit'); } diff --git a/trunk/includes/js/LSrelation.js b/trunk/includes/js/LSrelation.js index b8fc0a8d..c6d62f2a 100644 --- a/trunk/includes/js/LSrelation.js +++ b/trunk/includes/js/LSrelation.js @@ -36,7 +36,7 @@ var LSrelation = new Class({ var a = img.getPrevious('a'); this.confirmBox = new LSconfirmBox({ text: 'Do you really want to delete "'+a.innerHTML+'" ?', - title: 'Caution', + title: 'Warning', validate_label: 'Delete', cancel_label: 'Cancel', startElement: img, @@ -85,7 +85,7 @@ var LSrelation = new Class({ } } catch(e) { - LSdebug('Error during the li of DN delete : '+data.dn); + LSdebug('Error while deleting the li of DN : '+data.dn); } } }, diff --git a/trunk/includes/js/LSsmoothbox.js b/trunk/includes/js/LSsmoothbox.js index 3727f55b..c77ffb4a 100644 --- a/trunk/includes/js/LSsmoothbox.js +++ b/trunk/includes/js/LSsmoothbox.js @@ -210,8 +210,8 @@ var LSsmoothbox = new Class({ if (!this._closeConfirmOpened) { this._closeConfirmOpened = 1; this.confirmBox = new LSconfirmBox({ - text: 'Are you sure you want to close this window and lose all changes ?', - title: 'Caution', + text: 'Are you sure to want to close this window and lose all changes ?', + title: 'Warning', validate_label: 'Validate', cancel_label: 'Cancel', startElement: this.closeBtn, diff --git a/trunk/includes/js/functions.js b/trunk/includes/js/functions.js index 6d7e851d..efd1ef92 100644 --- a/trunk/includes/js/functions.js +++ b/trunk/includes/js/functions.js @@ -14,20 +14,18 @@ function LSdebug(arguments) { } /** - * Construction d'une chaine formatée + * Construction of formatted string * - * Cette fonction retourne la valeur d'une chaine formatée selon le format - * et les données passés en paramètre. + * This function returns a formatted string according to given data & format parameters * * @author Benjamin Renard * - * @param[in] $format string Format de la chaine - * @param[in] $data mixed Les données pour composés la chaine - * Ce paramètre peut être un tableau de string ou un objet. - * @param[in] $meth string Le nom de la methode de l'objet(s) à appeler pour - * obtenir la valeur de remplacement dans la chaine formatée. + * @param[in] $format string String Format + * @param[in] $data mixed Data used to compose the string. + * It can be strings array or object. + * @param[in] $meth string Object method name to call to get the new value for the formatted string. * - * Exemple d'appel : + * Invocation example : * getFData('%{test1} je %{test2}',{ * getValue: function(val) { * var data = { @@ -38,7 +36,7 @@ function LSdebug(arguments) { * } * },'getValue'); * - * @retval string La chaine formatée + * @retval string The formatted string */ function getFData(format,data,meth) { var getMotif = new RegExp('%\{(([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9])+)?)\}'); @@ -106,11 +104,11 @@ function getFData(format,data,meth) { } /** -* Supprime les accents d'une chaine +* Delete accentuated characters in a string * -* @param[in] $string La chaine originale +* @param[in] $string Original string * -* @retval string La chaine sans les accents +* @retval string de-accentuated string */ function replaceAccents(str) { var new_str = String(str); @@ -128,12 +126,12 @@ function replaceAccents(str) { } /** -* Remplace les espaces ou les tabulations d'une chaine +* Replace spaces or tabs of a string by an argument * -* @param[in] $string La chaine originale -* @param[in] $string Le caractère à mettre à la place +* @param[in] $string The original string +* @param[in] $string The character to set instead of spaces or tabs * -* @retval string La chaine sans espace +* @retval string The modified outspaced string */ function replaceSpaces(str,to) { if (!$type(to)) {