Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Added missing translations, improved es_ES translations and translated untranslated text in modules admin page

Browse Source
This commit is contained in:
Marcos García
2013-01-05 19:23:16 +01:00
parent d44b086527
commit ad5d2c3459
7 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/localtax/clients.php
View File

@@ -98,7 +98,7 @@ llxHeader('','','','',0,0,'','',$morequerystring);
$fsearch.='<br>'; $fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">'; $fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
$fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">'; $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; $fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': ';
$fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">'; $fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
// Affiche en-tete du rapport // Affiche en-tete du rapport

2
htdocs/compta/tva/clients.php
View File

@@ -103,7 +103,7 @@ llxHeader('','','','',0,0,'','',$morequerystring);
$fsearch.='<br>'; $fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">'; $fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
$fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">'; $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; $fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': ';
$fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">'; $fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
// Affiche en-tete du rapport // Affiche en-tete du rapport

2
htdocs/compta/tva/quadri_detail.php
View File

@@ -118,7 +118,7 @@ $paymentfourn_static=new PaiementFourn($db);
//$fsearch.='<br>'; //$fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">'; $fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
$fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">'; $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
//$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; //$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': ';
//$fsearch.=' <input type="text" name="min" value="'.$min.'">'; //$fsearch.=' <input type="text" name="min" value="'.$min.'">';
// Affiche en-tete du rapport // Affiche en-tete du rapport

50
htdocs/core/lib/admin.lib.php
View File

@@ -1134,33 +1134,33 @@ function form_constantes($tableau)
} }
/** /**
* Show array with constants to edit * Show array with constants to edit
* *
* @param array $modules Array of all modules * @param array $modules Array of all modules
* @return string HTML string with warning * @return string HTML string with warning
*/ */
function showModulesExludedForExternal($modules) function showModulesExludedForExternal($modules)
{ {
global $conf,$langs; global $conf,$langs;
$text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers");
$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
$i=0; $i=0;
foreach($modules as $module) foreach($modules as $module)
{ {
$moduleconst=$module->const_name; $moduleconst=$module->const_name;
$modulename=strtolower($module->name); $modulename=strtolower($module->name);
//print 'modulename='.$modulename; //print 'modulename='.$modulename;
//if (empty($conf->global->$moduleconst)) continue; //if (empty($conf->global->$moduleconst)) continue;
if (! in_array($modulename,$listofmodules)) continue; if (! in_array($modulename,$listofmodules)) continue;
if ($i > 0) $text.=', '; if ($i > 0) $text.=', ';
else $text.=' '; else $text.=' ';
$i++; $i++;
$text.=$langs->trans($module->name); $text .= $langs->trans('Module'.$module->numero.'Name');
} }
return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text; return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text;
} }

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

@@ -84,7 +84,8 @@ AccountNumberShort=Account number
AccountNumber=Account number AccountNumber=Account number
NewAccount=New account NewAccount=New account
SalesTurnover=Sales turnover SalesTurnover=Sales turnover
ByThirdParties=Bu third parties SalesTurnoverMinimum=Minimum sales turnover
ByThirdParties=By third parties
ByUserAuthorOfInvoice=By invoice author ByUserAuthorOfInvoice=By invoice author
AccountancyExport=Accountancy export AccountancyExport=Accountancy export
ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s

4
htdocs/langs/es_ES/companies.lang
View File

@@ -153,9 +153,9 @@ ProfId4DE=-
ProfId5DE=- ProfId5DE=-
ProfId6DE=- ProfId6DE=-
ProfId1ES=CIF/NIF ProfId1ES=CIF/NIF
ProfId2ES=Núm seguridad social ProfId2ES=Núm. seguridad social
ProfId3ES=CNAE ProfId3ES=CNAE
ProfId4ES=Núm colegiado ProfId4ES=Núm. colegiado
ProfId5ES=- ProfId5ES=-
ProfId6ES=- ProfId6ES=-
ProfId1FR=SIREN ProfId1FR=SIREN

1
htdocs/langs/es_ES/compta.lang
View File

@@ -85,6 +85,7 @@ AccountNumberShort=Nº de cuenta
AccountNumber=Número de cuenta AccountNumber=Número de cuenta
NewAccount=Nueva cuenta NewAccount=Nueva cuenta
SalesTurnover=Volumen de ventas SalesTurnover=Volumen de ventas
SalesTurnoverMinimum=Volumen de ventas mínimo
ByThirdParties=Por tercero ByThirdParties=Por tercero
ByUserAuthorOfInvoice=Por autor de la factura ByUserAuthorOfInvoice=Por autor de la factura
AccountancyExport=Exportación contabilidad AccountancyExport=Exportación contabilidad