Merge branch 'release/1.6.0'

pluginsGLPI · Feb 7, 2020 · c6902ef · c6902ef
2 parents 9a985e7 + cd2de74
commit c6902ef
Show file tree

Hide file tree

Showing 42 changed files with 182 additions and 105 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/css/styles.css b/css/styles.css
@@ -44,7 +44,8 @@
 }
 .plugin_news_alert-login .expanded .plugin_news_alert-content {
    padding: 5px 15px;
-   max-height: 500px;
+   max-height: 300px;
+   overflow-y: auto;
    transition: max-height .25s ease-in;
    transition: padding .25s ease-in;
 }

diff --git a/hook.php b/hook.php
@@ -24,10 +24,7 @@
 function plugin_news_install() {
    global $DB;
 
-   $plugin     = new Plugin();
-   $found      = $plugin->find(['name' => 'news']);
-   $pluginNews = array_shift($found);
-   $migration  = new Migration($pluginNews['version']);
+   $migration = new Migration(Plugin::getInfo('news', 'version'));
 
    if (! $DB->tableExists('glpi_plugin_news_alerts')) {
       $DB->query("

diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo
diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 18:11+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-news/language/cs_CZ/)\n"

diff --git a/locales/de_DE.mo b/locales/de_DE.mo
diff --git a/locales/de_DE.po b/locales/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: German (Germany) (http://www.transifex.com/teclib/glpi-plugin-news/language/de_DE/)\n"

diff --git a/locales/en_GB.mo b/locales/en_GB.mo
diff --git a/locales/en_GB.po b/locales/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
-"PO-Revision-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
+"PO-Revision-Date: 2019-11-12 10:18+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en_GB\n"

diff --git a/locales/en_US.mo b/locales/en_US.mo
diff --git a/locales/en_US.po b/locales/en_US.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-news/language/en_US/)\n"

diff --git a/locales/es_ES.mo b/locales/es_ES.mo
diff --git a/locales/es_ES.po b/locales/es_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-news/language/es_ES/)\n"

diff --git a/locales/fi_FI.mo b/locales/fi_FI.mo
diff --git a/locales/fi_FI.po b/locales/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-11-06 17:00+0000\n"
 "Last-Translator: Markku Vepsä\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-plugin-news/language/fi_FI/)\n"

diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
diff --git a/locales/fr_FR.po b/locales/fr_FR.po
@@ -5,13 +5,14 @@
 # Translators:
 # alexandre delaunay <delaunay.alexandre@gmail.com>, 2016
 # Cédric Anne, 2018
+# Christophe Brissy <metastase83@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: 2018-08-21 15:11+0000\n"
-"Last-Translator: Cédric Anne\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
+"PO-Revision-Date: 2019-09-09 13:36+0000\n"
+"Last-Translator: Christophe Brissy <metastase83@gmail.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-news/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +27,15 @@ msgstr "Alertes"
 
 #: inc/alert.class.php:126 inc/alert.class.php:391
 msgid "Can close alert"
-msgstr ""
+msgstr "Peut fermer l'alerte"
 
 #: inc/alert.class.php:135 inc/alert.class.php:400
 msgid "Show on login page"
 msgstr "Affiche sur la page de connexion"
 
 #: inc/alert.class.php:144 inc/alert.class.php:406
 msgid "Show on helpdesk page"
-msgstr ""
+msgstr "Affiche sur la page d'accueil de la Hotline"
 
 #: inc/alert.class.php:298
 msgid "Please enter a name."

diff --git a/locales/it_IT.mo b/locales/it_IT.mo
diff --git a/locales/it_IT.po b/locales/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-plugin-news/language/it_IT/)\n"

