From da762903bb555ed28c66570322a6c0111c8a4080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Fri, 17 Aug 2012 23:28:15 +0200 Subject: [PATCH] Missing paper format dict translations --- htdocs/admin/dict.php | 50 ++++++++++++++++++++++++++---------- htdocs/langs/es_ES/dict.lang | 25 ++++++++++++++++-- htdocs/langs/es_ES/main.lang | 3 ++- htdocs/langs/fr_FR/dict.lang | 23 ++++++++++++++++- 4 files changed, 84 insertions(+), 17 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 13864a37183..750b0a30bef 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -338,18 +338,23 @@ if ($id == 11) $langs->load("propal"); $langs->load("bills"); $langs->load("interventions"); - $elementList = array("commande"=>$langs->trans("Order"), - "order_supplier"=>$langs->trans("SupplierOrder"), - "contrat"=>$langs->trans("Contract"), - "project"=>$langs->trans("Project"), - "project_task"=>$langs->trans("Task"), - "propal"=>$langs->trans("Propal"), - "facture"=>$langs->trans("Bill"), - "facture_fourn"=>$langs->trans("SupplierBill"), - "fichinter"=>$langs->trans("InterventionCard")); - if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"]=$langs->trans("ThirdParty"); - $sourceList = array("internal"=>$langs->trans("Internal"), - "external"=>$langs->trans("External")); + $elementList = array( + 'commande' => $langs->trans('Order'), + 'invoice_supplier' => $langs->trans('SupplierBill'), + 'order_supplier' => $langs->trans('SupplierOrder'), + 'contrat' => $langs->trans('Contract'), + 'project' => $langs->trans('Project'), + 'project_task' => $langs->trans('Task'), + 'propal' => $langs->trans('Proposal'), + 'facture' => $langs->trans('Bill'), + 'facture_fourn' => $langs->trans('SupplierBill'), + 'fichinter' => $langs->trans('InterventionCard') + ); + if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty'); + $sourceList = array( + 'internal' => $langs->trans('Internal'), + 'external' => $langs->trans('External') + ); } $msg=''; @@ -827,7 +832,15 @@ if ($id) { $showfield=1; $valuetoshow=$obj->$fieldlist[$field]; - if ($valuetoshow=='all') { + if ($value == 'element') + { + $valuetoshow = $elementList[$valuetoshow]; + } + else if ($value == 'source') + { + $valuetoshow = $sourceList[$valuetoshow]; + } + else if ($valuetoshow=='all') { $valuetoshow=$langs->trans('All'); } else if ($fieldlist[$field]=='pays') { @@ -910,6 +923,17 @@ if ($id) $key=$langs->trans("SendingMethod".strtoupper($obj->code)); $valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code))?$key:$obj->$fieldlist[$field]; } + else if ($fieldlist[$field] == 'libelle' && $tabname[$_GET['id']]==MAIN_DB_PREFIX.'c_paper_format') + { + $key = $langs->trans('PaperFormat'.strtoupper($obj->code)); + $valuetoshow = ($obj->code && ($key != 'PaperFormat'.strtoupper($obj->code))) ? $key : $obj->$fieldlist[$field]; + } + else if ($fieldlist[$field] == 'libelle' && $tabname[$_GET['id']] == MAIN_DB_PREFIX.'c_type_fees') + { + $langs->load('trips'); + $key = $langs->trans(strtoupper($obj->code)); + $valuetoshow = ($obj->code && ($key != strtoupper($obj->code))) ? $key : $obj->$fieldlist[$field]; + } else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $showfield=0; } diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang index 1d5b5da8891..a6e34bdf173 100644 --- a/htdocs/langs/es_ES/dict.lang +++ b/htdocs/langs/es_ES/dict.lang @@ -297,7 +297,7 @@ CurrencySingXPF=Franco CFP CurrencyCentSingEUR=céntimo CurrencyThousandthSingTND=milésimo -#### Input reasons ##### +#### Input reasons #### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campaña correo DemandReasonTypeSRC_CAMP_EMAIL=Campaña E-Mailing @@ -308,4 +308,25 @@ DemandReasonTypeSRC_SHOP=Contacto tienda DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Socio DemandReasonTypeSRC_EMPLOYEE=Empleado -DemandReasonTypeSRC_SPONSORSHIP=Patrocinador \ No newline at end of file +DemandReasonTypeSRC_SPONSORSHIP=Patrocinador + +#### Paper formats #### +PaperFormatEU4A0=Formato 4A0 +PaperFormatEU2A0=Formato 2A0 +PaperFormatEUA0=Formato A0 +PaperFormatEUA1=Formato A1 +PaperFormatEUA2=Formato A2 +PaperFormatEUA3=Formato A3 +PaperFormatEUA4=Formato A4 +PaperFormatEUA5=Formato A5 +PaperFormatEUA6=Formato A6 +PaperFormatUSLETTER=Formato carta EE. UU. +PaperFormatUSLEGAL=Formato legal EE. UU. +PaperFormatUSEXECUTIVE=Formato ejecutivo EE. UU. +PaperFormatUSLEDGER=Formato tabloide +PaperFormatCAP1=Formato canadiense P1 +PaperFormatCAP2=Formato canadiense P2 +PaperFormatCAP3=Formato canadiense P3 +PaperFormatCAP4=Formato canadiense P4 +PaperFormatCAP5=Formato canadiense P5 +PaperFormatCAP6=Formato canadiense P6 \ No newline at end of file diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 53abda4891d..6defc575dbb 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -656,4 +656,5 @@ ShortSaturday=S ShortSunday=D View=Ver -Test=Prueba \ No newline at end of file +Test=Prueba +Element=Elemento \ No newline at end of file diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index 91c0f8d51f7..4d9c7b2736d 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -298,7 +298,7 @@ CurrencySingXPF=Franc CFP CurrencyCentSingEUR=centime CurrencyThousandthSingTND=millime -#### Input reasons ##### +#### Input reasons #### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campagne Publipostage DemandReasonTypeSRC_CAMP_EMAIL=Campagne EMailing @@ -310,3 +310,24 @@ DemandReasonTypeSRC_WOM=Bouche à oreille DemandReasonTypeSRC_PARTNER=Partenaire DemandReasonTypeSRC_EMPLOYEE=Employé DemandReasonTypeSRC_SPONSORSHIP=Parrainage/Sponsoring + +#### Paper formats #### +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Lettre US +PaperFormatUSLEGAL=Formato Legal US +PaperFormatUSEXECUTIVE=Formato Exécutif US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canadien +PaperFormatCAP2=Format P2 Canadien +PaperFormatCAP3=Format P3 Canadien +PaperFormatCAP4=Format P4 Canadien +PaperFormatCAP5=Format P5 Canadien +PaperFormatCAP6=Format P6 Canadien \ No newline at end of file