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

Fix: Missing translation of batch-serial prouct module

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-03 00:11:31 +01:00
parent 650d4a3da9
commit bde5a5d307
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.tx/config
View File

@ -248,6 +248,12 @@ source_file = htdocs/langs/en_US/products.lang
source_lang = en_US source_lang = en_US
type = MOZILLAPROPERTIES type = MOZILLAPROPERTIES
[dolibarr.productbatch]
file_filter = htdocs/langs/<lang>/products.lang
source_file = htdocs/langs/en_US/products.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.projects] [dolibarr.projects]
file_filter = htdocs/langs/<lang>/projects.lang file_filter = htdocs/langs/<lang>/projects.lang
source_file = htdocs/langs/en_US/projects.lang source_file = htdocs/langs/en_US/projects.lang

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

@ -503,6 +503,8 @@ Module2500Name=Electronic Content Management
Module2500Desc=Save and share documents Module2500Desc=Save and share documents
Module2600Name=WebServices Module2600Name=WebServices
Module2600Desc=Enable the Dolibarr web services server Module2600Desc=Enable the Dolibarr web services server
Module2650Name=WebServices (client)
Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
Module2700Name=Gravatar Module2700Name=Gravatar
Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
Module2800Desc=FTP Client Module2800Desc=FTP Client
@ -517,7 +519,7 @@ Module6000Desc=Workflow management
Module20000Name=Leave Requests management Module20000Name=Leave Requests management
Module20000Desc=Declare and follow employees leaves requests Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
Module50000Name=PayBox Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales Module50100Name=Point of sales

9
htdocs/langs/en_US/productbatch.lang
View File

@ -1,9 +1,10 @@
# ProductBATCH language file - en_US - ProductBATCH # ProductBATCH language file - en_US - ProductBATCH
CHARSET= UTF-8 CHARSET= UTF-8
ProductStatusOnBatch= Managed ManageLotSerial=Manage lot or serial
ProductStatusNotOnBatch= Not Managed ProductStatusOnBatch=Managed
ProductStatusOnBatchShort= Managed ProductStatusNotOnBatch=Not Managed
ProductStatusNotOnBatchShort= Not Managed ProductStatusOnBatchShort=Managed
ProductStatusNotOnBatchShort=Not Managed
Batch=Batch Batch=Batch
atleast1batchfield= Eat-by date or Sell-by date or Batch number atleast1batchfield= Eat-by date or Sell-by date or Batch number
batch_number= Batch number batch_number= Batch number

4
htdocs/product/card.php
View File

@ -1122,7 +1122,7 @@ else
// Batch number managment // Batch number managment
if ($conf->productbatch->enabled) { if ($conf->productbatch->enabled) {
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">'; print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch")); $statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
print $form->selectarray('status_batch',$statutarray,$object->status_batch); print $form->selectarray('status_batch',$statutarray,$object->status_batch);
print '</td></tr>'; print '</td></tr>';
@ -1437,7 +1437,7 @@ else
// Batch number management (to batch) // Batch number management (to batch)
if ($conf->productbatch->enabled) { if ($conf->productbatch->enabled) {
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">'; print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch'); print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
} else { } else {