Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Commit

Permalink
Merge 2.x into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Dec 21, 2017
2 parents f408c7d + 57831e5 commit e1e57b2
Show file tree
Hide file tree
Showing 10 changed files with 2,386 additions and 3 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"name": "Sonata Community",
"homepage": "https://github.com/sonata-project/SonataUserBundle/contributors"
"homepage": "https://github.com/sonata-project/ecommerce/contributors"
}
],
"require" : {
Expand Down Expand Up @@ -76,8 +76,7 @@
"Sonata\\OrderBundle\\Tests\\": "tests/OrderBundle",
"Sonata\\PaymentBundle\\Tests\\": "tests/PaymentBundle",
"Sonata\\PriceBundle\\Tests\\": "tests/PriceBundle",
"Sonata\\ProductBundle\\Tests\\": "tests/ProductBundle",
"Sonata\\Tests\\Helpers\\": "tests/Helpers"
"Sonata\\ProductBundle\\Tests\\": "tests/ProductBundle"
}
},
"config": {
Expand Down
347 changes: 347 additions & 0 deletions src/BasketBundle/Resources/translations/SonataBasketBundle.ru.xliff

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions src/BasketBundle/Resources/translations/validators.ru.xliff
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="ru" datatype="plaintext" original="validators.en.xliff">
<body>
<trans-unit id="product_not_available">
<source>product_not_available</source>
<target>Товар недоступен.</target>
</trans-unit>
<trans-unit id="product_not_enabled">
<source>product_not_enabled</source>
<target>Товар неактивен.</target>
</trans-unit>
<trans-unit id="product_quantity_not_numeric">
<source>product_quantity_not_numeric</source>
<target>Кол-во товара не является числом.</target>
</trans-unit>
<trans-unit id="basket_quantity_limit_min">
<source>basket_quantity_limit_min</source>
<target>У вас должно быть как минимум {{ limit }} позиций в корзине</target>
</trans-unit>
<trans-unit id="basket_quantity_limit_max">
<source>basket_quantity_limit_max</source>
<target>Осталось только {{ limit }} товаров в наличии, вы пытаетесь заказать {{ value }}.</target>
</trans-unit>
</body>
</file>
</xliff>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="ru" datatype="plaintext" original="SonataDeliveryBundle.en.xliff">
<body>
<!-- Begin - Titles -->
<trans-unit id="delivery">
<source>delivery</source>
<target>Доставка</target>
</trans-unit>
<!-- End - Titles -->
<!-- Begin - Breadcrumb translations -->
<trans-unit id="breadcrumb.link_delivery_list">
<source>breadcrumb.link_delivery_list</source>
<target>Доставка</target>
</trans-unit>
<trans-unit id="breadcrumb.link_delivery_edit">
<source>breadcrumb.link_delivery_edit</source>
<target>Редактировать</target>
</trans-unit>
<!-- End - Breadcrumb translations -->
<!-- Begin - Status translations -->
<trans-unit id="status_open">
<source>status_open</source>
<target>Открыто</target>
</trans-unit>
<trans-unit id="status_pending">
<source>status_pending</source>
<target>Ожидает проверки</target>
</trans-unit>
<trans-unit id="status_order_unknown">
<source>status_order_unknown</source>
<target>Неизвестный заказ</target>
</trans-unit>
<trans-unit id="status_validated">
<source>status_validated</source>
<target>Проверен</target>
</trans-unit>
<trans-unit id="status_cancelled">
<source>status_cancelled</source>
<target>Отменен</target>
</trans-unit>
<trans-unit id="status_unknown">
<source>status_unknown</source>
<target>Неизвестно</target>
</trans-unit>
<trans-unit id="status_error_validation">
<source>status_error_validation</source>
<target>Ошибка проверки</target>
</trans-unit>
<trans-unit id="status_wrong_callback">
<source>status_wrong_callback</source>
<target>Неверный callback</target>
</trans-unit>
<trans-unit id="status_wrong_request">
<source>status_wrong_request</source>
<target>Ошибочный запрос</target>
</trans-unit>
<trans-unit id="status_order_not_open">
<source>status_order_not_open</source>
<target>Заказ не открыт</target>
</trans-unit>
<trans-unit id="status_error">
<source>status_error</source>
<target>Ошибка</target>
</trans-unit>
<trans-unit id="status_stopped">
<source>status_stopped</source>
<target>Остановлен</target>
</trans-unit>
<trans-unit id="status_returned">
<source>status_returned</source>
<target>Возвращен</target>
</trans-unit>
<trans-unit id="status_completed">
<source>status_completed</source>
<target>Выполнен</target>
</trans-unit>
<trans-unit id="status_sent">
<source>status_sent</source>
<target>Отправлен</target>
</trans-unit>
<!-- End - Status translations -->
</body>
</file>
</xliff>
235 changes: 235 additions & 0 deletions src/InvoiceBundle/Resources/translations/SonataInvoiceBundle.ru.xliff
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="ru" datatype="plaintext" original="SonataInvoiceBundle.en.xliff">
<body>
<!-- Begin - Titles -->
<trans-unit id="invoice">
<source>invoice</source>
<target>Счет</target>
</trans-unit>
<trans-unit id="sonata.invoice.title_invoice">
<source>sonata.invoice.title_invoice</source>
<target>Счет</target>
</trans-unit>
<trans-unit id="subtitle_payment">
<source>subtitle_payment</source>
<target>Оплата</target>
</trans-unit>
<!-- End - Titles -->
<!-- Begin - Breadcrumb translations -->
<trans-unit id="breadcrumb.link_invoice_list">
<source>breadcrumb.link_invoice_list</source>
<target>Счет</target>
</trans-unit>
<trans-unit id="breadcrumb.link_invoice_edit">
<source>breadcrumb.link_invoice_edit</source>
<target>Редактировать</target>
</trans-unit>
<!-- End - Breadcrumb translations -->
<!-- Begin - List translations -->
<trans-unit id="list.label_id">
<source>list.label_id</source>
<target>ID</target>
</trans-unit>
<trans-unit id="list.label_reference">
<source>list.label_reference</source>
<target>Номер</target>
</trans-unit>
<trans-unit id="list.label_customer">
<source>list.label_customer</source>
<target>Покупатель</target>
</trans-unit>
<trans-unit id="list.label_status">
<source>list.label_status</source>
<target>Статус</target>
</trans-unit>
<trans-unit id="list.label_total_excl">
<source>list.label_total_excl</source>
<target>Итого без НДС</target>
</trans-unit>
<trans-unit id="list.label_total_inc">
<source>list.label_total_inc</source>
<target>Итого включая НДС</target>
</trans-unit>
<!-- End - List translations -->
<!-- Begin - Form translations -->
<trans-unit id="invoice.form.group_main_label">
<source>invoice.form.group_main_label</source>
<target>Общее</target>
</trans-unit>
<trans-unit id="invoice.form.group_billing_label">
<source>invoice.form.group_billing_label</source>
<target>Оплата</target>
</trans-unit>
<trans-unit id="invoice.form.group_misc_label">
<source>invoice.form.group_misc_label</source>
<target>Прочее</target>
</trans-unit>
<trans-unit id="form.label_reference">
<source>form.label_reference</source>
<target>Номер</target>
</trans-unit>
<trans-unit id="form.label_currency">
<source>form.label_currency</source>
<target>Валюта</target>
</trans-unit>
<trans-unit id="form.label_status">
<source>form.label_status</source>
<target>Статус</target>
</trans-unit>
<trans-unit id="form.label_total_inc">
<source>form.label_total_inc</source>
<target>Итого включая НДС</target>
</trans-unit>
<trans-unit id="form.label_total_excl">
<source>form.label_total_excl</source>
<target>Итого без НДС</target>
</trans-unit>
<trans-unit id="form.label_name">
<source>form.label_name</source>
<target>Название</target>
</trans-unit>
<trans-unit id="form.label_phone">
<source>form.label_phone</source>
<target>Телефон</target>
</trans-unit>
<trans-unit id="form.label_address1">
<source>form.label_address1</source>
<target>Адрес 1</target>
</trans-unit>
<trans-unit id="form.label_address2">
<source>form.label_address2</source>
<target>Адрес 2</target>
</trans-unit>
<trans-unit id="form.label_address3">
<source>form.label_address3</source>
<target>Адрес 3</target>
</trans-unit>
<trans-unit id="form.label_city">
<source>form.label_city</source>
<target>Город</target>
</trans-unit>
<trans-unit id="form.label_postcode">
<source>form.label_postcode</source>
<target>Индекс</target>
</trans-unit>
<trans-unit id="form.label_country">
<source>form.label_country</source>
<target>Страна</target>
</trans-unit>
<trans-unit id="form.label_fax">
<source>form.label_fax</source>
<target>Факс</target>
</trans-unit>
<trans-unit id="form.label_email">
<source>form.label_email</source>
<target>E-mail</target>
</trans-unit>
<trans-unit id="form.label_mobile">
<source>form.label_mobile</source>
<target>Мобильный</target>
</trans-unit>
<trans-unit id="form.label_customer">
<source>form.label_customer</source>
<target>Покупатель</target>
</trans-unit>
<!-- End - Form translations -->
<!-- Begin - Status translations -->
<trans-unit id="status_open">
<source>status_open</source>
<target>Открыт</target>
</trans-unit>
<trans-unit id="status_paid">
<source>status_paid</source>
<target>Оплачен</target>
</trans-unit>
<trans-unit id="status_conflict">
<source>status_conflict</source>
<target>Конфликт</target>
</trans-unit>
<!-- End - Status translations -->
<!-- Begin - Invoice admin filters -->
<trans-unit id="filter.label_reference">
<source>filter.label_reference</source>
<target>Номер</target>
</trans-unit>
<trans-unit id="filter.label_customer">
<source>filter.label_customer</source>
<target>Покупатель</target>
</trans-unit>
<trans-unit id="filter.label_status">
<source>filter.label_status</source>
<target>Статус</target>
</trans-unit>
<!-- End - Invoice admin filters -->
<!-- Begin - Invoice view -->
<trans-unit id="sonata.invoice.subtitle_billing">
<source>sonata.invoice.subtitle_billing</source>
<target>Адрес выставления счета</target>
</trans-unit>
<trans-unit id="sonata.invoice.subtitle_references">
<source>sonata.invoice.subtitle_references</source>
<target>Номера</target>
</trans-unit>
<trans-unit id="sonata.invoice.references.date">
<source>sonata.invoice.references.date</source>
<target>Дата</target>
</trans-unit>
<trans-unit id="sonata.invoice.references.invoice">
<source>sonata.invoice.references.invoice</source>
<target>Счет</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.list.title">
<source>sonata.invoice.elements.list.title</source>
<target>Позиции</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.id">
<source>sonata.invoice.elements.id</source>
<target>ID</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.label">
<source>sonata.invoice.elements.label</source>
<target>Навание</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.quantity">
<source>sonata.invoice.elements.quantity</source>
<target>Кол-во</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.unit_price">
<source>sonata.invoice.elements.unit_price</source>
<target>Цена за шт.</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.total_ex_vat">
<source>sonata.invoice.elements.total_ex_vat</source>
<target>Итого без НДС</target>
</trans-unit>
<trans-unit id="sonata.invoice.elements.total_inc_vat">
<source>sonata.invoice.elements.total_inc_vat</source>
<target>Итого включая НДС</target>
</trans-unit>
<trans-unit id="sonata.invoice.total_exc_vat">
<source>sonata.invoice.total_exc_vat</source>
<target>Итого без НДС</target>
</trans-unit>
<trans-unit id="sonata.invoice.vat">
<source>sonata.invoice.vat</source>
<target>НДС</target>
</trans-unit>
<trans-unit id="sonata.invoice.total_inc_vat">
<source>sonata.invoice.total_inc_vat</source>
<target>Итого включая НДС</target>
</trans-unit>
<trans-unit id="sonata_invoice_view_vat">
<source>sonata_invoice_view_vat</source>
<target>НДС</target>
</trans-unit>
<!-- End - Invoice View -->
<!-- Begin - Invoice page titles translations -->
<trans-unit id="invoice_view_title">
<source>invoice_view_title</source>
<target>Счет</target>
</trans-unit>
<!-- End - Invoice page titles translations -->
</body>
</file>
</xliff>
Loading

0 comments on commit e1e57b2

Please sign in to comment.