Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/4.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cedric-anne
cedric-anne committed Sep 4, 2018
2 parents b0d2153 + af1ade1 commit 253e126
Show file tree
Hide file tree
Showing 16 changed files with 312 additions and 283 deletions.
2 changes: 1 addition & 1 deletion inc/config.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static function install(Migration $migration) {
`check_ssl` int(1) NOT NULL DEFAULT 0,
`use_proxy` int(1) 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) or die($DB->error());

$query = "INSERT INTO `$table` (id) VALUES (1)";
Expand Down
11 changes: 8 additions & 3 deletions inc/mantis.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,13 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
* @param $item CommonDBTM object
**/
public static function countForItem(CommonDBTM $item) {
return countElementsInTable(self::getTable(), "`items_id` = '".$item->getID()."'
AND `itemtype` = '".$item->getType()."'");
return countElementsInTable(
self::getTable(),
[
'items_id' => $item->getID(),
'itemtype' => $item->getType(),
]
);
}

/**
Expand All @@ -106,7 +111,7 @@ static function install(Migration $migration) {
`itemtype` varchar(255) NOT NULL,
`user` 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) or die($DB->error());

} else {
Expand Down
4 changes: 2 additions & 2 deletions inc/profile.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static function addDefaultProfileInfos($profiles_id, $rights) {
$profileRight = new ProfileRight();
foreach ($rights as $right => $value) {
if (!countElementsInTable('glpi_profilerights',
"`profiles_id`='$profiles_id' AND `name`='$right'")) {
['profiles_id' => $profiles_id, 'name' => $right])) {
$myright['profiles_id'] = $profiles_id;
$myright['name'] = $right;
$myright['rights'] = $value;
Expand Down Expand Up @@ -212,7 +212,7 @@ static function changeProfile() {
* @return bool
*/
static function oldRightNameExists() {
if (countElementsInTable(ProfileRight::getTable(), "name = 'mantis:mantis'") > 0) {
if (countElementsInTable(ProfileRight::getTable(), ['name' => 'mantis:mantis']) > 0) {
return true;
}
return false;
Expand Down
Binary file modified locales/cs_CZ.mo
View file
Binary file not shown.
88 changes: 44 additions & 44 deletions locales/cs_CZ.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-06 09:37+0000\n"
"POT-Creation-Date: 2018-08-21 14:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n"
Expand Down Expand Up @@ -66,31 +66,31 @@ msgstr "Výchozí stav zaškrtávací kolonky"
msgid "Forward document(s)"
msgstr "Přeposlat dokumenty"

#: inc/userpref.class.php:130 inc/mantis.class.php:688
#: inc/userpref.class.php:130 inc/mantis.class.php:693
msgid "Forward ticket followup"
msgstr "Přeposlat komunikaci navazující na požadavek"

#: inc/userpref.class.php:136 inc/mantis.class.php:696
#: inc/userpref.class.php:136 inc/mantis.class.php:701
msgid "Forward ticket tasks"
msgstr "Přeposlat úkoly plynoucí z požadavku"

#: inc/userpref.class.php:142 inc/mantis.class.php:703
#: inc/mantis.class.php:849
#: inc/userpref.class.php:142 inc/mantis.class.php:708
#: inc/mantis.class.php:854
msgid "Forward title"
msgstr "Přeposlat nadpis"

#: inc/userpref.class.php:148 inc/mantis.class.php:709
#: inc/mantis.class.php:855
#: inc/userpref.class.php:148 inc/mantis.class.php:714
#: inc/mantis.class.php:860
msgid "Forward description"
msgstr "Přeposlat popis"

#: inc/userpref.class.php:154 inc/mantis.class.php:715
#: inc/mantis.class.php:861
#: inc/userpref.class.php:154 inc/mantis.class.php:720
#: inc/mantis.class.php:866
msgid "Forward category"
msgstr "Přeposlat kategorii"

#: inc/userpref.class.php:160 inc/mantis.class.php:722
#: inc/mantis.class.php:868
#: inc/userpref.class.php:160 inc/mantis.class.php:727
#: inc/mantis.class.php:873
msgid "Forward linked tickets"
msgstr "Přeposlat propojené požadavky"

Expand Down Expand Up @@ -147,7 +147,7 @@ msgstr "Typ přílohy přenášené do MantisBT"
msgid "MantisBT field for GLPI fields"
msgstr "Kolonky v MantisBT pro kolonky z GLPi"

#: inc/config.class.php:184 inc/mantis.class.php:669 inc/mantis.class.php:794
#: inc/config.class.php:184 inc/mantis.class.php:674 inc/mantis.class.php:799
msgid "MantisBT field for the link URL to the GLPi object"
msgstr "Kolonka v MantisBT pro URL odkazu na GLPi objekt"

Expand All @@ -167,137 +167,137 @@ msgstr "GLPi uživatel který řeší požadavek?"
msgid "Test the connection"
msgstr "Vyzkoušet spojení"

#: inc/mantis.class.php:178 setup.php:88
#: inc/mantis.class.php:183 setup.php:88
msgid "MantisBT synchronization"
msgstr "Synchronizace s MantisBT"

#: inc/mantis.class.php:190
#: inc/mantis.class.php:195
msgid "Starting update attachments."
msgstr "Zahajuje se aktualizace příloh."

#: inc/mantis.class.php:209
#: inc/mantis.class.php:214
#, php-format
msgid "GLPi object [%1$s:%2$s] is solved or closed."
msgstr "GLPi objekt [%1$s:%2$s] je vyřešen nebo uzavřen."

#: inc/mantis.class.php:236
#: inc/mantis.class.php:241
#, php-format
msgid "Can't load GLPi file [%1$s]."
msgstr "Nedaří se načíst GLPi soubor [%1$s]."

#: inc/mantis.class.php:249
#: inc/mantis.class.php:254
#, php-format
msgid "Can't send GLPi file [%1$s] to MantisBD."
msgstr "Nedaří se poslat GLPi soubor [%1$s] do MantisBT."

#: inc/mantis.class.php:257
#: inc/mantis.class.php:262
#, php-format
msgid "GLPi file [%1$s] doesn't exists."
msgstr "GLPi soubor [%1$s] neexistuje."

#: inc/mantis.class.php:264
#: inc/mantis.class.php:269
#, php-format
msgid "GLPi file [%1$s] already exists in MantisBT issue."
msgstr "GLPi soubor [%1$s] už v MantisBT hlášení existuje."

#: inc/mantis.class.php:304
#: inc/mantis.class.php:309
#, php-format
msgid "GLPi object [%1$s:%2$s] is already solved or closed."
msgstr "GLPi objekt [%1$s:%2$s] už je vyřešený nebo uzavřený."

#: inc/mantis.class.php:336
#: inc/mantis.class.php:341
msgid "Plugin configuration is not correct (MantisBT status is missing)"
msgstr "Nastavení zásuvného modulu není správné (chybí stav v MantisBT)"

#: inc/mantis.class.php:511
#: inc/mantis.class.php:516
msgid "Plugin configuration is not correct (connection error)."
msgstr "Nastavení zásuvného modulu není správné (chyba spojení)."

#: inc/mantis.class.php:545 inc/mantis.class.php:565
#: inc/mantis.class.php:550 inc/mantis.class.php:570
msgid "Link to an existing MantisBT issue"
msgstr "Propojit s existujícím hlášením v MantisBT"

#: inc/mantis.class.php:554 inc/mantis.class.php:570 inc/mantis.class.php:767
#: inc/mantis.class.php:559 inc/mantis.class.php:575 inc/mantis.class.php:772
msgid "Create a new MantisBT issue"
msgstr "Vytvořit nové hlášení v MantisBT"

#: inc/mantis.class.php:560
#: inc/mantis.class.php:565
msgid "MantisBT actions"
msgstr "Akce s MantisBT"

#: inc/mantis.class.php:598
#: inc/mantis.class.php:603
msgid "What do you want to do ?"
msgstr "Co chcete udělat?"

#: inc/mantis.class.php:602
#: inc/mantis.class.php:607
msgid "Only delete link between GLPi object AND MantisBT issue."
msgstr "Pouze smazat propojení mezi GLPi objektem a hlášením v MantisBT."

#: inc/mantis.class.php:608
#: inc/mantis.class.php:613
msgid "Force delete MantisBT issue (and GLPi object link)."
msgstr "Vynutit smazání hlášení v MantisBT (a propojení na GLPi objekt)."

#: inc/mantis.class.php:651
#: inc/mantis.class.php:656
msgid "Link to an existing MantisBT issue."
msgstr "Propojit s existujícím hlášením v MantisBT."

#: inc/mantis.class.php:654
#: inc/mantis.class.php:659
msgid "Id of MantisBT issue"
msgstr "Identifikátor hlášení v MantisBT"

#: inc/mantis.class.php:657
#: inc/mantis.class.php:662
msgid "Click to load issue from MantisBT"
msgstr "Kliknutím načtěte hlášení z MantisBT"

#: inc/mantis.class.php:662 inc/mantis.class.php:787
#: inc/mantis.class.php:667 inc/mantis.class.php:792
msgid "MantisBT field for GLPi fields"
msgstr "Kolonky v MantisBT pro ty z GLPi"

#: inc/mantis.class.php:677 inc/mantis.class.php:823
#: inc/mantis.class.php:682 inc/mantis.class.php:828
msgid "Attachments"
msgstr "Přílohy"

#: inc/mantis.class.php:680 inc/mantis.class.php:826
#: inc/mantis.class.php:685 inc/mantis.class.php:831
msgid "Forward attachments"
msgstr "Přeposlat přílohy"

#: inc/mantis.class.php:770
#: inc/mantis.class.php:775
msgid "Exact MantisBT project name"
msgstr "Přesný název projektu v MantisBT"

#: inc/mantis.class.php:775
#: inc/mantis.class.php:780
msgid "Click to load project from MantisBT"
msgstr "Kliknutím načtěte projekt z MantisBT"

#: inc/mantis.class.php:818
#: inc/mantis.class.php:823
msgid "Steps to reproduce"
msgstr "Kroky vedoucí k zopakování"

#: inc/mantis.class.php:834
#: inc/mantis.class.php:839
msgid "Forward followups"
msgstr "Přeposlat následnou komunikaci"

#: inc/mantis.class.php:842
#: inc/mantis.class.php:847
msgid "Forward tasks"
msgstr "Přeposlat úkoly"

#: inc/mantis.class.php:873
#: inc/mantis.class.php:878
msgid "Link"
msgstr "Odkaz"

#: inc/mantis.class.php:914
#: inc/mantis.class.php:919
msgid "List of linked MantisBT issues"
msgstr "Seznam odkazovaných hlášení v MantisBT"

#: inc/mantis.class.php:959
#: inc/mantis.class.php:964
msgid "Error when loading MantisBT issue"
msgstr "Chyba při načítání hlášení z MantisBT"

#: inc/mantis.class.php:990
#: inc/mantis.class.php:995
msgid "This GLPi object is not linked to MantisBT"
msgstr "Tento GLPi objekt není propojen s MantisBT"

#: inc/mantis.class.php:996
#: inc/mantis.class.php:1001
msgid "Escalation to MantisBT is neutralized by GLPi status"
msgstr "Eskalace do MantisBT je neutralizována stavem v GLPi"

Expand Down
Binary file modified locales/en_GB.mo
View file
Binary file not shown.
Loading

0 comments on commit 253e126

Please sign in to comment.