From f0bc9fc1fb5b4b9c68a7269e774f5f72f8cdce06 Mon Sep 17 00:00:00 2001 From: Dmitry Sergienko Date: Sat, 18 Nov 2023 15:04:17 +0200 Subject: [PATCH 01/10] fix logout button --- qpanel/themes/qpanel/templates/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpanel/themes/qpanel/templates/header.html b/qpanel/themes/qpanel/templates/header.html index 4346809..df8982f 100644 --- a/qpanel/themes/qpanel/templates/header.html +++ b/qpanel/themes/qpanel/templates/header.html @@ -38,6 +38,7 @@

+ {% endif %} {% if has_users() %}
  • @@ -48,7 +49,6 @@
    • {% endif %} - {% endif %}
    • from GitHub." +msgstr "" + +#: qpanel/templates/fs/index.html:54 qpanel/templates/fs/index.html:116 +#: qpanel/templates/global_js.html:6 qpanel/templates/index.html:43 +#: qpanel/templates/row_general_data.html:14 qpanel/templates/stats.html:55 +#: qpanel/themes/qpanel/templates/index.html:62 +#: qpanel/themes/qpanel/templates/row_general_data.html:32 +#: qpanel/themes/qpanel/templates/stats.html:97 +msgid "Abandoned" +msgstr "Втрачено" + +#: qpanel/templates/fs/index.html:53 qpanel/templates/fs/index.html:121 +#: qpanel/templates/global_js.html:7 qpanel/templates/index.html:42 +#: qpanel/templates/row_general_data.html:7 qpanel/templates/stats.html:47 +#: qpanel/themes/qpanel/templates/index.html:58 +#: qpanel/themes/qpanel/templates/row_general_data.html:15 +#: qpanel/themes/qpanel/templates/stats.html:79 +msgid "Answered" +msgstr "Прийнято" + +#: qpanel/templates/header.html:16 qpanel/templates/stats.html:6 +#: qpanel/templates/stats.html:28 qpanel/themes/qpanel/templates/header.html:35 +#: qpanel/themes/qpanel/templates/stats.html:60 +msgid "Stats" +msgstr "Статистика" + +#: qpanel/templates/i18n_js.html:30 +#: qpanel/themes/qpanel/templates/i18n_js.html:30 +msgid "Logged Out" +msgstr "Вийшов" + +#: qpanel/templates/i18n_js.html:32 +#: qpanel/themes/qpanel/templates/i18n_js.html:32 +msgid "Available" +msgstr "Доступно" + +#: qpanel/templates/i18n_js.html:34 +#: qpanel/themes/qpanel/templates/i18n_js.html:34 +msgid "Available (On Demand)" +msgstr "Доступно (за запитом)" + +#: qpanel/templates/i18n_js.html:36 +#: qpanel/themes/qpanel/templates/i18n_js.html:36 +msgid "On Break" +msgstr "На перерві" + +#: qpanel/templates/i18n_js.html:38 +#: qpanel/themes/qpanel/templates/i18n_js.html:38 +msgid "Idle" +msgstr "Вільний" + +#: qpanel/templates/i18n_js.html:40 +#: qpanel/themes/qpanel/templates/i18n_js.html:40 +msgid "Waiting" +msgstr "Очікує" + +#: qpanel/templates/i18n_js.html:42 +#: qpanel/themes/qpanel/templates/i18n_js.html:42 +msgid "Receiving" +msgstr "Отримує" + +#: qpanel/templates/i18n_js.html:44 +#: qpanel/themes/qpanel/templates/i18n_js.html:44 +msgid "In a queue call" +msgstr "Виклик у черзі" + +#: qpanel/templates/fs/index.html:34 qpanel/templates/index.html:23 +msgid "Queues" +msgstr "Черги" + +#: qpanel/templates/fs/index.html:55 qpanel/templates/index.html:44 +#: qpanel/templates/row_general_data.html:30 +#: qpanel/themes/qpanel/templates/index.html:66 +#: qpanel/themes/qpanel/templates/row_general_data.html:50 +msgid "Incoming" +msgstr "Вхідний" + +#: qpanel/templates/fs/index.html:57 qpanel/templates/index.html:46 +#: qpanel/themes/qpanel/templates/index.html:71 +#: qpanel/themes/qpanel/templates/row_general_data.html:68 +msgid "Service Level" +msgstr "Рівень сервісу" + +#: qpanel/templates/fs/index.html:71 qpanel/templates/index.html:60 +#: qpanel/themes/qpanel/templates/index.html:94 +msgid "Abandoned:" +msgstr "Втрачено:" + +#: qpanel/templates/language_selector.html:3 +#: qpanel/themes/qpanel/templates/header.html:61 +msgid "English" +msgstr "Англійська" + +#: qpanel/templates/language_selector.html:4 +#: qpanel/themes/qpanel/templates/header.html:62 +msgid "Spanish" +msgstr "Іспанська" + +#: qpanel/templates/language_selector.html:5 +#: qpanel/themes/qpanel/templates/header.html:63 +msgid "German" +msgstr "Німецька" + +#: qpanel/templates/language_selector.html:6 +#: qpanel/themes/qpanel/templates/header.html:64 +msgid "Russian" +msgstr "російська" + +#: qpanel/templates/language_selector.html:7 +#: qpanel/themes/qpanel/templates/header.html:65 +msgid "Portuguese" +msgstr "Португальська" + +#: qpanel/templates/language_selector.html:8 +#: qpanel/themes/qpanel/templates/header.html:66 +msgid "French" +msgstr "Французька" + +#: qpanel/templates/login.html:2 +msgid "Login" +msgstr "Вхід" + +#: qpanel/templates/login.html:10 qpanel/templates/login.html:19 +#: qpanel/themes/qpanel/templates/login.html:34 +#: qpanel/themes/qpanel/templates/login.html:56 +msgid "Sign in" +msgstr "Реєстрація" + +#: qpanel/templates/login.html:12 qpanel/themes/qpanel/templates/login.html:41 +msgid "User id" +msgstr "Користувач" + +#: qpanel/templates/login.html:14 qpanel/themes/qpanel/templates/login.html:49 +msgid "Password" +msgstr "Пароль" + +#: qpanel/templates/logout_button.html:2 +#: qpanel/themes/qpanel/templates/header.html:44 +msgid "Logout" +msgstr "Вихід" + +#: qpanel/templates/queue.html:35 qpanel/themes/qpanel/templates/queue.html:66 +msgid "Actions" +msgstr "Дії" + +#: qpanel/templates/queue.html:51 qpanel/templates/queue.html:198 +#: qpanel/themes/qpanel/templates/queue.html:84 +#: qpanel/themes/qpanel/templates/queue.html:270 +msgid "Spy" +msgstr "Шпигувати" + +#: qpanel/templates/queue.html:52 qpanel/templates/queue.html:199 +#: qpanel/themes/qpanel/templates/queue.html:85 +#: qpanel/themes/qpanel/templates/queue.html:271 +msgid "Whisper" +msgstr "Шепотіти" + +#: qpanel/templates/queue.html:53 qpanel/templates/queue.html:200 +#: qpanel/themes/qpanel/templates/queue.html:86 +#: qpanel/themes/qpanel/templates/queue.html:272 +msgid "Barge" +msgstr "Втрутитись" + +#: qpanel/templates/queue.html:54 qpanel/templates/queue.html:201 +#: qpanel/themes/qpanel/templates/queue.html:87 +#: qpanel/themes/qpanel/templates/queue.html:273 +msgid "Remove from queue" +msgstr "Видалити з черги" + +#: qpanel/templates/queue.html:112 +#: qpanel/themes/qpanel/templates/queue.html:162 +msgid "Insert where you listen the call, example: SIP/1001" +msgstr "Вкажіть номер, де будете слухати, наприклад: SIP/1001" + +#: qpanel/templates/queue.html:116 +#: qpanel/themes/qpanel/templates/queue.html:166 +msgid "Listen " +msgstr "Слухати " + +#: qpanel/templates/queue.html:295 +#: qpanel/themes/qpanel/templates/queue.html:369 +msgid "Execute a " +msgstr "Виконати " + +#: qpanel/templates/queue.html:302 +#: qpanel/themes/qpanel/templates/queue.html:378 +msgid "Insert where do need listen" +msgstr "Вкажіть номер де слухати" + +#: qpanel/templates/queue.html:308 +#: qpanel/themes/qpanel/templates/queue.html:384 +msgid "Try..." +msgstr "Спробувати..." + +#: qpanel/templates/row_general_data.html:10 qpanel/templates/stats.html:51 +msgid "Attended calls." +msgstr "Дзвінків прийнято." + +#: qpanel/templates/row_general_data.html:17 qpanel/templates/stats.html:59 +msgid "Calls not attended by agents." +msgstr "Дзвінків не прийнято агентами." + +#: qpanel/templates/row_general_data.html:22 +msgid "SL" +msgstr "SL" + +#: qpanel/templates/row_general_data.html:25 +msgid "Service Level." +msgstr "Рівень сервісу." + +#: qpanel/templates/row_general_data.html:33 +msgid "Call on line." +msgstr "Дзвінок онлайн" + +#: qpanel/templates/row_general_data.html:39 qpanel/templates/stats.html:63 +msgid "Av. time" +msgstr "Сер. час" + +#: qpanel/templates/row_general_data.html:42 qpanel/templates/stats.html:66 +msgid "Average time for answered calls." +msgstr "Середній час прийнятих дзвінків." + +#: qpanel/templates/row_general_data.html:46 qpanel/templates/stats.html:70 +msgid "Av. Wait" +msgstr "Сер. очікування" + +#: qpanel/templates/row_general_data.html:49 qpanel/templates/stats.html:73 +msgid "Average time waiting for calls." +msgstr "Середній час очікування дзвінків." + +#: qpanel/templates/stats.html:19 qpanel/themes/qpanel/templates/stats.html:37 +msgid "From:" +msgstr "Від:" + +#: qpanel/templates/stats.html:20 qpanel/themes/qpanel/templates/stats.html:43 +msgid "To:" +msgstr "До:" + +#: qpanel/templates/stats.html:38 qpanel/themes/qpanel/templates/stats.html:116 +msgid "Inbound" +msgstr "Вхідний" + +#: qpanel/templates/stats.html:41 +msgid "Total incomming calls" +msgstr "Всього вхідних дзвінків" + +#: qpanel/templates/fs/queue.html:32 +msgid "Contact" +msgstr "Контакт" + +#: qpanel/templates/fs/queue.html:34 +msgid "State" +msgstr "Стан" + +#: qpanel/themes/qpanel/templates/footer.html:12 +msgid "About Us" +msgstr "Про нас" + +#: qpanel/themes/qpanel/templates/header.html:15 +msgid "Home" +msgstr "Додому" + +#: qpanel/themes/qpanel/templates/header.html:57 +msgid "Language" +msgstr "Мова" + +#: qpanel/themes/qpanel/templates/row_general_data.html:87 +#: qpanel/themes/qpanel/templates/stats.html:133 +msgid "Average time" +msgstr "Середній час" + +#: qpanel/themes/qpanel/templates/row_general_data.html:104 +#: qpanel/themes/qpanel/templates/stats.html:150 +msgid "Average Wait" +msgstr "Середнє очікування" + From a226c2a462e3b054fa29ac18255d20a01b2078cb Mon Sep 17 00:00:00 2001 From: Dmitry Sergienko Date: Sun, 26 Nov 2023 13:17:56 +0200 Subject: [PATCH 07/10] add Ukrainian translation to themes/qpanel template --- qpanel/themes/qpanel/templates/header.html | 1 + 1 file changed, 1 insertion(+) diff --git a/qpanel/themes/qpanel/templates/header.html b/qpanel/themes/qpanel/templates/header.html index df8982f..a599b2d 100644 --- a/qpanel/themes/qpanel/templates/header.html +++ b/qpanel/themes/qpanel/templates/header.html @@ -64,6 +64,7 @@ {{ _('Russian')}} {{ _('Portuguese')}} {{ _('French')}} + {{ _('Ukrainian')}} From 2433cb3a8a0e1eb759e34b5b0acb9908833cf894 Mon Sep 17 00:00:00 2001 From: Dmitry Sergienko Date: Sun, 26 Nov 2023 13:26:25 +0200 Subject: [PATCH 08/10] Fix UA spelling, add Ukrainian to message.pot --- qpanel/translations/messages.pot | 5 +++++ qpanel/translations/uk_UA/LC_MESSAGES/messages.po | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/qpanel/translations/messages.pot b/qpanel/translations/messages.pot index abeff4f..c4d7cc6 100644 --- a/qpanel/translations/messages.pot +++ b/qpanel/translations/messages.pot @@ -316,6 +316,11 @@ msgstr "" msgid "French" msgstr "" +#: qpanel/templates/language_selector.html:9 +#: qpanel/themes/qpanel/templates/header.html:67 +msgid "Ukrainian" +msgstr "" + #: qpanel/templates/login.html:2 msgid "Login" msgstr "" diff --git a/qpanel/translations/uk_UA/LC_MESSAGES/messages.po b/qpanel/translations/uk_UA/LC_MESSAGES/messages.po index 94af9d1..0614ecf 100644 --- a/qpanel/translations/uk_UA/LC_MESSAGES/messages.po +++ b/qpanel/translations/uk_UA/LC_MESSAGES/messages.po @@ -118,14 +118,14 @@ msgstr "Дзвінки" #: qpanel/themes/qpanel/templates/all_queues.html:66 #: qpanel/themes/qpanel/templates/queue.html:63 msgid "Last call at" -msgstr "Останній дзвінок о" +msgstr "Останній дзвінок" #: qpanel/templates/all_queues.html:67 qpanel/templates/fs/queue.html:67 #: qpanel/templates/queue.html:66 #: qpanel/themes/qpanel/templates/all_queues.html:102 #: qpanel/themes/qpanel/templates/queue.html:105 msgid "Callers" -msgstr "Ті, що дзвонять" +msgstr "Телефонують" #: qpanel/templates/all_queues.html:72 qpanel/templates/fs/queue.html:71 #: qpanel/templates/queue.html:70 @@ -275,7 +275,7 @@ msgstr "Черги" #: qpanel/themes/qpanel/templates/index.html:66 #: qpanel/themes/qpanel/templates/row_general_data.html:50 msgid "Incoming" -msgstr "Вхідний" +msgstr "Вхідних" #: qpanel/templates/fs/index.html:57 qpanel/templates/index.html:46 #: qpanel/themes/qpanel/templates/index.html:71 @@ -318,6 +318,11 @@ msgstr "Португальська" msgid "French" msgstr "Французька" +#: qpanel/templates/language_selector.html:8 +#: qpanel/themes/qpanel/templates/header.html:66 +msgid "Ukrainian" +msgstr "Українська" + #: qpanel/templates/login.html:2 msgid "Login" msgstr "Вхід" From 24b1e22e1b76db34e03f590852be06b5314920e2 Mon Sep 17 00:00:00 2001 From: d-sergienko Date: Mon, 11 Dec 2023 14:00:18 +0200 Subject: [PATCH 09/10] add queue name to the card title --- qpanel/themes/qpanel/templates/queue.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qpanel/themes/qpanel/templates/queue.html b/qpanel/themes/qpanel/templates/queue.html index bc1e1ec..43d3304 100644 --- a/qpanel/themes/qpanel/templates/queue.html +++ b/qpanel/themes/qpanel/templates/queue.html @@ -40,7 +40,7 @@

    - {{ _('Agents') }}: + [{{ name }}] {{ _('Agents') }}:

    @@ -102,7 +102,7 @@

    - {{ _('Callers') }}: + [{{ name }}] {{ _('Callers') }}:

    From 7c40793dbd3b36d932bd3dab39ee7c134256e9b2 Mon Sep 17 00:00:00 2001 From: Dmitry Sergienko Date: Sun, 21 Jan 2024 16:06:58 +0200 Subject: [PATCH 10/10] docker customisations --- Dockerfile | 7 ++++--- docker-compose.yaml | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yaml diff --git a/Dockerfile b/Dockerfile index 85086ba..9dce318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,20 +20,21 @@ RUN apk add --ino-cache \ swig \ gcc \ alpine-sdk \ - python3-dev && \ + python3-dev \ + mariadb-dev && \ cd / && \ git clone \ -b master \ --depth=1 \ - https://github.com/roramirez/qpanel.git && \ + https://github.com/d-sergienko/qpanel.git && \ cd qpanel && \ pip3 install -r requirements.txt && \ + pip3 install -r requirements/dbs/mysql.txt && \ cd /qpanel && \ npm install && \ cd /qpanel && \ pybabel compile -d qpanel/translations && \ cd /qpanel && \ - cp samples/config.ini-dist config.ini && \ apk del --quiet \ git \ npm \ diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..375e534 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,20 @@ +# Comments are provided throughout this file to help you get started. +# If you need more help, visit the Docker compose reference guide at +# https://docs.docker.com/compose/compose-file/ + +# Here the instructions define your application as a service called "server". +# This service is built from the Dockerfile in the current directory. +# You can add other services your application may depend on here, such as a +# database or a cache. For examples, see the Awesome Compose repository: +# https://github.com/docker/awesome-compose +services: + qpanel: + build: + context: . + restart: unless-stopped + environment: + - TZ=Europe/Kiev + ports: + - 5000:5000 + volumes: + - ./config.ini:/qpanel/config.ini