diff --git a/locales/ko_KR.mo b/locales/ko_KR.mo
diff --git a/locales/ko_KR.po b/locales/ko_KR.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:
+# SeongHyeon Cho <jaymz9634@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: GLPI Plugin - News\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
+"PO-Revision-Date: 2020-01-30 02:05+0000\n"
+"Last-Translator: SeongHyeon Cho <jaymz9634@gmail.com>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/teclib/glpi-plugin-news/language/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "경고"
+
+#: inc/alert.class.php:126 inc/alert.class.php:391
+msgid "Can close alert"
+msgstr "경고 닫기 허용"
+
+#: inc/alert.class.php:135 inc/alert.class.php:400
+msgid "Show on login page"
+msgstr "로그인 페이지에 표시"
+
+#: inc/alert.class.php:144 inc/alert.class.php:406
+msgid "Show on helpdesk page"
+msgstr "안내 페이지에 표시"
+
+#: inc/alert.class.php:298
+msgid "Please enter a name."
+msgstr "이름을 입력해 주세요"
+
+#: inc/alert.class.php:302
+msgid "Please enter a message."
+msgstr "메시지를 입력해 주세요"
+
+#: inc/alert.class.php:308
+msgid "The end date must be greater than the start date."
+msgstr "종료 일자는 시작 일자보다 커야 합니다."
+
+#: inc/alert.class.php:383
+msgid "Type (to add an icon before alert title)"
+msgstr "유형 (경고 제목 앞에 추가할 아이콘)"
+
+#: inc/alert.class.php:482
+msgid "You have hidden alerts valid for current date"
+msgstr "현재 날짜에 대한 숨겨진 경고가 있습니다"
+
+#: inc/alert.class.php:501
+msgid "General"
+msgstr "일반"
+
+#: inc/alert.class.php:502
+msgid "Information"
+msgstr "정보"
+
+#: inc/alert.class.php:503
+msgid "Warning"
+msgstr "경고"
+
+#: inc/alert.class.php:504
+msgid "Problem"
+msgstr "문제"
diff --git a/locales/lv_LV.mo b/locales/lv_LV.mo
diff --git a/locales/lv_LV.po b/locales/lv_LV.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-12-11 06:06+0000\n"
 "Last-Translator: Andrejs <andrew.k2@gmail.com>\n"
 "Language-Team: Latvian (Latvia) (http://www.transifex.com/teclib/glpi-plugin-news/language/lv_LV/)\n"

diff --git a/locales/news.pot b/locales/news.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo
diff --git a/locales/pl_PL.po b/locales/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-plugin-news/language/pl_PL/)\n"

diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
diff --git a/locales/pt_BR.po b/locales/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\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"

diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo
diff --git a/locales/pt_PT.po b/locales/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+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"

diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo
diff --git a/locales/ro_RO.po b/locales/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-plugin-news/language/ro_RO/)\n"

diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo
diff --git a/locales/ru_RU.po b/locales/ru_RU.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Alexey Petukhov <lexx015@gmail.com>, 2015
-# Nikolay <techobsl@yandex.ru>, 2016
-# Nikolay <techobsl@yandex.ru>, 2016
+# Nikolai Petrov <techobsl@yandex.ru>, 2016
+# Nikolai Petrov <techobsl@yandex.ru>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-plugin-news/language/ru_RU/)\n"

diff --git a/locales/sk_SK.mo b/locales/sk_SK.mo
diff --git a/locales/sk_SK.po b/locales/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-12-03 09:43+0000\n"
 "Last-Translator: feonsu <feonsu@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/teclib/glpi-plugin-news/language/sk_SK/)\n"

diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo
diff --git a/locales/tr_TR.po b/locales/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-22 08:40+0000\n"
 "Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-plugin-news/language/tr_TR/)\n"

diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo
diff --git a/locales/zh_CN.po b/locales/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - News\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-15 09:41+0000\n"
+"POT-Creation-Date: 2019-11-12 10:18+0000\n"
 "PO-Revision-Date: 2018-08-21 15:11+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-plugin-news/language/zh_CN/)\n"

diff --git a/plugin.xml b/plugin.xml
@@ -53,6 +53,11 @@ Fonctionnalités
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.6.0</num>
+         <compatibility>~9.4.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/news/releases/download/1.6.0/glpi-news-1.6.0.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.5.4</num>
          <compatibility>~9.4.0</compatibility>

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