From 0966c031053a9b53e953af1ec8ce0a2456bb4530 Mon Sep 17 00:00:00 2001 From: E <2974895+eduardomozart@users.noreply.github.com> Date: Mon, 29 Dec 2025 17:15:52 -0300 Subject: [PATCH 1/2] Fix translation for "Observer" The correct string is 'Observer' instead of 'Watcher'. --- inc/change.class.php | 4 ++-- inc/group.class.php | 2 +- inc/problem.class.php | 4 ++-- inc/ticket.class.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/change.class.php b/inc/change.class.php index 0aa10a6..88d0158 100644 --- a/inc/change.class.php +++ b/inc/change.class.php @@ -199,7 +199,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Change $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Watcher'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -220,7 +220,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Change $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Watcher group'), + __s('Observer group'), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) { diff --git a/inc/group.class.php b/inc/group.class.php index 5b7e82c..baab780 100644 --- a/inc/group.class.php +++ b/inc/group.class.php @@ -71,7 +71,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Group $item) ), '' . sprintf( __s('%1$s - %2$s'), - __s('Watcher') . '', + __s('Observer') . '', Dropdown::getYesNo($item->fields['is_watcher']), ), '' . sprintf( diff --git a/inc/problem.class.php b/inc/problem.class.php index 0bcd65a..248d4ea 100644 --- a/inc/problem.class.php +++ b/inc/problem.class.php @@ -196,7 +196,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Problem $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Watcher'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -217,7 +217,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Problem $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Watcher group'), + __s('Observer group'), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) { diff --git a/inc/ticket.class.php b/inc/ticket.class.php index a09d9ed..a449230 100644 --- a/inc/ticket.class.php +++ b/inc/ticket.class.php @@ -355,7 +355,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Ticket $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Watcher'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -376,7 +376,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Ticket $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Watcher group'), + __s('Observer group'), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) { From e0ef88b1344e41fd611d71b274614e380c917c0f Mon Sep 17 00:00:00 2001 From: E <2974895+eduardomozart@users.noreply.github.com> Date: Thu, 8 Jan 2026 08:02:30 -0300 Subject: [PATCH 2/2] Changed to plural --- inc/change.class.php | 4 ++-- inc/group.class.php | 2 +- inc/problem.class.php | 4 ++-- inc/ticket.class.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/change.class.php b/inc/change.class.php index 88d0158..f66e41a 100644 --- a/inc/change.class.php +++ b/inc/change.class.php @@ -199,7 +199,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Change $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', _n('Observer', 'Observers', 1), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -220,7 +220,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Change $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Observer group'), + _n('Observer group', 'Observer groups', 1), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) { diff --git a/inc/group.class.php b/inc/group.class.php index baab780..31eea5d 100644 --- a/inc/group.class.php +++ b/inc/group.class.php @@ -71,7 +71,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Group $item) ), '' . sprintf( __s('%1$s - %2$s'), - __s('Observer') . '', + _n('Observer', 'Observers', 1) . '', Dropdown::getYesNo($item->fields['is_watcher']), ), '' . sprintf( diff --git a/inc/problem.class.php b/inc/problem.class.php index 248d4ea..f2ce73b 100644 --- a/inc/problem.class.php +++ b/inc/problem.class.php @@ -196,7 +196,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Problem $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', _n('Observer', 'Observers', 1), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -217,7 +217,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Problem $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Observer group'), + _n('Observer group', 'Observer groups', 1), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) { diff --git a/inc/ticket.class.php b/inc/ticket.class.php index a449230..49a1213 100644 --- a/inc/ticket.class.php +++ b/inc/ticket.class.php @@ -355,7 +355,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Ticket $job) // Observer $users = []; $listusers = ''; - $watcher = '' . sprintf(__s('%1$s: %2$s') . '', __s('Observer'), $listusers); + $watcher = '' . sprintf(__s('%1$s: %2$s') . '', _n('Observer', 'Observers', 1), $listusers); foreach ($job->getUsers(CommonITILActor::OBSERVER) as $d) { if ($d['users_id']) { $tmp = Toolbox::stripTags($dbu->getUserName($d['users_id'])); @@ -376,7 +376,7 @@ public static function pdfMain(PluginPdfSimplePDF $pdf, Ticket $job) $listgroups = ''; $watchergroup = '' . sprintf( __s('%1$s: %2$s') . '', - __s('Observer group'), + _n('Observer group', 'Observer groups', 1), $listgroups, ); foreach ($job->getGroups(CommonITILActor::OBSERVER) as $d) {