Skip to content

Commit fd4c463

Browse files
cedric-annecedric-anne
committed
Merge branch 'release/1.5.1'
2 parents 01dca3b + 897f38a commit fd4c463

37 files changed

+274
-269
lines changed

‎inc/alert.class.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,8 @@ class PluginNewsAlert extends CommonDBTM {
3434
const WARNING = 3;
3535
const PROBLEM = 4;
3636

37-
static function canCreate() {
38-
return self::canUpdate();
39-
}
40-
4137
static function canDelete() {
42-
return self::canUpdate();
43-
}
44-
45-
static function canPurge() {
46-
return self::canUpdate();
38+
return self::canPurge();
4739
}
4840

4941
/**

‎inc/alert_target.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
class PluginNewsAlert_Target extends CommonDBTM {
29-
static $rightname = 'entity';
29+
static $rightname = 'reminder_public';
3030

3131
static function getTypeName($nb = 0) {
3232
return _n('Target', 'Targets', $nb);

‎locales/cs_CZ.mo‎

0 Bytes
Binary file not shown.

‎locales/cs_CZ.po‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - News\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-09-10 08:41+0000\n"
11+
"POT-Creation-Date: 2019-02-15 09:41+0000\n"
1212
"PO-Revision-Date: 2018-08-21 18:11+0000\n"
1313
"Last-Translator: Pavel Borecki <[email protected]>\n"
1414
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-news/language/cs_CZ/)\n"
@@ -19,54 +19,54 @@ msgstr ""
1919
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
2020

2121
#: front/alert.php:27 front/alert.form.php:86 front/hidden_alerts.php:27
22-
#: front/hidden_alerts.php:30 inc/alert.class.php:56 setup.php:66
22+
#: front/hidden_alerts.php:30 inc/alert.class.php:48 setup.php:66
2323
msgid "Alerts"
2424
msgstr "Upozornění"
2525

26-
#: inc/alert.class.php:134 inc/alert.class.php:403
26+
#: inc/alert.class.php:126 inc/alert.class.php:391
2727
msgid "Can close alert"
2828
msgstr "Může zavřít výstrahu"
2929

30-
#: inc/alert.class.php:143 inc/alert.class.php:412
30+
#: inc/alert.class.php:135 inc/alert.class.php:400
3131
msgid "Show on login page"
3232
msgstr "Zobrazit na přihlašovací stránce"
3333

34-
#: inc/alert.class.php:152 inc/alert.class.php:418
34+
#: inc/alert.class.php:144 inc/alert.class.php:406
3535
msgid "Show on helpdesk page"
3636
msgstr "Zobrazit na stránce služby podpory"
3737

38-
#: inc/alert.class.php:310
38+
#: inc/alert.class.php:298
3939
msgid "Please enter a name."
4040
msgstr "Zadejte název."
4141

42-
#: inc/alert.class.php:314
42+
#: inc/alert.class.php:302
4343
msgid "Please enter a message."
4444
msgstr "Zadejte zprávu."
4545

46-
#: inc/alert.class.php:320
46+
#: inc/alert.class.php:308
4747
msgid "The end date must be greater than the start date."
4848
msgstr "Je třeba, aby datum konce bylo později než začátku."
4949

50-
#: inc/alert.class.php:395
50+
#: inc/alert.class.php:383
5151
msgid "Type (to add an icon before alert title)"
5252
msgstr "Typ (pro přidání ikony před titulek upozornění)"
5353

54-
#: inc/alert.class.php:494
54+
#: inc/alert.class.php:482
5555
msgid "You have hidden alerts valid for current date"
5656
msgstr "Máte skrytá upozornění platná pro aktuální datum"
5757

58-
#: inc/alert.class.php:513
58+
#: inc/alert.class.php:501
5959
msgid "General"
6060
msgstr "Obecné"
6161

62-
#: inc/alert.class.php:514
62+
#: inc/alert.class.php:502
6363
msgid "Information"
6464
msgstr "Informace"
6565

66-
#: inc/alert.class.php:515
66+
#: inc/alert.class.php:503
6767
msgid "Warning"
6868
msgstr "Varování"
6969

70-
#: inc/alert.class.php:516
70+
#: inc/alert.class.php:504
7171
msgid "Problem"
7272
msgstr "Problém"

‎locales/de_DE.mo‎

0 Bytes
Binary file not shown.

‎locales/de_DE.po‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - News\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-09-10 08:41+0000\n"
11+
"POT-Creation-Date: 2019-02-15 09:41+0000\n"
1212
"PO-Revision-Date: 2018-08-21 15:11+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: German (Germany) (http://www.transifex.com/teclib/glpi-plugin-news/language/de_DE/)\n"
@@ -19,54 +19,54 @@ msgstr ""
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2020

2121
#: front/alert.php:27 front/alert.form.php:86 front/hidden_alerts.php:27
22-
#: front/hidden_alerts.php:30 inc/alert.class.php:56 setup.php:66
22+
#: front/hidden_alerts.php:30 inc/alert.class.php:48 setup.php:66
2323
msgid "Alerts"
2424
msgstr "Alarme"
2525

26-
#: inc/alert.class.php:134 inc/alert.class.php:403
26+
#: inc/alert.class.php:126 inc/alert.class.php:391
2727
msgid "Can close alert"
2828
msgstr ""
2929

30-
#: inc/alert.class.php:143 inc/alert.class.php:412
30+
#: inc/alert.class.php:135 inc/alert.class.php:400
3131
msgid "Show on login page"
3232
msgstr "Auf der Anmeldeseite anzeigen."
3333

34-
#: inc/alert.class.php:152 inc/alert.class.php:418
34+
#: inc/alert.class.php:144 inc/alert.class.php:406
3535
msgid "Show on helpdesk page"
3636
msgstr ""
3737

38-
#: inc/alert.class.php:310
38+
#: inc/alert.class.php:298
3939
msgid "Please enter a name."
4040
msgstr "Bitte geben Sie einen Namen ein."
4141

42-
#: inc/alert.class.php:314
42+
#: inc/alert.class.php:302
4343
msgid "Please enter a message."
4444
msgstr "Bitte geben Sie die Nachricht ein."
4545

46-
#: inc/alert.class.php:320
46+
#: inc/alert.class.php:308
4747
msgid "The end date must be greater than the start date."
4848
msgstr "Das Enddatum muss größer als das Startdatum sein."
4949

50-
#: inc/alert.class.php:395
50+
#: inc/alert.class.php:383
5151
msgid "Type (to add an icon before alert title)"
5252
msgstr "Typ (Das Symbol wird vor dem Alarmtitel angezeigt.)"
5353

54-
#: inc/alert.class.php:494
54+
#: inc/alert.class.php:482
5555
msgid "You have hidden alerts valid for current date"
5656
msgstr "Sie haben ausgeblendete Alarme, welche für das aktuelle Datum gesetzt sind."
5757

58-
#: inc/alert.class.php:513
58+
#: inc/alert.class.php:501
5959
msgid "General"
6060
msgstr "Allgemein"
6161

62-
#: inc/alert.class.php:514
62+
#: inc/alert.class.php:502
6363
msgid "Information"
6464
msgstr "Information"
6565

66-
#: inc/alert.class.php:515
66+
#: inc/alert.class.php:503
6767
msgid "Warning"
6868
msgstr "Warnung"
6969

70-
#: inc/alert.class.php:516
70+
#: inc/alert.class.php:504
7171
msgid "Problem"
7272
msgstr "Problem"

‎locales/en_GB.mo‎

0 Bytes
Binary file not shown.

‎locales/en_GB.po‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# English translations for PACKAGE package.
2-
# Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER
2+
# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
33
# This file is distributed under the same license as the PACKAGE package.
4-
# Automatically generated, 2018.
4+
# Automatically generated, 2019.
55
#
66
msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-10 08:41+0000\n"
11-
"PO-Revision-Date: 2018-09-10 08:41+0000\n"
10+
"POT-Creation-Date: 2019-02-15 09:41+0000\n"
11+
"PO-Revision-Date: 2019-02-15 09:41+0000\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
1414
"Language: en_GB\n"
@@ -18,54 +18,54 @@ msgstr ""
1818
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1919

2020
#: front/alert.php:27 front/alert.form.php:86 front/hidden_alerts.php:27
21-
#: front/hidden_alerts.php:30 inc/alert.class.php:56 setup.php:66
21+
#: front/hidden_alerts.php:30 inc/alert.class.php:48 setup.php:66
2222
msgid "Alerts"
2323
msgstr "Alerts"
2424

25-
#: inc/alert.class.php:134 inc/alert.class.php:403
25+
#: inc/alert.class.php:126 inc/alert.class.php:391
2626
msgid "Can close alert"
2727
msgstr "Can close alert"
2828

29-
#: inc/alert.class.php:143 inc/alert.class.php:412
29+
#: inc/alert.class.php:135 inc/alert.class.php:400
3030
msgid "Show on login page"
3131
msgstr "Show on login page"
3232

33-
#: inc/alert.class.php:152 inc/alert.class.php:418
33+
#: inc/alert.class.php:144 inc/alert.class.php:406
3434
msgid "Show on helpdesk page"
3535
msgstr "Show on helpdesk page"
3636

37-
#: inc/alert.class.php:310
37+
#: inc/alert.class.php:298
3838
msgid "Please enter a name."
3939
msgstr "Please enter a name."
4040

41-
#: inc/alert.class.php:314
41+
#: inc/alert.class.php:302
4242
msgid "Please enter a message."
4343
msgstr "Please enter a message."
4444

45-
#: inc/alert.class.php:320
45+
#: inc/alert.class.php:308
4646
msgid "The end date must be greater than the start date."
4747
msgstr "The end date must be greater than the start date."
4848

49-
#: inc/alert.class.php:395
49+
#: inc/alert.class.php:383
5050
msgid "Type (to add an icon before alert title)"
5151
msgstr "Type (to add an icon before alert title)"
5252

53-
#: inc/alert.class.php:494
53+
#: inc/alert.class.php:482
5454
msgid "You have hidden alerts valid for current date"
5555
msgstr "You have hidden alerts valid for current date"
5656

57-
#: inc/alert.class.php:513
57+
#: inc/alert.class.php:501
5858
msgid "General"
5959
msgstr "General"
6060

61-
#: inc/alert.class.php:514
61+
#: inc/alert.class.php:502
6262
msgid "Information"
6363
msgstr "Information"
6464

65-
#: inc/alert.class.php:515
65+
#: inc/alert.class.php:503
6666
msgid "Warning"
6767
msgstr "Warning"
6868

69-
#: inc/alert.class.php:516
69+
#: inc/alert.class.php:504
7070
msgid "Problem"
7171
msgstr "Problem"

‎locales/en_US.mo‎

0 Bytes
Binary file not shown.

‎locales/en_US.po‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - News\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-09-10 08:41+0000\n"
11+
"POT-Creation-Date: 2019-02-15 09:41+0000\n"
1212
"PO-Revision-Date: 2018-08-21 15:11+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-news/language/en_US/)\n"
@@ -19,54 +19,54 @@ msgstr ""
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2020

2121
#: front/alert.php:27 front/alert.form.php:86 front/hidden_alerts.php:27
22-
#: front/hidden_alerts.php:30 inc/alert.class.php:56 setup.php:66
22+
#: front/hidden_alerts.php:30 inc/alert.class.php:48 setup.php:66
2323
msgid "Alerts"
2424
msgstr "Alerts"
2525

26-
#: inc/alert.class.php:134 inc/alert.class.php:403
26+
#: inc/alert.class.php:126 inc/alert.class.php:391
2727
msgid "Can close alert"
2828
msgstr ""
2929

30-
#: inc/alert.class.php:143 inc/alert.class.php:412
30+
#: inc/alert.class.php:135 inc/alert.class.php:400
3131
msgid "Show on login page"
3232
msgstr "Show on login page"
3333

34-
#: inc/alert.class.php:152 inc/alert.class.php:418
34+
#: inc/alert.class.php:144 inc/alert.class.php:406
3535
msgid "Show on helpdesk page"
3636
msgstr ""
3737

38-
#: inc/alert.class.php:310
38+
#: inc/alert.class.php:298
3939
msgid "Please enter a name."
4040
msgstr "Please enter a name."
4141

42-
#: inc/alert.class.php:314
42+
#: inc/alert.class.php:302
4343
msgid "Please enter a message."
4444
msgstr "Please enter a message."
4545

46-
#: inc/alert.class.php:320
46+
#: inc/alert.class.php:308
4747
msgid "The end date must be greater than the start date."
4848
msgstr "The end date must be greater than the start date."
4949

50-
#: inc/alert.class.php:395
50+
#: inc/alert.class.php:383
5151
msgid "Type (to add an icon before alert title)"
5252
msgstr "Type (to add an icon before alert title)"
5353

54-
#: inc/alert.class.php:494
54+
#: inc/alert.class.php:482
5555
msgid "You have hidden alerts valid for current date"
5656
msgstr "You have hidden alerts valid for current date"
5757

58-
#: inc/alert.class.php:513
58+
#: inc/alert.class.php:501
5959
msgid "General"
6060
msgstr "General"
6161

62-
#: inc/alert.class.php:514
62+
#: inc/alert.class.php:502
6363
msgid "Information"
6464
msgstr "Information"
6565

66-
#: inc/alert.class.php:515
66+
#: inc/alert.class.php:503
6767
msgid "Warning"
6868
msgstr "Warning"
6969

70-
#: inc/alert.class.php:516
70+
#: inc/alert.class.php:504
7171
msgid "Problem"
7272
msgstr "Problem"

0 commit comments

Comments
 (0)