Merge branch 'release/1.5.2'

pluginsGLPI · May 2, 2019 · 21a8b60 · 21a8b60
2 parents fd4c463 + 0dd83f0
commit 21a8b60
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 103 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/alert_target.class.php b/inc/alert_target.class.php
@@ -33,7 +33,11 @@ static function getTypeName($nb = 0) {
    }
 
    static function canDelete() {
-      return self::canPurge();
+      return self::canUpdate();
+   }
+
+   static function canPurge() {
+      return self::canUpdate();
    }
 
    static function getSpecificValueToDisplay($field, $values, array $options = []) {

diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
diff --git a/locales/pt_BR.po b/locales/pt_BR.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Andrei Bernardo Simoni <andrei_simoni@hotmail.com>, 2017
+# Deivid Valença de Araujo <deivid_valenca_araujo@yahoo.com.br>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-02-15 09:41+0000\n"
-"PO-Revision-Date: 2018-08-21 15:11+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2019-03-02 15:32+0000\n"
+"Last-Translator: Deivid Valença de Araujo <deivid_valenca_araujo@yahoo.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-plugin-news/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,15 +26,15 @@ msgstr "Alertas"
 
 #: inc/alert.class.php:126 inc/alert.class.php:391
 msgid "Can close alert"
-msgstr ""
+msgstr "Alerta pode ser fechado"
 
 #: inc/alert.class.php:135 inc/alert.class.php:400
 msgid "Show on login page"
 msgstr "Mostrar na pagina de login"
 
 #: inc/alert.class.php:144 inc/alert.class.php:406
 msgid "Show on helpdesk page"
-msgstr ""
+msgstr "Mostrar na página de helpdesk "
 
 #: inc/alert.class.php:298
 msgid "Please enter a name."

diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo
diff --git a/locales/pt_PT.po b/locales/pt_PT.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Rui Melo <viper5000pt@gmail.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: GLPI Plugin - News\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"PO-Revision-Date: 2019-02-26 14:15+0000\n"
+"Last-Translator: Rui Melo <viper5000pt@gmail.com>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-plugin-news/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: front/alert.php:27 front/alert.form.php:86 front/hidden_alerts.php:27
+#: front/hidden_alerts.php:30 inc/alert.class.php:48 setup.php:66
+msgid "Alerts"
+msgstr "Alertas"
+
+#: inc/alert.class.php:126 inc/alert.class.php:391
+msgid "Can close alert"
+msgstr "Posso fechar um alerta"
+
+#: inc/alert.class.php:135 inc/alert.class.php:400
+msgid "Show on login page"
+msgstr "Mostrar Página de Login"
+
+#: inc/alert.class.php:144 inc/alert.class.php:406
+msgid "Show on helpdesk page"
+msgstr "Mostrar paginas de Helpdesk"
+
+#: inc/alert.class.php:298
+msgid "Please enter a name."
+msgstr "Inserir o nome."
+
+#: inc/alert.class.php:302
+msgid "Please enter a message."
+msgstr "Inserir Mensagem."
+
+#: inc/alert.class.php:308
+msgid "The end date must be greater than the start date."
+msgstr ".A tem tem que ser após a data de inicio "
+
+#: inc/alert.class.php:383
+msgid "Type (to add an icon before alert title)"
+msgstr "Tipo (para adicionar antes do nome do alerta)"
+
+#: inc/alert.class.php:482
+msgid "You have hidden alerts valid for current date"
+msgstr "Alertas ocultados na data atual"
+
+#: inc/alert.class.php:501
+msgid "General"
+msgstr "Geral"
+
+#: inc/alert.class.php:502
+msgid "Information"
+msgstr "Informação"
+
+#: inc/alert.class.php:503
+msgid "Warning"
+msgstr "Aviso"
+
+#: inc/alert.class.php:504
+msgid "Problem"
+msgstr "Problema"
diff --git a/plugin.xml b/plugin.xml
@@ -53,6 +53,10 @@ Fonctionnalités
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.5.2</num>
+         <compatibility>9.4</compatibility>
+      </version>
       <version>
          <num>1.5.1</num>
          <compatibility>9.4</compatibility>

diff --git a/setup.php b/setup.php
@@ -21,7 +21,7 @@
  --------------------------------------------------------------------------
 */
 
-define ('PLUGIN_NEWS_VERSION', '1.5.1');
+define ('PLUGIN_NEWS_VERSION', '1.5.2');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_NEWS_MIN_GLPI", "9.4");