Skip to content

Commit c64db37

Browse files
voltanvoltan
authored
Merge pull request #1560 from voltan/develop
Work on #1465
2 parents 5e04f67 + 35d35ce commit c64db37

File tree

24 files changed

+119
-83
lines changed

24 files changed

+119
-83
lines changed

‎lib/Pi/Application/Bootstrap/Resource/Permission.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@ public function checkAction(MvcEvent $e)
5858
if (!isset($this->options['check_close'])
5959
|| false !== $this->options['check_close']
6060
) {
61-
if (Pi::config('site_close')) {
62-
$this->denyAccess($e);
61+
if (Pi::config('site_close')
62+
&& !Pi::service('permission')->isAdmin()
63+
) {
64+
$message = __('The website is in maintenance - we are back in a couple of minutes !');
65+
$this->denyAccess($e, $message);
6366
return;
6467
}
6568
}
@@ -159,13 +162,14 @@ public function checkModule(MvcEvent $e)
159162
* Set denied error
160163
*
161164
* @param MvcEvent $e
165+
* @param $message
162166
* @return void
163167
*/
164-
protected function denyAccess(MvcEvent $e)
168+
protected function denyAccess(MvcEvent $e, $message = true)
165169
{
166170
$statusCode = Pi::service('user')->getUser()->isGuest()
167171
? 401 : 403;
168172
$e->getResponse()->setStatusCode($statusCode);
169-
$e->setError(true);
173+
$e->setError($message);
170174
}
171175
}

‎usr/locale/en/country.mo

-1 Bytes
Binary file not shown.

‎usr/locale/en/country.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Timezone\n"
4-
"POT-Creation-Date: 2017-04-18 20:19+0430\n"
5-
"PO-Revision-Date: 2017-04-18 20:19+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:22+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:22+0430\n"
66
"Last-Translator: Taiwen Jiang <taiwenjiang@tsinghua.org.cn>\n"
77
"Language-Team: \n"
88
"Language: en\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _\n"
1414
"X-Poedit-Basepath: ../_source/country\n"
1515
"X-Poedit-SearchPath-0: .\n"

‎usr/locale/fa/default.mo

213 Bytes
Binary file not shown.

‎usr/locale/fa/default.po

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-Engine\n"
4-
"POT-Creation-Date: 2017-04-18 20:20+0430\n"
5-
"PO-Revision-Date: 2017-04-18 20:22+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:19+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:20+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: Pi Engine\n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: __;_t;_e\n"
1414
"X-Poedit-Basepath: ../../..\n"
1515
"X-Poedit-SearchPath-0: usr/editor\n"
1616
"X-Poedit-SearchPath-1: lib/Pi\n"
1717

18+
#: lib/Pi/Application/Bootstrap/Resource/Permission.php:64
19+
msgid "The website is in maintenance - we are back in a couple of minutes !"
20+
msgstr "وب سایت برای به روز رسانی فنی بسته است - لطفا بعدا مراجعه فرمایید !"
21+
1822
#: lib/Pi/Application/Installer/Theme.php:348
1923
msgid "Theme updated successfully."
20-
msgstr "به روز رسانی قالب موفقیت آمیز بود"
24+
msgstr "به روز رسانی قالب موفقیت آمیز بود."
2125

2226
#: lib/Pi/Application/Installer/Theme.php:355
2327
msgid "Theme failed to update."
24-
msgstr "خطا در به روز رسانی قالب"
28+
msgstr "خطا در به روز رسانی قالب."
2529

2630
#: lib/Pi/Application/Installer/Theme.php:357
2731
msgid "Theme upgraded successfully."
28-
msgstr "به روز رسانی قابل موفقیت آمیز بود"
32+
msgstr "به روز رسانی قابل موفقیت آمیز بود."
2933

3034
#: lib/Pi/Application/Installer/Theme.php:362
3135
msgid "Theme asset publish failed."
32-
msgstr "خطا در انتشار asset قالب"
36+
msgstr "خطا در انتشار asset قالب."
3337

3438
#: lib/Pi/Application/Service/Comment.php:552
3539
msgid "Posted a new comment."
36-
msgstr "ارسال نظر جدید"
40+
msgstr "ارسال نظر جدید."
3741

3842
#: lib/Pi/Application/Service/Editor.php:83
3943
msgid "Pi Default Editor"
@@ -103,7 +107,7 @@ msgstr ""
103107

104108
#: lib/Pi/Authentication/Adapter/DbTable/AbstractAdapter.php:198
105109
msgid "A record with the supplied identity could not be found."
106-
msgstr "هیچ رکوردی برای هویت انتخاب شده یافت نشد"
110+
msgstr "هیچ رکوردی برای هویت انتخاب شده یافت نشد."
107111

108112
#: lib/Pi/Authentication/Adapter/DbTable/AbstractAdapter.php:206
109113
msgid "More than one record matches the supplied identity."
@@ -115,7 +119,7 @@ msgstr "اعتبار عرضه شده نامعتبر است."
115119

