{% if is_branding_active %}
@@ -62,7 +62,7 @@
{% else %}
{% endif %}
@@ -72,7 +72,7 @@
{{ fields.textareaField(
'add_text',
add_text,
- __('Text to add at the end of the PDF generation', 'pdf'),
+ __s('Text to add at the end of the PDF generation', 'pdf'),
{
'rows': 5,
'style': 'width:95%'
diff --git a/templates/preference_form.html.twig b/templates/preference_form.html.twig
new file mode 100644
index 0000000..1d6ed58
--- /dev/null
+++ b/templates/preference_form.html.twig
@@ -0,0 +1,210 @@
+{#
+ # -------------------------------------------------------------------------
+ # LICENSE
+ #
+ # This file is part of PDF plugin for GLPI.
+ #
+ # PDF is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Affero General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # PDF is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Affero General Public License for more details.
+ #
+ # You should have received a copy of the GNU Affero General Public License
+ # along with Reports. If not, see
.
+ #
+ # @author Nelly Mahu-Lasson, Remi Collet, Teclib
+ # @copyright Copyright (c) 2009-2022 PDF plugin team
+ # @license AGPL License 3.0 or (at your option) any later version
+ # @link https://github.com/pluginsGLPI/pdf/
+ # @link http://www.glpi-project.org/
+ # @package pdf
+ # @since 2009
+ # http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ # --------------------------------------------------------------------------
+ #}
+
+
+
+
diff --git a/tools/move_to_po.php b/tools/move_to_po.php
index 2c28b44..f3a7c45 100755
--- a/tools/move_to_po.php
+++ b/tools/move_to_po.php
@@ -58,7 +58,7 @@
if (!is_readable(GLPI_ROOT . '/locales/' . $_GET['lang'] . '.php')) {
print "Unable to read dictionnary file\n";
- exit();
+ return;
}
include(GLPI_ROOT . '/locales/en_GB.php');
/** @var array $LANG */
@@ -72,7 +72,7 @@
if (!preg_match('/string to be translated/', $content, $reg)) {
if (fwrite($lf_new, $content) === false) {
echo 'unable to write in clean lang file';
- exit;
+ return;
}
}
}
@@ -84,7 +84,7 @@
if (!is_readable(GLPI_ROOT . '/locales/glpi.pot')) {
print "Unable to read glpi.pot file\n";
- exit();
+ return;
}
$current_string = '';
$current_string_plural = '';
@@ -183,7 +183,7 @@
if (fwrite($po, $content) === false) {
echo 'unable to write in po file';
- exit;
+ return;
}
}
}
diff --git a/tools/pdftest.php b/tools/pdftest.php
index 28cdda2..2ec4760 100644
--- a/tools/pdftest.php
+++ b/tools/pdftest.php
@@ -87,7 +87,7 @@
$pdf->setHeader('Another header');
$pdf->newPage();
$pdf->displayTitle('Part 2');
-$pdf->addPngFromFile(GLPI_ROOT . '/pics/logo-glpi-login.png', 168, 81);
+$pdf->addPngFromFile(GLPI_ROOT . '/public/pics/logo-glpi-login.png', 168, 81);
$pdf->displayTitle('End of Part 2');
if (file_put_contents('pdftest.pdf', $pdf->output())) {