diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index d3fdf872ad0..62e2baa3a98 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -27,11 +27,7 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Direct Debit orders StandingOrder=Direct debit order AccountStatement=Account statement diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 8e4132ba6f7..8ceec37d856 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -241,7 +241,6 @@ ProfId6RU=- VATIntra=VAT number VATIntraShort=VAT number VATIntraSyntaxIsValid=Syntax is valid -VATIntraValueIsValid=Value is valid ProspectCustomer=Prospect / Customer Prospect=Prospect CustomerCard=Customer Card diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index d9ac8ea0539..ec7840e9680 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -572,6 +572,8 @@ BackToList=Back to list GoBack=Go back CanBeModifiedIfOk=Can be modified if valid CanBeModifiedIfKo=Can be modified if not valid +ValueIsValid=Value is valid +ValueIsNotValid=Value is not valid RecordModifiedSuccessfully=Record modified successfully RecordsModified=%s records modified RecordsDeleted=%s records deleted diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index 702dbb0a08a..4d3daf138b3 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -120,7 +120,7 @@ else { if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'
'; print $langs->trans("VATIntraSyntaxIsValid").': '.$langs->trans("No").' (Might be a non europeen VAT)
'; - print $langs->trans("VATIntraValueIsValid").': '.$langs->trans("No").' (Might be a non europeen VAT)
'; + print $langs->trans("ValueIsValid").': '.$langs->trans("No").' (Might be a non europeen VAT)
'; //$messagetoshow=$soapclient->response; } else @@ -128,7 +128,7 @@ else // Syntaxe ok if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'
'; print $langs->trans("VATIntraSyntaxIsValid").': '.$langs->trans("Yes").'
'; - print $langs->trans("VATIntraValueIsValid").': '; + print $langs->trans("ValueIsValid").': '; if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring'])) { print ''.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$countryCode).'
'; diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index df2799d4f14..f3f993612ce 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -374,9 +374,9 @@ if ($socid && $action != 'edit' && $action != "create") $content = $account->number; if (! empty($account->label)) { if (! checkBanForAccount($account)) { - $content.= ' '.img_picto($langs->trans("NotValid"),'warning'); + $content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning'); } else { - $content.= ' '.img_picto($langs->trans("Valid"),'info'); + $content.= ' '.img_picto($langs->trans("ValueIsValid"),'info'); } } } elseif ($val == 'BankAccountNumberKey') { @@ -385,18 +385,18 @@ if ($socid && $action != 'edit' && $action != "create") $content = $account->iban; if (! empty($account->iban)) { if (! checkIbanForAccount($account)) { - $content.= ' '.img_picto($langs->trans("IbanNotValid"),'warning'); + $content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning'); } else { - $content.= ' '.img_picto($langs->trans("IbanValid"),'info'); + $content.= ' '.img_picto($langs->trans("ValueIsValid"),'info'); } } } elseif ($val == 'BIC') { $content = $account->bic; if (! empty($account->bic)) { if (! checkSwiftForAccount($account)) { - $content.= ' '.img_picto($langs->trans("SwiftNotValid"),'warning'); + $content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning'); } else { - $content.= ' '.img_picto($langs->trans("SwiftValid"),'info'); + $content.= ' '.img_picto($langs->trans("ValueIsValid"),'info'); } } }