Permalink
Browse files

Translate some French comments, part 3

  • Loading branch information...
1 parent 6d8fc1b commit 3c68035b1315733400a1e50ccc6641da3f01bac0 @kissifrot committed Mar 16, 2012
View
4 build/buildjelix.php
@@ -149,7 +149,7 @@
include(dirname(__FILE__).'/lib/jBuild.inc.php');
-//----------------- Preparation des variables d'environnement
+//----------------- Prepare environment variables
Env::setFromFile('LIB_VERSION','lib/jelix/VERSION', true);
$SOURCE_REVISION = Git::revision(dirname(__FILE__).'/../');
@@ -295,7 +295,7 @@
file_put_contents($BUILD_TARGET_PATH.'lib/jelix/VERSION', $LIB_VERSION);
-// creation du fichier d'infos sur le build
+// create the build info file
$view = array('EDITION_NAME', 'PHP_VERSION_TARGET', 'SOURCE_REVISION',
'ENABLE_PHP_XMLRPC','ENABLE_PHP_JELIX', 'WITH_BYTECODE_CACHE', 'ENABLE_DEVELOPER',
'ENABLE_OPTIMIZED_SOURCE', 'STRIP_COMMENT' );
View
12 build/mkmanifest.php
@@ -11,10 +11,10 @@
require_once(dirname(__FILE__).'/lib/jCmdUtils.class.php');
-// arguments : repertoire1 [repertoire2]
-// repertoire1 : le chemin du repertoire duquel on veut la liste
-// repertoire2 : si on veut une base de chemin différente de repertoire1 dans le fichier de sortie
-// on l'indique ici
+// arguments : directory1 [directory2]
+// directory1 : directory path from which we want the list
+// directory2 : if we want a different base path than directory1 in the output file
+// indicate it here
try{
$sws = array('-e'=>false);
@@ -77,7 +77,7 @@ function mkpath($dir, $basepath){
$output.=mkpath( $dir.'/'.$d, $basepath.'/'.$d);
}
}else{
- echo "erreur ouverture repertoire $dir\n";
+ echo "error opening directory $dir\n";
exit(1);
}
return $output;
@@ -89,7 +89,7 @@ function mkpath($dir, $basepath){
if (is_dir($dirpath)) {
$output=mkpath($dirpath,$basepath);
}else{
- echo "mauvais repertoire $dirpath\n";
+ echo "wrong directory $dirpath\n";
exit(1);
}
View
4 lib/jelix-modules/junittests/classes/junittestcase.class.php
@@ -93,7 +93,7 @@ function assertEqualOrDiff($first, $second, $message = "%s"){
function assertComplexIdentical($value, $file, $errormessage=''){
$xml = simplexml_load_file($file);
if(!$xml){
- trigger_error('Impossible de charger le fichier '.$file,E_USER_ERROR);
+ trigger_error('Impossible to load file '.$file,E_USER_ERROR);
return false;
}
return $this->_checkIdentical($xml, $value, '$value', $errormessage);
@@ -102,7 +102,7 @@ function assertComplexIdentical($value, $file, $errormessage=''){
function assertComplexIdenticalStr($value, $string, $errormessage=''){
$xml = simplexml_load_string($string);
if(!$xml){
- trigger_error('mauvais contenu xml '.$string,E_USER_ERROR);
+ trigger_error('wrong xml content '.$string,E_USER_ERROR);
return false;
}
if($errormessage != '')
View
4 lib/jelix-tests/classes/junittestcase.class.php
@@ -35,7 +35,7 @@ public function assertEqualOrDiff($first, $second, $message = "%s"){
public function assertComplexIdentical($value, $file, $errormessage=''){
$xml = simplexml_load_file($file);
if(!$xml){
- trigger_error('Impossible de charger le fichier '.$file,E_USER_ERROR);
+ trigger_error('Unable to load file '.$file,E_USER_ERROR);
return false;
}
return $this->_checkIdentical($xml, $value, '$value', $errormessage);
@@ -44,7 +44,7 @@ public function assertComplexIdentical($value, $file, $errormessage=''){
public function assertComplexIdenticalStr($value, $string, $errormessage=''){
$xml = simplexml_load_string($string);
if(!$xml){
- trigger_error('mauvais contenu xml '.$string,E_USER_ERROR);
+ trigger_error('Wrong xml content '.$string,E_USER_ERROR);
return false;
}
if($errormessage != '')
View
4 lib/jelix/acl/jAcl2DbManager.class.php
@@ -36,7 +36,7 @@ public static function addRight($group, $subject, $resource=''){
if($resource === null) $resource='';
- // ajoute la nouvelle valeur
+ // add the new value
$daoright = jDao::get('jacl2db~jacl2rights', 'jacl2_profile');
$right = $daoright->get($subject,$group,$resource);
if(!$right){
@@ -166,7 +166,7 @@ public static function removeSubject($subject){
}
/**
- * create a new subject group
+ * Create a new subject group
* @param string $subjectGroup the key of the subject group
* @param string $label_key the key of a locale which represents the label of the subject group
* @since 1.3
View
12 lib/jelix/acl/jAcl2DbUserGroup.class.php
@@ -27,7 +27,7 @@ class jAcl2DbUserGroup {
private function __construct (){ }
/**
- * Says if the current user is a member of the given user group
+ * Indicates if the current user is a member of the given user group
* @param string $groupid The id of a group
* @return boolean true if it's ok
*/
@@ -38,7 +38,7 @@ public static function isMemberOfGroup ($groupid){
protected static $groups = null;
/**
- * retrieve the list of group the current user is member of
+ * Retrieve the list of group the current user is member of
* @return array list of group id
*/
public static function getGroups(){
@@ -61,7 +61,7 @@ public static function getGroups(){
}
/**
- * get the private group for the current user or for the given login
+ * Get the private group for the current user or for the given login
* @param string $login The user's login
* @return string the id of the private group
* @since 1.2
@@ -76,7 +76,7 @@ public static function getPrivateGroup($login=null){
}
/**
- * get a group
+ * Get a group
* @param string $code The code
* @return jacl2group|false the dao object r false if it doesn't exist
* @since 1.2
@@ -131,7 +131,7 @@ public static function createUser($login, $defaultGroup=true){
}
/**
- * add a user into a group
+ * Add a user into a group
*
* (a user can be a member of several groups)
* @param string $login the user login
@@ -147,7 +147,7 @@ public static function addUserToGroup($login, $groupid){
}
/**
- * remove a user from a group
+ * Remove a user from a group
* @param string $login the user login
* @param string $groupid the group id
*/
View
16 lib/jelix/acl/jAclDbManager.class.php
@@ -24,7 +24,7 @@ class jAclDbManager {
private function __construct (){ }
/**
- * add a right on the given subject/group/resource
+ * Add a right on the given subject/group/resource
* @param int $group the group id.
* @param string $subject the key of the subject
* @param string $value the value of the right
@@ -38,12 +38,12 @@ public static function addRight($group, $subject, $value , $resource=''){
$sbj = $daosbj->get($subject);
if(!$sbj) return false;
- // récupère la liste des valeurs du groupe de valeur
+ // get the values list from the value group
$vallist = $daorightval->findByValGroup($sbj->id_aclvalgrp);
if($resource === null) $resource='';
- // on verifie que la valeur est autorisée
+ // check if the value is allowed
$ok=false;
foreach($vallist as $valueok){
if($valueok->value == $value){
@@ -53,7 +53,7 @@ public static function addRight($group, $subject, $value , $resource=''){
}
if(!$ok) return false;
- // ajoute la nouvelle valeur
+ // add the new value
$daoright = jDao::get('jacldb~jaclrights', 'jacl_profile');
$right = $daoright->get($subject,$group,$resource,$value);
if(!$right){
@@ -69,7 +69,7 @@ public static function addRight($group, $subject, $value , $resource=''){
}
/**
- * remove a right on the given subject/group/resource
+ * Remove a right on the given subject/group/resource
* @param int $group the group id.
* @param string $subject the key of the subject
* @param string $value the value of the right
@@ -85,7 +85,7 @@ public static function removeRight($group, $subject, $value , $resource=''){
/**
- * remove the right on the given subject/resource, for all groups
+ * Remove the right on the given subject/resource, for all groups
* @param string $subject the key of the subject
* @param string $resource the id of a resource
*/
@@ -96,13 +96,13 @@ public static function removeResourceRight($subject, $resource){
}
/**
- * create a new subject
+ * Create a new subject
* @param string $subject the key of the subject
* @param int $id_aclvalgrp the id of the values group with which the right can be set
* @param string $label_key the key of a locale which represents the label of the subject
*/
public static function addSubject($subject, $id_aclvalgrp, $label_key){
- // ajoute un sujet dans la table jacl_subject
+ // adds a subject in the jacl_subject table
$daosbj = jDao::get('jacldb~jaclsubject','jacl_profile');
$subj = jDao::createRecord('jacldb~jaclsubject','jacl_profile');
$subj->id_aclsbj=$subject;
View
10 lib/jelix/acl/jAclDbUserGroup.class.php
@@ -24,7 +24,7 @@ class jAclDbUserGroup {
private function __construct (){ }
/**
- * Says if the current user is a member of the given user group
+ * Indicates if the current user is a member of the given user group
* @param int $groupid The id of a group
* @return boolean true if it's ok
* @since 1.0b3
@@ -35,7 +35,7 @@ public static function isMemberOfGroup ($groupid){
}
/**
- * retrieve the list of group the current user is member of
+ * Retrieve the list of group the current user is member of
* @return array list of group id
* @since 1.0b3
*/
@@ -45,7 +45,7 @@ public static function getGroups(){
if(!jAuth::isConnected())
return array();
- // chargement des groupes
+ // load the groups
if($groups === null){
$dao = jDao::get('jacldb~jaclusergroup', 'jacl_profile');
$gp = $dao->getGroupsUser(jAuth::getUserSession()->login);
@@ -83,7 +83,7 @@ public static function createUser($login, $defaultGroup=true){
$usergrp = jDao::createRecord('jacldb~jaclusergroup','jacl_profile');
$usergrp->login =$login;
- // si $defaultGroup -> assign le user aux groupes par defaut
+ // if $defaultGroup -> assign the user to the default group(s)
if($defaultGroup){
$defgrp = $daogroup->getDefaultGroups();
foreach($defgrp as $group){
@@ -92,7 +92,7 @@ public static function createUser($login, $defaultGroup=true){
}
}
- // creation d'un groupe personnel
+ // create a personal group
$persgrp = jDao::createRecord('jacldb~jaclgroup','jacl_profile');
$persgrp->name = $login;
$persgrp->grouptype = 2;
View
4 lib/jelix/acl/jIAcl2Driver.iface.php
@@ -17,15 +17,15 @@
interface jIAcl2Driver {
/**
- * return the possible values of the right on the given subject (and on the optional resource)
+ * Return the possible values of the right on the given subject (and on the optional resource)
* @param string $subject the key of the subject
* @param string $resource the id of a resource
* @return array list of values corresponding to the right
*/
public function getRight($subject, $resource=null);
/**
- * clear some cached data, it a cache exists in the driver..
+ * Clear some cached data, it a cache exists in the driver..
*/
public function clearCache();
View
6 lib/jelix/core/request/jJsonRpcRequest.class.php
@@ -29,7 +29,7 @@ class jJsonRpcRequest extends jRequest {
public $jsonRequestId = null;
/**
- * analyse the http request and set the params property
+ * Analyze the HTTP request and set the params property
*/
protected function _initParams(){
global $HTTP_RAW_POST_DATA;
@@ -40,7 +40,7 @@ protected function _initParams(){
$request = implode("\n",$request);
}
- // Décodage de la requete
+ // Decode the request
$requestobj = jJsonRpc::decodeRequest($request);
if($requestobj['method']){
list($module, $action) = explode('~',$requestobj['method']);
@@ -56,7 +56,7 @@ protected function _initParams(){
$this->params['params'] = $requestobj['params'];
- // Définition de l'action a executer et des paramètres
+ // Definition of action to use and its parameters
$this->params['module'] = $module;
$this->params['action'] = $action;
}
View
6 lib/jelix/core/request/jXmlRpcRequest.class.php
@@ -31,7 +31,7 @@ class jXmlRpcRequest extends jRequest {
public $authorizedResponseClass = 'jResponseXmlrpc';
/**
- * analyse the http request and set the params property
+ * Analyze the HTTP request and set the params property
*/
protected function _initParams(){
global $HTTP_RAW_POST_DATA;
@@ -42,7 +42,7 @@ protected function _initParams(){
$requestXml = implode("\n",$requestXml);
}
- // Décodage de la requete
+ // Decode the request
list($nom,$vars) = jXmlRpc::decodeRequest($requestXml);
list($module, $action) = explode(':',$nom,2);
@@ -51,7 +51,7 @@ protected function _initParams(){
$this->params['params'] = $vars;
- // Définition de l'action a executer et des paramètres
+ // Definition of action to use and its parameters
$this->params['module'] = $module;
$this->params['action'] = $action;
}
View
4 lib/jelix/core/response/jResponseRss20.class.php
@@ -118,8 +118,8 @@ class jRSS20Info extends jXMLFeedInfo{
* not implemented
* @var string
*/
- public $cloud; // indique un webservice par lequel le client peut s'enregistrer auprés du serveur
- // pour être tenu au courant des modifs
+ public $cloud; // indicates a webservice from which the user can register to the server
+ // to be aware of modifications
//=array('domain'=>'','path'=>'','port'=>'','registerProcedure'=>'', 'protocol'=>'');
/**
* time to live of the cache, in minutes
View
4 lib/jelix/core/selector/jSelectorDao.class.php
@@ -48,14 +48,14 @@ protected function _createPath(){
throw new jExceptionSelector('jelix~errors.selector.module.unknown', $this->toString());
}
- // on regarde si le dao a été redéfini
+ // check if the dao was redefined (overloaded)
$overloadedPath = jApp::varPath('overloads/'.$this->module.'/'.$this->_dirname.$this->resource.$this->_suffix);
if (is_readable ($overloadedPath)){
$this->_path = $overloadedPath;
$this->_where = 'overloaded/';
return;
}
- // et sinon, on regarde si le dao existe dans le module en question
+ // else check if the module exists in the current module
$this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.$this->resource.$this->_suffix;
if (!is_readable ($this->_path)){
View
8 lib/jelix/core/selector/jSelectorTpl.class.php
@@ -58,21 +58,21 @@ protected function _createPath(){
$lpath = $this->module.'/'.$gJConfig->locale.'/'.$this->resource;
if($gJConfig->theme != 'default'){
- // on regarde si il y a un template redéfinie pour le theme courant
+ // check if there is a redefined template for the current theme
$this->_where = 'themes/'.$gJConfig->theme.'/'.$lpath;
$this->_path = jApp::varPath($this->_where.'.tpl');
if (is_readable ($this->_path)){
return;
}
- // on regarde si il y a un template redéfinie pour le theme courant
+ // check if there is a redefined template for the current localized theme
$this->_where = 'themes/'.$gJConfig->theme.'/'.$path;
$this->_path = jApp::varPath($this->_where.'.tpl');
if (is_readable ($this->_path)){
return;
}
}
- // on regarde si il y a un template redéfinie dans le theme par defaut
+ // check if there is a redefined template for the default theme
$this->_where = 'themes/default/'.$lpath;
$this->_path = jApp::varPath($this->_where.'.tpl');
if (is_readable ($this->_path)){
@@ -85,7 +85,7 @@ protected function _createPath(){
return;
}
- // et sinon, on regarde si le template existe dans le module en question
+ // else check if the template exists in the current module
$this->_path = $gJConfig->_modulesPathList[$this->module].$this->_dirname.$gJConfig->locale.'/'.$this->resource.'.tpl';
if (is_readable ($this->_path)){
$this->_where = 'modules/'.$lpath;
View
2 lib/jelix/forms/jFormsBuilderHtml.class.php
@@ -116,7 +116,7 @@ public function outputHeader($params){
$urlParams = $this->_actionParams;
$attrs['action'] = $this->_action;
} else {
- $url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
+ $url = jUrl::get($this->_action, $this->_actionParams, 2); // returns the corresponding jurl
$urlParams = $url->params;
$attrs['action'] = $url->getPath();
}
View
4 lib/jelix/forms/jFormsCompiler.class.php
@@ -14,7 +14,7 @@
*/
/**
- * generates form class from an xml file describing the form
+ * Generates form class from an xml file describing the form
* @package jelix
* @subpackage forms
*/
@@ -29,7 +29,7 @@ public function compile($selector){
$this->sourceFile = $selector->getPath();
- // chargement du fichier XML
+ // load XML file
$doc = new DOMDocument();
if(!$doc->load($this->sourceFile)){
View
8 lib/jelix/plugins/db/intuition/intuition.dbconnection.php
@@ -91,11 +91,11 @@ protected function _disconnect (){
}
protected function _doQuery ($queryString){
- // Avant tout, on enlève les retours-chariots
+ // Remove the carriage returns before anything
$queryString = str_replace (array ("\n", "\r"), " ", $queryString);
- // Exécution de la requète
+ // Query execution
$queryResult = $this->_connection->in_query ($queryString);
@@ -119,11 +119,11 @@ protected function _doLimitQuery ( $queryString, $offset, $number) {
}
protected function _doExec ($query){
- // Avant tout, on enlève les retours-chariots
+ // Remove the carriage returns before anything
$queryString = str_replace (array ("\n", "\r"), " ", $queryString);
- // Exécution de la requète
+ // Query execution
$queryResult = $this->_connection->in_query ($queryString);
View
2 lib/jelix/plugins/db/oci/oci.daobuilder.php
@@ -58,7 +58,7 @@ protected function buildSelectPattern ($pattern, $table, $fieldname, $propname )
}
/*
- * Remplace le lastInsertId qui ne marche pas avec oci
+ * Replaces the lastInsertId which doesn't work with oci
*/
protected function buildUpdateAutoIncrementPK($pkai) {
return ' $record->'.$pkai->name.'= $this->_conn->query(\'SELECT '.$pkai->sequenceName.'.currval as '.$pkai->name.' from dual\')->fetch()->'.$pkai->name.';';
View
6 lib/jelix/plugins/tpl/common/function.counter_init.php
@@ -25,13 +25,13 @@ function jtpl_function_common_counter_init($tpl, $name = '', $type = '0', $start
if( empty($name) && $name !== '0')
$name = 'default';
- /* On réinitialise le compteur et on ajoute les variables données */
+ /* Reinitalize the conter and add the given variables */
$tpl->_privateVars['counterArray'][$name] = array( 'type' => $type, 'start' => $start, 'incr' => $incr );
- /* On racourci la variable */
+ /* Truncate the variable */
$in_use = &$tpl->_privateVars['counterArray'][$name];
- /* Adapte le nombre au type (pas toujours nécessaire) */
+ /* Adapt the number to the type (not always necessary) */
if( !is_string($in_use['start']) )
{
if( $in_use['type'] === 'aa' )
View
2 lib/jelix/plugins/tpl/html/function.formurl.php
@@ -18,7 +18,7 @@
*/
function jtpl_function_html_formurl($tpl, $selector, $params=array())
{
- $url = jUrl::get($selector, $params, 2); // retourne le jurl correspondant
+ $url = jUrl::get($selector, $params, 2); // returns the corresponding jurl
echo $url->getPath();
$tpl->_privateVars['_formurl'] = $url;
View
4 lib/jelix/plugins/urls/significant/significant.urls.php
@@ -118,7 +118,7 @@ public function parseFromRequest ($request, $params) {
$file = jApp::tempPath('compiled/urlsig/'.$sel->file.'.'.$snp.'.entrypoint.php');
if (file_exists($file)) {
require($file);
- $this->dataCreateUrl = & $GLOBALS['SIGNIFICANT_CREATEURL']; // fourni via le jIncluder ligne 99
+ $this->dataCreateUrl = & $GLOBALS['SIGNIFICANT_CREATEURL']; // given by jIncluder line 99
$this->dataParseUrl = & $GLOBALS['SIGNIFICANT_PARSEURL'][$snp];
$isHttps = ($request->getProtocol() == 'https://');
return $this->_parse($request->urlScript, $request->urlPathInfo, $params, $isHttps);
@@ -158,7 +158,7 @@ public function parse($scriptNamePath, $pathinfo, $params){
$file = jApp::tempPath('compiled/urlsig/'.$sel->file.'.'.$snp.'.entrypoint.php');
if (file_exists($file)) {
require($file);
- $this->dataCreateUrl = & $GLOBALS['SIGNIFICANT_CREATEURL']; // fourni via le jIncluder ligne 127
+ $this->dataCreateUrl = & $GLOBALS['SIGNIFICANT_CREATEURL']; // given by jIncluder line 127
$this->dataParseUrl = & $GLOBALS['SIGNIFICANT_PARSEURL'][$snp];
return $this->_parse($scriptNamePath, $pathinfo, $params, false);
}
View
4 lib/jelix/tpl/jTplCompiler.class.php
@@ -586,7 +586,7 @@ protected function _parseFinal ($string, $allowed = array(), $exceptchar = array
$bracketcount = $sqbracketcount = 0;
$firstok = array_shift($tokens);
- // il y a un bug, parfois le premier token n'est pas T_OPEN_TAG...
+ // there is a bug, sometimes the first token isn't T_OPEN_TAG...
if ($firstok == '<' && $tokens[0] == '?' && is_array($tokens[1])
&& $tokens[1][0] == T_STRING && $tokens[1][1] == 'php') {
array_shift($tokens);
@@ -711,7 +711,7 @@ public function addMetaContent ($content) {
}
/**
- * try to find a plugin
+ * Try to find a plugin
* @param string $type type of plugin (function, modifier...)
* @param string $name the plugin name
* @return array|boolean an array containing the path of the plugin
View
6 lib/jelix/utils/jFilter.class.php
@@ -32,7 +32,7 @@ static public function usePhpFilter(){
* @return boolean true if it is valid
*/
static public function isInt ($val, $min=null, $max=null){
- // @FIXME pas de doc sur la façon d'utiliser les min/max sur les filters
+ // @FIXME no doc on the way to use min/max on filters
if(filter_var($val, FILTER_VALIDATE_INT) === false) return false;
if($min !== null && intval($val) < $min) return false;
if($max !== null && intval($val) > $max) return false;
@@ -47,7 +47,7 @@ static public function isInt ($val, $min=null, $max=null){
* @return boolean true if it is valid
*/
static public function isHexInt ($val, $min=null, $max=null){
- // @FIXME pas de doc sur la façon d'utiliser les min/max sur les filters
+ // @FIXME no doc on the way to use min/max on filters
if(filter_var($val, FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX) === false) return false;
if($min !== null && intval($val,16) < $min) return false;
if($max !== null && intval($val,16) > $max) return false;
@@ -75,7 +75,7 @@ static public function isBool ($val){
* @return boolean true if it is valid
*/
static public function isFloat ($val, $min=null, $max=null){
- // @FIXME pas de doc sur la façon d'utiliser les min/max sur les filters
+ // @FIXME no doc on the way to use min/max on filters
if(filter_var($val, FILTER_VALIDATE_FLOAT) === false) return false;
if($min !== null && floatval($val) < $min) return false;
if($max !== null && floatval($val) > $max) return false;
View
6 lib/jelix/utils/jIniFile.class.php
@@ -56,9 +56,9 @@ public static function write($array, $filename, $header='') {
fwrite($f, $header.$result);
fclose($f);
} else {
- // jIniFile est utilisé par le compilateur des configs
- // il n'y a alors pas de $gJConfig dans de cas :
- // il faut générer alors une erreur sans passer par jLocale
+ // jIniFile is used by the configs compiler
+ // there is no $gJConfig in that case:
+ // we need to generate an error without using jLocale
if(isset($GLOBALS['gJConfig'])){
throw new jException('jelix~errors.inifile.write.error', array ($filename));
}else{
View
2 testapp/modules/jelix_tests/tests/jtpl.plugins.html.php
@@ -15,7 +15,7 @@ class UTjtplplugins extends jUnitTestCase {
protected $templates = array(
0=>array(
- 'test_plugin_jurl', // selecteur du template
+ 'test_plugin_jurl', // template selector
'<p><a href="%BASEPATH%index.php?module=jelix_tests&amp;action=urlsig:url1">aaa</a></p>', // generated content
),
1=>array(

0 comments on commit 3c68035

Please sign in to comment.