Skip to content

Commit

Permalink
Merge branch 'master' into demo
Browse files Browse the repository at this point in the history
  • Loading branch information
maarcingebala committed May 13, 2019
2 parents 0b5c6cb + 2dd2332 commit d4ea40f
Show file tree
Hide file tree
Showing 100 changed files with 24,996 additions and 3,407 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Resort imports and remove unused imports - #4069 by @jxltom
- Fix typo in CheckoutBillingAddressUpdate - #4073 by @jxltom
- Required checkout ID for updating checkout's shipping and billing address - #4074 by @jxltom
- Implement order events - #4018 by @NyanKiyosho
- Implement order events - #4018 by @NyanKiyosho
- Implemented new events: `DRAFT_CREATED`, `DRAFT_ADDED_PRODUCTS`, `DRAFT_REMOVED_PRODUCTS`, and `PAYMENT_FAILED`;
- Implemented new mail events: `TRACKING_UPDATED`, `DIGITAL_LINKS`;
- Refactored logic of events, it's now easier than ever to add and send events.
Expand All @@ -57,6 +57,10 @@ All notable, unreleased changes to this project will be documented in this file.
- Migrated code style to Black. Saleor now includes configurations and tools related to use black. - #3852 by krzysztofwolski and NyanKiyoshi
- Allow filtering by lists of enums for fields: ``Voucher.filter.status``, ``Voucher.filter.discount_type``, ``Sale.filter.status``, ``Order.filter.payment_status``, ``Order.filter.status``, ``Order.filter.custom_status`` - #4078 by @korycins
- Code cleanup by replacing render props with react hooks - #4010 by @dominik-zeglen
- New translations:
- Albanian
- Colombian Spanish
- Lithuanian


## 2.5.0
Expand Down
Binary file modified locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
113 changes: 66 additions & 47 deletions locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-03-18 07:39-0500\n"
"POT-Creation-Date: 2019-04-08 06:18-0500\n"
"PO-Revision-Date: 2017-02-08 11:00+0000\n"
"Last-Translator: Patryk Zawadzki <[email protected]>, 2019\n"
"Language-Team: Arabic (https://www.transifex.com/mirumee/teams/34782/ar/)\n"
Expand Down Expand Up @@ -52,102 +52,102 @@ msgctxt "Customer form: Family name field"
msgid "Family name"
msgstr "اسم العائلة"

#: saleor/account/i18n.py:18
#: saleor/account/i18n.py:19
msgctxt "Address field"
msgid "Area"
msgstr "المنطقة"

#: saleor/account/i18n.py:19
#: saleor/account/i18n.py:20
msgctxt "Address field"
msgid "County"
msgstr "الدولة"

#: saleor/account/i18n.py:20
#: saleor/account/i18n.py:21
msgctxt "Address field"
msgid "Department"
msgstr "الفرع"

#: saleor/account/i18n.py:21
#: saleor/account/i18n.py:22
msgctxt "Address field"
msgid "District"
msgstr "الحي"

#: saleor/account/i18n.py:22
#: saleor/account/i18n.py:23
msgctxt "Address field"
msgid "Do/si"
msgstr "قم/ بشرط"

#: saleor/account/i18n.py:23
#: saleor/account/i18n.py:24
msgctxt "Address field"
msgid "Eircode"
msgstr ""

#: saleor/account/i18n.py:24
#: saleor/account/i18n.py:25
msgctxt "Address field"
msgid "Emirate"
msgstr "الإمارات"

#: saleor/account/i18n.py:25
#: saleor/account/i18n.py:26
msgctxt "Address field"
msgid "Island"
msgstr "جزيرة"

#: saleor/account/i18n.py:26
#: saleor/account/i18n.py:27
msgctxt "Address field"
msgid "Neighborhood"
msgstr "حي"

#: saleor/account/i18n.py:27
#: saleor/account/i18n.py:28
msgctxt "Address field"
msgid "Oblast"
msgstr "إقليم"

#: saleor/account/i18n.py:28
#: saleor/account/i18n.py:29
msgctxt "Address field"
msgid "Parish"
msgstr "دائرة"

#: saleor/account/i18n.py:29
#: saleor/account/i18n.py:30
msgctxt "Address field"
msgid "PIN"
msgstr "رقم التعريف الشخصي"

