lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-30 16:41:41 +02:00
parent 69511e2706
commit 223a06b77d
6 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/adherents/type_translation.php
View File

@ -87,7 +87,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
if ($object->setMultiLangs($user) > 0) { if ($object->setMultiLangs($user) > 0) {
$action = ''; $action = '';
} else { } else {
$action = 'add'; $action = 'create';
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
@ -185,7 +185,7 @@ print "\n<div class=\"tabsAction\">\n";
if ($action == '') { if ($action == '') {
if ($user->rights->produit->creer || $user->rights->service->creer) { if ($user->rights->produit->creer || $user->rights->service->creer) {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=create&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
if ($cnt_trans > 0) { if ($cnt_trans > 0) {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
} }
@ -208,7 +208,13 @@ if ($action == 'edit') {
if (!empty($object->multilangs)) { if (!empty($object->multilangs)) {
foreach ($object->multilangs as $key => $value) { foreach ($object->multilangs as $key => $value) {
$s = picto_from_langcode($key); $s = picto_from_langcode($key);
print '<br>'.($s ? $s.' ' : '').' <b>'.$langs->trans('Language_'.$key).':</b> <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>"; print '<br>';
print '<div class="inline-block marginbottomonly">';
print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
print '</div>';
print '<div class="inline-block marginbottomonly floatright">';
print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
print '</div>';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">'; print '<table class="border centpercent">';
@ -231,11 +237,17 @@ if ($action == 'edit') {
print '</div>'; print '</div>';
print '</form>'; print '</form>';
} elseif ($action != 'add') { } elseif ($action != 'create') {
if (!empty($object->multilangs)) { if (!empty($object->multilangs)) {
foreach ($object->multilangs as $key => $value) { foreach ($object->multilangs as $key => $value) {
$s = picto_from_langcode($key); $s = picto_from_langcode($key);
print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>'; print '<div class="inline-block marginbottomonly">';
print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
print '</div>';
print '<div class="inline-block marginbottomonly floatright">';
print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
print '</div>';
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
@ -244,9 +256,11 @@ if ($action == 'edit') {
print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>'; print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';
print '<br>';
} }
} }
if (!$cnt_trans && $action != 'add') { if (!$cnt_trans && $action != 'create') {
print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>'; print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
} }
} }
@ -257,7 +271,7 @@ if ($action == 'edit') {
* Form to add a new translation * Form to add a new translation
*/ */
if ($action == 'add' && $user->rights->adherent->configurer) { if ($action == 'create' && $user->rights->adherent->configurer) {
//WYSIWYG Editor //WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

2
htdocs/langs/en_US/banks.lang
View File

@ -128,7 +128,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this entry?
ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
BankMovements=Movements BankMovements=Movements
PlannedTransactions=Planned entries PlannedTransactions=Planned entries
Graph=Graphics Graph=Graphs
ExportDataset_banque_1=Bank entries and account statement ExportDataset_banque_1=Bank entries and account statement
ExportDataset_banque_2=Deposit slip ExportDataset_banque_2=Deposit slip
TransactionOnTheOtherAccount=Transaction on the other account TransactionOnTheOtherAccount=Transaction on the other account

2
htdocs/langs/en_US/companies.lang
View File

@ -69,7 +69,7 @@ PhoneShort=Phone
Skype=Skype Skype=Skype
Call=Call Call=Call
Chat=Chat Chat=Chat
PhonePro=Prof. phone PhonePro=Bus. phone
PhonePerso=Pers. phone PhonePerso=Pers. phone
PhoneMobile=Mobile PhoneMobile=Mobile
No_Email=Refuse bulk emailings No_Email=Refuse bulk emailings

6
htdocs/langs/en_US/errors.lang
View File

@ -4,9 +4,9 @@
NoErrorCommitIsDone=No error, we commit NoErrorCommitIsDone=No error, we commit
# Errors # Errors
ErrorButCommitIsDone=Errors found but we validate despite this ErrorButCommitIsDone=Errors found but we validate despite this
ErrorBadEMail=Email %s is wrong ErrorBadEMail=Email %s is incorrect
ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record) ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
ErrorBadUrl=Url %s is wrong ErrorBadUrl=Url %s is incorrect
ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing. ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
ErrorRefAlreadyExists=Reference <b>%s</b> already exists. ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
ErrorLoginAlreadyExists=Login %s already exists. ErrorLoginAlreadyExists=Login %s already exists.

4
htdocs/langs/en_US/main.lang
View File

@ -856,8 +856,8 @@ Denied=Denied
ListOf=List of %s ListOf=List of %s
ListOfTemplates=List of templates ListOfTemplates=List of templates
Gender=Gender Gender=Gender
Genderman=Man Genderman=Male
Genderwoman=Woman Genderwoman=Female
Genderother=Other Genderother=Other
ViewList=List view ViewList=List view
ViewGantt=Gantt view ViewGantt=Gantt view

38
htdocs/langs/en_US/members.lang
View File

@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
SetLinkToUser=Link to a Dolibarr user SetLinkToUser=Link to a Dolibarr user
SetLinkToThirdParty=Link to a Dolibarr third party SetLinkToThirdParty=Link to a Dolibarr third party
MembersCards=Members business cards MembersCards=Business cards for members
MembersList=List of members MembersList=List of members
MembersListToValid=List of draft members (to be validated) MembersListToValid=List of draft members (to be validated)
MembersListValid=List of valid members MembersListValid=List of valid members
@ -32,7 +32,7 @@ MembersWithSubscriptionToReceive=Members with subscription to receive
MembersWithSubscriptionToReceiveShort=Subscription to receive MembersWithSubscriptionToReceiveShort=Subscription to receive
DateSubscription=Subscription date DateSubscription=Subscription date
DateEndSubscription=Subscription end date DateEndSubscription=Subscription end date
EndSubscription=End subscription EndSubscription=Subscription Ends
SubscriptionId=Subscription id SubscriptionId=Subscription id
WithoutSubscription=Without subscription WithoutSubscription=Without subscription
MemberId=Member id MemberId=Member id
@ -83,10 +83,10 @@ WelcomeEMail=Welcome email
SubscriptionRequired=Subscription required SubscriptionRequired=Subscription required
DeleteType=Delete DeleteType=Delete
VoteAllowed=Vote allowed VoteAllowed=Vote allowed
Physical=Physical Physical=Individual
Moral=Moral Moral=Corporation
MorAndPhy=Moral and Physical MorAndPhy=Corporation and Individual
Reenable=Reenable Reenable=Re-Enable
ExcludeMember=Exclude a member ExcludeMember=Exclude a member
ConfirmExcludeMember=Are you sure you want to exclude this member ? ConfirmExcludeMember=Are you sure you want to exclude this member ?
ResiliateMember=Terminate a member ResiliateMember=Terminate a member
@ -175,32 +175,32 @@ MembersStatisticsByCountries=Members statistics by country
MembersStatisticsByState=Members statistics by state/province MembersStatisticsByState=Members statistics by state/province
MembersStatisticsByTown=Members statistics by town MembersStatisticsByTown=Members statistics by town
MembersStatisticsByRegion=Members statistics by region MembersStatisticsByRegion=Members statistics by region
NbOfMembers=Number of members NbOfMembers=Total number of members
NbOfActiveMembers=Number of current active members NbOfActiveMembers=Total number of current active members
NoValidatedMemberYet=No validated members found NoValidatedMemberYet=No validated members found
MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
MembersByTownDesc=This screen show you statistics on members by town. MembersByTownDesc=This screen show you statistics of members by town.
MembersByNature=This screen show you statistics of members by nature.
MembersByRegion=This screen show you statistics of members by region.
MembersStatisticsDesc=Choose statistics you want to read... MembersStatisticsDesc=Choose statistics you want to read...
MenuMembersStats=Statistics MenuMembersStats=Statistics
LastMemberDate=Latest member date LastMemberDate=Latest membership date
LatestSubscriptionDate=Latest subscription date LatestSubscriptionDate=Latest subscription date
MemberNature=Nature of member MemberNature=Nature of the member
MembersNature=Nature of members MembersNature=Nature of the members
Public=Information are public Public=Information is public
NewMemberbyWeb=New member added. Awaiting approval NewMemberbyWeb=New member added. Awaiting approval
NewMemberForm=New member form NewMemberForm=New member form
SubscriptionsStatistics=Statistics on subscriptions SubscriptionsStatistics=Subscriptions statistics
NbOfSubscriptions=Number of subscriptions NbOfSubscriptions=Number of subscriptions
AmountOfSubscriptions=Amount of subscriptions AmountOfSubscriptions=Amount collected from subscriptions
TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
DefaultAmount=Default amount of subscription DefaultAmount=Default amount of subscription
CanEditAmount=Visitor can choose/edit amount of its subscription CanEditAmount=Visitor can choose/edit amount of its subscription
MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
ByProperties=By nature ByProperties=By nature
MembersStatisticsByProperties=Members statistics by nature MembersStatisticsByProperties=Members statistics by nature
MembersByNature=This screen show you statistics on members by nature.
MembersByRegion=This screen show you statistics on members by region.
VATToUseForSubscriptions=VAT rate to use for subscriptions VATToUseForSubscriptions=VAT rate to use for subscriptions
NoVatOnSubscription=No VAT for subscriptions NoVatOnSubscription=No VAT for subscriptions
ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s