From e4a3434c81be8dc9ac52b7c73d29094eef163c4d Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Tue, 10 Jan 2012 13:45:06 +0000 Subject: [PATCH] [-] BO : #PSTEST-391 - Fixed bad description of the export --- modules/newsletter/de.php | 4 +- modules/newsletter/es.php | 4 +- modules/newsletter/fr.php | 5 +- modules/newsletter/it.php | 4 +- modules/newsletter/newsletter.php | 82 +++++++++++++++---------------- 5 files changed, 50 insertions(+), 49 deletions(-) diff --git a/modules/newsletter/de.php b/modules/newsletter/de.php index a5b3b3207..a6cfc190b 100644 --- a/modules/newsletter/de.php +++ b/modules/newsletter/de.php @@ -25,8 +25,8 @@ $_MODULE['<{newsletter}prestashop>newsletter_23e8f8a55548b88bfbdcd1f6ba26a010'] $_MODULE['<{newsletter}prestashop>newsletter_27d1ec406fd2baf49d03f81a4bb41122'] = 'Dies wird eine Liste mit E-Mails von Personen, die Ihren Shop besuchen und nicht Kunden werden, sondern Ihren Newsletter erhalten wollen. Mit der Benutzung der untenstehenden Liste \"Export Newsletter Abonnenten\"wird eine . CSV-Datei generiert, die auf den BlockNewsletter Abonnenten-Daten basiert .'; $_MODULE['<{newsletter}prestashop>newsletter_74ca54506cdbc82e3aa763ba91b8fa39'] = 'Kunden, die \"ja\" angeklickt haben, um einen Newsletter in ihrem Kundenprofil zu erhalten.'; $_MODULE['<{newsletter}prestashop>newsletter_1aa14f5a6423dbde1ef2cfe4734980b4'] = 'Der Abschnitt \"Export Kunden\" unten filtert die Kunden, denen Sie einen Newsletter schicken möchten.'; -$_MODULE['<{newsletter}prestashop>newsletter_b192ab83a19105bbf1e2d1fab548249a'] = 'Export Newsletter-Abonnenten'; +$_MODULE['<{newsletter}prestashop>newsletter_7f5c4d54d8602ab7234a715a2a10b98e'] = 'Export Newsletter-Abonnenten'; $_MODULE['<{newsletter}prestashop>newsletter_a60401e616125189d78605b2ddd7ff45'] = 'Erzeugen Sie eine. CSV-Datei aus BlockNewsletter Abonnenten-Daten.'; $_MODULE['<{newsletter}prestashop>newsletter_dbb392a2dc9b38722e69f6032faea73e'] = '.CSV-Datei exportieren'; $_MODULE['<{newsletter}prestashop>newsletter_4713ef5f2d6fc1e8f088c850e696a04b'] = 'Kunden exportieren '; -$_MODULE['<{newsletter}prestashop>newsletter_2f5a2bf1a10d25a408a8bab945e4dd3c'] = '.CSV-Datei aus Kunden-Konto-Daten generieren '; +$_MODULE['<{newsletter}prestashop>newsletter_2a96d838a5e89b86792669f0ab422987'] = '.CSV-Datei aus Kunden-Konto-Daten generieren.'; diff --git a/modules/newsletter/es.php b/modules/newsletter/es.php index fdd904315..21930ef04 100644 --- a/modules/newsletter/es.php +++ b/modules/newsletter/es.php @@ -25,8 +25,8 @@ $_MODULE['<{newsletter}prestashop>newsletter_23e8f8a55548b88bfbdcd1f6ba26a010'] $_MODULE['<{newsletter}prestashop>newsletter_27d1ec406fd2baf49d03f81a4bb41122'] = 'Esta será una lista de direcciones de correo para las personas que visiten su tienda y no se convierta en clientes, pero que desean obtener su newsletter. Use \\\"Newsletter Suscriptores de exportación\\\" más abajo para generar una . CSV sobre la base de los usuarios de los datos del bloque Newsletter.'; $_MODULE['<{newsletter}prestashop>newsletter_74ca54506cdbc82e3aa763ba91b8fa39'] = 'Los clientes que han dicho \"sí\" para recibir la newsletter en su perfil de cliente.'; $_MODULE['<{newsletter}prestashop>newsletter_1aa14f5a6423dbde1ef2cfe4734980b4'] = 'La sección \"exportación clientes\" debajo de los filtros para clientes a los que quiere enviar la newsletter.'; -$_MODULE['<{newsletter}prestashop>newsletter_b192ab83a19105bbf1e2d1fab548249a'] = 'Exportar suscritos a la newsletter'; +$_MODULE['<{newsletter}prestashop>newsletter_7f5c4d54d8602ab7234a715a2a10b98e'] = 'Exportar suscritos a la newsletter'; $_MODULE['<{newsletter}prestashop>newsletter_a60401e616125189d78605b2ddd7ff45'] = 'Generar un archivo. CSV BlockNewsletter sobre la base de datos de suscriptores.'; $_MODULE['<{newsletter}prestashop>newsletter_dbb392a2dc9b38722e69f6032faea73e'] = 'Exportar un fichero .CSV'; $_MODULE['<{newsletter}prestashop>newsletter_4713ef5f2d6fc1e8f088c850e696a04b'] = 'Exportar clientes'; -$_MODULE['<{newsletter}prestashop>newsletter_2f5a2bf1a10d25a408a8bab945e4dd3c'] = 'Generar un archivo. CSV de datos de la cuenta del cliente'; +$_MODULE['<{newsletter}prestashop>newsletter_2a96d838a5e89b86792669f0ab422987'] = 'Generar un archivo. CSV de datos de la cuenta del cliente.'; diff --git a/modules/newsletter/fr.php b/modules/newsletter/fr.php index 60c7c154f..d7eac4f73 100644 --- a/modules/newsletter/fr.php +++ b/modules/newsletter/fr.php @@ -25,8 +25,9 @@ $_MODULE['<{newsletter}prestashop>newsletter_23e8f8a55548b88bfbdcd1f6ba26a010'] $_MODULE['<{newsletter}prestashop>newsletter_27d1ec406fd2baf49d03f81a4bb41122'] = 'La liste ne comprendra alors que les adresses e-mails.'; $_MODULE['<{newsletter}prestashop>newsletter_74ca54506cdbc82e3aa763ba91b8fa39'] = 'Les clients ayant coché la case \"oui\" pour la souscription à la liste de diffusion.'; $_MODULE['<{newsletter}prestashop>newsletter_1aa14f5a6423dbde1ef2cfe4734980b4'] = 'Cette liste pourra être triée selon le type de client.'; -$_MODULE['<{newsletter}prestashop>newsletter_b192ab83a19105bbf1e2d1fab548249a'] = 'Exporter les inscrits à la newsletter'; +$_MODULE['<{newsletter}prestashop>newsletter_7f5c4d54d8602ab7234a715a2a10b98e'] = 'Exporter les inscrits à la newsletter depuis le bloc newsletter'; $_MODULE['<{newsletter}prestashop>newsletter_a60401e616125189d78605b2ddd7ff45'] = 'Génère un fichier .CSV à partir des données des inscrits au BlockNewsletter.'; +$_MODULE['<{newsletter}prestashop>newsletter_769050278dda5e93374adda37811e413'] = 'Seuls les abonnés sans compte sur la boutique seront exportés.'; $_MODULE['<{newsletter}prestashop>newsletter_dbb392a2dc9b38722e69f6032faea73e'] = 'Exporte un fichier CSV'; $_MODULE['<{newsletter}prestashop>newsletter_4713ef5f2d6fc1e8f088c850e696a04b'] = 'Export des clients'; -$_MODULE['<{newsletter}prestashop>newsletter_2f5a2bf1a10d25a408a8bab945e4dd3c'] = 'Génère un fichier .CSV à partir des données des clients.'; +$_MODULE['<{newsletter}prestashop>newsletter_2a96d838a5e89b86792669f0ab422987'] = 'Génère un fichier .CSV à partir des données des inscrits au BlockNewsletter.'; diff --git a/modules/newsletter/it.php b/modules/newsletter/it.php index a731d6d14..9697cb67f 100644 --- a/modules/newsletter/it.php +++ b/modules/newsletter/it.php @@ -25,8 +25,8 @@ $_MODULE['<{newsletter}prestashop>newsletter_23e8f8a55548b88bfbdcd1f6ba26a010'] $_MODULE['<{newsletter}prestashop>newsletter_27d1ec406fd2baf49d03f81a4bb41122'] = 'Questo sarà un elenco di indirizzi email delle persone che si recano nel tuo negozio non per diventare un cliente, ma per ottenere la tua newsletter. Utilizzando il seguente \"Esporta iscritti alla newsletter\" genererà un file. CSV sulla base dei dati abbonati BlockNewsletter.'; $_MODULE['<{newsletter}prestashop>newsletter_74ca54506cdbc82e3aa763ba91b8fa39'] = 'I clienti che hanno risposto \"sì\" per ricevere una newsletter nel loro profilo del cliente.'; $_MODULE['<{newsletter}prestashop>newsletter_1aa14f5a6423dbde1ef2cfe4734980b4'] = 'La sezione seguente \"Esporta clienti\" filtra a quali clienti si desidera inviare una newsletter.'; -$_MODULE['<{newsletter}prestashop>newsletter_b192ab83a19105bbf1e2d1fab548249a'] = 'Export Newsletter Iscritti'; +$_MODULE['<{newsletter}prestashop>newsletter_7f5c4d54d8602ab7234a715a2a10b98e'] = 'Export Newsletter Iscritti'; $_MODULE['<{newsletter}prestashop>newsletter_a60401e616125189d78605b2ddd7ff45'] = 'Genera un file. CSV sulla base dei dati abbonati BlockNewsletter.'; $_MODULE['<{newsletter}prestashop>newsletter_dbb392a2dc9b38722e69f6032faea73e'] = 'Esporta file. CSV'; $_MODULE['<{newsletter}prestashop>newsletter_4713ef5f2d6fc1e8f088c850e696a04b'] = 'Esporta clienti'; -$_MODULE['<{newsletter}prestashop>newsletter_2f5a2bf1a10d25a408a8bab945e4dd3c'] = 'Genera un file. CSV dai dati account clienti'; +$_MODULE['<{newsletter}prestashop>newsletter_2a96d838a5e89b86792669f0ab422987'] = 'Genera un file. CSV dai dati account clienti.'; diff --git a/modules/newsletter/newsletter.php b/modules/newsletter/newsletter.php index 854aa15dd..65c76666c 100644 --- a/modules/newsletter/newsletter.php +++ b/modules/newsletter/newsletter.php @@ -30,22 +30,22 @@ if (!defined('_PS_VERSION_')) class Newsletter extends Module { - private $_postErrors = array(); - private $_html = ''; - private $_postSucess; + private $_postErrors = array(); + private $_html = ''; + private $_postSucess; - public function __construct() - { - $this->name = 'newsletter'; - $this->tab = 'administration'; - $this->version = 2.0; + public function __construct() + { + $this->name = 'newsletter'; + $this->tab = 'administration'; + $this->version = 2.0; $this->author = 'PrestaShop'; $this->need_instance = 0; - parent::__construct(); + parent::__construct(); - $this->displayName = $this->l('Newsletter'); - $this->description = $this->l('Generates a .CSV file for mass mailings'); + $this->displayName = $this->l('Newsletter'); + $this->description = $this->l('Generates a .CSV file for mass mailings'); if ($this->id) { @@ -85,16 +85,16 @@ class Newsletter extends Module ), ); } - } + } public function install() { return (parent::install() AND Configuration::updateValue('PS_NEWSLETTER_RAND', rand().rand())); } - private function _postProcess() - { - if (isset($_POST['submitExport']) AND isset($_POST['action'])) + private function _postProcess() + { + if (isset($_POST['submitExport']) AND isset($_POST['action'])) { if ($_POST['action'] == 'customers') $result = $this->_getCustomers(); @@ -124,7 +124,7 @@ class Newsletter extends Module else $this->_html .= $this->displayError($this->l('Error: cannot write').' '.dirname(__FILE__).'/'.strval($_POST['action']).'_'.$this->_file.' !'); } - } + } private function _getCustomers() { @@ -174,7 +174,7 @@ class Newsletter extends Module $this->_postErrors[] = $this->l('Error: cannot write').' '.dirname(__FILE__).'/'.$this->_file.' !'; } - private function _displayFormExport() + private function _displayFormExport() { $this->_html .= '
@@ -182,26 +182,26 @@ class Newsletter extends Module

  1. '.$this->l('Persons who have subscribed using the BlockNewsletter block in the front office.').'
    - '.$this->l('This is a list of e-mail addresses of persons who come to your store that do not become customers, but have subscribed to your newsletter. Using the "Export Newsletter Subscribers" below will generate a .CSV file based on the BlockNewsletter subscribers data.').'

    '.' -
    2. -
  2. - '.$this->l('Customers that have checked "yes" to receive a newsletter in their customer profile.').'
    - '.$this->l('The "Export Customers" section below filters which customers you want to send a newsletter to.').' -
    3. -
