From 20bce1f392082c8df17e4b748a6eb39ba33a71b3 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 22 Jul 2014 09:11:38 -0500
Subject: [PATCH] i18n: De-duplicate confirmation messages
---
include/staff/apikeys.inc.php | 11 +++++++----
include/staff/banlist.inc.php | 9 ++++++---
include/staff/cannedresponses.inc.php | 11 +++++++----
include/staff/categories.inc.php | 11 +++++++----
include/staff/departments.inc.php | 11 +++++++----
include/staff/dynamic-forms.inc.php | 7 ++++---
include/staff/dynamic-lists.inc.php | 7 ++++---
include/staff/emails.inc.php | 5 +++--
include/staff/filters.inc.php | 11 +++++++----
include/staff/groups.inc.php | 11 +++++++----
include/staff/helptopics.inc.php | 11 +++++++----
include/staff/pages.inc.php | 13 ++++++++-----
include/staff/plugins.inc.php | 15 +++++++++------
include/staff/settings-pages.inc.php | 11 ++++++-----
include/staff/slaplans.inc.php | 9 ++++++---
include/staff/staffmembers.inc.php | 11 +++++++----
include/staff/syslogs.inc.php | 5 +++--
include/staff/teams.inc.php | 11 +++++++----
include/staff/templates.inc.php | 11 +++++++----
include/staff/ticket-view.inc.php | 2 +-
include/staff/tickets.inc.php | 3 ++-
21 files changed, 122 insertions(+), 74 deletions(-)
diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php
index 8b1220a34..ba45adcce 100644
--- a/include/staff/apikeys.inc.php
+++ b/include/staff/apikeys.inc.php
@@ -117,14 +117,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected API keys?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected API key', 'selected API keys', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected API keys?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected API key', 'selected API keys', 2)); ?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected API keys?');?></strong></font>
- <br><br><?php echo __('Deleted keys CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected API key', 'selected API keys', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 075d51aef..26e1d074d 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -143,13 +143,16 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected ban rules?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected ban rule', 'selected ban rules', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected ban rules?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected ban rule', 'selected ban rules', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected ban rules?');?></strong></font>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected ban rule', 'selected ban rules', 2));?></strong></font>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index e7b65b58c..1da21b8b0 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -129,14 +129,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected canned responses?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected canned response', 'selected canned responses', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected canned responses?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected canned response', 'selected canned responses', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected canned responses?');?></strong></font>
- <br><br><?php echo __('Deleted items CANNOT be recovered, including any associated attachments.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected canned response', 'selected canned responses', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered, including any associated attachments.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index 0fee06ca8..efdd593ba 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -122,14 +122,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="make_public-confirm">
- <?php echo __('Are you sure want to make selected categories <b>public</b>?');?>
+ <?php echo sprintf(__('Are you sure want to make %s <b>public</b>?'),
+ _N('selected category', 'selected categories', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="make_private-confirm">
- <?php echo __('Are you sure want to make selected categories <b>private</b> (internal)?');?>
+ <?php echo sprintf(__('Are you sure want to make %s <b>private</b> (internal)?'),
+ _N('selected category', 'selected categories', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected categories?');?></strong></font>
- <br><br><?php echo __('Deleted entries CANNOT be recovered, including any associated FAQs.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected category', 'selected categories', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered, including any associated FAQs.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index 85a7c0267..ba2d04707 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -140,14 +140,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="make_public-confirm">
- <?php echo __('Are you sure want to make selected departments <b>public</b>?');?>
+ <?php echo sprintf(__('Are you sure want to make %s <b>public</b>?'),
+ _N('selected department', 'selected departments', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="make_private-confirm">
- <?php echo __('Are you sure want to make selected departments <b>private</b>?');?>
+ <?php echo sprintf(__('Are you sure want to make %s <b>private</b> (internal)?'),
+ _N('selected department', 'selected departments', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected departments?');?></strong></font>
- <br><br><?php echo __('Deleted departments CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected department', 'selected departments', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 4e456873e..74e3af3f9 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -104,9 +104,10 @@ if ($count) //Show options..
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to DELETE selected forms?'); ?></strong></font>
- <br><br><?php echo __('Deleted forms CANNOT be recovered.'); ?>
+ <font color="red"><strong><?php echo sprintf(__(
+ 'Are you sure you want to DELETE %s?'),
+ _N('selected custom form', 'selected custom forms', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index fd4f7bf5b..824473c7f 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -77,9 +77,10 @@ if ($count) //Show options..
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to DELETE selected lists?'); ?></strong></font>
- <br><br><?php echo __('Deleted forms CANNOT be recovered.'); ?>
+ <font color="red"><strong><?php echo sprintf(
+ __('Are you sure you want to DELETE %s?'),
+ _N('selected custom list', 'selected custom lists', 2)); ?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index d2911eeee..7cc6d3ef6 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -125,8 +125,9 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected emails?');?></strong></font>
- <br><br><?php echo __('Deleted emails CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected email', 'selected emails', 2)) ;?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 60da7230b..5a063d3ea 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -128,14 +128,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected filters?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected filter', 'selected filters', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected filters?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected filter', 'selected filters', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected filters?');?></strong></font>
- <br><br><?php echo __('Deleted filters CANNOT be recovered, including any associated rules.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected filter', 'selected filters', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered, including any associated rules.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index 538ee9510..4b47dba87 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -129,14 +129,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected groups?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected group', 'selected groups', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected groups?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected group', 'selected groups', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected groups?');?></strong></font>
- <br><br><?php echo __("Deleted groups CANNOT be recovered and might affect agents' access.");?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected group', 'selected groups', 2));?></strong></font>
+ <br><br><?php echo __("Deleted data CANNOT be recovered and might affect agents' access.");?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index a907ab8c2..d124a67a2 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -148,14 +148,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected help topics?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected help topic', 'selected help topics', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected help topics?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected help topic', 'selected help topics', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected help topics?');?></strong></font>
- <br><br><?php echo __('Deleted topics CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected help topic', 'selected help topics', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index a98fca84f..19a307f93 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -135,15 +135,18 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected pages?'); ?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected site page', 'selected site pages', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected pages?'); ?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected site page', 'selected site pages', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to DELETE selected pages?'); ?></strong></font>
- <br><br><?php echo __('Deleted pages CANNOT be recovered.'); ?>
+ <font color="red"><strong><?php echo sprintf(
+ __('Are you sure you want to DELETE %s?'),
+ _N('selected site page', 'selected site pages', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/plugins.inc.php b/include/staff/plugins.inc.php
index d550d34a9..cd3282e4b 100644
--- a/include/staff/plugins.inc.php
+++ b/include/staff/plugins.inc.php
@@ -75,18 +75,21 @@ if ($count) //Show options..
<a class="close" href="">×</a>
<hr/>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to DELETE selected plugins?'); ?></strong></font>
+ <font color="red"><strong><?php echo sprintf(
+ __('Are you sure you want to DELETE %s?'),
+ _N('selected plugin', 'selected plugins', 2)); ?></strong></font>
<br><br><?php echo __(
'Configuration for deleted plugins CANNOT be recovered.'); ?>
</p>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <font color="green"><strong><?php echo __(
- 'Are you ready to enable selected plugins?'); ?></strong></font>
+ <font color="green"><?php echo sprintf(
+ __('Are you sure want to <b>enable</b> %s?'),
+ _N('selected plugin', 'selected plugins', 2)); ?></font>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to disable selected plugins?'); ?></strong></font>
+ <font color="red"><?php echo sprintf(
+ __('Are you sure want to <b>disable</b> %s?'),
+ _N('selected plugin', 'selected plugins', 2)); ?></font>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index eba678eba..9727bde40 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -170,18 +170,19 @@ $pages = Page::getPages();
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" id="delete-confirm">
- <font color="red"><strong><?php echo __(
- 'Are you sure you want to DELETE selected logos?'); ?></strong></font>
- <br/><br/><?php echo __('Deleted logos CANNOT be recovered.'); ?>
+ <font color="red"><strong><?php echo sprintf(
+ __('Are you sure you want to DELETE %s?'),
+ _N('selected logo', 'selected logos', 2)); ?></strong></font>
+ <br/><br/><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
<p class="full-width">
<span class="buttons pull-left">
- <input type="button" value="No, Cancel" class="close">
+ <input type="button" value="<?php echo __('No, Cancel'); ?>" class="close">
</span>
<span class="buttons pull-right">
- <input type="button" value="Yes, Do it!" class="confirm">
+ <input type="button" value="<?php echo __('Yes, Do it!'); ?>" class="confirm">
</span>
</p>
<div class="clear"></div>
diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php
index e6808db4a..4acf6763c 100644
--- a/include/staff/slaplans.inc.php
+++ b/include/staff/slaplans.inc.php
@@ -128,13 +128,16 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected SLA plans?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected SLA plan', 'selected SLA plans', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected SLA plans?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected SLA plan', 'selected SLA plans', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected SLA plans?');?></strong></font>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected SLA plan', 'selected SLA plans', 2)); ?></strong></font>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index acec392d4..f440ea396 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -192,15 +192,18 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> (unlock) selected agent?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> (unlock) %s?'),
+ _N('selected agent', 'selected agents', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> (lock) selected agent?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> (lock) %s?'),
+ _N('selected agent', 'selected agents', 2));?>
<br><br><?php echo __("Locked staff won't be able to login to Staff Control Panel.");?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected agent?');?></strong></font>
- <br><br><?php echo __('Deleted agent CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected agent', 'selected agents', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/syslogs.inc.php b/include/staff/syslogs.inc.php
index e490e2a82..b264ffa05 100644
--- a/include/staff/syslogs.inc.php
+++ b/include/staff/syslogs.inc.php
@@ -176,8 +176,9 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected logs?');?></strong></font>
- <br><br><?php echo __('Deleted logs CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected log entry', 'selected log entries', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index 62d415bfe..de08d25e8 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -125,14 +125,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected teams?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected team', 'selected teams', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected teams?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected team', 'selected teams', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected teams?');?></strong></font>
- <br><br><?php echo __('Deleted team CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected team', 'selected teams', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php
index 946baccb3..3fb2c49b5 100644
--- a/include/staff/templates.inc.php
+++ b/include/staff/templates.inc.php
@@ -127,14 +127,17 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> selected templates?');?>
+ <?php echo sprintf(__('Are you sure want to <b>enable</b> %s?'),
+ _N('selected template set', 'selected template sets', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> selected templates?');?>
+ <?php echo sprintf(__('Are you sure want to <b>disable</b> %s?'),
+ _N('selected template set', 'selected template sets', 2));?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected templates?');?></strong></font>
- <br><br><?php echo __('Deleted templates CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected template set', 'selected template sets', 2));?></strong></font>
+ <br><br><?php echo __('Deleted data CANNOT be recovered.'); ?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 031b79446..b3c621b8f 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -1004,7 +1004,7 @@ $tcount+= $ticket->getNumNotes();
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
<font color="red"><strong><?php echo __('Are you sure you want to DELETE this ticket?');?></strong></font>
- <br><br><?php echo __('Deleted tickets CANNOT be recovered, including any associated attachments.');?>
+ <br><br><?php echo __('Deleted data CANNOT be recovered, including any associated attachments.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<form action="tickets.php?id=<?php echo $ticket->getId(); ?>" method="post" id="confirm-form" name="confirm-form">
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 158504928..8e32518b4 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -525,7 +525,8 @@ if ($results) {
<?php echo __('Are you sure want to flag the selected tickets as <font color="red"><b>overdue</b></font>?');?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected tickets?');?></strong></font>
+ <font color="red"><strong><?php echo sprintf(__('Are you sure you want to DELETE %s?'),
+ _N('selected ticket', 'selected tickets', 2));?></strong></font>
<br><br><?php echo __('Deleted tickets CANNOT be recovered, including any associated attachments.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
--
GitLab