diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 3652c04518d..bebb9f7d0bd 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -248,14 +248,14 @@ print ''.img_picto('', 'language').' '.$langs->trans print ''; // Default language -print ''.$langs->trans("DefaultLanguage").''; +print ''.$langs->trans("DefaultLanguage").''; print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2); print ''; print ''; print ''; // Multilingual GUI -print ''.$langs->trans("EnableMultilangInterface").''; +print ''.$langs->trans("EnableMultilangInterface").''; print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0); print ''; print ''; @@ -303,28 +303,28 @@ print ''; */ // First day for weeks -print ''.$langs->trans("WeekStartOnDay").''; +print ''.$langs->trans("WeekStartOnDay").''; print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0); print ''; print ' '; print ''; // DefaultWorkingDays -print ''.$langs->trans("DefaultWorkingDays").''; +print ''.$langs->trans("DefaultWorkingDays").''; print ''; print ''; print ' '; print ''; // DefaultWorkingHours -print ''.$langs->trans("DefaultWorkingHours").''; +print ''.$langs->trans("DefaultWorkingHours").''; print ''; print ''; print ' '; print ''; // Firstname/Name -print ''.$langs->trans("FirstnameNamePosition").''; +print ''.$langs->trans("FirstnameNamePosition").''; $array = array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"), 1=>$langs->trans("Lastname").' '.$langs->trans("Firstname")); print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0)); print ''; @@ -332,7 +332,7 @@ print ' '; print ''; // Hide unauthorized menus -print ''.$langs->trans("HideUnauthorizedMenu").''; +print ''.$langs->trans("HideUnauthorizedMenu").''; //print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1); print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0); print ''; @@ -340,7 +340,7 @@ print ' '; print ''; // Hide unauthorized button -print ''.$langs->trans("ButtonHideUnauthorized").''; +print ''.$langs->trans("ButtonHideUnauthorized").''; //print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1); print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0); print ''; @@ -350,7 +350,7 @@ print ''; // Hide version link /* -print ''.$langs->trans("HideVersionLink").''; +print ''.$langs->trans("HideVersionLink").''; print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1); print ''; print ' '; @@ -358,7 +358,7 @@ print ''; */ // Show bugtrack link -print ''.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).''; +print ''.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).''; print ajax_constantonoff("MAIN_BUGTRACK_ENABLELINK", array(), $conf->entity, 0, 0, 1, 0); //print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1); print ''; @@ -367,7 +367,7 @@ print ''; // Hide wiki link on login page $pictohelp = ''; -print ''.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).''; +print ''.str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')).''; print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0); //print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1); print ''; @@ -378,7 +378,7 @@ print ''; $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount')); complete_substitutions_array($substitutionarray, $langs); -print ''; +print ''; $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'
'; foreach ($substitutionarray as $key => $val) { @@ -401,12 +401,12 @@ print '
'; // Other print '
'; print ''; -print ''; +print ''; print ''; print ''; // Hide helpcenter link on login page -print ''; print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 83b3c0514aa..f5822669bba 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -518,7 +518,7 @@ if (!empty($conf->use_javascript_ajax)) // If javascript on } // Birthdays - $s .= '
'.$langs->trans("AgendaShowBirthdayEvents").'  
'; + $s .= '
 
'; // Calendars from hooks $parameters = array(); $object = null; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b0a302fb80e..00b7014eb71 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -406,7 +406,7 @@ UrlGenerationParameters=Parameters to secure URLs SecurityTokenIsUnique=Use a unique securekey parameter for each URL EnterRefToBuildUrl=Enter reference for object %s GetSecuredUrl=Get calculated URL -ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons +ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise) OldVATRates=Old VAT rate NewVATRates=New VAT rate PriceBaseTypeToChange=Modify on prices with base reference value defined on @@ -1689,7 +1689,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry NewMenu=New menu MenuHandler=Menu handler MenuModule=Source module -HideUnauthorizedMenu= Hide unauthorized menus (gray) +HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise) DetailId=Id menu DetailMenuHandler=Menu handler where to show new menu DetailMenuModule=Module name if menu entry come from a module
'.$langs->trans("LoginPage").'
'.$langs->trans("LoginPage").' 
'.$langs->trans("DisableLinkToHelpCenter").''; +print '
'.$langs->trans("DisableLinkToHelpCenter").''; print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0); print '