From 35c3eb0d7e319a256df6cd7484c9927c2e2efdae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Jun 2019 17:59:00 +0200 Subject: [PATCH] Fix conflict in a translation key --- htdocs/adherents/card.php | 8 ++++---- htdocs/adherents/document.php | 2 +- htdocs/adherents/note.php | 2 +- htdocs/adherents/subscription.php | 2 +- htdocs/adherents/type.php | 20 ++++++++++---------- htdocs/langs/en_US/members.lang | 2 +- htdocs/langs/en_US/products.lang | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 3aed4bc11d5..e4a1fc01355 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -502,7 +502,7 @@ if (empty($reshook)) // Check parameters if (empty($morphy) || $morphy == "-1") { $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MemberNature")), null, 'errors'); } // Tests if the login already exists if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) @@ -941,7 +941,7 @@ else // Morphy $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Moral"); - print ''.$langs->trans("Nature")."\n"; + print ''.$langs->trans("MemberNature")."\n"; print $form->selectarray("morphy", $morphys, GETPOST('morphy', 'alpha')?GETPOST('morphy', 'alpha'):$object->morphy, 1); print "\n"; @@ -1182,7 +1182,7 @@ else // Morphy $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Morale"); - print ''.$langs->trans("Nature").''; + print ''.$langs->trans("MemberNature").''; print $form->selectarray("morphy", $morphys, (GETPOSTISSET("morphy")?GETPOST("morphy", 'alpha'):$object->morphy)); print ""; @@ -1613,7 +1613,7 @@ else print ''.$langs->trans("Type").''.$adht->getNomUrl(1)."\n"; // Morphy - print ''.$langs->trans("Nature").''.$object->getmorphylib().''; + print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; // Gender diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 2de98e1b96a..72a1bd0d569 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -127,7 +127,7 @@ if ($id > 0) print ''.$langs->trans("Type").''.$membert->getNomUrl(1)."\n"; // Morphy - print ''.$langs->trans("Nature").''.$object->getmorphylib().''; + print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; /*print ''; print $form->showphoto('memberphoto',$object); print '';*/ diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index b3e18f543be..ce2918cb86a 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -92,7 +92,7 @@ if ($id) print ''.$langs->trans("Type").''.$adht->getNomUrl(1)."\n"; // Morphy - print ''.$langs->trans("Nature").''.$object->getmorphylib().''; + print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; /*print ''; print $form->showphoto('memberphoto',$member); print '';*/ diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index b28a8b31f2c..eeeb821c223 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -490,7 +490,7 @@ if ($rowid > 0) print ''.$langs->trans("Type").''.$adht->getNomUrl(1)."\n"; // Morphy - print ''.$langs->trans("Nature").''.$object->getmorphylib().''; + print ''.$langs->trans("MemberNature").''.$object->getmorphylib().''; print ''; // Company diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 650a466140c..19790159c22 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -258,7 +258,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; print ''.$langs->trans("Ref").''; print ''.$langs->trans("Label").''; - print ''.$langs->trans("Nature").''; + print ''.$langs->trans("MemberNature").''; print ''.$langs->trans("SubscriptionRequired").''; print ''.$langs->trans("VoteAllowed").''; print ''.$langs->trans("Status").''; @@ -338,12 +338,12 @@ if ($action == 'create') print ''.$langs->trans("Status").''; print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), 1); print ''; - + // Morphy - $morphys[""] = $langs->trans("Physical & Morale"); + $morphys[""] = $langs->trans("MorPhy"); $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Morale"); - print ''.$langs->trans("Nature").''; + print ''.$langs->trans("MemberNature").''; print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy); print ""; @@ -427,9 +427,9 @@ if ($rowid > 0) print img_picto($langs->trans('TypeStatusInactive'), 'statut5').' '.$langs->trans("ActivityCeased"); } print ''; - + // Morphy - print ''.$langs->trans("Nature").''.$object->getmorphylib($object->morphy).''; + print ''.$langs->trans("MemberNature").''.$object->getmorphylib($object->morphy).''; print ''; print ''.$langs->trans("SubscriptionRequired").''; @@ -630,7 +630,7 @@ if ($rowid > 0) print ''; print_liste_field_titre("NameSlashCompany", $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder); - print_liste_field_titre("Nature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder); + print_liste_field_titre("MemberNature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder); @@ -771,12 +771,12 @@ if ($rowid > 0) print ''.$langs->trans("Status").''; print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')), $object->statut); print ''; - + // Morphy - $morphys[""] = $langs->trans("Physical & Morale"); + $morphys[""] = $langs->trans("MorPhy"); $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Morale"); - print ''.$langs->trans("Nature").''; + print ''.$langs->trans("MemberNature").''; print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy); print ""; diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 8b33117cc66..acae5aa73fb 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read... MenuMembersStats=Statistics LastMemberDate=Latest member date LatestSubscriptionDate=Latest subscription date -Nature=Nature +MemberNature=Nature of member Public=Information are public NewMemberbyWeb=New member added. Awaiting approval NewMemberForm=New member form diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 5f07a7f2eb0..46555a84528 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices SuppliersPricesOfProductsOrServices=Vendor prices (of products or services) CustomCode=Customs / Commodity / HS code CountryOrigin=Origin country -Nature=Product Type (material/finished) +Nature=Nature of produt (material/finished) ShortLabel=Short label Unit=Unit p=u.