From 68fc6e0424d2d735ec6dd82467f008012ae98945 Mon Sep 17 00:00:00 2001 From: benjamin Date: Tue, 31 May 2016 18:01:16 +0200 Subject: [PATCH] Correction bugs --- classes/controllers/LengowController.php | 2 +- classes/controllers/LengowFeedController.php | 2 +- classes/controllers/LengowHelpController.php | 54 ++++- classes/controllers/LengowHomeController.php | 1 + .../controllers/LengowLegalsController.php | 1 + classes/controllers/LengowOrderController.php | 10 +- classes/models/LengowConfiguration.php | 8 +- classes/models/LengowHook.php | 1 + classes/models/LengowImportOrder.php | 31 +-- classes/models/LengowList.php | 16 +- classes/models/LengowOrder.php | 7 + toolbox/config.php | 1 - translations/en.csv | 208 +++++++++--------- translations/fr.csv | 36 +-- translations/yml/en.yml | 105 +++++---- translations/yml/fr.yml | 21 +- translations/yml/log.yml | 98 ++++----- upgrade/update_3.0.0.php | 7 + views/js/lengow/home.js | 4 +- views/templates/admin/footer.tpl | 5 +- views/templates/admin/header.tpl | 26 +-- .../admin/lengow_feed/helpers/view/view.tpl | 40 +--- .../admin/lengow_help/helpers/view/view.tpl | 32 ++- .../lengow_home/helpers/view/connect.tpl | 45 ++-- .../admin/lengow_legals/helpers/view/view.tpl | 144 ++++++++++-- .../helpers/view/last_importation.tpl | 14 +- .../admin/lengow_order/helpers/view/view.tpl | 66 +++--- views/templates/admin/order/info.tpl | 4 + views/templates/admin/order/info_16.tpl | 4 + webservice/help.php | 86 -------- webservice/sync.php | 148 ------------- 31 files changed, 562 insertions(+), 665 deletions(-) delete mode 100644 webservice/help.php delete mode 100644 webservice/sync.php diff --git a/classes/controllers/LengowController.php b/classes/controllers/LengowController.php index fa645b5b..4a35cc79 100644 --- a/classes/controllers/LengowController.php +++ b/classes/controllers/LengowController.php @@ -65,7 +65,7 @@ public function display() $path = $lengowMain->fromCamelCase(Tools::substr($className, 0, Tools::strlen($className) - 10)); echo $module->display( _PS_MODULE_LENGOW_DIR_, - 'views/templates/admin/' . $path . '/helpers/view/view.tpl' + 'views/templates/admin/'.$path.'/helpers/view/view.tpl' ); } } diff --git a/classes/controllers/LengowFeedController.php b/classes/controllers/LengowFeedController.php index b4e69880..178ea247 100644 --- a/classes/controllers/LengowFeedController.php +++ b/classes/controllers/LengowFeedController.php @@ -197,7 +197,7 @@ public function display() $lengowExport = new LengowExport(array( "shop_id" => $shop->id )); - $shopCollection[]= array( + $shopCollection[] = array( 'shop' => $shop, 'link' => LengowMain::getExportUrl($shop->id), 'total_product' => $lengowExport->getTotalProduct(), diff --git a/classes/controllers/LengowHelpController.php b/classes/controllers/LengowHelpController.php index 2e092f3f..a3d3226a 100644 --- a/classes/controllers/LengowHelpController.php +++ b/classes/controllers/LengowHelpController.php @@ -27,24 +27,54 @@ class LengowHelpController extends LengowController */ public function postProcess() { - $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : false; - if ($action) { - switch ($action) { - case 'get_help_data': - $data = array(); - $data['function'] = 'sync'; - $data['parameters'] = LengowSync::getSyncData(); - echo Tools::jsonEncode($data); - break; - } - exit(); - } } public function display() { $lengowLink = new LengowLink(); + $this->context->smarty->assign('mailto', $this->getMailTo()); $this->context->smarty->assign('lengow_ajax_link', $lengowLink->getAbsoluteAdminLink('AdminLengowHelp', true)); parent::display(); } + + /** + * Generate mailto for help page + */ + public function getMailTo() + { + $mailto = LengowSync::getSyncData(); + $mail = 'support.lengow.zendesk@lengow.com'; + $subject = $this->locale->t('help.screen.mailto_subject'); + $result = LengowConnector::queryApi('get', '/v3.0/cms'); + $body = '%0D%0A%0D%0A%0D%0A%0D%0A%0D%0A' + . $this->locale->t('help.screen.mail_lengow_support_title').'%0D%0A'; + if (isset($result->cms)) { + $body .= 'commun_account : '.$result->cms->common_account.'%0D%0A'; + } + foreach ($mailto as $key => $value) { + if ($key == 'domain_name' || $key == 'token' || $key == 'return_url' || $key == 'shops') { + continue; + } + $body .= $key.' : '.$value.'%0D%0A'; + } + $shops = $mailto['shops']; + $i = 1; + foreach ($shops as $shop) { + foreach ($shop as $item => $value) { + if ($item == 'name') { + $body .= 'Store '.$i.' : '.$value.'%0D%0A'; + } elseif ($item == 'feed_url') { + $body .= $value . '%0D%0A'; + } + } + $i++; + } + $html = 'locale->t('help.screen.need_some_help').'" target="_blank">'; + $html.= $this->locale->t('help.screen.mail_lengow_support'); + $html.= ''; + return $html; + } } diff --git a/classes/controllers/LengowHomeController.php b/classes/controllers/LengowHomeController.php index b8de01b0..bcf9a20a 100644 --- a/classes/controllers/LengowHomeController.php +++ b/classes/controllers/LengowHomeController.php @@ -56,6 +56,7 @@ public function display() if (!$this->isNewMerchant) { $this->context->smarty->assign('stats', LengowStatistic::get()); } + $lengowLink = new LengowLink(); $this->context->smarty->assign('lengow_ajax_link', $lengowLink->getAbsoluteAdminLink('AdminLengowHome', true)); parent::display(); diff --git a/classes/controllers/LengowLegalsController.php b/classes/controllers/LengowLegalsController.php index 4e19696f..6bd6d0dd 100644 --- a/classes/controllers/LengowLegalsController.php +++ b/classes/controllers/LengowLegalsController.php @@ -29,6 +29,7 @@ public function postProcess() public function display() { + $this->context->smarty->assign('iso_code', Context::getContext()->language->iso_code); parent::display(); } } diff --git a/classes/controllers/LengowOrderController.php b/classes/controllers/LengowOrderController.php index 5c80475e..280ffbc7 100644 --- a/classes/controllers/LengowOrderController.php +++ b/classes/controllers/LengowOrderController.php @@ -362,11 +362,6 @@ public function loadTable() 'display_callback' => 'LengowOrderController::displayLengowExtra' ); } - /*$fields_list['search'] = array( - 'title' => '', - 'width' => '10%', - 'button_search' => true - );*/ $select = array( 'lo.id', 'lo.marketplace_sku', @@ -555,7 +550,7 @@ public static function displayLogStatus($key, $value, $item) $message = ''; if ($item[$key] == '2') { $message = LengowMain::decodeLogMessage('order.screen.action_sent_not_work') - .join('
', $errorMessage); + .'
'.join('
', $errorMessage); $value = ''.LengowMain::decodeLogMessage('order.screen.not_sent').' '; } else { - $message = LengowMain::decodeLogMessage('order.screen.order_not_imported').join('
', $errorMessage); + $message = LengowMain::decodeLogMessage('order.screen.order_not_imported') + .'
'.join('
', $errorMessage); $value = ' $locale->t('lengow_setting.lengow_import_preprod_enabled_title'), 'legend' => $locale->t('lengow_setting.lengow_import_preprod_enabled_legend'), ), - 'LENGOW_IMPORT_FAKE_EMAIL' => array( - 'type' => 'checkbox', - 'label' => $locale->t('lengow_setting.lengow_import_fake_mail_title'), - 'legend' => $locale->t('lengow_setting.lengow_import_fake_mail_legend'), - 'default_value' => true, - ), 'LENGOW_IMPORT_SHIP_MP_ENABLED' => array( 'type' => 'checkbox', 'label' => $locale->t('lengow_setting.lengow_import_ship_mp_enabled_title'), @@ -277,7 +271,7 @@ public static function updateValue($key, $values, $html = false, $id_shop_group public static function getReportEmailAddress() { - $emails = explode(',', self::get('LENGOW_REPORT_MAIL_ADDRESS')); + $emails = explode(';', self::get('LENGOW_REPORT_MAIL_ADDRESS')); if ($emails[0] == '') { $emails[0] = self::get('PS_SHOP_EMAIL'); } diff --git a/classes/models/LengowHook.php b/classes/models/LengowHook.php index c7608dcd..1260f827 100644 --- a/classes/models/LengowHook.php +++ b/classes/models/LengowHook.php @@ -459,6 +459,7 @@ public function hookAdminOrder($args) 'tracking_method' => $lengow_order->lengow_method, 'tracking' => $lengow_order->lengow_tracking, 'tracking_carrier' => $lengow_order->lengow_carrier, + 'customer_email' => $lengow_order->lengow_customer_email, 'sent_markeplace' => $sent_markeplace, 'message' => $lengow_order->lengow_message, 'action_synchronize' => $action_synchronize, diff --git a/classes/models/LengowImportOrder.php b/classes/models/LengowImportOrder.php index 56bd9748..2c73bf1f 100644 --- a/classes/models/LengowImportOrder.php +++ b/classes/models/LengowImportOrder.php @@ -222,8 +222,8 @@ public function importOrder() LengowMain::log( 'Import', LengowMain::setLogMessage('log.import.error_already_created', array( - 'decoded_message' => $decoded_message, - 'date_message' => $import_log['date'] + 'decoded_message' => $decoded_message, + 'date_message' => $import_log['date'] )), $this->log_output, $this->marketplace_sku @@ -303,6 +303,10 @@ public function importOrder() $this->loadTrackingData(); // get customer name $customer_name = $this->getCustomerName(); + $customer_email = (!is_null($this->order_data->billing_address->email) + ? (string)$this->order_data->billing_address->email + : (string)$this->package_data->delivery->email + ); // update Lengow order with new informations LengowOrder::updateOrderLengow( $this->id_order_lengow, @@ -310,6 +314,7 @@ public function importOrder() 'total_paid' => $this->order_amount, 'order_item' => $this->order_items, 'customer_name' => pSQL($customer_name), + 'customer_email' => pSQL($customer_email), 'carrier' => pSQL($this->carrier_name), 'method' => pSQL($this->carrier_method), 'tracking' => pSQL($this->tracking_number), @@ -748,19 +753,15 @@ protected function getCartData() // get billing datas $billing_data = LengowAddress::extractAddressDataFromAPI($this->order_data->billing_address); // create customer based on billing data - if (LengowConfiguration::getGlobalValue('LENGOW_IMPORT_FAKE_EMAIL') - || $this->preprod_mode - || empty($billing_data['email']) - ) { - $domain = !LengowMain::getHost() ? 'prestashop.shop' : LengowMain::getHost(); - $billing_data['email'] = 'generated-email+'.$this->marketplace_sku.'@'.$domain; - LengowMain::log( - 'Import', - LengowMain::setLogMessage('log.import.generate_unique_email', array('email' => $billing_data['email'])), - $this->log_output, - $this->marketplace_sku - ); - } + // generation of fictitious email + $domain = !LengowMain::getHost() ? 'prestashop.shop' : LengowMain::getHost(); + $billing_data['email'] = $this->marketplace_sku.'-'.$this->marketplace->name.'@'.$domain; + LengowMain::log( + 'Import', + LengowMain::setLogMessage('log.import.generate_unique_email', array('email' => $billing_data['email'])), + $this->log_output, + $this->marketplace_sku + ); // update Lengow order with customer name $customer = $this->getCustomer($billing_data); if (!$customer->id) { diff --git a/classes/models/LengowList.php b/classes/models/LengowList.php index 8b18a32c..3be0dbf0 100644 --- a/classes/models/LengowList.php +++ b/classes/models/LengowList.php @@ -76,11 +76,10 @@ public function __construct($params) */ public function displayHeader($order) { - if (count($this->collection) == 0) { - $tableClass="table_no_result"; - } + $tableClass = (count($this->collection) == 0 ? 'table_no_result' : ''); $newOrder = ( empty($this->orderValue) || $this->orderValue == "ASC" ) ? 'DESC' : "ASC"; - $html =''; + $html ='
'; $html.=''; $html.=''; @@ -94,7 +93,8 @@ public function displayHeader($order) } $html.=''; break; } } elseif (isset($values['button_search']) && $values['button_search']) { - $html.= ''; + $html.= ''; } $html.= ''; } @@ -163,8 +164,7 @@ public function displayContent() if (count($this->collection) == 0) { $html.= ''; } else { foreach ($this->collection as $item) { diff --git a/classes/models/LengowOrder.php b/classes/models/LengowOrder.php index 3102d743..84d81ff9 100644 --- a/classes/models/LengowOrder.php +++ b/classes/models/LengowOrder.php @@ -140,6 +140,11 @@ class LengowOrder extends Order */ public $lengow_customer_name; + /** + * @var string email of the customer + */ + public $lengow_customer_email; + /** * @var string current lengow state */ @@ -220,6 +225,7 @@ protected function loadLengowFields() lo.`delivery_address_id`, lo.`delivery_country_iso`, lo.`customer_name`, + lo.`customer_email`, lo.`order_lengow_state`, lo.`order_item` FROM `'._DB_PREFIX_.'lengow_orders` lo @@ -244,6 +250,7 @@ protected function loadLengowFields() $this->lengow_delivery_address_id = (int)$result['delivery_address_id']; $this->lengow_delivery_country_iso = $result['delivery_country_iso']; $this->lengow_customer_name = $result['customer_name']; + $this->lengow_customer_email = $result['customer_email']; $this->lengow_state = $result['order_lengow_state']; $this->lengow_order_item = (int)$result['order_item']; return true; diff --git a/toolbox/config.php b/toolbox/config.php index 22a46ef5..bc87990f 100644 --- a/toolbox/config.php +++ b/toolbox/config.php @@ -116,7 +116,6 @@ 'LENGOW_IMPORT_FORCE_PRODUCT', 'LENGOW_IMPORT_PROCESSING_FEE', 'LENGOW_IMPORT_DAYS', - 'LENGOW_IMPORT_FAKE_EMAIL', 'LENGOW_IMPORT_SHIP_MP_ENABLED', 'LENGOW_IMPORT_STOCK_SHIP_MP', 'LENGOW_IMPORT_SINGLE_ENABLED' diff --git a/translations/en.csv b/translations/en.csv index 5c722a9f..6bc9639c 100644 --- a/translations/en.csv +++ b/translations/en.csv @@ -6,43 +6,45 @@ tab.order_setting|Orders settings tab.help|Help tab.main_setting|Main settings tab.legals|Legals -menu.product|products -menu.order|orders +menu.product|Products +menu.order|Orders +menu.jump_to_lengow|Jump to Lengow menu.preprod_active|Pre-production mode menu.order_overview|Overview menu.order_parameter|Settings +menu.help|Help +menu.global_parameter|Global parameters footer.legals|Legals -connect.screen.lengow|Lengow, 'easily sell everywhere' -connect.screen.lengow_presentation|Lengow is the ecommerce automation solution that helps retailers improve their performance, automate their business processes and grow internationally. -connect.screen.lengow_platform|Discover the Lengow platform and open the door to strong profitability and visibility for your products around the world on all distribution channels: marketplaces, comparison shopping engines, affiliate platforms and display/retargeting… -connect.screen.create_account|Create my 15 days-free account -connect.screen.connect_account|or Connect to your account -connect.screen.free_days_title|15 free days -connect.screen.free_days_text|No credit card, no commitment : just results -connect.screen.marketing_channels_title|1 800 marketing channels -connect.screen.marketing_channels_text|Be visible on the major players in your market -connect.screen.retailers_title|3500 retailers -connect.screen.retailers_channels_text|Some of the world's most respected retailers and brands trust Lengow -dashboard.screen.good_job|Good Job! You have -dashboard.screen.pending_order|Pending Orders -dashboard.screen.sell_everywhere|Why not go a step further, and start selling everywhere? -dashboard.screen.stat_with_lengow_you_make|With Lengow, you have made +footer.copyright_lengow|Copyright Lengow +dashboard.screen.welcome_back|Hi! Welcome back! +dashboard.screen.go_to_lengow|Go to Lengow +dashboard.screen.products_title|Products +dashboard.screen.products_text|Take a look at all your products available to prepare your catalogue +dashboard.screen.orders_title|Orders +dashboard.screen.orders_text|Manage your orders directly on your PrestaShop dashboard +dashboard.screen.settings_title|Settings +dashboard.screen.settings_text|Configure the main settings of your PrestaShop plugin +dashboard.screen.partner_business|Lengow, partner of your business dashboard.screen.stat_turnover|Turnover dashboard.screen.stat_nb_orders|Orders dashboard.screen.stat_avg_order|Average Order -dashboard.screen.stat_more_stats|Want more stats? Go to Lengow.com +dashboard.screen.stat_more_stats|Want more stats? +dashboard.screen.some_help_title|Need some help? +dashboard.screen.get_in_touch|Get in touch with Lengow +dashboard.screen.visit_help_center|Visit our Help Center +dashboard.screen.configure_plugin|for detailed information on how to configure properly your PrestaShop plugin product.screen.nb_exported|products exported product.screen.nb_available|products available product.screen.include_variation|Include product variations -product.screen.include_variation_support|Use this option if you sell your products only on shopbots. For marketplaces, you have to export all of your catalogue with variations +product.screen.include_variation_support|Use this option if you want to export all of your catalogue with variations product.screen.include_out_of_stock|Include out of stock products product.screen.include_out_of_stock_support|Use this option if you want to export out of stock products product.screen.include_specific_product|Include specific products product.screen.include_specific_product_support|Use this option to select your products one by one product.screen.your_exported_catalog|This is your export catalogue. Copy this link into your Lengow platform -product.screen.last_export|Last export +product.screen.last_export|Last indexation product.screen.no_export|No export -product.screen.no_result_found|Sorry, no results found for your search +product.screen.no_result_found|Sorry, no results found for your search.
Maybe, you can try to change your request ? product.screen.no_product_selected|Please select a product product.screen.date_from|From product.screen.date_to|To @@ -52,10 +54,10 @@ product.screen.button_yes|Yes product.screen.button_no|No product.screen.button_search|Search product.screen.select_all_products|Select all of your products (%{nb} products) -product.screen.add_confirmation|Do you really want to add %{nb} products in your selection? -product.screen.remove_confirmation|Do you really want to remove %{nb} products in your selection? +product.screen.add_confirmation|Do you really want to add %{nb} products to your selection? +product.screen.remove_confirmation|Do you really want to remove %{nb} products from your selection? product.screen.remove_from_export|Remove from export -product.screen.add_from_export|Add from export +product.screen.add_from_export|Add to export product.screen.lengow_shop_sync|Synchronized product.screen.lengow_shop_no_sync|Not synchronized product.table.id_product|ID @@ -72,7 +74,7 @@ order.screen.import_charge_first|Retrieving your orders... order.screen.import_charge_second|Please bear with us; this will not take long (2 min average waiting time) order.screen.all_order_will_be_sent_to|All order issue reports will be sent by mail to order.screen.change_this|Change this? -order.screen.last_order_importation|Last order importation +order.screen.last_order_importation|Last synchronisation order.screen.no_order_importation|No order importation for now order.screen.import_auto|Auto order.screen.import_manuel|Manual @@ -86,15 +88,15 @@ order.screen.not_sent|not sent order.screen.refresh_order|refresh order order.screen.order_not_imported|Order hasn't been imported into PrestaShop order.screen.action_sent|action sent -order.screen.action_waiting_return|Action sent, waiting returns -order.screen.action_sent_not_work|Action sent to the marketplace didn't work +order.screen.action_waiting_return|Action sent, waiting for response +order.screen.action_sent_not_work|Action sent to the marketplace failed order.screen.no_order_title|The best is yet to come! order.screen.no_order_description|Your products have great visibility and your sales are about to prosper! order.screen.action_success|Success order.screen.action_error|Error order.screen.status_not_synchronized|Not synchronized order.screen.status_accepted|Accepted -order.screen.status_waiting_shipment|Waiting shipment +order.screen.status_waiting_shipment|Waiting for shipment order.screen.status_shipped|Shipped order.screen.status_closed|Closed order.screen.status_refunded|Refunded @@ -111,18 +113,18 @@ order.table.order_item|Quantity order.table.total_paid|Total order.table.extra|Extra order_setting.screen.order_status_title|Order Status -order_setting.screen.order_status_description|It's time to match your Lengow platform order status with the following PrestaShop status +order_setting.screen.order_status_description|Match your Lengow order status to retrieve them easily among your orders order_setting.screen.carrier_management_title|Marketplace carrier management -order_setting.screen.carrier_management_description|For each country that you are active in, select the default carrier to apply to your orders. Then, match your marketplace carrier with the PrestaShop carrier -order_setting.screen.country_wt_carrier|Some countries may have no configured carriers, in which case, please go to +order_setting.screen.carrier_management_description|Select the default carrier that you would like to apply to your orders for each country that you are active in. Then, match your marketplace carrier with the PrestaShop carrier +order_setting.screen.country_wt_carrier|Some countries may have no configured carriers, in which case, please setup them order_setting.screen.country_wt_carrier_link|link order_setting.screen.default_country|default order_setting.screen.import_setting_title|Order import order_setting.screen.select_a_country|Please choose a country... -order_setting.screen.import_setting_description|Manage your import settings here for marketplace orders +order_setting.screen.import_setting_description|Manage your import settings here for marketplace orders order_setting.screen.nb_days|days order_setting.screen.cron_title|Cron settings -order_setting.screen.cron_description|Use the Crontab Module to import orders from Lengow +order_setting.screen.cron_description|Use the Crontab Module to import orders from Lengow order_setting.screen.cron_not_configured|Cron import is not configured in your PrestaShop order_setting.screen.cron_configured|Cron Import exists in your PrestaShop order_setting.screen.cron_if_not_exists|or @@ -134,25 +136,32 @@ order_setting.screen.no_default_carrier_selected|No default carrier selected order_setting.screen.confirmation_delete_carrier_country|Are you sure ? global_setting.screen.notification_alert_title|Notifications & alerts global_setting.screen.preprod_mode_title|Pre-production Mode -global_setting.screen.preprod_mode_description|Use pre-production mode for testing and to simulate fictitious orders. Please note that you have to activate this setting on your pre-production server ONLY +global_setting.screen.preprod_mode_description|Use pre-production mode for testing and to simulate fictitious orders. Please note that you have to activate this setting on your pre-production server ONLY global_setting.screen.log_file_title|Log Files global_setting.screen.log_file_description|Find all the maintenance logs below (imported orders, errors reports...). They will be recorded here for 20 days. global_setting.screen.please_choose_log|Please choose a log file... global_setting.screen.download_all_files|Download all files -global_setting.screen.uninstall_module|Uninstall the module completely -global_setting.screen.uninstall_module_description|Description uninstall module +global_setting.screen.uninstall_module|Remove the entire module +global_setting.screen.uninstall_module_description|Uninstall the entire module and all related data here global_setting.screen.all_data_will_be_lost|All data will be lost (tables and configuration) and you will lose order history -global_setting.screen.you_will_find_a_backup|After uninstalling the module, you will find a back-up of your Lengow database in +global_setting.screen.you_will_find_a_backup|After removing the module, you will find a back-up of your Lengow database in global_setting.screen.prestashop_backup|PrestaShop Backup -global_setting.screen.i_want_uninstall|I want to uninstall the Lengow module -global_setting.screen.button_i_want_uninstall|Delete Lengow +global_setting.screen.i_want_uninstall|I want to remove the Lengow module +global_setting.screen.button_i_want_uninstall|Remove Lengow Module global_setting.screen.title_modal_uninstall|Remove Lengow Module global_setting.screen.cancel_i_want_uninstall|Cancel -global_setting.screen.to_uninstall_type|To uninstall, type +global_setting.screen.to_uninstall_type|To remove, type global_setting.screen.button_download_file|Download log files global_setting.screen.button_save|Save changes help.screen.title|Get a little help from your support team ! -help.screen.content_text|Ask us anything about Lengow or share your feedback +help.screen.contain_text_support|Ask us anything about Lengow or share your feedback at +help.screen.mail_lengow_support|support@lengow.com. +help.screen.mail_lengow_support_title|Account Information : +help.screen.mailto_subject|Prestashop Lengow Plugin #Need assistance +help.screen.need_some_help|Need some help ? +help.screen.contain_text_support_hour|We’ll do our best to get back to you during regular business hours (Monday to Friday – 9am to 6pm / France Timezone). +help.screen.find_answer|You can also find answers in our +help.screen.link_prestashop_guide|PrestaShop dedicated guide lengow_setting.lengow_account_id_title|Account ID lengow_setting.lengow_access_token_title|Access Token lengow_setting.lengow_secret_token_title|Secret Token @@ -171,9 +180,9 @@ lengow_setting.lengow_order_id_shipped_title|Shipped orders lengow_setting.lengow_order_id_cancel_title|Cancelled orders lengow_setting.lengow_order_id_shippedbymp_title|Shipped marketplace orders lengow_setting.lengow_import_force_product_title|Force products -lengow_setting.lengow_import_force_product_legend|Enable this option if you want to automate the importing of out of stock and inactive products -lengow_setting.lengow_import_days_title|Re-import all orders made after -lengow_setting.lengow_import_days_legend|Activate this option if you have pending orders in error. It lets you re-import orders made since your last good period +lengow_setting.lengow_import_force_product_legend|Enable this option if you want to force the importing of out of stock/inactive products +lengow_setting.lengow_import_days_title|Re-import all orders made since +lengow_setting.lengow_import_days_legend|Activate this option if you have incorrect pending orders. It lets you re-import all orders that have been processed during this faulty period lengow_setting.lengow_import_processing_fee_title|Import processing fee lengow_setting.lengow_import_processing_fee_legend|Enable this option if you want to have marketplace processing fee inside your order lengow_setting.lengow_import_preprod_enabled_title|Activate Pre-production Mode @@ -183,7 +192,7 @@ lengow_setting.lengow_import_fake_mail_legend|When enabled, a fictitious email i lengow_setting.lengow_import_ship_mp_enabled_title|Import orders shipped by marketplaces lengow_setting.lengow_import_stock_ship_mp_title|I want to decrease my stock lengow_setting.lengow_import_stock_ship_mp_legend|This option is only available for orders shipped by marketplaces -lengow_setting.lengow_report_mail_enabled_title|I would like to be notified when there are issues regarding order importation and/or catalogue exportation +lengow_setting.lengow_report_mail_enabled_title|I would like to be notified when there are issues on order importation lengow_setting.lengow_report_mail_enabled_legend|We will send you this once a day lengow_setting.lengow_report_mail_address_title|Mail for the report email lengow_setting.lengow_import_single_enabled_title|Limited to one order per import process @@ -191,7 +200,7 @@ lengow_setting.lengow_import_single_enabled_legend|Useful for PrestaShop version lengow_setting.lengow_import_in_progress_title|Import in progress lengow_setting.lengow_last_import_cron_title|Last Cron import lengow_setting.lengow_last_import_manual_title|Last manual import -lengow_setting.lengow_cron_enabled_title|Use crontab module PrestaShop +lengow_setting.lengow_cron_enabled_title|Use Crontab module PrestaShop lengow_setting.lengow_global_token_title|Lengow global Token lengow_setting.lengow_authorized_ip_title|Authorised IP lengow_setting.lengow_authorized_ip_legend|Authorized IP separated by: @@ -202,9 +211,9 @@ lengow_setting.lengow_order_stat_update_title|Order statistics update lengow_log.error.nb_order_imported|%{nb_order} order(s) imported lengow_log.error.nb_order_updated|%{nb_order} order(s) updated lengow_log.error.nb_order_with_error|%{nb_order} order(s) with errors -lengow_log.error.account_id_empty|id account, access token or secret is empty in shop %{name_shop} (%{id_shop}) +lengow_log.error.account_id_empty|Account ID, Access Token or Secret is empty in shop %{name_shop} (%{id_shop}) lengow_log.error.account_id_already_used|account ID %{account_id} is already used by shop %{name_shop} (%{id_shop}) -lengow_log.error.import_in_progress|import has already started +lengow_log.error.import_in_progress|import has already begun lengow_log.error.rest_time_to_import|Please wait %{rest_time} seconds before re-importing orders lengow_log.error.no_product|no products in the order lengow_log.error.no_change_rate|no exchange rates available for order prices @@ -213,7 +222,7 @@ lengow_log.error.currency_not_available|currency %{currency_iso} is not availabl lengow_log.error.no_country_for_delivery_address|delivery address doesn't contain the country lengow_log.error.no_billing_address|no billing address in the order lengow_log.error.no_country_for_billing_address|billing address doesn't contain the country -lengow_log.error.order_not_found|Order can't be found in lengow feed +lengow_log.error.order_not_found|Order cannot be found in Lengow feed lengow_log.exception.product_not_be_found|product %{product_id} could not be found lengow_log.exception.product_is_a_parent|product %{product_id} is a parent ID. Product variation is needed lengow_log.exception.no_product_to_cart|no product to be added to cart @@ -226,7 +235,7 @@ lengow_log.exception.order_list_is_empty|order could not be saved lengow_log.exception.carrier_shipping_address_no_country|shipping address doesn't contain the country lengow_log.exception.no_default_carrier_for_country|you must select a default carrier for the country : %{country_name} lengow_log.exception.marketplace_not_present|the marketplace %{markeplace_name} does not feature in the marketplace list -lengow_log.exception.order_line_required|order Line require, but not found in order +lengow_log.exception.order_line_required|order line is required but cannot be not found in order lengow_log.exception.action_not_valid|action %{action} is not valid lengow_log.exception.marketplace_action_not_present|marketplace actions %{action} are not present lengow_log.exception.shop_id_require|shop ID is required @@ -242,7 +251,7 @@ lengow_log.exception.delivery_country_not_active|the country in the delivery add lengow_log.exception.product_is_not_listed|product %{product_id} is not listed as part of the current order lengow_log.exception.unable_to_save_order|unable to save PrestaShop order - %{error} lengow_log.exception.unable_to_save_order_payment|unable to save PrestaShop order payment -lengow_log.exception.timeout_api|API call was blocked by a timeout +lengow_log.exception.timeout_api|API call has been blocked by a timeout lengow_log.mail_report.order|Order %{marketplace_sku} lengow_log.mail_report.no_error_in_report_mail|no error message, contact support via https://supportlengow.zendesk.com/agent/ admin.order.import_lengow|Import Lengow @@ -254,6 +263,7 @@ admin.order.total_paid|Total amount paid on Marketplace admin.order.carrier_from_marketplace|Carrier from marketplace admin.order.method_from_marketplace|Shipping method from marketplace admin.order.tracking_number|Tracking number +admin.order.customer_email|Customer email admin.order.message|Message admin.order.shipped_by_marketplace|Shipped by marketplace admin.order.cancel_and_reimport|Cancel and re-import order @@ -263,9 +273,9 @@ log.install.install_tab|install tab %{class_name} log.install.uninstall_tab|uninstall tab %{class_name} log.hook.registering_hook_success|registering hook - %{hook}: success log.hook.registering_hook_error|registering hook - %{hook}: error -log.cron.creation_success|lengow import cron task sucessfully created -log.cron.creation_error|lengow import cron task could not be created -log.cron.delete_success|cron tasks sucessfully removed +log.cron.creation_success|Lengow import cron task sucessfully created +log.cron.creation_error|Lengow import cron task could not be created +log.cron.delete_success|cron task(s) sucessfully removed log.cron.delete_error|import and/or export cron task(s) could not be removed log.mail_report.send_mail_to|report email sent to %{emails} log.mail_report.unable_send_mail_to|unable to send report email to %{emails} @@ -273,18 +283,18 @@ log.export.start|## start export ## log.export.end|## end export ## log.export.start_for_shop|start export in shop %{name_shop} (%{id_shop}) log.export.nb_product_found|%{nb_product} product(s) found -log.export.count_product|%{product_count} products exported +log.export.count_product|%{product_count} product(s) exported log.export.export_failed|export failed - %{decoded_message} log.export.your_feed_available_here|your feed is available here: %{feed_url} log.export.error_folder_not_writable|export file generation did not end properly. Please make sure the export folder is writable log.export.error_no_product_combination|unable to retrieve product combinations -log.export.error_illegal_currency|illegal Currency +log.export.error_illegal_currency|illegal currency log.export.error_no_carrier_selected|you must select a default carrier in Lengow import parameters log.export.error_illegal_export_format|illegal export format -log.export.error_unable_to_create_folder|unable to create folder %{folder_path}. Make sure it is writeable +log.export.error_unable_to_create_folder|unable to create folder %{folder_path}. Make sure it is writable log.export.error_unable_to_create_file|unable to create file %{file_name} in %{folder_name} -log.export.error_cant_find_image_size|cant find Image type size, check your table ps_image_type -log.import.preprod_mode_active|warning ! Preprod mode is activated +log.export.error_cant_find_image_size|can't find image type size, check your table ps_image_type +log.import.preprod_mode_active|warning ! Pre-prod mode is activated log.import.start|## start %{type} import ## log.import.end|## end %{type} import ## log.import.start_for_shop|start import in shop %{name_shop} (%{id_shop}) @@ -294,41 +304,41 @@ log.import.nb_order_imported|%{nb_order} order(s) imported log.import.nb_order_updated|%{nb_order} order(s) updated log.import.nb_order_with_error|%{nb_order} order(s) with errors log.import.connector_get_order|get order with order id: %{marketplace_sku} and marketplace: %{markeplace_name} -log.import.connector_get_all_order|get orders between %{date_from} and %{date_to} with account ID: %{account_id} +log.import.connector_get_all_order|get orders between %{date_from} and %{date_to} for the account ID: %{account_id} log.import.error_already_created|%{decoded_message} (created on the %{date_message}) -log.import.external_id_exist|already imported in a Prestashop with order ID %{order_id} +log.import.external_id_exist|already imported in a PrestaShop with the order ID %{order_id} log.import.order_shipped_by_marketplace|order shipped by %{markeplace_name} -log.import.current_order_state_unavailable|current order's state [%{order_state_marketplace}] makes it unavailable to import for marketplace %{marketplace_name} +log.import.current_order_state_unavailable|current order's status [%{order_state_marketplace}] makes it unavailable to import for marketplace %{marketplace_name} log.import.order_successfully_imported|order successfully imported (ORDER ID %{order_id}) log.import.import_failed|import failed - %{decoded_message} log.import.order_import_failed|import order failed - %{decoded_message} -log.import.lengow_order_saved|order saved in lengow orders table -log.import.lengow_order_not_saved|WARNING ! Order could NOT be saved in lengow orders table -log.import.lengow_order_updated|order updated in lengow orders table -log.import.lengow_order_not_updated|WARNING ! Order could NOT be updated in lengow orders table -log.import.lengow_order_line_saved|save order lines product : %{order_line_saved} +log.import.lengow_order_saved|order saved in Lengow orders table +log.import.lengow_order_not_saved|WARNING ! Order could NOT be saved in Lengow orders table +log.import.lengow_order_updated|order updated in Lengow orders table +log.import.lengow_order_not_updated|WARNING ! Order could NOT be updated in Lengow orders table +log.import.lengow_order_line_saved|save order lines product: %{order_line_saved} log.import.quantity_back_shipped_by_marketplace|adding quantity back to stock (order shipped by marketplace) log.import.quantity_back_reimported_order|adding quantity back to stock (order is re-imported) log.import.order_already_imported|order already imported (ORDER ID %{order_id}) log.import.order_ready_to_reimport|order is ready to be re-imported (ORDER ID %{order_id}) -log.import.order_state_updated|order's state has been updated to %{state_name} +log.import.order_state_updated|order's status has been updated to %{state_name} log.import.rewrite_processing_fee|rewrite amount without processing fee log.import.rewrite_shipping_cost|rewrite amount without shipping cost log.import.generate_unique_email|generate unique email %{email} log.import.product_be_found|product id %{id_full} found with field %{attribute_name} (%{attribute_value}) log.import.product_advanced_search|product not found with field %{attribute_name} (%{attribute_value}). Using advanced search log.import.product_state_canceled|product %{product_id} could not be added to cart - status: %{state_product} -log.import.error_order_state_updated|error while updating state: %{error_message} +log.import.error_order_state_updated|error while updating status: %{error_message} log.import.error_no_package|import order failed - no package in the order log.import.error_wrong_package_number|import order failed - wrong package number log.import.error_no_delivery_address|import order failed - no delivery address in the order -log.import.error_carrier_not_found|carrier %{carrier_name} could not be found in your Prestashop +log.import.error_carrier_not_found|carrier %{carrier_name} could not be found in your PrestaShop log.import.error_mondial_relay_not_found|relay %{id_relay} could not be found log.import.error_mondial_relay_missing_file|missing file %{ps_module_dir}mondialrelay/classes/MRRelayDetail.php log.import.error_colissimo_missing_file|missing file %{ps_module_dir}socolissimo/classes/SCFields.php log.import.carrier_compatibility_ensured|carrier compatibility ensured with carrier %{carrier_name} -log.import.state_updated_to_shipped|state updated to shipped -log.import.state_updated_to_canceled|state updated to canceled +log.import.state_updated_to_shipped|status updated to shipped +log.import.state_updated_to_canceled|status updated to cancelled log.import.order_synchronized_with_lengow|order successfully synchronised with Lengow webservice (ORDER ID %{order_id}) log.import.order_not_synchronized_with_lengow|WARNING ! Order could NOT be synchronised with Lengow webservice (ORDER ID %{order_id}) log.order_action.call_tracking|call tracking @@ -338,22 +348,22 @@ log.connector.call_api|call %{curl_url} log.connector.error_api|call api failed - %{error_code} log.setting.setting_reset|All Lengow settings were reset log.setting.setting_updated|All Lengow settings were updated -log.setting.setting_change|%{key} - old value %{old_value} change by %{value} -log.setting.setting_change_for_shop|%{key} - old value %{old_value} change by %{value} for shop %{shop_id} +log.setting.setting_change|%{key} - old value %{old_value} replaced with %{value} +log.setting.setting_change_for_shop|%{key} - old value %{old_value} replaced with %{value} for shop %{shop_id} toolbox.menu.lengow_toolbox|Lengow Toolbox toolbox.menu.product|Products toolbox.menu.order|Orders toolbox.menu.configuration|Configuration toolbox.menu.checksum|Checksum toolbox.menu.log|Logs -toolbox.menu.log_off|Log Off -toolbox.index.checklist_information|Check-list +toolbox.menu.log_off|Log out +toolbox.index.checklist_information|Checklist toolbox.index.curl_message|Lengow needs the CURL PHP extension -toolbox.index.curl_help|The CURL extension is not installed or enabled in your PHP installation.Check the manual for information on how to install or enable CURL on your system +toolbox.index.curl_help|The CURL extension is not installed or enabled in your PHP installation. Check the manual to get more information on how to install or enable CURL on your system toolbox.index.curl_help_link|http://www.php.net/manual/en/curl.setup.php toolbox.index.curl_help_label|Go to Curl PHP extension manual toolbox.index.simple_xml_message|Lengow needs the SimpleXML PHP extension -toolbox.index.simple_xml_help|The SimpleXML extension is not installed or enabled in your PHP installation. Check the manual for information on how to install or enable SimpleXML on your system +toolbox.index.simple_xml_help|The SimpleXML extension is not installed or enabled in your PHP installation. Check the manual to get more information on how to install or enable SimpleXML on your system toolbox.index.simple_xml_help_link|http://www.php.net/manual/en/book.simplexml.php toolbox.index.simple_xml_help_label|Go to SimpleXML PHP extension manual toolbox.index.json_php_message|Lengow needs the JSON PHP extension @@ -361,33 +371,33 @@ toolbox.index.json_php_help|The JSON extension is not installed or enabled in yo toolbox.index.json_php_help_link|http://www.php.net/manual/fr/book.json.php toolbox.index.json_php_help_label|Go to JSON PHP extension manual toolbox.index.shop_functionality_message|Shop functionality -toolbox.index.shop_functionality_help|Shop functionality are disabled, order import will be impossible, please enable them in your products settings +toolbox.index.shop_functionality_help|Shop functionalities are disabled, order import is impossible: please enable them in the products settings section toolbox.index.mail_configuration_enabled|Email are enabled with custom settings -toolbox.index.email_desactived|Email are desactived -toolbox.index.error_mail_setting|Error mail settings, PS_MAIL_METHOD is 3 but this value is not allowed in Prestashop 1.4 +toolbox.index.email_desactived|Email are disabled +toolbox.index.error_mail_setting|Error on email settings: PS_MAIL_METHOD is 3 but this value is not allowed in Prestashop 1.4 toolbox.index.email_using_php_mail|Email using php mail function -toolbox.index.checksum_message|Verification plugin files -toolbox.index.checksum_help|Some files have been modified by the customer +toolbox.index.checksum_message|Plugin files check +toolbox.index.checksum_help|Some files have been changed by the customer toolbox.index.checksum_help_label|Go to Checksum page toolbox.index.global_information|Global information -toolbox.index.prestashop_version|Prestashop version +toolbox.index.prestashop_version|PrestaShop version toolbox.index.plugin_version|Plugin version toolbox.index.ip_server|Server IP -toolbox.index.ip_authorized|Ip authorised -toolbox.index.preprod_disabled|Preprod mode disabled -toolbox.index.cron_enable|Cron job set in the crontab Module +toolbox.index.ip_authorized|IP authorised +toolbox.index.preprod_disabled|Pre-production mode disabled +toolbox.index.cron_enable|Cron job set in the Crontab module toolbox.index.import_information|Import information (Global) toolbox.index.global_token|Import token toolbox.index.url_import|Import URL toolbox.index.import_in_progress|Import in progress -toolbox.index.no_import|no import in progress +toolbox.index.no_import|No import in progress toolbox.index.rest_time_to_import|wait %{rest_time} seconds before the next import toolbox.index.shop_last_import|Last import toolbox.index.shop_type_import|Last import type toolbox.index.last_import_none|none -toolbox.index.last_import_cron|cron +toolbox.index.last_import_cron|Cron toolbox.index.last_import_manual|manual -toolbox.index.export_information|Export information (By store) +toolbox.index.export_information|Export information (by store) toolbox.index.shop_active|Shop followed by Lengow toolbox.index.shop_export_token|Export token toolbox.index.shop_last_export|Last export @@ -396,11 +406,11 @@ toolbox.index.shop_product_exported|Products exported in the shop toolbox.index.url_export|Export URL for this shop toolbox.order.shop|Shop toolbox.order.markeplace_name|Marketplace -toolbox.order.order_sku|Sku Order +toolbox.order.order_sku|Sku order toolbox.order.delivery_address_id|Delivery address ID -toolbox.order.import_one_order|Import Order +toolbox.order.import_one_order|Import order toolbox.order.import_days|Import days -toolbox.order.import_shop_order|Import Orders +toolbox.order.import_shop_order|Import orders toolbox.order.import_all_order|Import all orders toolbox.order.order_import_success|Order %{marketplace_sku} from %{marketplace_name} is imported toolbox.order.order_import_failed|Order import failed (See logs for more information) @@ -409,15 +419,15 @@ toolbox.configuration.export_setting|Export settings toolbox.configuration.import_setting|Import settings toolbox.configuration.global_setting|Global settings toolbox.configuration.get_default_settings|Get default settings -toolbox.configuration.check_get_default_settings|Do you really want to reset all settings ? +toolbox.configuration.check_get_default_settings|Do you really want to reset all settings? toolbox.configuration.update_settings|Update settings -toolbox.configuration.check_update_settings|Do you really want to update settings and Lengow tables ? +toolbox.configuration.check_update_settings|Do you really want to update settings and Lengow tables? toolbox.configuration.button_save|Save settings -toolbox.checksum.checksum_integrity|File checksum integrity -toolbox.checksum.file_not_exists|checkmd5.csv file is not present. Verification is impossible ! +toolbox.checksum.checksum_integrity|File Checksum integrity +toolbox.checksum.file_not_exists|checkmd5.csv file is not available. Checking is impossible! toolbox.checksum.summary|Summary toolbox.checksum.file_checked|%{nb_file} files checked -toolbox.checksum.file_modified|%{nb_file} files modified -toolbox.checksum.list_modified_file|List of modified files +toolbox.checksum.file_modified|%{nb_file} files changed +toolbox.checksum.list_modified_file|Files changed list toolbox.log.log_files|Log Files toolbox.log.download_all|Download all files diff --git a/translations/fr.csv b/translations/fr.csv index 2230b7a8..2619da54 100644 --- a/translations/fr.csv +++ b/translations/fr.csv @@ -1,20 +1,22 @@ -menu.product|produits -menu.order|commandes -menu.preprod_active|mode préproduction +menu.product|Produits +menu.order|Commandes +menu.preprod_active|Mode préproduction menu.order_overview|Vue d'ensemble menu.order_parameter|Paramètres -connect.screen.lengow|Lengow, 'easily sell everywhere' -connect.screen.lengow_presentation|Lengow est la solution d'automatisation de commerce électronique qui aide les détaillants à améliorer leurs performances, d'automatiser leurs processus d'affaires et de croître à l'échelle internationale. -connect.screen.lengow_platform|Découvrez la plate-forme Lengow et ouvrir la porte à une forte rentabilité et la visibilité de vos produits dans le monde entier sur tous les canaux de distribution : les marchés , les moteurs de comparaison de prix , les plates-formes d'affiliation et de l'affichage / retargeting ... -connect.screen.create_account|Créer mon compte gratuit pendant 15 jours -connect.screen.connect_account|ou me connecter à mon compte -connect.screen.free_days_title|15 jours gratuits -connect.screen.free_days_text|Pas de carte de crédit, aucun engagement : juste du résultat +connect.screen.free_days_title|15 free days +connect.screen.free_days_text|No credit card, no commitment : just results connect.screen.marketing_channels_title|1 800 marketing channels -connect.screen.marketing_channels_text|Soyez visible sur les principaux acteurs de votre marché -connect.screen.retailers_title|3500 detaillants -connect.screen.retailers_channels_text|De nombreux détaillants et marques les plus respectées dans le monde font confiance à Lengow +connect.screen.marketing_channels_text|Be visible on the major players in your market +connect.screen.retailers_title|3500 retailers +connect.screen.retailers_channels_text|Some of the world's most respected retailers and brands trust Lengow footer.legals|Mentions légales +dashboard.screen.products_title|Produits +dashboard.screen.products_text|Jetez un oeil à tous vos produits disponibles pour préparer votre catalogue +dashboard.screen.orders_title|Commandes +dashboard.screen.orders_text|Gérer vos commandes directement sur votre tableau de bord PrestaShop +dashboard.screen.settings_title|Paramètres +dashboard.screen.settings_text|Configurer les principaux paramètres de votre plugin PrestaShop +dashboard.screen.partner_business|Lengow, partenaire de votre entreprise dashboard.screen.good_job|Bon travail ! Vous avez dashboard.screen.pending_order|Commandes en attente dashboard.screen.sell_everywhere|Passez à l'étape supérieure et vendez vos produits partout dans le monde ! @@ -22,7 +24,11 @@ dashboard.screen.stat_with_lengow_you_make|Vos ventes avec Lengow dashboard.screen.stat_turnover|Chiffre d'affaires dashboard.screen.stat_nb_orders|Commandes dashboard.screen.stat_avg_order|Panier moyen -dashboard.screen.stat_more_stats|Vous voulez accéder à plus de statistiques ? Rendez-vous sur Lengow.com +dashboard.screen.stat_more_stats|Plus de statistiques ? +dashboard.screen.some_help_title|Besoin d'aide? +dashboard.screen.get_in_touch|Restez en contact avec Lengow +dashboard.screen.visit_help_center|Visitez notre Help Center +dashboard.screen.configure_plugin|pour des informations détaillées sur la façon de configurer correctement votre plugin PrestaShop product.screen.nb_exported|produits exportés product.screen.nb_available|produits disponibles product.screen.include_variation|Inclure les produits déclinés @@ -103,8 +109,6 @@ global_setting.screen.cancel_i_want_uninstall|Annuler global_setting.screen.to_uninstall_type|Pour désinstaller, écrivez global_setting.screen.button_download_all|Télécharger tous les fichiers global_setting.screen.button_save|Sauvegarder les changements -help.screen.title|Titre de la page -help.screen.content_text|Demandez-nous quelque chose sur Lengow lengow_setting.lengow_account_id_title|ID du compte lengow_setting.lengow_access_token_title|Token d'accès lengow_setting.lengow_secret_token_title|Token secret diff --git a/translations/yml/en.yml b/translations/yml/en.yml index ffe7214b..15787baf 100644 --- a/translations/yml/en.yml +++ b/translations/yml/en.yml @@ -12,37 +12,26 @@ en: menu: product: "Products" order: "Orders" + jump_to_lengow: "Jump to Lengow" preprod_active: "Pre-production mode" order_overview: "Overview" order_parameter: "Settings" + help: "Help" + global_parameter: "Global parameters" footer: legals: "Legals" - connect: - screen: - lengow: "Lengow, 'easily sell everywhere'" - lengow_presentation: "Lengow is the ecommerce automation solution that helps retailers improve their performance, automate their business processes and grow internationally." - lengow_platform: "Discover the Lengow platform and open the door to strong profitability and visibility for your products around the world on all distribution channels: marketplaces, comparison shopping engines, affiliate platforms and display/retargeting…" - create_account: "Create my 15 days-free account" - connect_account: "or Connect to your account" - free_days_title: "15 free days" - free_days_text: "No credit card, no commitment : just results" - marketing_channels_title: "1 800 marketing channels" - marketing_channels_text: "Be visible on the major players in your market" - retailers_title: "3500 retailers" - retailers_channels_text: "Some of the world's most respected retailers and brands trust Lengow" + copyright_lengow: "Copyright Lengow" dashboard: screen: - product_title: "Products" - product_text: "Take a look at all your products available to prepare your catalogue" + welcome_back: "Hi! Welcome back!" + go_to_lengow: "Go to Lengow" + products_title: "Products" + products_text: "Take a look at all your products available to prepare your catalogue" orders_title: "Orders" orders_text: "Manage your orders directly on your PrestaShop dashboard" settings_title: "Settings" settings_text: "Configure the main settings of your PrestaShop plugin" partner_business: "Lengow, partner of your business" - good_job: "Good Job! You have" - pending_order: "Pending Orders" - sell_everywhere: "Why not go a step further, and start selling everywhere?" - stat_with_lengow_you_make: "With Lengow, you have made" stat_turnover: "Turnover" stat_nb_orders: "Orders" stat_avg_order: "Average Order" @@ -51,22 +40,20 @@ en: get_in_touch: "Get in touch with Lengow" visit_help_center: "Visit our Help Center" configure_plugin: "for detailed information on how to configure properly your PrestaShop plugin" - product: screen: nb_exported: "products exported" nb_available: "products available" include_variation: "Include product variations" - include_variation_support: "Use this option if you sell your products only on shopbots. For marketplaces, you have to export all of your catalogue with variations" + include_variation_support: "Use this option if you want to export all of your catalogue with variations" include_out_of_stock: "Include out of stock products" include_out_of_stock_support: "Use this option if you want to export out of stock products" include_specific_product: "Include specific products" include_specific_product_support: "Use this option to select your products one by one" your_exported_catalog: "This is your export catalogue. Copy this link into your Lengow platform" - last_export: "Last export" + last_export: "Last indexation" no_export: "No export" - no_result_found_title: "Sorry, we've found nothing." - no_result_found_description: "Maybe, you can try to change your request to find your order ?" + no_result_found: "Sorry, no results found for your search.\nMaybe, you can try to change your request ?" no_product_selected: "Please select a product" date_from: "From" date_to: "To" @@ -76,10 +63,10 @@ en: button_no: "No" button_search: "Search" select_all_products: "Select all of your products (%{nb} products)" - add_confirmation: "Do you really want to add %{nb} products in your selection?" - remove_confirmation: "Do you really want to remove %{nb} products in your selection?" + add_confirmation: "Do you really want to add %{nb} products to your selection?" + remove_confirmation: "Do you really want to remove %{nb} products from your selection?" remove_from_export: "Remove from export" - add_from_export: "Add from export" + add_from_export: "Add to export" lengow_shop_sync: "Synchronized" lengow_shop_no_sync: "Not synchronized" table: @@ -97,11 +84,11 @@ en: screen: import_charge_first: "Retrieving your orders..." import_charge_second: "Please bear with us; this will not take long (2 min average waiting time)" - all_order_will_be_sent_to : "All order issue reports will be sent by mail to" + all_order_will_be_sent_to: "All order issue reports will be sent by mail to" change_this: "Change this?" - last_order_importation: "Last order importation" + last_order_importation: "Last synchronisation" no_order_importation: "No order importation for now" - import_auto : "Auto" + import_auto: "Auto" import_manuel: "Manual" button_update_orders: "Import Orders" button_reimport_order: "Re-import Orders" @@ -113,15 +100,15 @@ en: refresh_order: "refresh order" order_not_imported: "Order hasn't been imported into PrestaShop" action_sent: "action sent" - action_waiting_return: "Action sent, waiting returns" - action_sent_not_work: "Action sent to the marketplace didn't work" + action_waiting_return: "Action sent, waiting for response" + action_sent_not_work: "Action sent to the marketplace failed" no_order_title: "The best is yet to come!" - no_order_description: "Your future customers don't know yet how good your products are!" + no_order_description: "Your products have great visibility and your sales are about to prosper!" action_success: "Success" action_error: "Error" status_not_synchronized: "Not synchronized" status_accepted: "Accepted" - status_waiting_shipment: "Waiting shipment" + status_waiting_shipment: "Waiting for shipment" status_shipped: "Shipped" status_closed: "Closed" status_refunded: "Refunded" @@ -141,10 +128,10 @@ en: order_setting: screen: order_status_title: "Order Status" - order_status_description: "It's time to match your Lengow platform order status with the following PrestaShop status" + order_status_description: "Match your Lengow order status to retrieve them easily among your orders" carrier_management_title: "Marketplace carrier management" - carrier_management_description: "For each country that you are active in, select the default carrier to apply to your orders. Then, match your marketplace carrier with the PrestaShop carrier" - country_wt_carrier: "Some countries may have no configured carriers, in which case, please go to" + carrier_management_description: "Select the default carrier that you would like to apply to your orders for each country that you are active in. Then, match your marketplace carrier with the PrestaShop carrier" + country_wt_carrier: "Some countries may have no configured carriers, in which case, please setup them" country_wt_carrier_link: "link" default_country: "default" import_setting_title: "Order import" @@ -152,7 +139,7 @@ en: import_setting_description: "Manage your import settings here for marketplace orders " nb_days: "days" cron_title: "Cron settings" - cron_description: "Use the Crontab Module to import orders from Lengow" + cron_description: "Use the Crontab Module to import orders from Lengow" cron_not_configured: "Cron import is not configured in your PrestaShop" cron_configured: "Cron Import exists in your PrestaShop" cron_if_not_exists: "or" @@ -171,22 +158,29 @@ en: log_file_description: "Find all the maintenance logs below (imported orders, errors reports...). They will be recorded here for 20 days." please_choose_log: "Please choose a log file..." download_all_files: "Download all files" - uninstall_module: "Uninstall the module completely" - uninstall_module_description: "Description uninstall module" + uninstall_module: "Remove the entire module" + uninstall_module_description: "Uninstall the entire module and all related data here" all_data_will_be_lost: "All data will be lost (tables and configuration) and you will lose order history" - you_will_find_a_backup: "After uninstalling the module, you will find a back-up of your Lengow database in" + you_will_find_a_backup: "After removing the module, you will find a back-up of your Lengow database in" prestashop_backup: "PrestaShop Backup" - i_want_uninstall: "I want to uninstall the Lengow module" - button_i_want_uninstall: "Uninstall Lengow module" + i_want_uninstall: "I want to remove the Lengow module" + button_i_want_uninstall: "Remove Lengow Module" title_modal_uninstall: "Remove Lengow Module" cancel_i_want_uninstall: "Cancel" - to_uninstall_type: "To uninstall, type" + to_uninstall_type: "To remove, type" button_download_file: "Download log files" button_save: "Save changes" help: screen: title: "Get a little help from your support team !" - content_text: "Ask us anything about Lengow or share your feedback" + contain_text_support: "Ask us anything about Lengow or share your feedback at " + mail_lengow_support: "support@lengow.com." + mail_lengow_support_title: "Account Information :" + mailto_subject: "Prestashop Lengow Plugin #Need assistance" + need_some_help: "Need some help ?" + contain_text_support_hour: "We’ll do our best to get back to you during regular business hours (Monday to Friday – 9am to 6pm / France Timezone)." + find_answer: "You can also find answers in our " + link_prestashop_guide: "PrestaShop dedicated guide" lengow_setting: lengow_account_id_title: "Account ID" lengow_access_token_title: "Access Token" @@ -206,9 +200,9 @@ en: lengow_order_id_cancel_title: "Cancelled orders" lengow_order_id_shippedbymp_title: "Shipped marketplace orders" lengow_import_force_product_title: "Force products" - lengow_import_force_product_legend: "Enable this option if you want to automate the importing of out of stock and inactive products" - lengow_import_days_title: "Re-import all orders made after " - lengow_import_days_legend: "Activate this option if you have pending orders in error. It lets you re-import orders made since your last good period" + lengow_import_force_product_legend: "Enable this option if you want to force the importing of out of stock/inactive products" + lengow_import_days_title: "Re-import all orders made since" + lengow_import_days_legend: "Activate this option if you have incorrect pending orders. It lets you re-import all orders that have been processed during this faulty period" lengow_import_processing_fee_title: "Import processing fee" lengow_import_processing_fee_legend: "Enable this option if you want to have marketplace processing fee inside your order" lengow_import_preprod_enabled_title: "Activate Pre-production Mode" @@ -218,7 +212,7 @@ en: lengow_import_ship_mp_enabled_title: "Import orders shipped by marketplaces" lengow_import_stock_ship_mp_title: "I want to decrease my stock" lengow_import_stock_ship_mp_legend: "This option is only available for orders shipped by marketplaces" - lengow_report_mail_enabled_title: "I would like to be notified when there are issues regarding order importation and/or catalogue exportation" + lengow_report_mail_enabled_title: "I would like to be notified when there are issues on order importation" lengow_report_mail_enabled_legend: "We will send you this once a day" lengow_report_mail_address_title: "Mail for the report email" lengow_import_single_enabled_title: "Limited to one order per import process" @@ -226,7 +220,7 @@ en: lengow_import_in_progress_title: "Import in progress" lengow_last_import_cron_title: "Last Cron import" lengow_last_import_manual_title: "Last manual import" - lengow_cron_enabled_title: "Use crontab module PrestaShop" + lengow_cron_enabled_title: "Use Crontab module PrestaShop" lengow_global_token_title: "Lengow global Token" lengow_authorized_ip_title: "Authorised IP" lengow_authorized_ip_legend: "Authorized IP separated by:" @@ -239,9 +233,9 @@ en: nb_order_imported: "%{nb_order} order(s) imported" nb_order_updated: "%{nb_order} order(s) updated" nb_order_with_error: "%{nb_order} order(s) with errors" - account_id_empty: "id account, access token or secret is empty in shop %{name_shop} (%{id_shop})" + account_id_empty: "Account ID, Access Token or Secret is empty in shop %{name_shop} (%{id_shop})" account_id_already_used: "account ID %{account_id} is already used by shop %{name_shop} (%{id_shop})" - import_in_progress: "import has already started" + import_in_progress: "import has already begun" rest_time_to_import: "Please wait %{rest_time} seconds before re-importing orders" no_product: "no products in the order" no_change_rate: "no exchange rates available for order prices" @@ -250,7 +244,7 @@ en: no_country_for_delivery_address: "delivery address doesn't contain the country" no_billing_address: "no billing address in the order" no_country_for_billing_address: "billing address doesn't contain the country" - order_not_found: "Order can't be found in lengow feed" + order_not_found: "Order cannot be found in Lengow feed" exception: product_not_be_found: "product %{product_id} could not be found" product_is_a_parent: "product %{product_id} is a parent ID. Product variation is needed" @@ -264,7 +258,7 @@ en: carrier_shipping_address_no_country: "shipping address doesn't contain the country" no_default_carrier_for_country: "you must select a default carrier for the country : %{country_name}" marketplace_not_present: "the marketplace %{markeplace_name} does not feature in the marketplace list" - order_line_required: "order Line require, but not found in order" + order_line_required: "order line is required but cannot be not found in order" action_not_valid: "action %{action} is not valid" marketplace_action_not_present: "marketplace actions %{action} are not present" shop_id_require: "shop ID is required" @@ -280,7 +274,7 @@ en: product_is_not_listed: "product %{product_id} is not listed as part of the current order" unable_to_save_order: "unable to save PrestaShop order - %{error}" unable_to_save_order_payment: "unable to save PrestaShop order payment" - timeout_api: "API call was blocked by a timeout" + timeout_api: "API call has been blocked by a timeout" mail_report: order: "Order %{marketplace_sku}" no_error_in_report_mail: "no error message, contact support via https://supportlengow.zendesk.com/agent/" @@ -295,6 +289,7 @@ en: carrier_from_marketplace: "Carrier from marketplace" method_from_marketplace: "Shipping method from marketplace" tracking_number: "Tracking number" + customer_email: "Customer email" message: "Message" shipped_by_marketplace: "Shipped by marketplace" cancel_and_reimport: "Cancel and re-import order" diff --git a/translations/yml/fr.yml b/translations/yml/fr.yml index 8bb7a732..c3cb3b38 100644 --- a/translations/yml/fr.yml +++ b/translations/yml/fr.yml @@ -15,23 +15,10 @@ fr: retailers_channels_text: "Some of the world's most respected retailers and brands trust Lengow" footer: legals: "Mentions légales" - connect: - screen: - lengow: "Lengow, 'easily sell everywhere'" - lengow_presentation: "Lengow est la solution d'automatisation de commerce électronique qui aide les détaillants à améliorer leurs performances, d'automatiser leurs processus d'affaires et de croître à l'échelle internationale." - lengow_platform: "Découvrez la plate-forme Lengow et ouvrir la porte à une forte rentabilité et la visibilité de vos produits dans le monde entier sur tous les canaux de distribution : les marchés , les moteurs de comparaison de prix , les plates-formes d'affiliation et de l'affichage / retargeting ..." - create_account: "Créer mon compte gratuit pendant 15 jours" - connect_account: "ou me connecter à mon compte" - free_days_title: "15 jours gratuits" - free_days_text: "Pas de carte de crédit, aucun engagement : juste du résultat" - marketing_channels_title: "1 800 marketing channels" - marketing_channels_text: "Soyez visible sur les principaux acteurs de votre marché" - retailers_title: "3500 detaillants" - retailers_channels_text: "De nombreux détaillants et marques les plus respectées dans le monde font confiance à Lengow" dashboard: screen: - product_title: "Produits" - product_text: "Jetez un oeil à tous vos produits disponibles pour préparer votre catalogue" + products_title: "Produits" + products_text: "Jetez un oeil à tous vos produits disponibles pour préparer votre catalogue" orders_title: "Commandes" orders_text: "Gérer vos commandes directement sur votre tableau de bord PrestaShop" settings_title: "Paramètres" @@ -139,10 +126,6 @@ fr: to_uninstall_type: "Pour désinstaller, écrivez" button_download_all: "Télécharger tous les fichiers" button_save: "Sauvegarder les changements" - help: - screen: - title: "Titre de la page" - content_text: "Demandez-nous quelque chose sur Lengow" lengow_setting: lengow_account_id_title: "ID du compte" lengow_access_token_title: "Token d'accès" diff --git a/translations/yml/log.yml b/translations/yml/log.yml index 12c363d0..6c37484d 100644 --- a/translations/yml/log.yml +++ b/translations/yml/log.yml @@ -7,9 +7,9 @@ en: registering_hook_success: "registering hook - %{hook}: success" registering_hook_error: "registering hook - %{hook}: error" cron: - creation_success: "lengow import cron task sucessfully created" - creation_error: "lengow import cron task could not be created" - delete_success: "cron tasks sucessfully removed" + creation_success: "Lengow import cron task sucessfully created" + creation_error: "Lengow import cron task could not be created" + delete_success: "cron task(s) sucessfully removed" delete_error: "import and/or export cron task(s) could not be removed" mail_report: send_mail_to: "report email sent to %{emails}" @@ -19,19 +19,19 @@ en: end: "## end export ##" start_for_shop: "start export in shop %{name_shop} (%{id_shop})" nb_product_found: "%{nb_product} product(s) found" - count_product: "%{product_count} products exported" + count_product: "%{product_count} product(s) exported" export_failed: "export failed - %{decoded_message}" your_feed_available_here: "your feed is available here: %{feed_url}" error_folder_not_writable: "export file generation did not end properly. Please make sure the export folder is writable" error_no_product_combination: "unable to retrieve product combinations" - error_illegal_currency: "illegal Currency" + error_illegal_currency: "illegal currency" error_no_carrier_selected: "you must select a default carrier in Lengow import parameters" error_illegal_export_format: "illegal export format" - error_unable_to_create_folder: "unable to create folder %{folder_path}. Make sure it is writeable" + error_unable_to_create_folder: "unable to create folder %{folder_path}. Make sure it is writable" error_unable_to_create_file: "unable to create file %{file_name} in %{folder_name}" - error_cant_find_image_size: "cant find Image type size, check your table ps_image_type" + error_cant_find_image_size: "can't find image type size, check your table ps_image_type" import: - preprod_mode_active: "warning ! Preprod mode is activated" + preprod_mode_active: "warning ! Pre-prod mode is activated" start: "## start %{type} import ##" end: "## end %{type} import ##" start_for_shop: "start import in shop %{name_shop} (%{id_shop})" @@ -41,41 +41,41 @@ en: nb_order_updated: "%{nb_order} order(s) updated" nb_order_with_error: "%{nb_order} order(s) with errors" connector_get_order: "get order with order id: %{marketplace_sku} and marketplace: %{markeplace_name}" - connector_get_all_order: "get orders between %{date_from} and %{date_to} with account ID: %{account_id}" + connector_get_all_order: "get orders between %{date_from} and %{date_to} for the account ID: %{account_id}" error_already_created: "%{decoded_message} (created on the %{date_message})" - external_id_exist: "already imported in a Prestashop with order ID %{order_id}" + external_id_exist: "already imported in a PrestaShop with the order ID %{order_id}" order_shipped_by_marketplace: "order shipped by %{markeplace_name}" - current_order_state_unavailable: "current order's state [%{order_state_marketplace}] makes it unavailable to import for marketplace %{marketplace_name}" + current_order_state_unavailable: "current order's status [%{order_state_marketplace}] makes it unavailable to import for marketplace %{marketplace_name}" order_successfully_imported: "order successfully imported (ORDER ID %{order_id})" import_failed: "import failed - %{decoded_message}" order_import_failed: "import order failed - %{decoded_message}" - lengow_order_saved: "order saved in lengow orders table" - lengow_order_not_saved: "WARNING ! Order could NOT be saved in lengow orders table" - lengow_order_updated: "order updated in lengow orders table" - lengow_order_not_updated: "WARNING ! Order could NOT be updated in lengow orders table" - lengow_order_line_saved: "save order lines product : %{order_line_saved}" + lengow_order_saved: "order saved in Lengow orders table" + lengow_order_not_saved: "WARNING ! Order could NOT be saved in Lengow orders table" + lengow_order_updated: "order updated in Lengow orders table" + lengow_order_not_updated: "WARNING ! Order could NOT be updated in Lengow orders table" + lengow_order_line_saved: "save order lines product: %{order_line_saved}" quantity_back_shipped_by_marketplace: "adding quantity back to stock (order shipped by marketplace)" quantity_back_reimported_order: "adding quantity back to stock (order is re-imported)" order_already_imported: "order already imported (ORDER ID %{order_id})" order_ready_to_reimport: "order is ready to be re-imported (ORDER ID %{order_id})" - order_state_updated: "order's state has been updated to %{state_name}" + order_state_updated: "order's status has been updated to %{state_name}" rewrite_processing_fee: "rewrite amount without processing fee" rewrite_shipping_cost: "rewrite amount without shipping cost" generate_unique_email: "generate unique email %{email}" product_be_found: "product id %{id_full} found with field %{attribute_name} (%{attribute_value})" product_advanced_search: "product not found with field %{attribute_name} (%{attribute_value}). Using advanced search" product_state_canceled: "product %{product_id} could not be added to cart - status: %{state_product}" - error_order_state_updated: "error while updating state: %{error_message}" + error_order_state_updated: "error while updating status: %{error_message}" error_no_package: "import order failed - no package in the order" error_wrong_package_number: "import order failed - wrong package number" error_no_delivery_address: "import order failed - no delivery address in the order" - error_carrier_not_found: "carrier %{carrier_name} could not be found in your Prestashop" + error_carrier_not_found: "carrier %{carrier_name} could not be found in your PrestaShop" error_mondial_relay_not_found: "relay %{id_relay} could not be found" error_mondial_relay_missing_file: "missing file %{ps_module_dir}mondialrelay/classes/MRRelayDetail.php" error_colissimo_missing_file: "missing file %{ps_module_dir}socolissimo/classes/SCFields.php" carrier_compatibility_ensured: "carrier compatibility ensured with carrier %{carrier_name}" - state_updated_to_shipped: "state updated to shipped" - state_updated_to_canceled: "state updated to canceled" + state_updated_to_shipped: "status updated to shipped" + state_updated_to_canceled: "status updated to cancelled" order_synchronized_with_lengow: "order successfully synchronised with Lengow webservice (ORDER ID %{order_id})" order_not_synchronized_with_lengow: "WARNING ! Order could NOT be synchronised with Lengow webservice (ORDER ID %{order_id})" order_action: @@ -88,8 +88,8 @@ en: setting: setting_reset: "All Lengow settings were reset" setting_updated: "All Lengow settings were updated" - setting_change: "%{key} - old value %{old_value} change by %{value}" - setting_change_for_shop: "%{key} - old value %{old_value} change by %{value} for shop %{shop_id}" + setting_change: "%{key} - old value %{old_value} replaced with %{value}" + setting_change_for_shop: "%{key} - old value %{old_value} replaced with %{value} for shop %{shop_id}" toolbox: menu: lengow_toolbox: "Lengow Toolbox" @@ -98,15 +98,15 @@ en: configuration: "Configuration" checksum: "Checksum" log: "Logs" - log_off: "Log Off" + log_off: "Log out" index: - checklist_information: "Check-list" + checklist_information: "Checklist" curl_message: "Lengow needs the CURL PHP extension" - curl_help: "The CURL extension is not installed or enabled in your PHP installation.Check the manual for information on how to install or enable CURL on your system" + curl_help: "The CURL extension is not installed or enabled in your PHP installation. Check the manual to get more information on how to install or enable CURL on your system" curl_help_link: "http://www.php.net/manual/en/curl.setup.php" curl_help_label: "Go to Curl PHP extension manual" simple_xml_message: "Lengow needs the SimpleXML PHP extension" - simple_xml_help: "The SimpleXML extension is not installed or enabled in your PHP installation. Check the manual for information on how to install or enable SimpleXML on your system" + simple_xml_help: "The SimpleXML extension is not installed or enabled in your PHP installation. Check the manual to get more information on how to install or enable SimpleXML on your system" simple_xml_help_link: "http://www.php.net/manual/en/book.simplexml.php" simple_xml_help_label: "Go to SimpleXML PHP extension manual" json_php_message: "Lengow needs the JSON PHP extension" @@ -114,33 +114,33 @@ en: json_php_help_link: "http://www.php.net/manual/fr/book.json.php" json_php_help_label: "Go to JSON PHP extension manual" shop_functionality_message: "Shop functionality" - shop_functionality_help: "Shop functionality are disabled, order import will be impossible, please enable them in your products settings" + shop_functionality_help: "Shop functionalities are disabled, order import is impossible: please enable them in the products settings section" mail_configuration_enabled: "Email are enabled with custom settings" - email_desactived: "Email are desactived" - error_mail_setting: "Error mail settings, PS_MAIL_METHOD is 3 but this value is not allowed in Prestashop 1.4" + email_desactived: "Email are disabled" + error_mail_setting: "Error on email settings: PS_MAIL_METHOD is 3 but this value is not allowed in Prestashop 1.4" email_using_php_mail: "Email using php mail function" - checksum_message: "Verification plugin files" - checksum_help: "Some files have been modified by the customer" + checksum_message: "Plugin files check" + checksum_help: "Some files have been changed by the customer" checksum_help_label: "Go to Checksum page" global_information: "Global information" - prestashop_version: "Prestashop version" + prestashop_version: "PrestaShop version" plugin_version: "Plugin version" ip_server: "Server IP" - ip_authorized: "Ip authorised" - preprod_disabled: "Preprod mode disabled" - cron_enable: "Cron job set in the crontab Module" + ip_authorized: "IP authorised" + preprod_disabled: "Pre-production mode disabled" + cron_enable: "Cron job set in the Crontab module" import_information: "Import information (Global)" global_token: "Import token" url_import: "Import URL" import_in_progress: "Import in progress" - no_import: "no import in progress" + no_import: "No import in progress" rest_time_to_import: "wait %{rest_time} seconds before the next import" shop_last_import: "Last import" shop_type_import: "Last import type" last_import_none: "none" - last_import_cron: "cron" + last_import_cron: "Cron" last_import_manual: "manual" - export_information: "Export information (By store)" + export_information: "Export information (by store)" shop_active: "Shop followed by Lengow" shop_export_token: "Export token" shop_last_export: "Last export" @@ -150,14 +150,14 @@ en: order: shop: "Shop" markeplace_name: "Marketplace" - order_sku: "Sku Order" + order_sku: "Sku order" delivery_address_id: "Delivery address ID" import_one_order: "Import one order" import_days: "Import days" import_shop_order: "Import shop orders" import_all_order: "Import all orders" - import_one_order: "Import Order" - import_shop_order: "Import Orders" + import_one_order: "Import order" + import_shop_order: "Import orders" order_import_success: "Order %{marketplace_sku} from %{marketplace_name} is imported" order_import_failed: "Order import failed (See logs for more information)" configuration: @@ -166,17 +166,17 @@ en: import_setting: "Import settings" global_setting: "Global settings" get_default_settings: "Get default settings" - check_get_default_settings: "Do you really want to reset all settings ?" + check_get_default_settings: "Do you really want to reset all settings?" update_settings: "Update settings" - check_update_settings: "Do you really want to update settings and Lengow tables ?" + check_update_settings: "Do you really want to update settings and Lengow tables?" button_save: "Save settings" checksum: - checksum_integrity: "File checksum integrity" - file_not_exists: "checkmd5.csv file is not present. Verification is impossible !" + checksum_integrity: "File Checksum integrity" + file_not_exists: "checkmd5.csv file is not available. Checking is impossible!" summary: "Summary" file_checked: "%{nb_file} files checked" - file_modified: "%{nb_file} files modified" - list_modified_file: "List of modified files" - log: + file_modified: "%{nb_file} files changed" + list_modified_file: "Files changed list" + log: log_files: "Log Files" download_all: "Download all files" \ No newline at end of file diff --git a/upgrade/update_3.0.0.php b/upgrade/update_3.0.0.php index 9202c83e..f1015a88 100644 --- a/upgrade/update_3.0.0.php +++ b/upgrade/update_3.0.0.php @@ -250,6 +250,7 @@ `delivery_address_id` INT(11) UNSIGNED NULL, `delivery_country_iso` VARCHAR(3) NULL, `customer_name` VARCHAR(255) NULL, + `customer_email` VARCHAR(255) NULL, `order_lengow_state` VARCHAR(32) NOT NULL, `currency` VARCHAR(3) NULL, PRIMARY KEY(id) , @@ -365,6 +366,11 @@ 'ALTER TABLE '._DB_PREFIX_.'lengow_orders ADD `customer_name` VARCHAR(255) NULL' ); } + if (!LengowInstall::checkFieldExists('lengow_orders', 'customer_email')) { + Db::getInstance()->execute( + 'ALTER TABLE '._DB_PREFIX_.'lengow_orders ADD `customer_email` VARCHAR(255) NULL' + ); + } if (!LengowInstall::checkFieldExists('lengow_orders', 'order_lengow_state')) { Db::getInstance()->execute( 'ALTER TABLE '._DB_PREFIX_.'lengow_orders ADD `order_lengow_state` VARCHAR(32) NOT NULL' @@ -410,6 +416,7 @@ 'LENGOW_EXPORT_FEATURES', 'LENGOW_EXPORT_SELECT_FEATURES', 'LENGOW_IMPORT_CARRIER_MP_ENABLED', + 'LENGOW_IMPORT_FAKE_EMAIL', 'LENGOW_FLOW_DATA', 'LENGOW_CRON_EDITOR', 'LENGOW_EXPORT_TIMEOUT', diff --git a/views/js/lengow/home.js b/views/js/lengow/home.js index 79858448..e611465f 100644 --- a/views/js/lengow/home.js +++ b/views/js/lengow/home.js @@ -42,10 +42,10 @@ if (sync_link) { //synchronisation des boutiques, à modifier lorsque l'API sera disponible // sync_iframe.src = 'http://cms.lengow.io/sync/'; - sync_iframe.src = 'http://cms.lengow.local/sync/'; + sync_iframe.src = 'http://cms.lengow.int/sync/'; } else { // sync_iframe.src = 'http://cms.lengow.io/'; - sync_iframe.src = 'http://cms.lengow.local/'; + sync_iframe.src = 'http://cms.lengow.int/'; } $('#frame_loader').hide(); diff --git a/views/templates/admin/footer.tpl b/views/templates/admin/footer.tpl index a07b77df..cef13de8 100644 --- a/views/templates/admin/footer.tpl +++ b/views/templates/admin/footer.tpl @@ -26,7 +26,10 @@ {else}

{/if} - {$locale->t('footer.legals')|escape:'htmlall':'UTF-8'} | Copyright Lengow

+ + {$locale->t('footer.legals')|escape:'htmlall':'UTF-8'} + | {$locale->t('footer.copyright_lengow')|escape:'htmlall':'UTF-8'} +

diff --git a/views/templates/admin/header.tpl b/views/templates/admin/header.tpl index 0d88fa62..53a72c21 100644 --- a/views/templates/admin/header.tpl +++ b/views/templates/admin/header.tpl @@ -18,24 +18,15 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 *} - - - - - - @@ -43,12 +34,9 @@ {if version_compare($smarty.const._PS_VERSION_,'1.5','<')&&version_compare($smarty.const._PS_VERSION_,'1.4','>=')} - - {/if} {if version_compare($smarty.const._PS_VERSION_,'1.6','<')&&version_compare($smarty.const._PS_VERSION_,'1.5','>=')} - {/if} {if !$isNewMerchant} @@ -57,7 +45,7 @@ {$locale->t('menu.preprod_active')|escape:'htmlall':'UTF-8'} {/if} -
'; if (isset($values['filter_order']) && $values['filter_order']) { - $html.=''.$values['title'].''; + $html.=''.$values['title'].''; } else { $html.=$values['title']; } @@ -142,7 +142,8 @@ class="lengow_select_all lengow_link_tooltip"/>
-

'.htmlspecialchars_decode($this->locale->t('product.screen.no_result_found_title')).'

-

'.htmlspecialchars_decode($this->locale->t('product.screen.no_result_found_description')).'

+

'.$this->locale->t('product.screen.no_result_found_title').'