#: saleor/account/i18n.py:30
#: saleor/account/i18n.py:31
msgctxt "Address field"
msgid "Postal code"
msgstr "الرمز البريدي"

#: saleor/account/i18n.py:31
#: saleor/account/i18n.py:32
msgctxt "Address field"
msgid "Prefecture"
msgstr "محافظة"

#: saleor/account/i18n.py:32
#: saleor/account/i18n.py:33
msgctxt "Address field"
msgid "Province"
msgstr "مقاطعة"

#: saleor/account/i18n.py:33
#: saleor/account/i18n.py:34
msgctxt "Address field"
msgid "State"
msgstr "ولاية"

#: saleor/account/i18n.py:34
#: saleor/account/i18n.py:35
msgctxt "Address field"
msgid "Suburb"
msgstr "ضاحية"

#: saleor/account/i18n.py:35
#: saleor/account/i18n.py:36
msgctxt "Address field"
msgid "Townland"
msgstr "الحدود"

#: saleor/account/i18n.py:36
#: saleor/account/i18n.py:37
msgctxt "Address field"
msgid "Village/township"
msgstr "القرية/البلدة"

#: saleor/account/i18n.py:37
#: saleor/account/i18n.py:38
msgctxt "Address field"
msgid "ZIP code"
msgstr "الرمز البريدي"
Expand Down Expand Up @@ -212,7 +212,11 @@ msgctxt "Address"
msgid "Apartment, suite, unit, building, floor, etc"
msgstr "الشقة، الجناح، الوحدة، البناية، الطابق، إلخ"

#: saleor/account/i18n.py:170
#: saleor/account/i18n.py:155 saleor/account/validators.py:11
msgid "The phone number entered is not valid."
msgstr "رقم الهاتف المدخل غير صحيح ."

#: saleor/account/i18n.py:195
msgctxt "Address form"
msgid "This value is invalid for selected country"
msgstr "القيمة غير صحيحة للدولة المختارة ."
Expand Down Expand Up @@ -246,10 +250,6 @@ msgid ""
"%(street_address_2)s"
msgstr ""

#: saleor/account/validators.py:11
msgid "The phone number entered is not valid."
msgstr "رقم الهاتف المدخل غير صحيح ."

#: saleor/account/views.py:31
msgid "You have been successfully logged out."
msgstr "تم تسجيل الخروج بنجاح ."
Expand Down Expand Up @@ -595,22 +595,22 @@ msgctxt "Impersonation message"
msgid "You are now logged as {}"
msgstr "أنت الآن مسجل دخول ك{}"

#: saleor/core/weight.py:33
#: saleor/core/weight.py:32
msgctxt "Kilogram weight unit symbol"
msgid "kg"
msgstr "كيلوغرام"

#: saleor/core/weight.py:34
#: saleor/core/weight.py:33
msgctxt "Pound weight unit symbol"
msgid "lb"
msgstr "رطل"

#: saleor/core/weight.py:35
#: saleor/core/weight.py:34
msgctxt "Ounce weight unit symbol"
msgid "oz"
msgstr "أوقية"

#: saleor/core/weight.py:36
#: saleor/core/weight.py:35
msgctxt "Gram weight unit symbol"
msgid "g"
msgstr "غرام"
Expand Down Expand Up @@ -686,7 +686,7 @@ msgctxt "Voucher not applicable"
msgid "This offer is only valid for orders over %(amount)s."
msgstr "هذا العرض صالح فقط للطلبات التي تزيد عن %(amount)s' "

#: saleor/discount/models.py:180
#: saleor/discount/models.py:181
msgctxt "Permission description"
msgid "Manage sales and vouchers."
msgstr "إدارة المبيعات والقسائم."
Expand All @@ -708,7 +708,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""

#: saleor/graphql/order/mutations/fulfillments.py:216
#: saleor/graphql/order/mutations/fulfillments.py:218
msgctxt "Cancel fulfillment mutation error"
msgid "This fulfillment can't be canceled"
msgstr "لا يمكن إلغاء هذا الإجراء"
Expand Down Expand Up @@ -929,7 +929,7 @@ msgctxt "Permission description"
msgid "Manage orders."
msgstr "إدارة طلبات الشراء"

