Commit 644f65fa authored by Stefan Krueger's avatar Stefan Krueger Committed by Alexandre Delaunay

replace dustbin with trashbin, its much more common

parent dfacc29c
......@@ -1158,7 +1158,7 @@ $ curl -X PUT \
id parameter has precedence over input payload.
* *force_purge* (default false): boolean, if the itemtype have a dustbin, you can force purge (delete finally).
* *force_purge* (default false): boolean, if the itemtype have a trashbin, you can force purge (delete finally).
Optional.
* *history* (default true): boolean, set to false to disable saving of deletion in global history.
Optional.
......
......@@ -1774,7 +1774,7 @@ abstract class API extends CommonGLPI {
* - 'input' : Array of objects with fields of itemtype to be updated.
* Mandatory.
* You must provide in each object a key named 'id' to identify item to delete.*
* - 'force_purge' : boolean, if itemtype have a dustbin, you can force purge (delete finally).
* - 'force_purge' : boolean, if itemtype have a trashbin, you can force purge (delete finally).
* Optionnal.
* - 'history' : boolean, default true, false to disable saving of deletion in global history.
* Optionnal.
......
......@@ -3404,7 +3404,7 @@ class AuthLDAP extends CommonDBTM {
$options = [
__('Preserve'),
__('Put in dustbin'),
__('Put in trashbin'),
__('Withdraw dynamic authorizations and groups'),
__('Disable'),
__('Disable').' + '.__('Withdraw dynamic authorizations and groups'),
......
......@@ -1678,7 +1678,7 @@ class CommonDBTM extends CommonGLPI {
/**
* Restore an item put in the dustbin in the database.
* Restore an item put in the trashbin in the database.
*
* @param array $input the _POST vars returned by the item form when press restore
* @param boolean $history do history log ? (default 1)
......@@ -2340,7 +2340,7 @@ class CommonDBTM extends CommonGLPI {
}
} else if (!$this->isDeleted()
&& $this->can($ID, DELETE)) {
echo Html::submit(_x('button', 'Put in dustbin'), ['name' => 'delete']);
echo Html::submit(_x('button', 'Put in trashbin'), ['name' => 'delete']);
}
}
......@@ -3994,9 +3994,9 @@ class CommonDBTM extends CommonGLPI {
}
}
}
// Add information on item in dustbin
// Add information on item in trashbin
if ($item->isField('is_deleted') && $item->getField('is_deleted')) {
$double_text = sprintf(__('%1$s - %2$s'), $double_text, __('Item in the dustbin'));
$double_text = sprintf(__('%1$s - %2$s'), $double_text, __('Item in the trashbin'));
}
$message_text .= "<br>[$double_text]";
......@@ -4152,7 +4152,7 @@ class CommonDBTM extends CommonGLPI {
* Clean all infos which match some criteria
*
* @param array $crit array of criteria (ex array('is_active'=>'1'))
* @param boolean $force force purge not on put in dustbin (default 0)
* @param boolean $force force purge not on put in trashbin (default 0)
* @param boolean $history do history log ? (true by default)
*
* @return boolean
......@@ -4859,7 +4859,7 @@ class CommonDBTM extends CommonGLPI {
if ($this->maybeDeleted()) {
$values[DELETE] = ['short' => __('Delete'),
'long' => _x('button', 'Put in dustbin')];
'long' => _x('button', 'Put in trashbin')];
}
if ($this->usenotepad) {
$values[READNOTE] = ['short' => __('Read notes'),
......
......@@ -891,7 +891,7 @@ abstract class CommonDropdown extends CommonDBTM {
if ($newid = $item->import($input2)) {
// Delete old
if ($newid > 0 && $key != $newid) {
// delete with purge for dropdown with dustbin (Budget)
// delete with purge for dropdown with trashbin (Budget)
$item->delete(['id' => $key,
'_replace_by' => $newid], 1);
} else if ($newid > 0 && $key == $newid) {
......
......@@ -551,7 +551,7 @@ class MassiveAction {
if ($item->maybeDeleted()
&& !$item->useDeletedToLockIfDynamic()) {
if ($candelete) {
$actions[$self_pref.'delete'] = _x('button', 'Put in dustbin');
$actions[$self_pref.'delete'] = _x('button', 'Put in trashbin');
}
} else if ($canpurge) {
if ($item instanceof CommonDBRelation) {
......
......@@ -816,7 +816,7 @@ class Printer extends CommonDBTM {
/**
* Add a printer. If already exist in dustbin restore it
* Add a printer. If already exist in trashbin restore it
*
* @param $name the printer's name (need to be addslashes)
* @param $manufacturer the software's manufacturer (need to be addslashes)
......@@ -900,9 +900,9 @@ class Printer extends CommonDBTM {
/**
* Restore a software from dustbin
* Restore a software from trashbin
*
* @param $ID the ID of the software to put in dustbin
* @param $ID the ID of the software to put in trashbin
*
* @return boolean (success)
**/
......
......@@ -720,7 +720,7 @@ class Reservation extends CommonDBChild {
echo "</td></tr>\n";
if (empty($ID)) {
echo "<tr class='tab_bg_2'><td>".__('Rehearsal')."</td>";
echo "<tr class='tab_bg_2'><td>".__('Repetition')."</td>";
echo "<td>";
$values = ['' => _x('periodicity', 'None'),
'day' => _x('periodicity', 'Daily'),
......@@ -760,7 +760,7 @@ class Reservation extends CommonDBChild {
class='submit'>";
if ($resa->fields["group"] > 0) {
echo "<br><input type='checkbox' name='_delete_group'>&nbsp;".
__s('Delete all rehearsals');
__s('Delete all repetition');
}
echo "</td>";
}
......
......@@ -88,7 +88,7 @@ class RuleDictionnaryPrinterCollection extends RuleCollection {
LEFT JOIN `glpi_manufacturers`
ON (`glpi_manufacturers`.`id` = `glpi_printers`.`manufacturers_id`) ";
// Do not replay on dustbin and templates
// Do not replay on trashbin and templates
$sql .= "WHERE `glpi_printers`.`is_deleted` = 0
AND `glpi_printers`.`is_template` = 0 ";
......@@ -247,7 +247,7 @@ class RuleDictionnaryPrinterCollection extends RuleCollection {
* @param &$new_printers array containing new printers already computed
* @param $res_rule array of rule results
* @param $params array
* @param &$printers_ids array containing replay printer need to be dustbined
* @param &$printers_ids array containing replay printer need to be put in trashbin
**/
function replayDictionnaryOnOnePrinter(array &$new_printers, array $res_rule,
array $params, array &$printers_ids) {
......@@ -286,7 +286,7 @@ class RuleDictionnaryPrinterCollection extends RuleCollection {
//New printer not already present in this entity
if (!isset($new_printers[$p['entity']][$res_rule["name"]])) {
// create new printer or restore it from dustbin
// create new printer or restore it from trashbin
$new_printer_id = $printer->addOrRestoreFromTrash($res_rule["name"], $manufacturer,
$p['entity']);
$new_printers[$p['entity']][$res_rule["name"]] = $new_printer_id;
......
......@@ -83,7 +83,7 @@ class RuleDictionnarySoftwareCollection extends RuleCollection {
echo "<tr><td class='tab_bg_2 center'>";
echo "<img src=\"" . $CFG_GLPI["root_doc"] . "/pics/warning.png\"></td>";
echo "<td class='tab_bg_2 center'>" .
__('Warning! This operation can put merged software in the dustbin.<br>Sure to notify your users.').
__('Warning! This operation can put merged software in the trashbin.<br>Sure to notify your users.').
"</td></tr>\n";
echo "<tr><th colspan='2' class='b'>" . __('Manufacturer choice') . "</th></tr>\n";
echo "<tr><td class='tab_bg_2 center'>" .
......@@ -127,7 +127,7 @@ class RuleDictionnarySoftwareCollection extends RuleCollection {
LEFT JOIN `glpi_manufacturers`
ON (`glpi_manufacturers`.`id` = `glpi_softwares`.`manufacturers_id`)";
// Do not replay on dustbin and templates
// Do not replay on trashbin and templates
$sql .= "WHERE `glpi_softwares`.`is_deleted` = 0
AND `glpi_softwares`.`is_template` = 0 ";
......@@ -266,7 +266,7 @@ class RuleDictionnarySoftwareCollection extends RuleCollection {
* @param $entity working entity ID
* @param $name softwrae name
* @param $manufacturer manufacturer name
* @param &$soft_ids array containing replay software need to be dustbined
* @param &$soft_ids array containing replay software need to be put in trashbin
**/
function replayDictionnaryOnOneSoftware(array &$new_softs, array $res_rule, $ID, $entity, $name,
$manufacturer, array &$soft_ids) {
......@@ -307,7 +307,7 @@ class RuleDictionnarySoftwareCollection extends RuleCollection {
//New software not already present in this entity
if (!isset($new_softs[$entity][$new_name])) {
// create new software or restore it from dustbin
// create new software or restore it from trashbin
$new_software_id = $soft->addOrRestoreFromTrash($new_name, $manufacturer,
$entity, '', true);
$new_softs[$entity][$new_name] = $new_software_id;
......@@ -361,7 +361,7 @@ class RuleDictionnarySoftwareCollection extends RuleCollection {
/**
* Delete a list of softwares
*
* @param $soft_ids array containing replay software need to be dustbined
* @param $soft_ids array containing replay software need to be put in trashbin
**/
function putOldSoftsInTrash(array $soft_ids) {
global $DB;
......
......@@ -1805,8 +1805,8 @@ class Search {
$rand = mt_rand();
return "<div class='switch grey_border pager_controls'>".
"<label for='is_deletedswitch$rand' title='".__s('Show the dustbin')."' >".
"<span class='sr-only'>" . __s('Show the dustbin') . "</span>" .
"<label for='is_deletedswitch$rand' title='".__s('Show the trashbin')."' >".
"<span class='sr-only'>" . __s('Show the trashbin') . "</span>" .
"<input type='hidden' name='is_deleted' value='0' /> ".
"<input type='checkbox' id='is_deletedswitch$rand' name='is_deleted' value='1' ".
($is_deleted?"checked='checked'":"").
......
......@@ -823,7 +823,7 @@ class Software extends CommonDBTM {
/**
* Add a software. If already exist in dustbin restore it
* Add a software. If already exist in trashbin restore it
*
* @param name the software's name
* @param manufacturer the software's manufacturer
......@@ -875,9 +875,9 @@ class Software extends CommonDBTM {
/**
* Put software in dustbin because it's been removed by GLPI software dictionnary
* Put software in trashbin because it's been removed by GLPI software dictionnary
*
* @param $ID the ID of the software to put in dustbin
* @param $ID the ID of the software to put in trashbin
* @param $comment the comment to add to the already existing software's comment (default '')
*
* @return boolean (success)
......@@ -904,9 +904,9 @@ class Software extends CommonDBTM {
/**
* Restore a software from dustbin
* Restore a software from trashbin
*
* @param $ID the ID of the software to put in dustbin
* @param $ID the ID of the software to put in trashbin
*
* @return boolean (success)
**/
......
......@@ -5237,7 +5237,7 @@ class Ticket extends CommonITILObject {
} else {
if ($this->canDeleteItem()) {
echo "<input type='submit' class='submit' name='delete' value='".
_sx('button', 'Put in dustbin')."'>";
_sx('button', 'Put in trashbin')."'>";
}
}
echo "<input type='hidden' name='_read_date_mod' value='".$this->getField('date_mod')."'>";
......
......@@ -289,7 +289,7 @@ class TicketTask extends CommonITILTask {
echo Ticket::getSplittedSubmitButtonHtml($this->fields['tickets_id'], 'add');
} else {
if ($params['candel']
// no dustbin in tickettask
// no trashbin in tickettask
// && !$this->can($ID, DELETE)
&& !$this->can($ID, PURGE)) {
$params['candel'] = false;
......
......@@ -3330,7 +3330,7 @@ class Transfer extends CommonDBTM {
1 => __('Preserve')];
$clean = [0 => __('Preserve'),
1 => _x('button', 'Put in dustbin'),
1 => _x('button', 'Put in trashbin'),
2 => _x('button', 'Delete permanently')];
echo "<tr class='tab_bg_1'>";
......
......@@ -4160,7 +4160,7 @@ class User extends CommonDBTM {
$myuser->update($tmp);
break;
//Put user in dustbin
//Put user in trashbin
case 1 :
$myuser->delete($tmp);
break;
......
......@@ -720,7 +720,7 @@ class AuthLDAP extends DbTestCase {
$ldap = $this->ldap;
//put deleted LDAP users in dustbin
//put deleted LDAP users in trashbin
$CFG_GLPI['user_deleted_ldap'] = 1;
//add a new user in directory
......
......@@ -82,8 +82,8 @@ Usage : php cleanhistory.php [ --item=# ] [ --type=# ] [ --old=<regex> ] [ --new
10 : OCS ID Changed 24 : Unlock a link with an item
11 : OCS Link 25 : Unlock an sub item
12 : Other (often from plugin) 26 : Lock an sub item
13 : Delete item (put in dustbin) 27 : Unlock an item
14 : Restore item from dustbin
13 : Delete item (put in trashbin) 27 : Unlock an item
14 : Restore item from trashbin
With old an optional regex pattern on old_value
With new an optional regex pattern on new_value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment