Yarik / artbox-shop

Commit 9c523fed0bf08f5ab07ba598311e427476058f22

Authored by Yarik
2 parents 76095dd1 033c0912

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	common/models/LoginForm.php
Showing 7 changed files with 35 additions and 24 deletions   Show diff stats
Inline Side-by-side
backend/views/ajax/_table.php
  Show/Hide comments   View file @9c523fe
... ... @@ -14,7 +14,7 @@
14 14 <tr>
15 15 <th>#</th>
16 16 <th><?= $name ?></th>
17   - <th>Sessions</th>
  17 + <th>Сессии</th>
18 18 </tr>
19 19 </thead>
20 20 <tbody>
... ...
backend/views/layouts/main.php
  Show/Hide comments   View file @9c523fe
... ... @@ -155,7 +155,7 @@
155 155 'i',
156 156 '',
157 157 [ 'class' => 'fa fa-user pull-right' ]
158   - ) . ' Profile',
  158 + ) . ' Профиль',
159 159 [ '/profile' ]
160 160 ) ?>
161 161 </li>
... ... @@ -165,7 +165,7 @@
165 165 'i',
166 166 '',
167 167 [ 'class' => 'fa fa-cogs pull-right' ]
168   - ) . ' Settings',
  168 + ) . ' Настройки',
169 169 [ '/settings' ]
170 170 ) ?>
171 171 </li>
... ... @@ -175,7 +175,7 @@
175 175 'i',
176 176 '',
177 177 [ 'class' => 'fa fa-sign-out pull-right' ]
178   - ) . ' Log out',
  178 + ) . ' Выйти',
