diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php index 3fa6cc65a..3b5c639e4 100644 --- a/controllers/admin/AdminDeliverySlipController.php +++ b/controllers/admin/AdminDeliverySlipController.php @@ -62,7 +62,7 @@ class AdminDeliverySlipControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Print PDF delivery slips'), - 'image' => '../img/t/AdminPDF.gif' + 'image' => '../img/t/AdminPdf.gif' ), 'input' => array( array( diff --git a/controllers/admin/AdminPDFController.php b/controllers/admin/AdminPdfController.php similarity index 98% rename from controllers/admin/AdminPDFController.php rename to controllers/admin/AdminPdfController.php index f57f15141..87a15258b 100644 --- a/controllers/admin/AdminPDFController.php +++ b/controllers/admin/AdminPdfController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminPDFControllerCore extends AdminController +class AdminPdfControllerCore extends AdminController { private $encoding_list = array(); diff --git a/img/t/AdminCMS.gif b/img/t/AdminCms.gif similarity index 100% rename from img/t/AdminCMS.gif rename to img/t/AdminCms.gif diff --git a/img/t/AdminCMSContent.gif b/img/t/AdminCmsContent.gif similarity index 100% rename from img/t/AdminCMSContent.gif rename to img/t/AdminCmsContent.gif diff --git a/img/t/AdminPDF.gif b/img/t/AdminPdf.gif similarity index 100% rename from img/t/AdminPDF.gif rename to img/t/AdminPdf.gif diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index e9ca0cd42..2da1605ad 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -939,7 +939,7 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE (21, 'AdminRangeWeight', 5, 7),(51, 'AdminStatsConf', 6, 1),(61, 'AdminSearchEngines', 6, 2),(62, 'AdminReferrers', 6, 3), (22, 'AdminModulesPositions', 7, 4),(30, 'AdminProfiles', 29, 1),(31, 'AdminAccess', 29, 2),(28, 'AdminContacts', 29, 3),(39, 'AdminContact', 8, 1), (38, 'AdminThemes', 8, 2),(56, 'AdminMeta', 8, 3),(27, 'AdminPPreferences', 8, 4),(24, 'AdminEmails', 8, 5),(26, 'AdminImages', 8, 6),(23, 'AdminDb', 8, 7), -(48, 'AdminPDF', 3, 8),(44, 'AdminLocalization', 8, 9),(67, 'AdminSearchConf', 8, 10),(32, 'AdminLanguages', 9, 1),(33, 'AdminTranslations', 9, 2), +(48, 'AdminPdf', 3, 8),(44, 'AdminLocalization', 8, 9),(67, 'AdminSearchConf', 8, 10),(32, 'AdminLanguages', 9, 1),(33, 'AdminTranslations', 9, 2), (35, 'AdminTabs', 29, 3),(37, 'AdminQuickAccesses', 9, 4),(40, 'AdminAliases', 8, 5),(41, 'AdminImport', 9, 6),(52, 'AdminSubDomains', 9, 7), (53, 'AdminBackup', 9, 8),(57, 'AdminCmsContent', 9, 9),(64, 'AdminGenerator', 9, 10),(43, 'AdminSearch', -1, 0),(69, 'AdminInformation', 9, 5), (70, 'AdminPerformance', 8, 11),(71, 'AdminCustomerThreads', 29, 4),(72, 'AdminWebservice', 9, 12),(73, 'AdminStockMvt', 95, 3), diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql index 6173bc88c..d93f8dc6b 100644 --- a/install-dev/sql/upgrade/1.5.0.1.sql +++ b/install-dev/sql/upgrade/1.5.0.1.sql @@ -580,4 +580,5 @@ UPDATE `PREFIX_employee` SET `bo_theme` = 'default'; UPDATE `PREFIX_tab` SET `class_name` = 'AdminCmsContent' WHERE `class_name` = 'AdminCMSContent'; UPDATE `PREFIX_tab` SET `class_name` = 'AdminCms' WHERE `class_name` = 'AdminCMS'; -UPDATE `PREFIX_tab` SET `class_name` = 'AdminCmsCategories' WHERE `class_name` = 'AdminCMSCategories'; \ No newline at end of file +UPDATE `PREFIX_tab` SET `class_name` = 'AdminCmsCategories' WHERE `class_name` = 'AdminCMSCategories'; +UPDATE `PREFIX_tab` SET `class_name` = 'AdminPdf' WHERE `class_name` = 'AdminPDF'; \ No newline at end of file diff --git a/translations/de/admin.php b/translations/de/admin.php index e4ded7eef..6fd6215aa 100644 --- a/translations/de/admin.php +++ b/translations/de/admin.php @@ -1738,11 +1738,11 @@ $_LANGADM['AdminOrdersStates31fde7b05ac8952dacf4af8a704074ec'] = 'Vorschau'; $_LANGADM['AdminOrdersStatesb32475cd81cfdb314b57ae77c560640f'] = 'Name der E-Mail-Vorlage (HTML und .txt)'; $_LANGADM['AdminOrdersStates38fb7d24e0d60a048f540ecb18e13376'] = 'Speichern'; $_LANGADM['AdminOrdersStates19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder'; -$_LANGADM['AdminPDF788ebe0fc7fc09c0c20069659af8e139'] = 'Konfigurieren der PDF in der eingestellten Sprache:'; -$_LANGADM['AdminPDF41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Verschlüsselung:'; -$_LANGADM['AdminPDF7b66a66ca2141a1184bf40c300d00007'] = 'Verschlüsselung der PDF-Rechnungen'; -$_LANGADM['AdminPDF7b33872f9b52c649fda24a8fef9492bb'] = 'Schriftart:'; -$_LANGADM['AdminPDF8b28d3153d454696bef299fd0bbc2d7e'] = 'Schriftart der PDF-Rechnungen'; +$_LANGADM['AdminPdf788ebe0fc7fc09c0c20069659af8e139'] = 'Konfigurieren der PDF in der eingestellten Sprache:'; +$_LANGADM['AdminPdf41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Verschlüsselung:'; +$_LANGADM['AdminPdf7b66a66ca2141a1184bf40c300d00007'] = 'Verschlüsselung der PDF-Rechnungen'; +$_LANGADM['AdminPdf7b33872f9b52c649fda24a8fef9492bb'] = 'Schriftart:'; +$_LANGADM['AdminPdf8b28d3153d454696bef299fd0bbc2d7e'] = 'Schriftart der PDF-Rechnungen'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Produkte'; $_LANGADM['AdminPPreferences90dc497d9d6686ce91ad5c94524020f0'] = 'Katalog-Modus:'; $_LANGADM['AdminPPreferences0a2ab45f848348a2626b7491ab6d8cdd'] = 'Wenn diese Einstellung aktiviert ist, sind alle Kauf-Funktionen deaktiviert'; diff --git a/translations/en/admin.php b/translations/en/admin.php index 859ad4e09..9e5cf0b41 100644 --- a/translations/en/admin.php +++ b/translations/en/admin.php @@ -1758,11 +1758,11 @@ $_LANGADM['AdminOrdersStates31fde7b05ac8952dacf4af8a704074ec'] = 'Preview'; $_LANGADM['AdminOrdersStatesb32475cd81cfdb314b57ae77c560640f'] = 'E-mail template for both .html and .txt'; $_LANGADM['AdminOrdersStates38fb7d24e0d60a048f540ecb18e13376'] = ' Save '; $_LANGADM['AdminOrdersStates19f823c6453c2b1ffd09cb715214813d'] = 'Required field'; -$_LANGADM['AdminPDF788ebe0fc7fc09c0c20069659af8e139'] = 'PDF settings for the current language:'; -$_LANGADM['AdminPDF41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Encoding:'; -$_LANGADM['AdminPDF7b66a66ca2141a1184bf40c300d00007'] = 'Encoding for PDF invoice'; -$_LANGADM['AdminPDF7b33872f9b52c649fda24a8fef9492bb'] = 'Font:'; -$_LANGADM['AdminPDF8b28d3153d454696bef299fd0bbc2d7e'] = 'Font for PDF invoice'; +$_LANGADM['AdminPdf788ebe0fc7fc09c0c20069659af8e139'] = 'PDF settings for the current language:'; +$_LANGADM['AdminPdf41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Encoding:'; +$_LANGADM['AdminPdf7b66a66ca2141a1184bf40c300d00007'] = 'Encoding for PDF invoice'; +$_LANGADM['AdminPdf7b33872f9b52c649fda24a8fef9492bb'] = 'Font:'; +$_LANGADM['AdminPdf8b28d3153d454696bef299fd0bbc2d7e'] = 'Font for PDF invoice'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Products'; $_LANGADM['AdminPPreferences90dc497d9d6686ce91ad5c94524020f0'] = 'Catalog mode:'; $_LANGADM['AdminPPreferences0a2ab45f848348a2626b7491ab6d8cdd'] = 'When active, all shopping features will be disabled'; diff --git a/translations/es/admin.php b/translations/es/admin.php index d1415ed94..fc17f1a48 100644 --- a/translations/es/admin.php +++ b/translations/es/admin.php @@ -1734,11 +1734,11 @@ $_LANGADM['AdminOrdersStates31fde7b05ac8952dacf4af8a704074ec'] = 'Vista previa'; $_LANGADM['AdminOrdersStatesb32475cd81cfdb314b57ae77c560640f'] = 'Plantilla de Email para .html y .txt'; $_LANGADM['AdminOrdersStates38fb7d24e0d60a048f540ecb18e13376'] = 'Guardar'; $_LANGADM['AdminOrdersStates19f823c6453c2b1ffd09cb715214813d'] = 'Campos obligatorios'; -$_LANGADM['AdminPDF788ebe0fc7fc09c0c20069659af8e139'] = 'Configuración PDF para el idioma actual:'; -$_LANGADM['AdminPDF41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Cifrado:'; -$_LANGADM['AdminPDF7b66a66ca2141a1184bf40c300d00007'] = 'Cifrado para la factura PDF'; -$_LANGADM['AdminPDF7b33872f9b52c649fda24a8fef9492bb'] = 'Fuente:'; -$_LANGADM['AdminPDF8b28d3153d454696bef299fd0bbc2d7e'] = 'Fuente para la factura PDF'; +$_LANGADM['AdminPdf788ebe0fc7fc09c0c20069659af8e139'] = 'Configuración PDF para el idioma actual:'; +$_LANGADM['AdminPdf41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Cifrado:'; +$_LANGADM['AdminPdf7b66a66ca2141a1184bf40c300d00007'] = 'Cifrado para la factura PDF'; +$_LANGADM['AdminPdf7b33872f9b52c649fda24a8fef9492bb'] = 'Fuente:'; +$_LANGADM['AdminPdf8b28d3153d454696bef299fd0bbc2d7e'] = 'Fuente para la factura PDF'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Productos'; $_LANGADM['AdminPPreferences90dc497d9d6686ce91ad5c94524020f0'] = 'Modo catálogo:'; $_LANGADM['AdminPPreferences0a2ab45f848348a2626b7491ab6d8cdd'] = 'Cuando este parámetro se encuentra activado, todas las aplicaciones de compra aparecen desactivadas'; diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 3f9b629fa..7be7f8a43 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -2,11 +2,11 @@ global $_LANGADM; $_LANGADM = array(); -$_LANGADM['AdminPDF788ebe0fc7fc09c0c20069659af8e139'] = 'Configuration des PDF dans la langue courante :'; -$_LANGADM['AdminPDF41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Encodage :'; -$_LANGADM['AdminPDF7b66a66ca2141a1184bf40c300d00007'] = 'Encodage des factures PDF'; -$_LANGADM['AdminPDF7b33872f9b52c649fda24a8fef9492bb'] = 'Police :'; -$_LANGADM['AdminPDF8b28d3153d454696bef299fd0bbc2d7e'] = 'Police des factures PDF'; +$_LANGADM['AdminPdf788ebe0fc7fc09c0c20069659af8e139'] = 'Configuration des PDF dans la langue courante :'; +$_LANGADM['AdminPdf41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Encodage :'; +$_LANGADM['AdminPdf7b66a66ca2141a1184bf40c300d00007'] = 'Encodage des factures PDF'; +$_LANGADM['AdminPdf7b33872f9b52c649fda24a8fef9492bb'] = 'Police :'; +$_LANGADM['AdminPdf8b28d3153d454696bef299fd0bbc2d7e'] = 'Police des factures PDF'; $_LANGADM['AdminSubDomainsb718adec73e04ce3ec720dd11a06a308'] = 'ID'; $_LANGADM['AdminSubDomainsbeed05bccb8b6f21466910eb4a4f142b'] = 'Sous-domaine'; $_LANGADM['AdminSubDomains51e2fe0e1a41fe9fec46ae2129bb8513'] = 'Sous-domaines'; diff --git a/translations/it/admin.php b/translations/it/admin.php index d8c6dcce0..efb6538e3 100644 --- a/translations/it/admin.php +++ b/translations/it/admin.php @@ -1737,11 +1737,11 @@ $_LANGADM['AdminOrdersStates31fde7b05ac8952dacf4af8a704074ec'] = 'Pre-visualizza $_LANGADM['AdminOrdersStatesb32475cd81cfdb314b57ae77c560640f'] = 'Nome del modello della e-mail (HTML e .txt)'; $_LANGADM['AdminOrdersStates38fb7d24e0d60a048f540ecb18e13376'] = 'Salva'; $_LANGADM['AdminOrdersStates19f823c6453c2b1ffd09cb715214813d'] = 'Campi richiesti'; -$_LANGADM['AdminPDF788ebe0fc7fc09c0c20069659af8e139'] = 'Impostazioni PDF per la lingua attuale:'; -$_LANGADM['AdminPDF41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Codifica:'; -$_LANGADM['AdminPDF7b66a66ca2141a1184bf40c300d00007'] = 'Codifica fatture PDF'; -$_LANGADM['AdminPDF7b33872f9b52c649fda24a8fef9492bb'] = 'Font:'; -$_LANGADM['AdminPDF8b28d3153d454696bef299fd0bbc2d7e'] = 'Font fatture PDF'; +$_LANGADM['AdminPdf788ebe0fc7fc09c0c20069659af8e139'] = 'Impostazioni PDF per la lingua attuale:'; +$_LANGADM['AdminPdf41fcf9407f9c20e5d2306bbc4c3fed2f'] = 'Codifica:'; +$_LANGADM['AdminPdf7b66a66ca2141a1184bf40c300d00007'] = 'Codifica fatture PDF'; +$_LANGADM['AdminPdf7b33872f9b52c649fda24a8fef9492bb'] = 'Font:'; +$_LANGADM['AdminPdf8b28d3153d454696bef299fd0bbc2d7e'] = 'Font fatture PDF'; $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Prodotti'; $_LANGADM['AdminPPreferences90dc497d9d6686ce91ad5c94524020f0'] = 'Modalità catalogo:'; $_LANGADM['AdminPPreferences0a2ab45f848348a2626b7491ab6d8cdd'] = 'pagina precedente';