Fixed: Untranslatable tokens

Dolibarr · Nov 21, 2014 · a2d4046 · a2d4046
1 parent 068c7fd
commit a2d4046
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
@@ -23,7 +23,7 @@
  */
 
 require '../main.inc.php';
-	
+
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
@@ -45,7 +45,7 @@
 /*
  * Actions
  */
- 
+
 if ($action == 'update')
 {
     $error = 0;
@@ -72,12 +72,12 @@
  * View
  */
 
-llxHeader();
+llxHeader('',$langs->trans('SalariesSetup'));
 
 $form = new Form($db);
 
 $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 '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -98,7 +98,7 @@
 	print '<tr '.$bc[$var].' class="value">';
 
 	// Param
-	$label = $langs->trans($key); 
+	$label = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$label.'</label></td>';
 
 	// Value

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -1546,6 +1546,7 @@ NbSpeMin=Minimum number of special characters
 NbSpeMin=Minimum number of special characters
 NbIteConsecutive=Maximum number of repeating same characters
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type 
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
 ThankYou=Thank You
 IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
 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
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but 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
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
@@ -34,4 +34,6 @@ ConfirmDeleteResource=Confirm to delete this resource
 RessourceSuccessfullyDeleted=Resource successfully deleted
 DictionaryResourceType=Type of resources
 
+DictionaryEMailTemplates=Modèles d'Emails
+
 SelectResource=Select resource