Merge pull request #49 from yandex-money/release/v1.2.1

мелкие правки

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v1.2.1 от 30.07.2020
+* мелкие правки
+
 ### v1.2.0 от 10.07.2020
 * Обновлен SDK до версии 1.6.4
 

ya_commerce/ya_commerce_api.info

@@ -2,7 +2,7 @@ name = Yandex Commerce Api
 description = "Yandex.Money module for Drupal Commerce."
 package = Yandex.Money 2.0
 core = 7.x
-version = 1.2.0
+version = 1.2.1
 configure = admin/config/system/yamoney_api
 dependencies[] = yamoney_api
 dependencies[] = commerce

ya_commerce/ya_commerce_api.module

@@ -67,7 +67,7 @@ function ya_commerce_api_commerce_payment_method_info()
     } else if (variable_get('yamoney_api_p2p', 0)) {
         $display_title = t('Yandex.Money (bank card, e-wallet)');
     } else if (variable_get('yamoney_api_billing_enable', 0)) {
-        $display_title = t('Yandex.Billing (bank card, e-wallets)');
+        $display_title = t('Billing (bank card, e-wallets)');
     }
 
     $display_title                      .= '<br/>'.$icon;

ya_ubercart/ya_ubercart_api.info

@@ -2,6 +2,6 @@ name = Yandex Ubercart Api
 description = "Yandex.Money module for Ubercart."
 package = Yandex.Money 2.0
 core = 7.x
-version = 1.2.0
+version = 1.2.1
 dependencies[] = yamoney_api
 dependencies[] = uc_payment

ya_ubercart/ya_ubercart_api.module

@@ -65,7 +65,7 @@ function ya_ubercart_api_uc_payment_method()
     } else if (variable_get('yamoney_api_p2p', 0)) {
         $display_title = t('Yandex.Money (bank card, e-wallet)');
     } else if (variable_get('yamoney_api_billing_enable', 0)) {
-        $display_title = t('Yandex.Billing (bank card, e-wallets)');
+        $display_title = t('Billing (bank card, e-wallets)');
     }
 
     $display_title                      .= '<br/>'.$icon;

yamoney_api.admin.inc

@@ -654,26 +654,26 @@ function yamoney_api_admin_settings()
 
     $form['yamoney_api_billing_tab'] = array(
         '#type'   => 'fieldset',
-        '#title'  => t('Yandex.Billing'),
+        '#title'  => t('Billing'),
         '#group'  => 'vertical_tabs',
         '#weight' => 50,
     );
 
     $form['yamoney_api_billing_tab']['intro'] = array(
         '#markup' => t(
-            'This is a payment form for your site. It allows for accepting payments to your company account from cards and Yandex.Money e-wallets without a contract. To set it up, you need to provide the Yandex.Billing identifier: we will send it via email after you <a href=\'https://money.yandex.ru/fastpay\'>create a form in construction kit.</a>'
+            'This is a payment form for your site. It allows for accepting payments to your company account from cards and Yandex.Money e-wallets without a contract. To set it up, you need to provide the Billing identifier: we will send it via email after you <a href=\'https://money.yandex.ru/fastpay\'>create a form in construction kit.</a>'
         ),
     );
 
     $form['yamoney_api_billing_tab']['yamoney_api_billing_enable'] = array(
         '#type'          => 'checkbox',
-        '#title'         => t('Activate payments via Yandex.Billing'),
+        '#title'         => t('Activate payments via Billing'),
         '#default_value' => variable_get('yamoney_api_billing_enable'),
     );
 
     $form['yamoney_api_billing_tab']['yamoney_api_billing_id'] = array(
         '#type'          => 'textfield',
-        '#title'         => t('Yandex.Billing\'s identifier'),
+        '#title'         => t('Billing\'s identifier'),
         '#default_value' => variable_get('yamoney_api_billing_id', ''),
         '#size'          => 30,
     );
@@ -682,11 +682,11 @@ function yamoney_api_admin_settings()
         '#type'          => 'textfield',
         '#title'         => t('Payment purpose'),
         '#description'   => t(
-            'Purpose of payment is added to the payment order: specify whatever will help identify the order paid via Yandex.Billing'
+            'Purpose of payment is added to the payment order: specify whatever will help identify the order paid via Billing'
         ),
         '#default_value' => variable_get(
             'yamoney_api_billing_narrative',
-            t('Order No. %order_id% Payment via Yandex.Billing')
+            t('Order No. %order_id% Payment via Billing')
         ),
         '#size'          => 30,
     );
@@ -717,7 +717,7 @@ function yamoney_api_admin_settings_validate($form, &$form_state)
         $form_state['values']['yamoney_api_shop']           = 1;
         $form_state['values']['yamoney_api_billing_enable'] = 0;
         drupal_set_message(
-            t('Unable to activate payments via Yandex.Billing and Yandex.Checkout at the same time'),
+            t('Unable to activate payments via Billing and Yandex.Checkout at the same time'),
             'warning'
         );
         form_set_error('yamoney_api_shop');

