diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php index be1a3d2f8bf..f0dfb8c690a 100644 --- a/htdocs/admin/ticketsup.php +++ b/htdocs/admin/ticketsup.php @@ -235,9 +235,9 @@ $head = ticketsupAdminPrepareHead(); dol_fiche_head( $head, 'settings', - $langs->trans("Module110120Name"), + $langs->trans("Module56000Name"), 0, - "ticketsup@ticketsup" + "ticketsup" ); print '

' . $langs->trans("TicketsupSetupDictionaries") . ' : ' . dol_buildpath('/admin/dict.php', 2) . '

'; @@ -546,7 +546,7 @@ if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) { // Email d'envoi des notifications print '' . $langs->trans("TicketEmailNotificationFrom") . ''; print ''; -print ''; +print ''; print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); print ''; diff --git a/htdocs/admin/ticketsup_extrafields.php b/htdocs/admin/ticketsup_extrafields.php index 6a6a36a3bf8..09fe827ca7c 100644 --- a/htdocs/admin/ticketsup_extrafields.php +++ b/htdocs/admin/ticketsup_extrafields.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php"; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; -$langs->load("ticketsup@ticketsup"); +$langs->load("ticketsup"); $langs->load("admin"); $extrafields = new ExtraFields($db); @@ -50,11 +50,7 @@ if (!$user->admin) { /* * Actions */ -if (versioncompare(versiondolibarrarray(), array(3, 5, 0)) > 0) { - include DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php'; -} elseif (versioncompare(versiondolibarrarray(), array(3, 4, 0)) > 0) { - include DOL_DOCUMENT_ROOT . '/core/admin_extrafields.inc.php'; -} +include DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php'; /* * View @@ -74,9 +70,9 @@ $head = ticketsupAdminPrepareHead(); dol_fiche_head( $head, 'attributes', - $langs->trans("Module110120Name"), + $langs->trans("Module56000Name"), 0, - "ticketsup@ticketsup" + "ticketsup" ); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index a35f89f9038..44375df6dc8 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -56,15 +56,7 @@ if (!empty($conf->variants->enabled)) { require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; } -$langs->load('orders'); -$langs->load('sendings'); -$langs->load('companies'); -$langs->load('bills'); -$langs->load('propal'); -$langs->load('deliveries'); -$langs->load('sendings'); -$langs->load('products'); -$langs->load('other'); +$langs->loadLangs(array('orders','sendings','companies','bills','propal','deliveries','products','other')); if (!empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (! empty($conf->margin->enabled)) $langs->load('margins'); if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php index 52b470c0929..08dbc4e0fe6 100644 --- a/htdocs/core/class/html.formticketsup.class.php +++ b/htdocs/core/class/html.formticketsup.class.php @@ -499,7 +499,7 @@ class FormTicketsup } print ''; if ($user->admin && !$noadmininfo) { - print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); + print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } } @@ -597,7 +597,7 @@ class FormTicketsup } print ''; if ($user->admin && !$noadmininfo) { - print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); + print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } } @@ -694,7 +694,7 @@ class FormTicketsup } print ''; if ($user->admin && !$noadmininfo) { - print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"), 1); + print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); } } diff --git a/htdocs/langs/en_US/ticketsup.lang b/htdocs/langs/en_US/ticketsup.lang index ebf1f89309a..b50116c4997 100644 --- a/htdocs/langs/en_US/ticketsup.lang +++ b/htdocs/langs/en_US/ticketsup.lang @@ -18,14 +18,14 @@ # Generic # -Module110120Name = Tickets -Module110120Desc = Ticket system for incident management +Module56000Name=Tickets +Module56000Desc=Ticket system for incident management -Permission110121=See tickets -Permission110122=Modify tickets -Permission110123=Delete tickets -Permission110124=Manage tickets -Permission110125=See tickets of all thirdparties (not effective for external users, always be limited to the thirdparty they depend on) +Permission56001=See tickets +Permission56002=Modify tickets +Permission56003=Delete tickets +Permission56004=Manage tickets +Permission56005=See tickets of all thirdparties (not effective for external users, always be limited to the thirdparty they depend on) TicketsupDictType=Tickets type TicketsupDictCategory=Tickets categories @@ -70,22 +70,22 @@ Category=Category Severity=Severity # Email templates -MailToSendTicketsupMessage = To send email from ticket message +MailToSendTicketsupMessage=To send email from ticket message # # Admin page # -TicketsupSetup = Ticket module setup -TicketSupSettings = Settings -TicketsupSetupPage = -TicketsupPublicAccess = A public interface requiring no identification is available at the following url -TicketsupSetupDictionaries = The type of application categories and severity level are configurable from dictionaries +TicketsupSetup=Ticket module setup +TicketSupSettings=Settings +TicketsupSetupPage= +TicketsupPublicAccess=A public interface requiring no identification is available at the following url +TicketsupSetupDictionaries=The type of application categories and severity level are configurable from dictionaries TicketParamModule=Module variable setup TicketParamMail=Email setup -TicketEmailNotificationFrom = Notification email from -TicketEmailNotificationFromHelp = Used into ticket message answer by example -TicketEmailNotificationTo = Notifications email to -TicketEmailNotificationToHelp = Send email notifications to this address. +TicketEmailNotificationFrom=Notification email from +TicketEmailNotificationFromHelp=Used into ticket message answer by example +TicketEmailNotificationTo=Notifications email to +TicketEmailNotificationToHelp=Send email notifications to this address. TicketNewEmailBodyLabel=Text message sent after creating a ticket (public interface) TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added. TicketParamPublicInterface=Public interface setup @@ -128,9 +128,9 @@ TicketNotNotifyTiersAtCreate=Do not notify the company to the creation # # About page # -About = About -TicketSupAbout = About ticket module -TicketSupAboutModule = The development of this module has been initiated by the company Libr&thic. +About=About +TicketSupAbout=About ticket module +TicketSupAboutModule=The development of this module has been initiated by the company Libr&thic. TicketSupAboutModuleHelp=You can get help by using the contact form on the website librethic.io TicketSupAboutModuleImprove=Feel free to suggest improvements! Please visit the project page on Doliforge website to report bugs and add tasks. TicketSupAboutModuleThanks=Thanks to nwa who creates icons for this module./