Merge branch 'release/2.4.1'

escalade.xml

@@ -61,6 +61,10 @@ Elle ajoute les fonctionnalités suivantes :
       <author>Teclib'</author>
    </authors>
    <versions>
+      <version>
+         <num>2.4.1</num>
+         <compatibility>9.4</compatibility>
+      </version>
       <version>
          <num>2.4.0</num>
          <compatibility>9.4</compatibility>

hook.php

@@ -424,7 +424,7 @@ function plugin_escalade_getAddSearchOptions($itemtype) {
          $sopt[1881]['name']          = __("Group concerned by the escalation", "escalade");
          $sopt[1881]['forcegroupby']  = true;
          $sopt[1881]['massiveaction'] = false;
-         $sopt[1881]['condition']     = 'is_assign';
+         $sopt[1881]['condition']     = ['is_assign' => 1];
          $sopt[1881]['joinparams']    = [
             'beforejoin' => [
                'table'      => 'glpi_plugin_escalade_histories',

locales/cs_CZ.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: GLPI Plugin - Escalade\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-07 15:09+0000\n"
-"PO-Revision-Date: 2018-12-07 15:09+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2018-12-10 06:54+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-escalade/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,11 +39,11 @@ msgstr "Skupina které se eskalace týká"
 
 #: hook.php:442
 msgid "Number of escalations"
-msgstr ""
+msgstr "Počet eskalací"
 
 #: hook.php:456
 msgid "Number of escalations between two groups"
-msgstr ""
+msgstr "Počet eskalací mezi dvěma skupinami"
 
 #: hook.php:469 hook.php:487 inc/config.class.php:260 inc/user.class.php:129
 msgid "Enable filtering on the groups assignment"

locales/fi_FI.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Markku Vepsä, 2018
+# Markku Vepsä, 2018-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Escalade\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-07 15:09+0000\n"
-"PO-Revision-Date: 2018-12-07 15:09+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2019-01-22 09:31+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"
@@ -37,11 +37,11 @@ msgstr "Ryhmä, jota eskalaatio koskee"
 
 #: hook.php:442
 msgid "Number of escalations"
-msgstr ""
+msgstr "Eskalaatioiden määrä"
 
 #: hook.php:456
 msgid "Number of escalations between two groups"
-msgstr ""
+msgstr "Kahden ryhmän välisten eskalaatioiden määrä"
 
 #: hook.php:469 hook.php:487 inc/config.class.php:260 inc/user.class.php:129
 msgid "Enable filtering on the groups assignment"

locales/lv_LV.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Andrejs <andrew.k2@gmail.com>, 2016
+# Andrejs <andrew.k2@gmail.com>, 2016,2018
 # Cédric Anne, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Escalade\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-07 15:09+0000\n"
-"PO-Revision-Date: 2018-12-07 15:09+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2018-12-11 06:36+0000\n"
+"Last-Translator: Andrejs <andrew.k2@gmail.com>\n"
 "Language-Team: Latvian (Latvia) (http://www.transifex.com/teclib/glpi-project-plugin-escalade/language/lv_LV/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,31 +30,31 @@ msgstr "trūkstoši parametri"
 
 #: front/popup_histories.php:4
 msgid "full assignation history"
-msgstr "pilna pārrakstīšanas vēsture"
+msgstr "pilna piešķiršanas vēsture"
 
 #: hook.php:424
 msgid "Group concerned by the escalation"
 msgstr "Grupa saistīta ar eskalācijas procedūru"
 
 #: hook.php:442
 msgid "Number of escalations"
-msgstr ""
+msgstr "Eskalāciju skaits"
 
 #: hook.php:456
 msgid "Number of escalations between two groups"
-msgstr ""
+msgstr "Eskalāciju skaits starp divām grupām"
 
 #: hook.php:469 hook.php:487 inc/config.class.php:260 inc/user.class.php:129
 msgid "Enable filtering on the groups assignment"
-msgstr "Iespējot filtrāciju grupas pievienošanai"
+msgstr "Iespējot filtrēšanu grupu piešķiršanā"
 
 #: inc/config.class.php:7
 msgid "Configuration Escalade plugin"
 msgstr "Papildspraudņa Escalade iestatījumi"
 
 #: inc/config.class.php:22
 msgid "Remove old assign group on new group assign"
-msgstr "Noņemt iepriekš piesaistīto grupu, kad jauna grupa tiks piesaistīta"
+msgstr "Noņemt iepriekš piešķirto grupu piešķirot jauno grupu"
 
 #: inc/config.class.php:44
 msgid "show group assign history visually"
@@ -74,15 +74,15 @@ msgstr "Pieteikuma statuss pēc eskalācijas"
 
 #: inc/config.class.php:85
 msgid "Assign ticket to initial group on solve ticket"
-msgstr ""
+msgstr "Piešķirt pieteikumu sākotnējai grupai kad pieteikums tiks atrisināts"
 
 #: inc/config.class.php:98
 msgid "Assign the technical manager on ticket category change"
-msgstr "Piešķirt tehnisko menedžeri pieteikuma kategorijas maiņai"
+msgstr "Piešķirt tehnisko menedžeri kad pieteikuma kategorija tiks mainīta"
 
 #: inc/config.class.php:109
 msgid "Assign the technical group on ticket category change"
-msgstr ""
+msgstr "Piešķirt tehnisko grupu pieteikumam kad pieteikuma kategorija tiks mainīta"
 
 #: inc/config.class.php:121
 msgid "Clone tickets"
@@ -98,45 +98,45 @@ msgstr "Izmantot tehniķu grupu"
 
 #: inc/config.class.php:167
 msgid "a time of creation"
-msgstr ""
+msgstr "izveidošanas laiks"
 
 #: inc/config.class.php:169
 msgid "a time of modification"
-msgstr ""
+msgstr "rediģēšanas laiks"
 
 #: 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 ""
+msgstr "Piezīme: Šī iespēja (izveidošanas daļa) ir dublikāts ar papildspraudni <a href='##link##'>Behavior</a>. Pēdējam ir prioritāte."
 
 #: inc/config.class.php:205
 msgid "Display delete button"
-msgstr ""
+msgstr "Parādīt dzēšanas pogu"
 
 #: inc/config.class.php:295
 msgid "Don't change"
 msgstr "Nemainīt"
 
 #: inc/notification.class.php:29
 msgid "Requester user of the ticket"
-msgstr ""
+msgstr "Pieteikuma pieteicējs"
 
 #: inc/notification.class.php:51
 msgid "Group escalated in the ticket"
-msgstr ""
+msgstr "Grupa eskalēta pieteikumā"
 
 #: inc/notification.class.php:53
 msgid "Manager of the group escalated in the ticket"
-msgstr ""
+msgstr "Grupas menedžeris eskalēts pieteikumā"
 
 #: inc/notification.class.php:57
 msgid "Requester user of the task/reminder"
-msgstr ""
+msgstr "Pieteikuma/atgādinājuma pieteicējs"
 
 #: inc/notification.class.php:187
 msgid "Solve date modification"
-msgstr ""
+msgstr "Risinājuma rediģēšanas datums"
 
 #: inc/history.class.php:95
 msgid "Reassign the ticket to group"
@@ -184,7 +184,7 @@ msgstr "Šīs pieteikums ir no pieteikuma num"
 
 #: inc/ticket.class.php:684
 msgid "Error : adding followups"
-msgstr ""
+msgstr "Kļūda : pievienojot sekojumus"
 
 #: inc/ticket.class.php:695
 msgid "Error : adding actors (user)"

locales/tr_TR.po

@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: GLPI Plugin - Escalade\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-07 15:09+0000\n"
-"PO-Revision-Date: 2018-12-07 15:09+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2018-12-08 06:37+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\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"
@@ -38,11 +38,11 @@ msgstr "Yetkisi yükseltilecek grup"
 
 #: hook.php:442
 msgid "Number of escalations"
-msgstr ""
+msgstr "Yetki yükseltme sayısı"
 
 #: hook.php:456
 msgid "Number of escalations between two groups"
-msgstr ""
+msgstr "İki grup arasındaki yetki yükseltme sayısı"
 
 #: hook.php:469 hook.php:487 inc/config.class.php:260 inc/user.class.php:129
 msgid "Enable filtering on the groups assignment"

setup.php

@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define ('PLUGIN_ESCALADE_VERSION', '2.4.0');
+define ('PLUGIN_ESCALADE_VERSION', '2.4.1');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_ESCALADE_MIN_GLPI", "9.4");