+ '.$this->l('This is a list of e-mail addresses of persons who come to your store that do not become customers, but have subscribed to your newsletter. Using the "Export Newsletter Subscribers" below will generate a .CSV file based on the BlockNewsletter subscribers data.').'

'.' + +
  • + '.$this->l('Customers that have checked "yes" to receive a newsletter in their customer profile.').'
    + '.$this->l('The "Export Customers" section below filters which customers you want to send a newsletter to.').' +
    • +

    -

    -
    '.$this->l('Export Newsletter Subscribers').' -
    +

    +
    '.$this->l('Export Newsletter Subscribers from the BlockNewsletter').' + - '.$this->l('Generate a .CSV file based on BlockNewsletter subscribers data.').'.

    '; + '.$this->l('Generate a .CSV file based on BlockNewsletter subscribers data.').' '.$this->l('Only subscribers without an account on the shop will be exported.').'

    '; $this->_html .= '
    -

    +
    '.$this->l('Export customers').' -
    + - '.$this->l('Generate a .CSV file from customer account data').'.

    '; + '.$this->l('Generate a .CSV file from customer account data.').'

    '; foreach ($this->_fieldsExport as $key => $field) { $this->_html .= ' @@ -225,23 +225,23 @@ class Newsletter extends Module } $this->_html .= '
    -
    '; + '; } - private function _displayForm() - { + private function _displayForm() + { $this->_displayFormExport(); - } + } - public function getContent() - { - $this->_html .= '

    '.$this->displayName.'

    '; + public function getContent() + { + $this->_html .= '

    '.$this->displayName.'

    '; - if (!empty($_POST)) + if (!empty($_POST)) $this->_html .= $this->_postProcess(); - $this->_displayForm(); + $this->_displayForm(); return $this->_html; - } + } }