Skip to content

Commit

Permalink
Merge branch 'release/2.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cedric-anne
cedric-anne committed Sep 4, 2018
2 parents d8c3301 + 64789a5 commit a1afa29
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 34 deletions.
78 changes: 56 additions & 22 deletions escalade.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,24 @@
<logo>https://raw.githubusercontent.com/pluginsGLPI/escalade/master/escalade.png</logo>
<description>
<short>
<fr><![CDATA[Cette extension permet de simplifier l'escalade de ticket vers des groupes différents]]></fr>
<cs><![CDATA[Tento zásuvný modul zjednodušuje eskalaci požadavku na jiné skupiny]]></cs>
<en><![CDATA[This plugin simplifies the ticket escalation to different groups]]></en>
<fr><![CDATA[Cette extension permet de simplifier l'escalade de ticket vers des groupes différents]]></fr>
</short>
<long>
<fr>
Cette extension permet de simplifier l'escalade de ticket vers des groupes différents.
Elle ajoute les fonctionnalités suivantes :
<cs>
Tento zásuvný modul zjednodušuje eskalaci požadavku na jiné skupiny.
Přidává následující funkce:

* Affichage d'un historique visuel de l'assignation des groupes sur un ticket.
* Escalade rapide à un groupe présent dans cette historique.
* Assignation du groupe initiateur lors de l'apport d'une solution.
* Attribution du responsable et groupe technique lors d'un changement de catégorie de ticket.
* Clonage rapide de ticket.
* Cloture des tickets clonés en même temps.
* Prendre le premier ou dernier groupe du technicien (sur modification du ticket).
* Bouton d'assignation rapide à soi-même d'un ticket.
</fr>
* Zobrazení vizuální historie přiřazení požadavku skupinám.
* Zrychlená eskalace na skupinu nacházející se v historii.
* Přiřazení skupiny iniciátora když je poskytnuto řešení požadavku.
* Poskytnutí automatického přiřazování požadavků při změně jeho kategorie.
* Rychlé klonování požadavku.
* Současné uzavření klonovaných požadavků.
* Vzetí první nebo poslední skupiny technika (při změně požadavku).
* Nové tlačítko pro zrychlené přiřazení požadavku sám sobě.
</cs>
<en>
This plugin simplifies the ticket escalation to different groups.
It adds the following features :
Expand All @@ -36,6 +37,19 @@ It adds the following features :
* Take the first or last group of technician (on ticket modification).
* New button for rapid self-assignment of a ticket.
</en>
<fr>
Cette extension permet de simplifier l'escalade de ticket vers des groupes différents.
Elle ajoute les fonctionnalités suivantes :

* Affichage d'un historique visuel de l'assignation des groupes sur un ticket.
* Escalade rapide à un groupe présent dans cette historique.
* Assignation du groupe initiateur lors de l'apport d'une solution.
* Attribution du responsable et groupe technique lors d'un changement de catégorie de ticket.
* Clonage rapide de ticket.
* Cloture des tickets clonés en même temps.
* Prendre le premier ou dernier groupe du technicien (sur modification du ticket).
* Bouton d'assignation rapide à soi-même d'un ticket.
</fr>
</long>
</description>
<homepage>https://github.com/pluginsGLPI/escalade</homepage>
Expand All @@ -47,6 +61,10 @@ It adds the following features :
<author>Teclib'</author>
</authors>
<versions>
<version>
<num>2.3.2</num>
<compatibility>9.3</compatibility>
</version>
<version>
<num>2.3.1</num>
<compatibility>9.3</compatibility>
Expand Down Expand Up @@ -103,19 +121,27 @@ It adds the following features :
</version>
</versions>
<langs>
<lang>fr_FR</lang>
<lang>cs_CZ</lang>
<lang>en_GB</lang>
<lang>en_US</lang>
<lang>es_ES</lang>
<lang>fi_FI</lang>
<lang>fr_FR</lang>
<lang>it_IT</lang>
<lang>lv_LV</lang>
<lang>ru_RU</lang>
<lang>tr_TR</lang>
</langs>
<license><![CDATA[GPL v2+]]></license>
<tags>
<fr>
<tag>Groupes</tag>
<tag>Ticket</tag>
<tag>Helpdesk</tag>
<tag>Escalade</tag>
<tag>Clone</tag>
<tag>Attribution</tag>
</fr>
<cs>
<tag>Skupiny</tag>
<tag>Požadavek</tag>
<tag>Asistence</tag>
<tag>Eskalace</tag>
<tag>Klon</tag>
<tag>Přiřazení</tag>
</cs>
<en>
<tag>Groups</tag>
<tag>Ticket</tag>
Expand All @@ -124,6 +150,14 @@ It adds the following features :
<tag>Clone</tag>
<tag>Assignement</tag>
</en>
<fr>
<tag>Groupes</tag>
<tag>Ticket</tag>
<tag>Helpdesk</tag>
<tag>Escalade</tag>
<tag>Clone</tag>
<tag>Attribution</tag>
</fr>
</tags>
<screenshots>
<screenshot>https://raw.githubusercontent.com/pluginsGLPI/escalade/master/screenshots/escalade_config.png</screenshot>
Expand Down
6 changes: 3 additions & 3 deletions hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function plugin_escalade_install() {
PRIMARY KEY (`id`),
KEY `tickets_id` (`tickets_id`),
KEY `groups_id` (`groups_id`)
) ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
$DB->query($query);
}

Expand Down Expand Up @@ -81,7 +81,7 @@ function plugin_escalade_install() {
`use_filter_assign_group` INT(11) NOT NULL,
`ticket_last_status` INT(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
$DB->query($query);

$query = "INSERT INTO glpi_plugin_escalade_configs
Expand Down Expand Up @@ -135,7 +135,7 @@ function plugin_escalade_install() {
`groups_id_source` int(11) NOT NULL DEFAULT '0',
`groups_id_destination` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";
$DB->query($query);
}

Expand Down
Binary file added locales/fi_FI.mo
View file
Binary file not shown.
194 changes: 194 additions & 0 deletions locales/fi_FI.po
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Markku Vepsä, 2018
msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Escalade\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-22 12:38+0000\n"
"PO-Revision-Date: 2018-08-03 11:44+0000\n"
"Last-Translator: Markku Vepsä\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-project-plugin-escalade/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: front/config.form.php:36 inc/user.class.php:168
#: inc/group_group.class.php:24 setup.php:165
msgid "Escalation"
msgstr "Eskalaatio"

#: front/climb_group.php:6 ajax/assign_me.php:5
msgid "missing parameters"
msgstr "puuttuvat parametrit"

#: front/popup_histories.php:4
msgid "full assignation history"
msgstr "täysi osoitushistoria"

#: hook.php:376
msgid "Group concerned by the escalation"
msgstr "Ryhmä, jota eskalaatio koskee"

#: hook.php:396 hook.php:414 inc/config.class.php:260 inc/user.class.php:129
msgid "Enable filtering on the groups assignment"
msgstr "Ota suodatus käyttöön ryhmiin osoituksessa"

#: inc/config.class.php:7
msgid "Configuration Escalade plugin"
msgstr "Escalade -liitännäisen asetukset"

#: inc/config.class.php:22
msgid "Remove old assign group on new group assign"
msgstr "Poista vanha ryhmä, jos osoitetaan uudelle ryhmälle "

#: inc/config.class.php:44
msgid "show group assign history visually"
msgstr "näytä ryhmäosoituksen historia visuaalisesti"

#: inc/config.class.php:56
msgid "Escalation history in tasks"
msgstr "Eskaloitumishistoria tehtävissä"

#: inc/config.class.php:65
msgid "Remove technician(s) on escalation"
msgstr "Poista teknikko/teknikot eskaloituessa"

#: inc/config.class.php:77
msgid "Ticket status after an escalation"
msgstr "Tiketin tila eskaloitumisen jälkeen"

#: inc/config.class.php:85
msgid "Assign ticket to initial group on solve ticket"
msgstr "Osoite tiketti alkuperäiselle ryhmälle ratkaistaessa"

#: inc/config.class.php:98
msgid "Assign the technical manager on ticket category change"
msgstr "Osoita teknikko -ryhmän managerille tiketin luokan muuttuessa"

#: inc/config.class.php:109
msgid "Assign the technical group on ticket category change"
msgstr "Osoita teknikko -ryhmälle tiketin luokan muuttuessa"

#: inc/config.class.php:121
msgid "Clone tickets"
msgstr "Kloonaa tiketit"

#: inc/config.class.php:131
msgid "Close cloned tickets at the same time"
msgstr "Sulje kloonatut tiketit samaan aikaan"

#: inc/config.class.php:149
msgid "Use the technician's group"
msgstr "Käytä teknikko -ryhmää"

#: inc/config.class.php:167
msgid "a time of creation"
msgstr "luomisen aikaan"

#: inc/config.class.php:169
msgid "a time of modification"
msgstr "muutoksen aikaan"

#: inc/config.class.php:196
msgid ""
"Nota: This feature (creation part) is duplicate with the <a "
"href='##link##'>Behavior</a>plugin. This last has priority."
msgstr "Huomio: Tämä ominaisuus (luonnin osa) on vastaava kuin <a href='##link##'> Behavior </a> liitännäisessä. Tämä on etusijalla."

#: inc/config.class.php:205
msgid "Display delete button"
msgstr "Näytä poistopainike"

#: inc/config.class.php:295
msgid "Don't change"
msgstr "Älä muuta"

#: inc/notification.class.php:29
msgid "Requester user of the ticket"
msgstr "Tiketin toimeksiantaja"

#: inc/notification.class.php:51
msgid "Group escalated in the ticket"
msgstr "Tiketissä eskaloitu ryhmä"

#: inc/notification.class.php:53
msgid "Manager of the group escalated in the ticket"
msgstr "Tiketissä eskaloidun ryhmän manageri"

#: inc/notification.class.php:57
msgid "Requester user of the task/reminder"
msgstr "Toimeksiantajan tehtävästä/muistutuksesta"

#: inc/notification.class.php:187
msgid "Solve date modification"
msgstr "Ratkaise päivämäärän muutos"

#: inc/history.class.php:80
msgid "Reassign the ticket to group"
msgstr "Uudelleenosoita tiketti ryhmälle"

#: inc/history.class.php:104
msgid "View full history"
msgstr "Näytä koko historia"

#: inc/history.class.php:151
msgid "Tickets to follow (climbed)"
msgstr "Seurattavat tiketit (nostettu)"

#: inc/history.class.php:165
msgid "Tickets to close (climbed)"
msgstr "Suljettavat tiketit (nostettu)"

#: inc/ticket.class.php:102
msgid "Solution provided, back to the group"
msgstr "Ratkaisu tarjottu, takaisin ryhmälle"

#: inc/ticket.class.php:164
msgid "Solution rejected, return to the group"
msgstr "Ratkaisu hylättiin, palautettu ryhmään"

#: inc/ticket.class.php:241
msgid "escalated to the group"
msgstr "eskaloitu ryhmälle"

#: inc/ticket.class.php:606
msgid "Error : get old ticket"
msgstr "Virhe : noudettaessa tikettiä"

#: inc/ticket.class.php:622
msgid "Error : adding new ticket"
msgstr "Virhe : lisättäessä uutta tikettiä"

#: inc/ticket.class.php:634
msgid "Error : adding link between the two tickets"
msgstr "Virhe : lisättäessä linkkiä tikettien välille"

#: inc/ticket.class.php:643 inc/ticket.class.php:684 inc/ticket.class.php:689
msgid "This ticket has been cloned from the ticket num"
msgstr "Tiketti kloonattu tiketistä nro"

#: inc/ticket.class.php:648
msgid "Error : adding followups"
msgstr "Virhe : lisättäessä seurantaa"

#: inc/ticket.class.php:659
msgid "Error : adding actors (user)"
msgstr "Virhe : lisättäessä toimijoita (käyttäjä)"

#: inc/ticket.class.php:668
msgid "Error : adding actors (group)"
msgstr "Virhe : lisättäessä toimijoita (ryhmä)"

#: inc/ticket.class.php:678
msgid "Error : adding documents"
msgstr "Virhe : lisättäessä asiakirjoja"

#: js/cloneandlink_ticket.js.php:13
msgid "Clone and link"
msgstr "Kloonaa ja linkitä"
Binary file modified locales/tr_TR.mo
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions locales/tr_TR.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: GLPI Plugin - Escalade\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-22 12:38+0000\n"
"PO-Revision-Date: 2018-06-28 07:59+0000\n"
"Last-Translator: Cédric Anne\n"
"PO-Revision-Date: 2018-07-12 13:39+0000\n"
"Last-Translator: Kaya Zeren <[email protected]>\n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-project-plugin-escalade/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -104,31 +104,31 @@ msgstr "Not: Bu özellik (oluşturulma kısmı) <a href='##link##'>Davranış</a

#: inc/config.class.php:205
msgid "Display delete button"
msgstr ""
msgstr "Sil düğmesi görüntülensin"

#: inc/config.class.php:295
msgid "Don't change"
msgstr "Değiştirilmesin"

#: inc/notification.class.php:29
msgid "Requester user of the ticket"
msgstr ""
msgstr "Destek kaydı isteğinde bulunan kullanıcı"

#: inc/notification.class.php:51
msgid "Group escalated in the ticket"
msgstr ""
msgstr "Destek kaydına atanmış grup"

#: inc/notification.class.php:53
msgid "Manager of the group escalated in the ticket"
msgstr ""
msgstr "Destek kaydına atanmış kullanıcının yöneticisi"

#: inc/notification.class.php:57
msgid "Requester user of the task/reminder"
msgstr ""
msgstr "Görev/anımsatıcı isteğinde bulunan kullanıcı"

#: inc/notification.class.php:187
msgid "Solve date modification"
msgstr ""
msgstr "Tarih değişikliğini çöz"

#: inc/history.class.php:80
msgid "Reassign the ticket to group"
Expand Down
Loading

0 comments on commit a1afa29

Please sign in to comment.