#: saleor/order/models.py:344
#: saleor/order/models.py:368
#, python-format
msgctxt "Fulfillment str"
msgid "Fulfillment #%s"
Expand Down Expand Up @@ -1071,7 +1071,7 @@ msgctxt "Stripe payment gateway description"
msgid "Total payment"
msgstr ""

#: saleor/payment/utils.py:236
#: saleor/payment/utils.py:239
msgctxt "Mark order as paid validation error"
msgid "Orders with payments can not be manually marked as paid."
msgstr ""
Expand Down Expand Up @@ -1147,11 +1147,16 @@ msgctxt "Variant choice field label"
msgid "%(variant_label)s - %(price)s"
msgstr ""

#: saleor/product/models.py:129
#: saleor/product/models.py:131
msgctxt "Permission description"
msgid "Manage products."
msgstr "إدارة المنتجات"

#: saleor/product/models.py:316
msgctxt "File as a digital product"
msgid "digital_product"
msgstr ""

#: saleor/search/forms.py:9
msgctxt "Search form label"
msgid "Query"
Expand Down Expand Up @@ -1270,35 +1275,43 @@ msgid "Serbian"
msgstr ""

#: saleor/settings.py:89
msgid "Swedish"
msgid "Swahili"
msgstr ""

#: saleor/settings.py:90
msgid "Swedish"
msgstr ""

#: saleor/settings.py:91
msgid "Thai"
msgstr ""

#: saleor/settings.py:92
msgid "Turkish"
msgstr "اللغة التركية"

#: saleor/settings.py:91
#: saleor/settings.py:93
msgid "Ukrainian"
msgstr "اللغة الأوكرانية"

#: saleor/settings.py:92
#: saleor/settings.py:94
msgid "Vietnamese"
msgstr "الفيتنامية"

#: saleor/settings.py:93
#: saleor/settings.py:95
msgid "Simplified Chinese"
msgstr ""

#: saleor/settings.py:94
#: saleor/settings.py:96
msgid "Traditional Chinese"
msgstr ""

#: saleor/settings.py:330
#: saleor/settings.py:332
msgctxt "Name of political and economical union of european countries"
msgid "European Union"
msgstr "الاتحاد الأوروبي"

#: saleor/settings.py:567
#: saleor/settings.py:573
msgctxt "Payment method name"
msgid "Dummy gateway"
msgstr ""
Expand Down Expand Up @@ -1348,12 +1361,12 @@ msgctxt "Applies to orders of total weight within this range"
msgid "%(min_weight)s to %(max_weight)s"
msgstr ""

#: saleor/site/models.py:40
#: saleor/site/models.py:42
msgctxt "Permission description"
msgid "Manage settings."
msgstr "إدارة الإعدادات"

#: saleor/site/models.py:42
#: saleor/site/models.py:44
msgctxt "Permission description"
msgid "Manage translations."
msgstr ""
Expand Down Expand Up @@ -6210,14 +6223,14 @@ msgstr ""
#: templates/templated_email/order/confirm_fulfillment.email:4
#, python-format
msgctxt "Fulfillment confirmation email subject"
msgid "A shipment from order %(order)s is on the way"
msgid "Your order %(order)s has been fulfilled"
msgstr ""

#: templates/templated_email/order/confirm_fulfillment.email:11
msgctxt "Fulfillment confirmation email text"
msgid ""
"\n"
"Thank you for your order. Below is the list of shipped products.\n"
"Thank you for your order. Below is the list of fulfilled products.\n"
msgstr ""

#: templates/templated_email/order/confirm_fulfillment.email:15
Expand Down Expand Up @@ -6367,7 +6380,13 @@ msgstr ""

#: templates/templated_email/source/confirm_fulfillment.mjml:16
msgctxt "Fulfillment confirmation email text"
msgid "Thank you for your order. Below is the list of shipped products."
msgid "Thank you for your order. Below is the list of fulfilled products."
msgstr ""

#: templates/templated_email/source/confirm_fulfillment.mjml:27
msgctxt "Fulfillment digital products email text"
msgid ""
"You can download your digital products by clicking in download link(s)."
msgstr ""

#: templates/templated_email/source/confirm_order.mjml:17
Expand Down
Binary file modified locale/az/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit d4ea40f

Please sign in to comment.