Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
This commit is contained in:
+63
-63
@@ -1,52 +1,52 @@
|
||||
<?php
|
||||
$lang->dev->common = 'D?veloppeur';
|
||||
$lang->dev->common = 'Develop';
|
||||
$lang->dev->api = 'API';
|
||||
$lang->dev->db = 'Base de Donn?es';
|
||||
$lang->dev->editor = 'Editeur';
|
||||
$lang->dev->db = 'Database';
|
||||
$lang->dev->editor = 'Editor';
|
||||
$lang->dev->translate = 'Translate';
|
||||
$lang->dev->dbList = 'Bases de Donn?es';
|
||||
$lang->dev->dbList = 'Database';
|
||||
$lang->dev->moduleList = 'Modules';
|
||||
$lang->dev->params = 'Param?tres';
|
||||
$lang->dev->params = 'Parameters';
|
||||
$lang->dev->type = 'Type';
|
||||
$lang->dev->desc = 'Description';
|
||||
$lang->dev->noParams = 'Pas de Param?tres';
|
||||
$lang->dev->post = 'Param?tre POST';
|
||||
$lang->dev->noParams = 'No Parameters';
|
||||
$lang->dev->post = 'POST Parameter';
|
||||
|
||||
$lang->dev->paramRange = 'Rang Param?tre : %s';
|
||||
$lang->dev->paramDate = 'Format Date : YY-mm-dd, e.g 2019-01-01';
|
||||
$lang->dev->paramColor = 'Format Couleur : #RGB, e.g. #3da7f5';
|
||||
$lang->dev->paramMailto = "Comptes utilisateurs. S?par? par des ','.";
|
||||
$lang->dev->noteEditor = "L'?diteur est d?sactiv? pour des raisons de s?curit?. Pour utiliser cette fonction, veuillez vous rendre sur le site officiel pour t?l?charger et installer le plugin de l'<a href='https://www.zentao.pm/extension-viewExt-150.html' target='_blank'>editeur</a>.";
|
||||
$lang->dev->noteTranslate = "La traduction est d?sactiv?e pour des raisons de s?curit?. Pour utiliser cette fonctionnalit?, veuillez vous rendre sur le site officiel pour t?l?charger et installer le plugin de <a href='https://www.zentao.pm/extension-viewExt-151.html' target='_blank'>traduction</a>.";
|
||||
$lang->dev->paramRange = 'Parameter Range: %s';
|
||||
$lang->dev->paramDate = 'Date format: YY-mm-dd, e.g 2019-01-01';
|
||||
$lang->dev->paramColor = 'Color format: #RGB, e.g. #3da7f5';
|
||||
$lang->dev->paramMailto = "User account. Separate accounts by ','.";
|
||||
$lang->dev->noteEditor = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
|
||||
$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
|
||||
|
||||
$lang->dev->fields = array();
|
||||
$lang->dev->fields['id'] = 'ID';
|
||||
$lang->dev->fields['name'] = 'Champ';
|
||||
$lang->dev->fields['name'] = 'Feild';
|
||||
$lang->dev->fields['desc'] = 'Description';
|
||||
$lang->dev->fields['type'] = 'Type';
|
||||
$lang->dev->fields['length'] = 'Longueur';
|
||||
$lang->dev->fields['length'] = 'Length';
|
||||
$lang->dev->fields['null'] = 'Null';
|
||||
|
||||
$lang->dev->tableList = array();
|
||||
$lang->dev->tableList['action'] = 'Action';
|
||||
$lang->dev->tableList['bug'] = 'Bug';
|
||||
$lang->dev->tableList['build'] = 'Build';
|
||||
$lang->dev->tableList['burn'] = 'Graphe Burndown';
|
||||
$lang->dev->tableList['case'] = 'CasTest';
|
||||
$lang->dev->tableList['casestep'] = 'Step';
|
||||
$lang->dev->tableList['company'] = 'Entreprise';
|
||||
$lang->dev->tableList['burn'] = 'Burndown Chart';
|
||||
$lang->dev->tableList['case'] = 'Test Case';
|
||||
$lang->dev->tableList['casestep'] = 'Case Step';
|
||||
$lang->dev->tableList['company'] = 'Company';
|
||||
$lang->dev->tableList['config'] = 'Configuration';
|
||||
$lang->dev->tableList['custom'] = 'Personnalisation';
|
||||
$lang->dev->tableList['dept'] = 'Compartiment';
|
||||
$lang->dev->tableList['custom'] = 'Custom';
|
||||
$lang->dev->tableList['dept'] = 'Department';
|
||||
$lang->dev->tableList['doc'] = 'Document';
|
||||
$lang->dev->tableList['doclib'] = 'Biblioth?que Document';
|
||||
$lang->dev->tableList['doclib'] = 'Document Library';
|
||||
$lang->dev->tableList['effort'] = 'Effort';
|
||||
$lang->dev->tableList['extension'] = 'Extension';
|
||||
$lang->dev->tableList['file'] = 'Fichier';
|
||||
$lang->dev->tableList['group'] = 'Groupe';
|
||||
$lang->dev->tableList['grouppriv'] = 'Privil?ge';
|
||||
$lang->dev->tableList['history'] = 'Historique';
|
||||
$lang->dev->tableList['lang'] = 'Langue';
|
||||
$lang->dev->tableList['file'] = 'File';
|
||||
$lang->dev->tableList['group'] = 'Group';
|
||||
$lang->dev->tableList['grouppriv'] = 'Privilege';
|
||||
$lang->dev->tableList['history'] = 'History';
|
||||
$lang->dev->tableList['lang'] = 'Language';
|
||||
$lang->dev->tableList['module'] = 'Module';
|
||||
$lang->dev->tableList['program'] = 'Program';
|
||||
$lang->dev->tableList['product'] = $lang->productCommon;
|
||||
@@ -56,62 +56,62 @@ $lang->dev->tableList['programplan'] = 'Project Stage';
|
||||
$lang->dev->tableList['weekly'] = 'Weekly';
|
||||
$lang->dev->tableList['sonarqube'] = 'Sonarqube';
|
||||
$lang->dev->tableList['projectproduct'] = 'Project' . $lang->productCommon;
|
||||
$lang->dev->tableList['projectstory'] = 'Project';
|
||||
$lang->dev->tableList['projectstory'] = 'Project Story';
|
||||
$lang->dev->tableList['execution'] = $lang->executionCommon;
|
||||
$lang->dev->tableList['release'] = 'Release';
|
||||
$lang->dev->tableList['story'] = 'Story';
|
||||
$lang->dev->tableList['storyspec'] = 'Description Story';
|
||||
$lang->dev->tableList['task'] = 'T?che';
|
||||
$lang->dev->tableList['taskestimate'] = 'Estim?s';
|
||||
$lang->dev->tableList['team'] = 'Equipe';
|
||||
$lang->dev->tableList['testresult'] = 'R?sultats Test';
|
||||
$lang->dev->tableList['testrun'] = 'Ex?cution Test';
|
||||
$lang->dev->tableList['testtask'] = 'Campagne';
|
||||
$lang->dev->tableList['todo'] = 'Agenda';
|
||||
$lang->dev->tableList['storyspec'] = 'Story Description';
|
||||
$lang->dev->tableList['task'] = 'Task';
|
||||
$lang->dev->tableList['taskestimate'] = 'Estimates';
|
||||
$lang->dev->tableList['team'] = 'Team';
|
||||
$lang->dev->tableList['testresult'] = 'Test Result';
|
||||
$lang->dev->tableList['testrun'] = 'Test Run';
|
||||
$lang->dev->tableList['testtask'] = 'Test Request';
|
||||
$lang->dev->tableList['todo'] = 'Todo';
|
||||
$lang->dev->tableList['user'] = 'User';
|
||||
$lang->dev->tableList['usercontact'] = 'Contact Utilisateur';
|
||||
$lang->dev->tableList['usercontact'] = 'User Contact';
|
||||
$lang->dev->tableList['usergroup'] = 'User Group';
|
||||
$lang->dev->tableList['userquery'] = 'User Query';
|
||||
$lang->dev->tableList['usertpl'] = 'User Template';
|
||||
$lang->dev->tableList['admin'] = 'Admin';
|
||||
$lang->dev->tableList['api'] = 'API';
|
||||
$lang->dev->tableList['backup'] = 'Sauvegarde';
|
||||
$lang->dev->tableList['common'] = 'Commun';
|
||||
$lang->dev->tableList['backup'] = 'Backup';
|
||||
$lang->dev->tableList['common'] = 'Common';
|
||||
$lang->dev->tableList['convert'] = 'Convert';
|
||||
$lang->dev->tableList['dev'] = 'D?velop';
|
||||
$lang->dev->tableList['dev'] = 'Develop';
|
||||
$lang->dev->tableList['git'] = 'GIT';
|
||||
$lang->dev->tableList['index'] = 'Accueil';
|
||||
$lang->dev->tableList['install'] = 'Installer';
|
||||
$lang->dev->tableList['index'] = 'Home';
|
||||
$lang->dev->tableList['install'] = 'Install';
|
||||
$lang->dev->tableList['mail'] = 'Email';
|
||||
$lang->dev->tableList['misc'] = 'Divers';
|
||||
$lang->dev->tableList['misc'] = 'Misc.';
|
||||
$lang->dev->tableList['my'] = 'Dashboard';
|
||||
$lang->dev->tableList['qa'] = 'QA';
|
||||
$lang->dev->tableList['report'] = 'Rapport';
|
||||
$lang->dev->tableList['search'] = 'Recherche';
|
||||
$lang->dev->tableList['qa'] = 'Test';
|
||||
$lang->dev->tableList['report'] = 'Report';
|
||||
$lang->dev->tableList['search'] = 'Search';
|
||||
$lang->dev->tableList['sso'] = 'SSO';
|
||||
$lang->dev->tableList['svn'] = 'SVN';
|
||||
$lang->dev->tableList['testcase'] = 'CasTest';
|
||||
$lang->dev->tableList['testcase'] = 'Test Case';
|
||||
$lang->dev->tableList['automation'] = 'Automation';
|
||||
$lang->dev->tableList['testreport'] = 'Rapport Test';
|
||||
$lang->dev->tableList['testsuite'] = 'Cahier Recette';
|
||||
$lang->dev->tableList['testreport'] = 'Test Report';
|
||||
$lang->dev->tableList['testsuite'] = 'Test Suite';
|
||||
$lang->dev->tableList['caselib'] = 'Case Library';
|
||||
$lang->dev->tableList['tree'] = 'Arborescence';
|
||||
$lang->dev->tableList['tree'] = 'Module Tree';
|
||||
$lang->dev->tableList['upgrade'] = 'Update';
|
||||
$lang->dev->tableList['cron'] = 'Cron';
|
||||
$lang->dev->tableList['datatable'] = 'Tableau Donn?es';
|
||||
$lang->dev->tableList['block'] = 'Bloc';
|
||||
$lang->dev->tableList['branch'] = 'Branche';
|
||||
$lang->dev->tableList['doccontent'] = 'Contenu Doc';
|
||||
$lang->dev->tableList['storystage'] = 'Phase Story Phase';
|
||||
$lang->dev->tableList['tutorial'] = 'Tutoriel';
|
||||
$lang->dev->tableList['suitecase'] = 'Cas Cahier Recette';
|
||||
$lang->dev->tableList['datatable'] = 'Data Table';
|
||||
$lang->dev->tableList['block'] = 'Block';
|
||||
$lang->dev->tableList['branch'] = 'Branch';
|
||||
$lang->dev->tableList['doccontent'] = 'Doc Content';
|
||||
$lang->dev->tableList['storystage'] = 'Story Phase';
|
||||
$lang->dev->tableList['tutorial'] = 'Tutorial';
|
||||
$lang->dev->tableList['suitecase'] = 'Suite Case';
|
||||
$lang->dev->tableList['score'] = 'Score';
|
||||
$lang->dev->tableList['entry'] = 'Application';
|
||||
$lang->dev->tableList['webhook'] = 'WebHook';
|
||||
$lang->dev->tableList['log'] = 'Log';
|
||||
$lang->dev->tableList['message'] = 'Message';
|
||||
$lang->dev->tableList['notify'] = 'Notification';
|
||||
$lang->dev->tableList['userview'] = 'Droits Utilisateur';
|
||||
$lang->dev->tableList['userview'] = 'User Privilege';
|
||||
$lang->dev->tableList['repo'] = 'Code';
|
||||
$lang->dev->tableList['repohistory'] = 'Repo History';
|
||||
$lang->dev->tableList['repofiles'] = 'Repo Files';
|
||||
@@ -161,11 +161,11 @@ $lang->dev->groupList['product'] = $lang->productCommon;
|
||||
$lang->dev->groupList['project'] = 'Project';
|
||||
$lang->dev->groupList['execution'] = $lang->executionCommon;
|
||||
$lang->dev->groupList['kanban'] = 'Kanban';
|
||||
$lang->dev->groupList['qa'] = 'QA';
|
||||
$lang->dev->groupList['qa'] = 'Test';
|
||||
$lang->dev->groupList['doc'] = 'Doc';
|
||||
$lang->dev->groupList['assetlib'] = 'Assetlib';
|
||||
$lang->dev->groupList['report'] = 'Rapport';
|
||||
$lang->dev->groupList['company'] = 'Entreprise';
|
||||
$lang->dev->groupList['report'] = 'Report';
|
||||
$lang->dev->groupList['company'] = 'Company';
|
||||
$lang->dev->groupList['repo'] = 'CI';
|
||||
$lang->dev->groupList['api'] = 'API';
|
||||
$lang->dev->groupList['message'] = 'Message';
|
||||
@@ -175,5 +175,5 @@ global $config;
|
||||
if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
|
||||
|
||||
$lang->dev->endGroupList['admin'] = 'Admin';
|
||||
$lang->dev->endGroupList['system'] = 'Syst?me';
|
||||
$lang->dev->endGroupList['other'] = 'Autres';
|
||||
$lang->dev->endGroupList['system'] = 'System';
|
||||
$lang->dev->endGroupList['other'] = 'Others';
|
||||
|
||||
@@ -1382,6 +1382,7 @@ $(function()
|
||||
$('.kanban-header-col>.title>span:not(.text)').hide();
|
||||
$('.kanban-header-col>.title > span.text').css('max-width', miniColWidth + 'px');
|
||||
}
|
||||
$('[data-toggle="tooltip"]').tooltip();
|
||||
});
|
||||
|
||||
$('#type').change(function()
|
||||
|
||||
+73
-73
@@ -1,107 +1,107 @@
|
||||
<?php
|
||||
$lang->mail->common = 'Paramétrage Email';
|
||||
$lang->mail->index = 'Accueil Email';
|
||||
$lang->mail->detect = 'Détecter';
|
||||
$lang->mail->detectAction = 'Détecter par Adresse mail';
|
||||
$lang->mail->edit = 'Editer Paramétrages';
|
||||
$lang->mail->save = 'Sauver';
|
||||
$lang->mail->saveAction = 'Saver Paramétrages';
|
||||
$lang->mail->test = 'Test Envoi Email';
|
||||
$lang->mail->reset = 'Réinitialiser';
|
||||
$lang->mail->resetAction = 'Réinitialiser Paramétrages';
|
||||
$lang->mail->resend = 'Renvoyer';
|
||||
$lang->mail->resendAction = 'Renvoyer mail';
|
||||
$lang->mail->browse = 'Liste Email';
|
||||
$lang->mail->delete = 'Supprimer mail';
|
||||
$lang->mail->common = 'Email Settings';
|
||||
$lang->mail->index = 'Email Home';
|
||||
$lang->mail->detect = 'Detect';
|
||||
$lang->mail->detectAction = 'Detect By Email Address';
|
||||
$lang->mail->edit = 'Edit Settings';
|
||||
$lang->mail->save = 'Save';
|
||||
$lang->mail->saveAction = 'Save Settings';
|
||||
$lang->mail->test = 'Email Sending Test';
|
||||
$lang->mail->reset = 'Reset';
|
||||
$lang->mail->resetAction = 'Reset Settings';
|
||||
$lang->mail->resend = 'Resend';
|
||||
$lang->mail->resendAction = 'Resend Email';
|
||||
$lang->mail->browse = 'Email List';
|
||||
$lang->mail->delete = 'Delete Email';
|
||||
$lang->mail->ztCloud = 'ZenTao CloudMail';
|
||||
$lang->mail->gmail = 'Gmail';
|
||||
$lang->mail->sendCloud = 'Notice SendCloud';
|
||||
$lang->mail->batchDelete = 'Suppression par Lot';
|
||||
$lang->mail->batchDelete = 'Batch Delete';
|
||||
$lang->mail->sendcloudUser = 'Sync. Contact';
|
||||
$lang->mail->agreeLicense = 'Oui';
|
||||
$lang->mail->disagree = 'Non';
|
||||
$lang->mail->agreeLicense = 'Yes';
|
||||
$lang->mail->disagree = 'No';
|
||||
|
||||
$lang->mail->turnon = 'Notification Email';
|
||||
$lang->mail->async = 'Envoi Async';
|
||||
$lang->mail->fromAddress = 'Expéditeur mail';
|
||||
$lang->mail->fromName = 'Expéditeur';
|
||||
$lang->mail->domain = 'Domaine ZenTao';
|
||||
$lang->mail->host = 'Serveur SMTP';
|
||||
$lang->mail->port = 'Port SMTP';
|
||||
$lang->mail->auth = 'Validation SMTP';
|
||||
$lang->mail->username = 'Compte SMTP';
|
||||
$lang->mail->password = 'Mot de passe SMTP';
|
||||
$lang->mail->secure = 'Cryptage';
|
||||
$lang->mail->debug = 'Debug';
|
||||
$lang->mail->turnon = 'Email Notification';
|
||||
$lang->mail->async = 'Async Sending';
|
||||
$lang->mail->fromAddress = 'Sender Email';
|
||||
$lang->mail->fromName = 'Sender';
|
||||
$lang->mail->domain = 'ZenTao Domain';
|
||||
$lang->mail->host = 'SMTP Server';
|
||||
$lang->mail->port = 'SMTP Port';
|
||||
$lang->mail->auth = 'SMTP Validation';
|
||||
$lang->mail->username = 'SMTP Account';
|
||||
$lang->mail->password = 'SMTP Password';
|
||||
$lang->mail->secure = 'Encryption';
|
||||
$lang->mail->debug = 'Debugging';
|
||||
$lang->mail->charset = 'Charset';
|
||||
$lang->mail->accessKey = "Clé d'Accès";
|
||||
$lang->mail->secretKey = "Clé Secrète";
|
||||
$lang->mail->accessKey = 'Access Key';
|
||||
$lang->mail->secretKey = 'Secret Key';
|
||||
$lang->mail->license = 'ZenTao CloudMail Notice';
|
||||
|
||||
$lang->mail->selectMTA = 'Sélect Type';
|
||||
$lang->mail->selectMTA = 'Select Type';
|
||||
$lang->mail->smtp = 'SMTP';
|
||||
|
||||
$lang->mail->syncedUser = 'Synchronis';
|
||||
$lang->mail->unsyncUser = 'Non Synchronis';
|
||||
$lang->mail->sync = 'Synchronisation';
|
||||
$lang->mail->remove = 'Retirer';
|
||||
$lang->mail->syncedUser = 'Synchronized';
|
||||
$lang->mail->unsyncUser = 'Not Synchronized';
|
||||
$lang->mail->sync = 'Synchronize';
|
||||
$lang->mail->remove = 'Remove';
|
||||
|
||||
$lang->mail->toList = 'Destinataire';
|
||||
$lang->mail->ccList = 'Copie ';
|
||||
$lang->mail->subject = 'Sujet';
|
||||
$lang->mail->createdBy = 'Expéditeur';
|
||||
$lang->mail->createdDate = 'Création';
|
||||
$lang->mail->sendTime = 'Envoi';
|
||||
$lang->mail->status = 'Statut';
|
||||
$lang->mail->failReason = 'Raison';
|
||||
$lang->mail->toList = 'Recipient';
|
||||
$lang->mail->ccList = 'Copy to';
|
||||
$lang->mail->subject = 'Subject';
|
||||
$lang->mail->createdBy = 'Sender';
|
||||
$lang->mail->createdDate = 'CreatedDate';
|
||||
$lang->mail->sendTime = 'Sent';
|
||||
$lang->mail->status = 'Status';
|
||||
$lang->mail->failReason = 'Reason';
|
||||
|
||||
$lang->mail->statusList['wait'] = 'en Attente';
|
||||
$lang->mail->statusList['sended'] = 'Envoy';
|
||||
$lang->mail->statusList['fail'] = 'Echec';
|
||||
$lang->mail->statusList['wait'] = 'Wait';
|
||||
$lang->mail->statusList['sended'] = 'Sent';
|
||||
$lang->mail->statusList['fail'] = 'Failed';
|
||||
|
||||
$lang->mail->turnonList[1] = 'On';
|
||||
$lang->mail->turnonList[0] = 'Off';
|
||||
|
||||
$lang->mail->asyncList[1] = 'Oui';
|
||||
$lang->mail->asyncList[0] = 'Non';
|
||||
$lang->mail->asyncList[1] = 'Yes';
|
||||
$lang->mail->asyncList[0] = 'No';
|
||||
|
||||
$lang->mail->debugList[0] = 'Off';
|
||||
$lang->mail->debugList[1] = 'Normal';
|
||||
$lang->mail->debugList[2] = 'Haute';
|
||||
$lang->mail->debugList[2] = 'High';
|
||||
|
||||
$lang->mail->authList[1] = 'Oui';
|
||||
$lang->mail->authList[0] = 'Non';
|
||||
$lang->mail->authList[1] = 'Yes';
|
||||
$lang->mail->authList[0] = 'No';
|
||||
|
||||
$lang->mail->secureList[''] = 'Plain';
|
||||
$lang->mail->secureList['ssl'] = 'ssl';
|
||||
$lang->mail->secureList['tls'] = 'tls';
|
||||
|
||||
$lang->mail->more = 'Plus';
|
||||
$lang->mail->noticeResend = 'Le mail a été renvoyé !';
|
||||
$lang->mail->inputFromEmail = 'Expéditeur Email';
|
||||
$lang->mail->nextStep = 'Suivant';
|
||||
$lang->mail->successSaved = 'Paramétrage Email sauvegardés.';
|
||||
$lang->mail->more = 'More';
|
||||
$lang->mail->noticeResend = 'The Email has been re-sent!';
|
||||
$lang->mail->inputFromEmail = 'Sender Email';
|
||||
$lang->mail->nextStep = 'Next';
|
||||
$lang->mail->successSaved = 'Email settings are saved.';
|
||||
$lang->mail->setForUser = 'Could not test mail configure because the users are without mail in system. Please set mail for user first.';
|
||||
$lang->mail->testSubject = 'mail de test';
|
||||
$lang->mail->testContent = 'Les Paramétrages Email sont ok !';
|
||||
$lang->mail->successSended = 'Envoyé !';
|
||||
$lang->mail->confirmDelete = 'Voulez-vous le supprimer ?';
|
||||
$lang->mail->sendmailTips = "Note : l'expéditeur ne recevra pas ce mail.";
|
||||
$lang->mail->needConfigure = "Les paramétrages Email n'ont pas été trouvés. Commencez par paramétrer l'Email.";
|
||||
$lang->mail->connectFail = 'Echec de Connexion à ZenTao.';
|
||||
$lang->mail->centifyFail = 'Echec de Vérification. La clé secrète peut avoir été changée. Essayez à nouveau !';
|
||||
$lang->mail->nofsocket = 'Les fonctions fsocket sont désactivées. Les mails ne peuvent pas être envoyés. Modifiez allow_url_fopen dans php.ini pour ouvrir Onopenssl, et redémarrez Apache.';
|
||||
$lang->mail->noOpenssl = 'Activez Onopenssl, et redémarrez Apache.';
|
||||
$lang->mail->disableSecure = 'Pas de openssl. ssl et tls sont inactifs.';
|
||||
$lang->mail->sendCloudFail = 'Echec. Raison :';
|
||||
$lang->mail->testSubject = 'Testing Email';
|
||||
$lang->mail->testContent = 'Email settings are done!';
|
||||
$lang->mail->successSended = 'Sent!';
|
||||
$lang->mail->confirmDelete = 'Do you want to delete it?';
|
||||
$lang->mail->sendmailTips = 'Note: Email sender will not receive this email.';
|
||||
$lang->mail->needConfigure = 'Email settings are not found. Please do the Email settings first.';
|
||||
$lang->mail->connectFail = 'Connection to ZenTao failed.';
|
||||
$lang->mail->centifyFail = 'Verification failed. The secret key might be changed. Please try to bind again!';
|
||||
$lang->mail->nofsocket = 'fsocket related functions are deactivated. so Emails cannot be sent out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
|
||||
$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.';
|
||||
$lang->mail->disableSecure = 'No openssl. Disable ssl and tls.';
|
||||
$lang->mail->sendCloudFail = 'Failed. Reason:';
|
||||
$lang->mail->sendCloudHelp = <<<EOD
|
||||
|
||||
|
||||
|
||||
EOD;
|
||||
$lang->mail->sendCloudSuccess = 'Envoy';
|
||||
$lang->mail->closeSendCloud = 'Fermer SendCloud';
|
||||
$lang->mail->addressWhiteList = "Ajoutez le à la liste blanche de votre serveur de mail pour éviter d'être bloqué.";
|
||||
$lang->mail->sendCloudSuccess = 'Done';
|
||||
$lang->mail->closeSendCloud = 'Close SendCloud';
|
||||
$lang->mail->addressWhiteList = 'Add it to the whiltelist of your email server to avoid being blocked.';
|
||||
$lang->mail->ztCloudNotice = <<<EOD
|
||||
|
||||
|
||||
@@ -121,4 +121,4 @@ $lang->mail->forgetPassword = <<<EOT
|
||||
EOT;
|
||||
|
||||
$lang->mail->placeholder = new stdclass();
|
||||
$lang->mail->placeholder->password = "Certains serveurs de mails demandent un code d'autorisation, consultez le service d'Emails de votre provider.";
|
||||
$lang->mail->placeholder->password = 'Some Email servers require auth code, refer to your Email service provider.';
|
||||
|
||||
@@ -152,7 +152,7 @@ class programplanModel extends model
|
||||
$this->loadModel('stage');
|
||||
$this->loadModel('execution');
|
||||
|
||||
$plans = $this->getStage($executionID, $productID);
|
||||
$plans = $this->getStage($executionID, $productID, 'all', 'order');
|
||||
if($baselineID)
|
||||
{
|
||||
$baseline = $this->loadModel('cm')->getByID($baselineID);
|
||||
|
||||
@@ -2439,7 +2439,7 @@ class repoModel extends model
|
||||
*/
|
||||
public function buildTree($files = array(), $parent = 0)
|
||||
{
|
||||
$treeList = [];
|
||||
$treeList = array();
|
||||
$key = 0;
|
||||
$pathName = array();
|
||||
$fileName = array();
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -216,8 +216,9 @@ class xuanxuanIm extends imModel
|
||||
}
|
||||
if ($contentData->objectType == 'story' && $contentData->action == 'reviewed')
|
||||
{
|
||||
$extra = explode(',', $contentDataOuter->extra)[0];
|
||||
$messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor-$extra"][] = $message;
|
||||
$extra = explode(',', $contentDataOuter->extra);
|
||||
$actor = $extra[0];
|
||||
$messageGroups["$contentData->objectType-$contentData->parentType-$contentData->action-$contentData->actor-$actor"][] = $message;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -53,7 +53,8 @@ class xuanxuanMessage extends messageModel
|
||||
$title = $objectType == 'mr' ? '' : sprintf($this->lang->message->notifyTitle, $this->app->user->realname, $this->lang->action->label->$actionType, 1, $this->lang->action->objectTypes[$objectType]);
|
||||
if($objectType == 'story' && $actionType == 'reviewed' && !empty($extra))
|
||||
{
|
||||
$notifyType = strtolower(explode(',', $extra)[0]);
|
||||
$notifyExtra = explode(',', $extra);
|
||||
$notifyType = strtolower($notifyExtra[0]);
|
||||
if($notifyType == 'pass')
|
||||
{
|
||||
$title = sprintf($this->lang->message->notifyPassTitle, $this->app->user->realname, 1);
|
||||
|
||||
Reference in New Issue
Block a user