From 3a9b794da3821eae2cb383e7744b1ff6a1712dea Mon Sep 17 00:00:00 2001 From: vam Date: Thu, 14 Nov 2019 17:18:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/de.json | 4 +++- locales/en.json | 4 +++- locales/en_US.json | 4 +++- locales/fr.json | 4 +++- locales/it.json | 4 +++- locales/pt_BR.json | 4 +++- locales/ru.json | 8 +++++--- locales/uk.json | 8 +++++--- locales/zh_CN.json | 4 +++- .../edit/additional/components/importproduct.js | 10 +++++----- 10 files changed, 36 insertions(+), 18 deletions(-) diff --git a/locales/de.json b/locales/de.json index 95270a9..cd481d4 100644 --- a/locales/de.json +++ b/locales/de.json @@ -141,9 +141,11 @@ "settings_kilogram": "Kilogram", "settings_pound": "Pfund", "settings_ounce": "Unze", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/en.json b/locales/en.json index bb168ee..6e7ecb1 100644 --- a/locales/en.json +++ b/locales/en.json @@ -142,9 +142,11 @@ "settings_kilogram": "kilogram", "settings_pound": "pound", "settings_ounce": "ounce", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/en_US.json b/locales/en_US.json index bb168ee..6e7ecb1 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -142,9 +142,11 @@ "settings_kilogram": "kilogram", "settings_pound": "pound", "settings_ounce": "ounce", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/fr.json b/locales/fr.json index 6418e23..c950bd5 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -142,9 +142,11 @@ "settings_kilogram": "kilogram", "settings_pound": "pound", "settings_ounce": "ounce", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/it.json b/locales/it.json index 8e11c15..b0ce3bc 100644 --- a/locales/it.json +++ b/locales/it.json @@ -142,9 +142,11 @@ "settings_kilogram": "kilogrammi", "settings_pound": "libre", "settings_ounce": "oncie", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/pt_BR.json b/locales/pt_BR.json index 1c98d03..271f1a9 100644 --- a/locales/pt_BR.json +++ b/locales/pt_BR.json @@ -140,9 +140,11 @@ "settings_kilogram": "quilograma", "settings_pound": "libra", "settings_ounce": "onça", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/locales/ru.json b/locales/ru.json index 5bd16ec..fd7e2d4 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -142,9 +142,11 @@ "settings_kilogram": "килограмм", "settings_pound": "фунт", "settings_ounce": "унция", - "settings_apikey": "Google Sheets API Ключ", - "settings_sheetid": "Google Sheets ID код таблицы", - "settings_tablename": "Google Sheets Название таблицы", + "missing_dashboardsettings": "Google Таблица не настроена.", + "setup_google_spreadsheet": "Укажите настройки google таблицы в Админке - Настройки - Импорт товаров.", + "settings_apikey": "Google Таблицы API Ключ", + "settings_sheetid": "Google Таблицы ID код таблицы", + "settings_tablename": "Google Таблицы название листа таблицы", "settings_googlesheet_header": "Импорт товаров", "settings_googlesheet_products": "Товаров в таблице:", "settings_googlesheet_uploaded": "Загружено в магазин:", diff --git a/locales/uk.json b/locales/uk.json index 7c7f9ec..533ddf5 100644 --- a/locales/uk.json +++ b/locales/uk.json @@ -142,9 +142,11 @@ "settings_kilogram": "килограмм", "settings_pound": "фунт", "settings_ounce": "унция", - "settings_apikey": "Google Sheets API Ключ", - "settings_sheetid": "Google Sheets ID код таблицы", - "settings_tablename": "Google Sheets Название таблицы", + "missing_dashboardsettings": "Google Таблица не настроена.", + "setup_google_spreadsheet": "Укажите настройки google таблицы в Админке - Настройки - Импорт товаров.", + "settings_apikey": "Google Таблицы API Ключ", + "settings_sheetid": "Google Таблицы ID код таблицы", + "settings_tablename": "Google Таблицы название листа таблицы", "settings_googlesheet_header": "Импорт товаров", "settings_googlesheet_products": "Товаров в таблице:", "settings_googlesheet_uploaded": "Загружено в магазин:", diff --git a/locales/zh_CN.json b/locales/zh_CN.json index 1cb2d3d..e17b0e3 100644 --- a/locales/zh_CN.json +++ b/locales/zh_CN.json @@ -142,9 +142,11 @@ "settings_kilogram": "千克", "settings_pound": "磅", "settings_ounce": "盎司", + "missing_dashboardsettings": "Google Sheets Settings Missing.", + "setup_google_spreadsheet": "Setup Google Sheets at Admin - Settings - Product import.", "settings_apikey": "Google Sheets API Key", "settings_sheetid": "Sheet ID", - "settings_tablename": "Table Name", + "settings_tablename": "Sheet Name", "settings_googlesheet_header": "Google Spreadsheet Product Import", "settings_googlesheet_products": "Products listed:", "settings_googlesheet_uploaded": "Products uploaded:", diff --git a/src/modules/products/edit/additional/components/importproduct.js b/src/modules/products/edit/additional/components/importproduct.js index 2222cb4..11b8b1b 100755 --- a/src/modules/products/edit/additional/components/importproduct.js +++ b/src/modules/products/edit/additional/components/importproduct.js @@ -515,11 +515,11 @@ class ProductImport extends React.Component { this.state.errors : ''} {this.state.errors > 0 ? this.state.errors : null} - {!this.state.dashboardsettings - ? '

' + - messages.missing_dashboardsettings + - '

' - : null} +

+ {!this.state.dashboardsettings + ? messages.missing_dashboardsettings + : null} +

{!this.state.dashboardsettings ? messages.setup_google_spreadsheet : null}