yamoney_api.info

@@ -2,5 +2,5 @@ name = Yandex.Money Core 2.0
 description = Yandex.Money 2.0 core module.
 package = Yandex.Money 2.0
 core = 7.x
-version = 1.2.0
+version = 1.2.1
 configure = admin/config/system/yamoney_api

yamoney_api.module

@@ -17,7 +17,7 @@ define('YAMONEY_API_CHECK_RESULT_CODE_ERROR_MD5', 1);
 define('YAMONEY_API_CHECK_RESULT_CODE_ERROR_CUSTOM', 100);
 define('YAMONEY_API_CHECK_RESULT_CODE_ERROR_REQUEST', 200);
 define('YAMONEY_API_DEFAULT_TAX_RATE_ID', 1);
-define('YAMONEY_MODULE_VERSION', '1.2.0');
+define('YAMONEY_MODULE_VERSION', '1.2.1');
 define('YAMONEY_API_DEFAULT_PAYMENT_METHOD', \YandexCheckout\Model\PaymentMethodType::BANK_CARD);
 define('QUICK_API_PAY_VERSION', 2);
 define('INSTALLMENTS_MIN_AMOUNT', 3000);

yamoney_api.ru.po

@@ -251,37 +251,37 @@ msgid "Text for fail page"
 msgstr "Текст для страницы неуспеха"
 
 #: yamoney_api.admin.inc:367
-msgid "Yandex.Billing"
-msgstr "Яндекс.Платежка"
+msgid "Billing"
+msgstr "Платежка"
 
 #: yamoney_api.admin.inc:373
 msgid ""
 "This is a payment form for your site. It allows for accepting payments to "
 "your company account from cards and Yandex.Money e-wallets without a "
-"contract. To set it up, you need to provide the Yandex.Billing identifier: "
+"contract. To set it up, you need to provide the Billing identifier: "
 "we will send it via email after you <a href='https://money.yandex.ru/"
 "fastpay'>create a form in construction kit.</a>"
 msgstr "Это платежная форма на ваш сайт. Позволяет принимать платежи на счет компании — с карт или из кошельков Яндекс.Денег, без договора. Для настройки нужен идентификатор Платежки: он придёт в письме,<a href='https://money.yandex.ru/fastpay'>когда вы соберете форму в конструкторе.</a>"
 
 #: yamoney_api.admin.inc:380
-msgid "Activate payments via Yandex.Billing"
-msgstr "Включить прием платежей через Яндекс.Платежку"
+msgid "Activate payments via Billing"
+msgstr "Включить прием платежей через Платежку"
 
 #: yamoney_api.admin.inc:387
-msgid "Yandex.Billing's identifier"
-msgstr "Идентификатор Яндекс.Платежки"
+msgid "Billing's identifier"
+msgstr "Идентификатор Платежки"
 
 #: yamoney_api.admin.inc:394
 msgid "Payment purpose"
 msgstr "Назначение платежа"
 
 #: yamoney_api.admin.inc:395
-msgid "Purpose of payment is added to the payment order: specify whatever will help identify the order paid via Yandex.Billing"
+msgid "Purpose of payment is added to the payment order: specify whatever will help identify the order paid via Billing"
 msgstr "Назначение будет в платежном поручении: напишите в нем всё, что поможет отличить заказ, который оплатили через Платежку"
 
 #: yamoney_api.admin.inc:400
-msgid "Order No. %order_id% Payment via Yandex.Billing"
-msgstr "Номер заказа %order_id% Оплата через Яндекс.Платежку"
+msgid "Order No. %order_id% Payment via Billing"
+msgstr "Номер заказа %order_id% Оплата через Платежку"
 
 #: yamoney_api.admin.inc:420;442
 msgid ""
@@ -291,8 +291,8 @@ msgstr ""
 "time"
 
 #: yamoney_api.admin.inc:431
-msgid "Unable to activate payments via Yandex.Billing and Yandex.Checkout at the same time"
-msgstr "Невозможно одновременно включить оплату через Яндекс.Платежку и Яндекс.Кассу"
+msgid "Unable to activate payments via Billing and Yandex.Checkout at the same time"
+msgstr "Невозможно одновременно включить оплату через Платежку и Яндекс.Кассу"
 
 #: yamoney_api.admin.inc:463
 msgid ""
@@ -440,8 +440,8 @@ msgid "Yandex.Money (bank card, e-wallet)"
 msgstr "Яндекс.Деньги (банковские карты, кошелек)"
 
 #: ya_commerce_api.module:33 ya_ubercart_api.module:33
-msgid "Yandex.Billing (bank card, e-wallets)"
-msgstr "Яндекс.Платежка (банковские карты, кошелек)"
+msgid "Billing (bank card, e-wallets)"
+msgstr "Платежка (банковские карты, кошелек)"
 
 #: ya_commerce_api.module:40
 msgid "Yandex"