116120
#: lib/Pi/Authentication/Adapter/DbTable/CallbackAdapter.php:90
117121
msgid "Authentication successful."
118-
msgstr "تایید سندیت موفقیت آمیز بود"
122+
msgstr "تایید سندیت موفقیت آمیز بود."
119123

120124
#: lib/Pi/Feed/Model.php:200
121125
#, php-format
@@ -294,11 +298,11 @@ msgstr "برای تغییر تصویر کلیک کنید"
294298
msgid "Required"
295299
msgstr "ضروری"
296300

297-
#: lib/Pi/Form/View/Helper/Form.php:483
301+
#: lib/Pi/Form/View/Helper/Form.php:485
298302
msgid "Close"
299303
msgstr "بستن"
300304

301-
#: lib/Pi/Form/View/Helper/Form.php:484
305+
#: lib/Pi/Form/View/Helper/Form.php:486
302306
msgid "Form"
303307
msgstr "فرم"
304308

@@ -316,7 +320,7 @@ msgstr "ماه"
316320

317321
#: lib/Pi/Mvc/Controller/ActionController.php:98
318322
msgid "The requested action was not found."
319-
msgstr "اکشن مورد نظر یافت نشد"
323+
msgstr "اکشن مورد نظر یافت نشد."
320324

321325
#: lib/Pi/Mvc/Controller/Plugin/Terminate.php:39
322326
msgid "Login"
@@ -333,7 +337,7 @@ msgstr "مهمان"
333337

334338
#: lib/Pi/View/Helper/Conditions.php:39
335339
msgid "New terms and conditions are available. Please accept them."
336-
msgstr "شرایط و مقررات جدید به روز شد ، لطفا آن را مطالعه و تایید فرمایید"
340+
msgstr "شرایط و مقررات جدید به روز شد ، لطفا آن را مطالعه و تایید فرمایید."
337341

338342
#: lib/Pi/View/Helper/Conditions.php:40
339343
msgid "I agree"
@@ -343,11 +347,11 @@ msgstr "موافق ام"
343347
msgid "Read Term and conditions"
344348
msgstr "مطالعه شرایط و مقررات"
345349

346-
#: lib/Pi/View/Helper/GoogleMap.php:208
350+
#: lib/Pi/View/Helper/GoogleMap.php:228
347351
msgid "Choose a location"
348352
msgstr "انتخاب مکان"
349353

350-
#: lib/Pi/View/Helper/GoogleMap.php:209
354+
#: lib/Pi/View/Helper/GoogleMap.php:229
351355
msgid "View all"
352356
msgstr "نمایش همه"
353357

@@ -358,7 +362,7 @@ msgstr "صفحه"
358362

359363
#: lib/Pi/View/Helper/Tag.php:92
360364
msgid "Tags: "
361-
msgstr "برچسب ها :"
365+
msgstr "برچسب ها : "
362366

363367
#~ msgid "Manager"
364368
#~ msgstr "مدیریت"

‎usr/locale/fa/validator.mo

987 Bytes
Binary file not shown.

‎usr/locale/fa/validator.po

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-Engine\n"
4-
"POT-Creation-Date: 2017-04-18 20:22+0430\n"
5-
"PO-Revision-Date: 2017-04-18 20:24+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:20+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:22+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: Pi Engine\n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _\n"
1414
"X-Poedit-Basepath: ../_source/Validator\n"
1515
"X-Poedit-SearchPath-0: .\n"
@@ -250,24 +250,32 @@ msgid ""
250250
"Maximum allowed width for image should be '%maxwidth%' px but '%width%' px "
251251
"detected"
252252
msgstr ""
253+
"حداکثر عرض تصویر باید '%maxwidth%' پیکسل باشد اما عرض تصویر انتخابی شما "
254+
"'%width%' است"
253255

254256
#: File/ImageSize.php:11
255257
msgid ""
256258
"Minimum expected width for image should be '%minwidth%' px but '%width%' px "
257259
"detected"
258260
msgstr ""
261+
"حداقل عرض تصویر باید '%minwidth%' پیکسل باشد اما عرض تصویر انتخابی شما "
262+
"'%width%' است"
259263

260264
#: File/ImageSize.php:12
261265
msgid ""
262266
"Maximum allowed height for image should be '%maxheight%' px but '%height%' "
263267
"px detected"
264268
msgstr ""
269+
"حداکثر ارتفاع تصویر باید '%maxheight%' پیکسل باشد اما ارتفاع تصویر انتخابی "
270+
"شما '%height%' است"
265271

266272
#: File/ImageSize.php:13
267273
msgid ""
268274
"Minimum expected height for image should be '%minheight%' px but '%height%' "
269275
"px detected"
270276
msgstr ""
277+
"حداقل ارتفاع تصویر باید '%minheight%' پیکسل باشد اما ارتفاع تصویر انتخابی "
278+
"شما '%height%' است"
271279

272280
#: File/ImageSize.php:14
273281
msgid "The size of image could not be detected"

‎usr/module/system/locale/fa/admin.mo

-1 Bytes
Binary file not shown.

