From a606b79af894a19405238a0537ff4a8ec4b67c66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Feb 2012 16:14:48 +0100
Subject: [PATCH] Move error code into error lang file.

---
 htdocs/core/class/html.formbarcode.class.php | 3 ++-
 htdocs/langs/ca_ES/admin.lang                | 1 -
 htdocs/langs/ca_ES/errors.lang               | 2 ++
 htdocs/langs/en_US/admin.lang                | 1 -
 htdocs/langs/en_US/errors.lang               | 1 +
 htdocs/langs/es_ES/admin.lang                | 1 -
 htdocs/langs/es_ES/errors.lang               | 2 ++
 htdocs/langs/fr_FR/admin.lang                | 1 -
 htdocs/langs/fr_FR/errors.lang               | 1 +
 htdocs/langs/nl_NL/admin.lang                | 1 -
 htdocs/langs/nl_NL/errors.lang               | 2 +-
 htdocs/langs/ru_RU/admin.lang                | 1 -
 htdocs/langs/ru_RU/errors.lang               | 2 +-
 htdocs/langs/sl_SI/admin.lang                | 1 -
 htdocs/langs/sl_SI/errors.lang               | 1 +
 htdocs/langs/tr_TR/admin.lang                | 1 -
 htdocs/langs/tr_TR/errors.lang               | 7 +------
 17 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 1eb70c4ae3b..c7b6bab3a0c 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -127,8 +127,9 @@ class FormBarCode
             }
             else
             {
+                $langs->load("errors");
                 print '<select disabled="disabled" class="flat" name="'.$htmlname.'">';
-                print '<option value="0" selected="selected">'.$langs->trans('NoActivatedBarcode').'</option>';
+                print '<option value="0" selected="selected">'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
             }
 
             while ($i < $num)
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index e73593337ba..f67c7d64036 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -1150,7 +1150,6 @@ BarcodeDescUPC=Codis de barra tipus UPC
 BarcodeDescISBN=Codis de barra tipus ISBN
 BarcodeDescC39=Codis de barra tipus C39
 BarcodeDescC128=Codis de barra tipus C128
-NoActivatedBarcode=Cap tipus de codi de barres activat
 ##### Prelevements #####
 WithdrawalsSetup=Configuració del mòdul domiciliacions
 ##### ExternalRSS #####
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 8d4172aea62..70153f88163 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -101,6 +101,8 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
+ErrorNoActivatedBarcode=Cap tipus de codi de barres activat
+
 # Warnings
 WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
 WarningAllowUrlFopenMustBeOn=El paràmetre <b>allow_url_fopen</b> ha de ser especificat a <b>on</b> a l'arxiu <b>php.ini</b> per disposar d'aquest mòdul completament actiu. Ha de modificar aquest arxiu manualment
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9a5707d155c..5d31ead4c5e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1149,7 +1149,6 @@ BarcodeDescUPC=Barcode of type UPC
 BarcodeDescISBN=Barcode of type ISBN
 BarcodeDescC39=Barcode of type C39
 BarcodeDescC128=Barcode of type C128
-NoActivatedBarcode=No barcode type activated
 ##### Prelevements #####
 WithdrawalsSetup=Withdrawal module setup
 ##### ExternalRSS #####
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f7451cfc506..81f53565d53 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -103,6 +103,7 @@ ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorNoActivatedBarcode=No barcode type activated
 
 # Warnings
 WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 62c5f29b825..1e4ddc292f0 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1150,7 +1150,6 @@ BarcodeDescUPC=Códigos de barra tipo UPC
 BarcodeDescISBN=Códigos de barra tipo ISBN
 BarcodeDescC39=Códigos de barra tipo C39
 BarcodeDescC128=Códigos de barra tipo C128
-NoActivatedBarcode=Ningún tipo de código de barra activado
 ##### Prelevements #####
 WithdrawalsSetup=Configuración del módulo domiciliaciones
 ##### ExternalRSS #####
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index a77b34d8fd6..f4bcee3f9e2 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -101,6 +101,8 @@ ErrorLoginDoesNotExists=La cuenta de usuario de <b>%s</b> no se ha encontrado.
 ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
 ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
