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

Fixed: Untranslatable tokens

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-22 00:45:04 +01:00
parent 068c7fdb2d
commit a2d4046f50
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/salaries.php
View File

@ -23,7 +23,7 @@
*/ */
require '../main.inc.php'; require '../main.inc.php';
// Class // Class
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@ -45,7 +45,7 @@ $list = array (
/* /*
* Actions * Actions
*/ */
if ($action == 'update') if ($action == 'update')
{ {
$error = 0; $error = 0;
@ -72,12 +72,12 @@ if ($action == 'update')
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans('SalariesSetup'));
$form = new Form($db); $form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ConfigSalaries'),$linkback,'setup'); print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'setup');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -98,7 +98,7 @@ foreach ($list as $key)
print '<tr '.$bc[$var].' class="value">'; print '<tr '.$bc[$var].' class="value">';
// Param // Param
$label = $langs->trans($key); $label = $langs->trans($key);
print '<td><label for="'.$key.'">'.$label.'</label></td>'; print '<td><label for="'.$key.'">'.$label.'</label></td>';
// Value // Value

3
htdocs/langs/en_US/admin.lang
View File

@ -1546,6 +1546,7 @@ NbSpeMin=Minimum number of special characters
NbSpeMin=Minimum number of special characters NbSpeMin=Minimum number of special characters
NbIteConsecutive=Maximum number of repeating same characters NbIteConsecutive=Maximum number of repeating same characters
NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
SalariesSetup=Setup of module salaries
SortOrder=Sort order
Format=Format Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type

5
htdocs/langs/en_US/donations.lang
View File

@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s MinimumAmount=Minimum amount is %s
FreeTextOnDonations=Free text to show in footer
FrenchOptions=Options for France
DONATION_ART200=Show legacy article 200
DONATION_ART238=Show legacy article 238
DONATION_ART885=Show legacy article 885

3
htdocs/langs/en_US/paybox.lang
View File

@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
PAYBOX_PBX_SITE=Value for PBX SITE
PAYBOX_PBX_RANG=Value for PBX Rang
PAYBOX_PBX_IDENTIFIANT=Value for PBX ID

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

@ -34,4 +34,6 @@ ConfirmDeleteResource=Confirm to delete this resource
RessourceSuccessfullyDeleted=Resource successfully deleted RessourceSuccessfullyDeleted=Resource successfully deleted
DictionaryResourceType=Type of resources DictionaryResourceType=Type of resources
DictionaryEMailTemplates=Modèles d'Emails
SelectResource=Select resource SelectResource=Select resource