From ecb16cf914b30443ee968373ef597cc325b2096d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 Jan 2019 07:07:26 +0100 Subject: [PATCH 1/2] Trans --- htdocs/langs/en_US/projects.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 75987cc621e..fb004ca0bfb 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -203,7 +203,7 @@ ProjectsStatistics=Statistics on projects/leads TasksStatistics=Statistics on project/lead tasks TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible. IdTaskTime=Id task time -YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes. +YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX OpenedProjectsByThirdparties=Open projects by third parties OnlyOpportunitiesShort=Only leads OpenedOpportunitiesShort=Open leads From 3f75bb694c8a9ca1d6834c26dd4df045b3972ca1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 26 Jan 2019 01:31:22 +0100 Subject: [PATCH 2/2] Fix phpcs --- htdocs/website/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 31fc81280c2..1433ae5324c 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1851,14 +1851,13 @@ if (! GETPOST('hide_websitemenu')) $htmltext.=$langs->trans("SetHereVirtualHost", $dataroot); $htmltext.='
'; $htmltext.='
'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT); - $htmltext.='
bb'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website
'.DOL_DATA_ROOT.'/medias'); + $htmltext.='
'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website
'.DOL_DATA_ROOT.'/medias'); $htmltext.='
'; $htmltext.='
'; $htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot); } print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 2, 'helpvirtualhost'); print ''; - } if (in_array($action, array('editcss','editmenu','file_manager')))