+ErrorNoActivatedBarcode=Ningún tipo de código de barra activado
+
 # Warnings
 WarningSafeModeOnCheckExecDir=Atención, está activada la opción PHP <b>safe_mode</b>, el comando deberá estar dentro de un directorio declarado dentro del parámetro php <b>safe_mode_exec_dir</b>.
 WarningAllowUrlFopenMustBeOn=El parámetro <b>allow_url_fopen</b> debe ser especificado a <b>on</b> en el archivo <b>php.ini</b> para disponer de este módulo completamente activo. Debe modificar este archivo manualmente
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1821d1cf0bf..341e98cc173 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1157,7 +1157,6 @@ BarcodeDescUPC= code-barres de type UPC
 BarcodeDescISBN= code-barres de type ISBN
 BarcodeDescC39= code-barres de type C39
 BarcodeDescC128= code-barres de type C128
-NoActivatedBarcode=Aucun type de code bar activé
 ##### Prelevements #####
 WithdrawalsSetup= Configuration du module prélèvement
 ##### ExternalRSS #####
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index ac8ac411651..3c55e98bc54 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -104,6 +104,7 @@ ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
 ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
 ErrorWebServerUserHasNotPermission=Le compte d'execution du serveur web <b>%s</b> n'a pas les permissions pour cela
+ErrorNoActivatedBarcode=Aucun type de code bar activé
 
 # Warnings
 WarningSafeModeOnCheckExecDir=Attention, l'option PHP <b>safe_mode</b> est active, la commande doit dont être dans un répertoire déclaré dans le paramètre php <b>safe_mode_exec_dir</b>.
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 775155f95ba..99685100ede 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1262,7 +1262,6 @@ TestLoginToAPI=Test inloggen op API
 ContractsSetup=Contracten module setup
 ContractsNumberingModules=Contracten nummering modules
 AdherentLoginRequired=Beheren van een login voor elk lid
-NoActivatedBarcode=Geen geactiveerde barcode soort
 ListOfAvailableNotifications=Lijst van beschikbare meldingen (Deze lijst is afhankelijk van geactiveerde modules)
 SendingsNumberingModules=Verzendingen nummering modules
 FreeLegalTextOnShippings=Vrije tekst op verzendingen
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 1c058b479ac..fb8b426d43d 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -76,7 +76,7 @@ ErrorDatabaseParameterWrong = Database instelling <b>%s</b> heeft een waarde die
 ErrorNumRefModel = Er bestaat een verwijzing in de database (%s) en deze is niet compatibel met deze nummeringsregel. Verwijder de tabelregel of hernoem de verwijzing om deze module te activeren.
 ErrorQtyTooLowForThisSupplier = Hoeveelheid te laag voor deze leverancier of geen prijs ingesteld voor dit product voor deze leverancier
 ErrorModuleSetupNotComplete = De installatie van de module lijkt incompleet te zijn. Ga naar Home->instellingen->moduleinstellingen om de intallatie te voltooien.
-
+ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 
 // START - Lines generated via autotranslator.php tool (2011-10-10 01:37:25).
 // Reference language: en_US -> nl_NL
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 98336beaee8..e5118df257d 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1265,7 +1265,6 @@ Miscellanous=Разнообразный
 ContractsSetup=Контракты модуль установки
 ContractsNumberingModules=Контракты нумерации модулей
 AdherentLoginRequired=Управление Логин для каждого члена
-NoActivatedBarcode=Нет штрих-кодов типа активированного
 ListOfAvailableNotifications=Список доступных уведомлений (Этот список зависит от активированных модулей)
 SendingsNumberingModules=Отправки нумерации модулей
 FreeLegalTextOnShippings=Свободный текст на морские перевозки
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 2d7f8e02d5b..59ce0652191 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -81,7 +81,7 @@ ErrorDatabaseParameterWrong=База данных установки парам
 ErrorNumRefModel=Ссылка есть в базе данных (%s) и не совместимы с данным правилом нумерации. Удаление записей или переименован ссылкой для активации этого модуля.
 ErrorQtyTooLowForThisSupplier=Количество слишком мало для этого поставщика или не определена цена на этот продукт для этого поставщика
 ErrorFailedToSendPassword=Не удалось отправить пароль