179 179 [ '/site/logout' ],
180 180 [
181 181 'data-method' => 'POST',
... ... @@ -204,9 +204,9 @@
204 204 <div class="title_right">
205 205 <div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">
206 206 <div class="input-group">
207   - <input type="text" class="form-control" placeholder="Search for...">
  207 + <input type="text" class="form-control" placeholder="Поиск...">
208 208 <span class="input-group-btn">
209   - <button class="btn btn-default" type="button">Go!</button>
  209 + <button class="btn btn-default" type="button">Вперёд!</button>
210 210 </span>
211 211 </div>
212 212 </div>
... ...
backend/views/settings/settings.php
  Show/Hide comments   View file @9c523fe
... ... @@ -11,7 +11,7 @@
11 11 use yii\web\View;
12 12 use yiister\gentelella\widgets\Panel;
13 13  
14   - $this->title = 'Settings';
  14 + $this->title = 'Настройки';
15 15  
16 16 $this->params[ 'breadcrumbs' ][] = $this->title;
17 17 ?>
... ... @@ -78,7 +78,7 @@
78 78 );
79 79  
80 80 echo Html::submitButton(
81   - 'Save',
  81 + 'Сохранить',
82 82 [
83 83 'class' => 'btn btn-primary',
84 84 ]
... ...
backend/views/site/error.php
  Show/Hide comments   View file @9c523fe
... ... @@ -22,11 +22,11 @@
22 22 </a>
23 23 </p>
24 24  
25   - <h3>We are sorry - this page is not here anymore</h3>
26   - <h4 class="text-muted">Error 404 - Page not found</h4>
  25 + <h3>Извините, данной страницы не существует</h3>
  26 + <h4 class="text-muted">Ошибка 404 - Страница не найдена</h4>
27 27  
28 28 <p class="buttons">
29   - <a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> Go to Homepage</a>
  29 + <a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> На главную</a>
30 30 </p>
31 31 </div>
32 32  
... ...
backend/views/site/index.php
  Show/Hide comments   View file @9c523fe
... ... @@ -23,7 +23,7 @@
23 23  
24 24 <div class="count" id="sessions">0</div>
25 25  
26   - <h3>Sessions</h3>
  26 + <h3>Сессий</h3>
27 27 <p>Lorem ipsum psdea itgum rixt.</p>
28 28 </div>
29 29 </div>
... ... @@ -34,7 +34,7 @@
34 34  
35 35 <div class="count" id="users">0</div>
36 36  
37   - <h3>Users</h3>
  37 + <h3>Пользователей</h3>
38 38 <p>Lorem ipsum psdea itgum rixt.</p>
39 39 </div>
40 40 </div>
... ... @@ -45,7 +45,7 @@
45 45  
46 46 <div class="count" id="views">0</div>
47 47  
48   - <h3>Page views</h3>
  48 + <h3>Просмотров</h3>
49 49 <p>Lorem ipsum psdea itgum rixt.</p>
50 50 </div>
51 51 </div>
... ... @@ -56,7 +56,7 @@
56 56  
57 57 <div class="count" id="newusers">0</div>
58 58  
59   - <h3>New sessions</h3>
  59 + <h3>Сессий</h3>
60 60 <p>Lorem ipsum psdea itgum rixt.</p>
61 61 </div>
62 62 </div>
... ... @@ -66,7 +66,7 @@
66 66 <div class="col-md-12">
67 67 <?php $panel = Panel::begin(
68 68 [
69   - 'header' => 'Analytic',
  69 + 'header' => 'Аналитика',
70 70 ]
71 71 ) ?>
72 72  
... ... @@ -80,7 +80,7 @@
80 80 <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
81 81 <?php $panel = Panel::begin(
82 82 [
83   - 'header' => 'Pie chart',
  83 + 'header' => 'Диаграмма',
84 84 ]
85 85 ) ?>
86 86  
... ... @@ -93,7 +93,7 @@
93 93  
94 94 <?php $panel = Panel::begin(
95 95 [
96   - 'header' => 'Some stats',
  96 + 'header' => 'Статистика',
97 97 ]
98 98 ); ?>
99 99  
... ... @@ -105,16 +105,16 @@
105 105 ],
106 106 'items' => [
107 107 [
108   - 'label' => 'Browsers',
  108 + 'label' => 'Браузеры',
109 109 'content' => '<div id="browsers"></div>',
110 110 'active' => true,
111 111 ],
112 112 [
113   - 'label' => 'Cities',
  113 + 'label' => 'Города',
114 114 'content' => '<div id="cities"></div>',
115 115 ],
116 116 [
117   - 'label' => 'Countries',
  117 + 'label' => 'Страны',
118 118 'content' => '<div id="countries"></div>',
119 119 ],
120 120 ],
... ...
common/messages/ru/app.php
  Show/Hide comments   View file @9c523fe
... ... @@ -18,4 +18,15 @@
18 18 'Please choose payment method.' => 'Пожалуйста, выберите способ оплаты.',
19 19 'Home' => 'Главная',
20 20 'Toggle navigation' => 'Переключатель навигации',
  21 + 'Catalog' => 'Каталог',
  22 + 'Options' => 'Опции',
  23 + 'Options for products' => 'Опции для продуктов',
  24 + 'Complementary' => 'Дополнительно',
  25 + 'Exclusion' => 'Исключения',
  26 + 'Options for variants' => 'Опции для вариантов',
  27 + 'Blog' => 'Блог',
  28 + 'Write text to search for.' => 'Введиите текст для поиска.',
  29 + 'Write at least 3 symbols.' => 'Введите минимум 3 символа',
  30 + 'Save' => 'Сохранить',
  31 +
21 32 ];
22 33 \ No newline at end of file
... ...
common/models/LoginForm.php
  Show/Hide comments   View file @9c523fe
... ... @@ -98,9 +98,9 @@
98 98 public function attributeLabels()
99 99 {
100 100 return [
101   - 'username' => 'Логин',
102   - 'password' => 'Пароль',
103   - 'rememberMe' => 'Запомнить',
  101 + 'username' => Yii::t('app', 'Логин'),
  102 + 'password' => Yii::t('app', 'Пароль'),
  103 + 'rememberMe' => Yii::t('app', 'Запомнить'),
104 104 ];
105 105 }
106 106 }
... ...