‎usr/module/system/locale/fa/admin.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-admin\n"
4-
"POT-Creation-Date: 2017-04-19 10:20+0430\n"
5-
"PO-Revision-Date: 2017-04-19 10:23+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:24+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:24+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _a;_t\n"
1414
"X-Poedit-Basepath: ../..\n"
1515
"X-Poedit-SearchPath-0: .\n"

‎usr/module/system/locale/fa/block.mo

-1 Bytes
Binary file not shown.

‎usr/module/system/locale/fa/block.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-block\n"
4-
"POT-Creation-Date: 2017-04-19 10:13+0430\n"
5-
"PO-Revision-Date: 2017-04-19 10:15+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:24+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:24+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _b\n"
1414
"X-Poedit-Basepath: ../..\n"
1515
"X-Poedit-SearchPath-0: .\n"

‎usr/module/system/locale/fa/default.mo

-1 Bytes
Binary file not shown.

‎usr/module/system/locale/fa/default.po

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-system\n"
4-
"POT-Creation-Date: 2017-04-19 10:13+0430\n"
5-
"PO-Revision-Date: 2017-04-19 10:14+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:24+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:24+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: __;_e\n"
1414
"X-Poedit-Basepath: ../..\n"
1515
"X-Poedit-SearchPath-0: .\n"
@@ -110,8 +110,9 @@ msgstr "ورود کاربر"
110110

111111
#: src/Controller/Front/LoginController.php:93 src/Form/LoginForm.php:119
112112
#: template/block/partial/login-register-modal.phtml:52
113-
#: template/block/partial/login-register-modal.phtml:90
114-
#: template/block/partial/login-register-modal.phtml:91
113+
#: template/block/partial/login-register-modal.phtml:64
114+
#: template/block/partial/login-register-modal.phtml:92
115+
#: template/block/partial/login-register-modal.phtml:93
115116
#: template/front/login-logout.phtml:13 template/front/register.phtml:6
116117
msgid "Login"
117118
msgstr "ورود"
@@ -159,7 +160,7 @@ msgstr ""
159160
#: src/Controller/Front/PasswordController.php:127
160161
#: src/Controller/Front/PasswordController.php:128
161162
#: src/Form/FindPasswordForm.php:49
162-
#: template/block/partial/login-register-modal.phtml:66
163+
#: template/block/partial/login-register-modal.phtml:67
163164
#: template/front/login.phtml:17 template/front/password-find.phtml:2
164165
#: template/front/register.phtml:5
165166
msgid "Find password"
@@ -222,8 +223,9 @@ msgstr "ایجاد حساب کاربری"
222223
#: src/Controller/Front/RegisterController.php:52
223224
#: src/Controller/Front/RegisterController.php:113
224225
#: template/block/partial/login-register-modal.phtml:53
225-
#: template/block/partial/login-register-modal.phtml:71
226226
#: template/block/partial/login-register-modal.phtml:72
227+
#: template/block/partial/login-register-modal.phtml:73
228+
#: template/block/partial/login-register-modal.phtml:86
227229
#: template/front/login-logout.phtml:14 template/front/login.phtml:20
228230
msgid "Register"
229231
msgstr "ثبت نام"
@@ -590,11 +592,11 @@ msgstr "دوباره سازی"
590592
msgid "Customize"
591593
msgstr "شخصی سازی"
592594

593-
#: template/block/partial/login-register-modal.phtml:69
595+
#: template/block/partial/login-register-modal.phtml:70
594596
msgid "Not already registered ?"
595597
msgstr "تا کنون ثبت نام نکرده اید؟"
596598

597-
#: template/block/partial/login-register-modal.phtml:88
599+
#: template/block/partial/login-register-modal.phtml:90
598600
msgid "Already registered ?"
599601
msgstr "قبلا ثبت نام کرده اید؟"
600602

‎usr/module/user/locale/fa/admin.mo

-1 Bytes
Binary file not shown.

‎usr/module/user/locale/fa/admin.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-user\n"
4-
"POT-Creation-Date: 2017-04-19 10:24+0430\n"
5-
"PO-Revision-Date: 2017-04-19 10:24+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:24+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:24+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _a;_t\n"
1414
"X-Poedit-Basepath: ../..\n"
1515
"X-Poedit-SearchPath-0: .\n"

‎usr/module/user/locale/fa/block.mo

-1 Bytes
Binary file not shown.

‎usr/module/user/locale/fa/block.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: Pi-user\n"
4-
"POT-Creation-Date: 2017-04-19 10:12+0430\n"
5-
"PO-Revision-Date: 2017-04-19 10:12+0430\n"
4+
"POT-Creation-Date: 2017-09-06 15:24+0430\n"
5+
"PO-Revision-Date: 2017-09-06 15:24+0430\n"
66
"Last-Translator: \n"
77
"Language-Team: \n"
88
"Language: fa\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.8.12\n"
12+
"X-Generator: Poedit 2.0.3\n"
1313
"X-Poedit-KeywordsList: _b\n"
1414
"X-Poedit-Basepath: ../..\n"
1515
"X-Poedit-SearchPath-0: .\n"

‎usr/module/user/locale/fa/default.mo

-1 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)