-
+ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 
 // START - Lines generated via autotranslator.php tool (2011-08-27 16:56:14).
 // Reference language: en_US -> ru_RU
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 1da1cc89011..7a0d777875a 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1125,7 +1125,6 @@ BarcodeDescUPC = Črtna koda tipa UPC
 BarcodeDescISBN = Črtna koda tipa ISBN
 BarcodeDescC39 = Črtna koda tipa C39
 BarcodeDescC128 = Črtna koda tipa C128
-NoActivatedBarcode = Noben tip črtne kode ni aktiviran
 ##### Prelevements ##### = 
 WithdrawalsSetup = Nastavitev modula za dvige
 ##### ExternalRSS ##### = 
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 752b306d49c..e630fd279ba 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -83,3 +83,4 @@ ErrorBadMaskBadRazMonth = Napaka, napačna resetirana vrednost
 ErrorSelectAtLeastOne = Napaka. Izberite vsaj en vnos.
 ErrorProductWithRefNotExist = Proizvod z referenco '<i>%s</i>' ne obstaja
 ErrorDeleteNotPossibleLineIsConsolidated = Brisanje ni možno, ker je zapis vezan na posredovano bančno transakcijo
+ErrorNoActivatedBarcode = Noben tip črtne kode ni aktiviran
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index baff5c967f8..72adbc39d00 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1275,7 +1275,6 @@ ExtraFields=Tamamlayıcı öznitelikleri
 SendingMailSetup=E-posta ile gönderilenlerin Kurulumu
 SendmailOptionNotComplete=Uyarı, bazı Linux sistemleri, e-posta, e-posta göndermek için, sendmail yürütme kurulum conatins-ba seçeneği (parametre mail.force_extra_parameters php.ini dosyasının içine). Bazı alıcılar e-postalar almak hiç mail.force_extra_parameters =-BA) ile PHP parametre düzenlemek için deneyin.
 UsersSetup=Modülü kurulum Kullanıcılar
-NoActivatedBarcode=Aktive yok barkod tipi
 MailingEMailError=Hataları ile e-postalar için e-posta (Hatalar-)
 ListOfAvailableNotifications=Mevcut bildirimlerin Listesi (Bu liste aktive modülleri bağlıdır)
 SendingsNumberingModules=Modülleri numaralandırma gönderilenlerin
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 6d0c43e61e7..dc57938b194 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -65,12 +65,6 @@ ErrorContactEMail=Teknik bir hata oluştu. Lütfen, en hata <b>kodu% email%</b>
 ErrorWrongValueForField=Alan <b>numarası%</b> için yanlış değer <b>ler)</b> regex <b>kural %s</b> uymuyor <b>s (değeri&#39;% s</b>
 ErrorsOnXLines=<b>%</b> Doğum Hatalar kaynak hatları <b>var</b>
 WarningsOnXLines=<b>%</b> Uyarıları kaynak hatları <b>var</b>
-// STOP - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).
-
-
-
-// START - Lines generated via autotranslator.php tool (2011-10-10 15:02:39).
-// Reference language: en_US -> tr_TR
 ErrorBadEMail=EMail %s yanlış.
 ErrorBadUrl=URL %s yanlış.
 ErrorFailToRenameFile=<b>'%s'</b> dosya <b>'%s'</b> yeniden adlandırmak için başarısız oldu.
@@ -102,4 +96,5 @@ ErrorDeleteNotPossibleLineIsConsolidated=Kayıt conciliated bir banka transation
 ErrorProdIdAlreadyExist=%s başka bir üçüncü atanır
 ErrorFailedToSendPassword=Şifre göndereceğiz başarısız
 ErrorFailedToLoadRSSFile=RSS beslemesi almak için başarısız olur. Hata mesajları yeterli bilgi sağlamaz eğer sabit MAIN_SIMPLEXMLLOAD_DEBUG eklemeyi deneyin.
+ErrorNoActivatedBarcode=Aktive yok barkod tipi
 // STOP - Lines generated via autotranslator.php tool (2011-10-10 15:05:52).