Add confirm and rejext option for manager

config/config.php

@@ -113,8 +113,8 @@
                 'type'     => 'select',
                 'options'     => array(
                     'options' => array(
-                        0     => _a('All questions and answers need admin review before publish'),
                         1     => _a('Automatic approval all questions and answers'),
+                        2     => _a('All questions and answers need admin or project manager review before publish'),
                     ),
                 ),
             ),

config/module.php

@@ -14,7 +14,7 @@
     'meta'  => array(
         'title'         => _a('Ask'),
         'description'   => _a('Ask and Answer'),
-        'version'       => '0.3.0',
+        'version'       => '0.3.1',
         'license'       => 'New BSD',
         'logo'          => 'image/logo.png',
         'readme'        => 'docs/readme.txt',

locale/en/admin.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-06 13:38+0430\n"
+"POT-Creation-Date: 2017-08-12 10:40+0430\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -80,11 +80,11 @@ msgid "Automatic approval"
 msgstr ""
 
 #: config/config.php:116
-msgid "All questions and answers need admin review before publish"
+msgid "Automatic approval all questions and answers"
 msgstr ""
 
 #: config/config.php:117
-msgid "Automatic approval all questions and answers"
+msgid "All questions and answers need admin or project manager review before publish"
 msgstr ""
 
 #: config/config.php:128

locale/en/default.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-06 13:34+0430\n"
+"POT-Creation-Date: 2017-08-12 10:40+0430\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -72,7 +72,8 @@ msgid "Answer question not active"
 msgstr ""
 
 #: src/Controller/Front/AnswerController.php:41
-#: src/Controller/Front/QuestionController.php:33
+#: src/Controller/Front/QuestionController.php:36
+#: src/Controller/Front/QuestionController.php:62
 msgid "The question not found."
 msgstr ""
 
@@ -98,15 +99,31 @@ msgid "List of all projects"
 msgstr ""
 
 #: src/Controller/Front/IndexController.php:53
-#: src/Controller/Front/ProjectController.php:55
+#: src/Controller/Front/ProjectController.php:65
 msgid "List of all questions"
 msgstr ""
 
-#: src/Controller/Front/ProjectController.php:34
+#: src/Controller/Front/ProjectController.php:37
 #: src/Controller/Front/SubmitController.php:45
 msgid "Project not set."
 msgstr ""
 
+#: src/Controller/Front/QuestionController.php:174
+msgid "Question confirmed !"
+msgstr ""
+
+#: src/Controller/Front/QuestionController.php:185
+msgid "Question rejected !"
+msgstr ""
+
+#: src/Controller/Front/QuestionController.php:200
+msgid "Answer confirmed !"
+msgstr ""
+
+#: src/Controller/Front/QuestionController.php:211
+msgid "Answer rejected !"
+msgstr ""
+
 #: src/Controller/Front/SubmitController.php:34
 msgid "Ask question not active"
 msgstr ""
@@ -144,9 +161,9 @@ msgid "List of all used tags"
 msgstr ""
 
 #: src/Form/AnswerForm.php:49 template/admin/question-index.phtml:26
-#: template/front/question-index.phtml:104
-#: template/front/question-index.phtml:108
 #: template/front/question-list.phtml:73
+#: template/front/question-single.phtml:148
+#: template/front/question-single.phtml:152
 msgid "Answer"
 msgstr ""
 
@@ -201,12 +218,15 @@ msgid "Status"
 msgstr ""
 
 #: src/Form/ProjectForm.php:106 src/Form/UpdateForm.php:112
-#: template/admin/project-index.phtml:34 template/admin/question-index.phtml:61
+#: template/admin/project-index.phtml:34 template/admin/question-index.phtml:74
 msgid "Published"
 msgstr ""
 
 #: src/Form/ProjectForm.php:107 src/Form/UpdateForm.php:113
-#: template/admin/project-index.phtml:35 template/admin/question-index.phtml:62
+#: template/admin/project-index.phtml:35 template/admin/question-index.phtml:75
+#: template/front/question-list.phtml:95
+#: template/front/question-single.phtml:53
+#: template/front/question-single.phtml:128
 msgid "Pending review"
 msgstr ""
 
@@ -285,7 +305,8 @@ msgid "View"
 msgstr ""
 
 #: template/admin/project-index.phtml:26 template/admin/project-index.phtml:28
-#: template/admin/question-index.phtml:53
+#: template/admin/question-index.phtml:62
+#: template/admin/question-index.phtml:64
 msgid "Edit"
 msgstr ""
 
@@ -306,54 +327,50 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: template/admin/question-index.phtml:49
-#: template/admin/question-index.phtml:78
+#: template/admin/question-index.phtml:55
+#: template/admin/question-index.phtml:91
+#: template/front/question-single.phtml:40
+#: template/front/question-single.phtml:45
+#: template/front/question-single.phtml:116
+#: template/front/question-single.phtml:121
 msgid "Reject"
 msgstr ""
 
-#: template/admin/question-index.phtml:51
-#: template/admin/question-index.phtml:83
+#: template/admin/question-index.phtml:60
+#: template/admin/question-index.phtml:96
 msgid "Accept"
 msgstr ""
 
-#: template/admin/question-index.phtml:54
+#: template/admin/question-index.phtml:65
+#: template/admin/question-index.phtml:67
 msgid "Delete"
 msgstr ""
 
-#: template/admin/question-index.phtml:65
+#: template/admin/question-index.phtml:78
 msgid "No question submit yet"
 msgstr ""
 
-#: template/admin/question-index.phtml:72
+#: template/admin/question-index.phtml:85
 msgid "Accept in process"
 msgstr ""
 
 #: template/admin/question-update.phtml:8
 msgid "Slug"
 msgstr ""
 
-#: template/front/answer-index.phtml:19 template/front/question-index.phtml:27
-#: template/front/question-index.phtml:82
+#: template/front/answer-index.phtml:19 template/front/question-single.phtml:28
+#: template/front/question-single.phtml:106
 msgid "Time"
 msgstr ""
 
-#: template/front/answer-index.phtml:20 template/front/question-index.phtml:28
+#: template/front/answer-index.phtml:20 template/front/question-single.phtml:29
 msgid "Read"
 msgstr ""
 
-#: template/front/answer-index.phtml:20 template/front/question-index.phtml:28
+#: template/front/answer-index.phtml:20 template/front/question-single.phtml:29
 msgid "Times"
 msgstr ""
 
-#: template/front/question-index.phtml:13
-#: template/front/question-index.phtml:76
-msgid "View profile"
-msgstr ""
-
-#: template/front/question-index.phtml:62
-msgid "Answers"
-msgstr ""
-
 #: template/front/question-list.phtml:20
 msgid "Contact to manager"
 msgstr ""
@@ -371,14 +388,30 @@ msgstr ""
 msgid "Vote"
 msgstr ""
 
-#: template/front/question-list.phtml:100
+#: template/front/question-list.phtml:103
 msgid "On"
 msgstr ""
 
-#: template/front/question-list.phtml:102
+#: template/front/question-list.phtml:105
 msgid "By"
 msgstr ""
 
+#: template/front/question-single.phtml:14
+#: template/front/question-single.phtml:100
+msgid "View profile"
+msgstr ""
+
+#: template/front/question-single.phtml:34
+#: template/front/question-single.phtml:39
+#: template/front/question-single.phtml:110
+#: template/front/question-single.phtml:115
+msgid "Confirm"
+msgstr ""
+
+#: template/front/question-single.phtml:85
+msgid "Answers"
+msgstr ""
+
 #: template/front/submit-index.phtml:11
 msgid "Roles to ask question"
 msgstr ""

locale/fa/admin.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-06 13:36+0430\n"
+"POT-Creation-Date: 2017-08-12 10:40+0430\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -23,7 +23,7 @@ msgstr "مدیریت"
 msgid "Show"
 msgstr "نمایش"
 
-#: config/config.php:24 config/page.php:53
+#: config/config.php:24 config/page.php:48
 msgid "Question"
 msgstr "سوال"
 
@@ -80,13 +80,13 @@ msgid "Automatic approval"
 msgstr "تایید خودکار"
 
 #: config/config.php:116
-msgid "All questions and answers need admin review before publish"
-msgstr "تمام سوالات و پاسخ خا به تایید مدیر برای انتشار نیاز دارند"
-
-#: config/config.php:117
 msgid "Automatic approval all questions and answers"
 msgstr "تایید خودکار پرسش و پاسخ های ارسالی"
 
+#: config/config.php:117
+msgid "All questions and answers need admin or project manager review before publish"
+msgstr "تمام سوال ها و جواب ها قبل از انتشار نیاز به تایید مدیر سایت یا مدیر پروژه دارند"
+
 #: config/config.php:128
 msgid "Show feed icon"
 msgstr "نمایش آیکن خوارک"
@@ -136,27 +136,23 @@ msgstr "پروژه ها"
 msgid "New project"
 msgstr "پروژه جدید"
 
-#: config/navigation.php:112 config/page.php:27 config/permission.php:51
-msgid "Tools"
-msgstr "ابزار"
-
-#: config/page.php:35
+#: config/page.php:30
 msgid "Index page"
 msgstr "صفحه اول"
 
-#: config/page.php:41
+#: config/page.php:36
 msgid "Project page"
 msgstr "صفحه پروژه"
 
-#: config/page.php:47 config/permission.php:30
+#: config/page.php:42 config/permission.php:30
 msgid "Answer"
 msgstr "پاسخ"
 
-#: config/page.php:59
+#: config/page.php:54
 msgid "Submit question"
 msgstr "ارسال سوال"
 
-#: config/page.php:65
+#: config/page.php:60
 msgid "Tag"
 msgstr "برچسب"
 
@@ -168,6 +164,12 @@ msgstr "دسترسی های عمومی"
 msgid "Submit"
 msgstr "ارسال"
 
+#~ msgid "All questions and answers need admin review before publish"
+#~ msgstr "تمام سوالات و پاسخ خا به تایید مدیر برای انتشار نیاز دارند"
+
+#~ msgid "Tools"
+#~ msgstr "ابزار"
+
 #~ msgid "Title"
 #~ msgstr "عنوان"