Yarik / artbox-shop

Commit 8bdabac2a2897aead751e331158dd7a02c4f9780

Authored by Eugeny Galkovskiy
1 parent b8a1c97a

Переводы

Showing 4 changed files with 49 additions and 15 deletions   Show diff stats
Inline Side-by-side
backend/controllers/AjaxController.php
  Show/Hide comments   View file @8bdabac
... ... @@ -50,11 +50,11 @@
50 50 'plot' => $data[ 'plot' ],
51 51 'pie' => [
52 52 [
53   - "category" => "Новый посетитель",
  53 + "category" => "Новых посетителей",
54 54 "column-1" => round(intval($data[ 'new' ]), 2),
55 55 ],
56 56 [
57   - "category" => "Вернувшийся посетитель",
  57 + "category" => "Вернувшихся посетителей",
58 58 "column-1" => 100 - round(intval($data[ 'new' ]), 2),
59 59 ],
60 60 ],
... ...
backend/models/Analytics.php
  Show/Hide comments   View file @8bdabac
... ... @@ -37,7 +37,7 @@
37 37 */
38 38 $sessions = new \Google_Service_AnalyticsReporting_Metric();
39 39 $sessions->setExpression('ga:sessions');
40   - $sessions->setAlias('Сеансы');
  40 + $sessions->setAlias('Сессии');
41 41  
42 42 $users = new \Google_Service_AnalyticsReporting_Metric();
43 43 $users->setExpression('ga:users');
... ...
common/messages/ru/app.php
  Show/Hide comments   View file @8bdabac
... ... @@ -34,4 +34,32 @@
34 34 'Update' => 'Обновить',
35 35 'Search' => 'Найти',
36 36 'Reset' => 'Сбросить',
  37 + 'Alias Value' => 'Значение псевдонима',
  38 + 'Update Category' => 'Обновить категорию',
  39 + 'Image' => 'Изображение',
  40 + 'Brand Title' => 'Заголовок бренда',
  41 + 'Created At' => 'Создано',
  42 + 'Status' => 'Статус',
  43 + 'Sort' => 'Сортировка',
  44 + 'Upload Document' => 'Загрузить документ',
  45 + 'Send' => 'Отправить',
  46 + 'Generate' => 'Сгенерировать',
  47 + 'Common' => 'Общее',
  48 + 'Gallery' => 'Галерея',
  49 + 'Add' => 'Добавить',
  50 + 'Product option group complementary' => 'Дополнительные группы опций товара',
  51 + 'Is Filter' => 'Является фильтром',
  52 + 'Search for a categories ...' => 'Поиск категорий ..',
  53 + 'Product option group exclude' => 'Исключения группы опций товара',
  54 + 'Variant option group exclude' => 'Исключения группы варианта товара',
  55 + 'Option Groups' => 'Группы опций',
  56 + 'Image Id' => 'ID изображения',
  57 + 'Updated At' => 'Обновлено',
  58 + 'Body' => 'Тело',
  59 + 'Body Preview' => 'Предпросмотр',
  60 + 'Author ID' => 'ID автора',
  61 + 'Description' => 'Описание',
  62 + 'Parent ID' => 'Родительский ID',
  63 + 'Count' => 'Количество',
  64 + 'Color' => 'Цвет',
37 65 ];
38 66 \ No newline at end of file
... ...
composer.lock
  Show/Hide comments   View file @8bdabac
... ... @@ -82,7 +82,10 @@
82 82 },
83 83 "type": "bower-asset-library",
84 84 "extra": {
85   - "bower-asset-main": "./dist/amcharts/amcharts.js"
  85 + "bower-asset-main": "./dist/amcharts/amcharts.js",
  86 + "branch-alias": {
  87 + "dev-master": "3.18.5-dev"
  88 + }
86 89 },
87 90 "time": "2016-01-04 17:22:55"
88 91 },
... ... @@ -102,7 +105,10 @@
102 105 },
103 106 "type": "bower-asset-library",
104 107 "extra": {
105   - "bower-asset-main": "./dist/amcharts/amcharts.js"
  108 + "bower-asset-main": "./dist/amcharts/amcharts.js",
  109 + "branch-alias": {
  110 + "dev-master": "3.13.0-dev"
  111 + }
106 112 },
107 113 "time": "2015-01-28 07:40:20"
108 114 },
... ... @@ -1226,16 +1232,16 @@
1226 1232 },
1227 1233 {
1228 1234 "name": "kartik-v/bootstrap-fileinput",
1229   - "version": "v4.3.9",
  1235 + "version": "v4.4.0",
1230 1236 "source": {
1231 1237 "type": "git",
1232 1238 "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
1233   - "reference": "4aec9b00de25b4b3cca1f11ffbaa823c67c33590"
  1239 + "reference": "eea8e20f20302c52a346cd31ffe154561ee609a3"
1234 1240 },
1235 1241 "dist": {
1236 1242 "type": "zip",
1237   - "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/4aec9b00de25b4b3cca1f11ffbaa823c67c33590",
1238   - "reference": "4aec9b00de25b4b3cca1f11ffbaa823c67c33590",
  1243 + "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/eea8e20f20302c52a346cd31ffe154561ee609a3",
  1244 + "reference": "eea8e20f20302c52a346cd31ffe154561ee609a3",
1239 1245 "shasum": ""
1240 1246 },
1241 1247 "type": "library",
... ... @@ -1275,7 +1281,7 @@
1275 1281 "progress",
1276 1282 "upload"
1277 1283 ],
1278   - "time": "2017-04-02T18:38:08+00:00"
  1284 + "time": "2017-05-13T22:52:09+00:00"
1279 1285 },
1280 1286 {
1281 1287 "name": "kartik-v/yii2-krajee-base",
... ... @@ -1624,16 +1630,16 @@
1624 1630 },
1625 1631 {
1626 1632 "name": "noam148/yii2-image-manager",
1627   - "version": "1.2.3",
  1633 + "version": "1.2.4",
1628 1634 "source": {
1629 1635 "type": "git",
1630 1636 "url": "https://github.com/noam148/yii2-image-manager.git",
1631   - "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098"
  1637 + "reference": "7df3ce72d4fb14caca4749790bfdccc46b9e7184"
1632 1638 },
1633 1639 "dist": {
1634 1640 "type": "zip",
1635   - "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/82466e453b5b68e2567d3dae6f8af0ab687ae098",
1636   - "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098",
  1641 + "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/7df3ce72d4fb14caca4749790bfdccc46b9e7184",
  1642 + "reference": "7df3ce72d4fb14caca4749790bfdccc46b9e7184",
1637 1643 "shasum": ""
1638 1644 },
1639 1645 "require": {
... ... @@ -1669,7 +1675,7 @@
1669 1675 "widget",
1670 1676 "yii2"
1671 1677 ],
1672   - "time": "2017-05-10T19:29:49+00:00"
  1678 + "time": "2017-05-14T20:08:45+00:00"
1673 1679 },
1674 1680 {
1675 1681 "name": "noam148/yii2-image-resize",
... ...