diff --git a/libraries/navigation/Nodes/Node_Column_Container.class.php b/libraries/navigation/Nodes/Node_Column_Container.class.php index fc41184af0..3bb1462135 100644 --- a/libraries/navigation/Nodes/Node_Column_Container.class.php +++ b/libraries/navigation/Nodes/Node_Column_Container.class.php @@ -35,12 +35,10 @@ class Node_Column_Container extends Node ); $this->real_name = 'columns'; - $new = PMA_NodeFactory::getInstance( - 'Node', - _pgettext('Create new column', 'New') - ); + $new_label = _pgettext('Create new column', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_column_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_column_add.png', $new_label); $new->links = array( 'text' => 'tbl_addfield.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s' diff --git a/libraries/navigation/Nodes/Node_Function_Container.class.php b/libraries/navigation/Nodes/Node_Function_Container.class.php index b72503fdbb..4a1f9b8a56 100644 --- a/libraries/navigation/Nodes/Node_Function_Container.class.php +++ b/libraries/navigation/Nodes/Node_Function_Container.class.php @@ -35,11 +35,10 @@ class Node_Function_Container extends Node ); $this->real_name = 'functions'; - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new function', 'New') - ); + $new_label = _pgettext('Create new function', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_routine_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_routine_add.png', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&token=' . $GLOBALS['token'] diff --git a/libraries/navigation/Nodes/Node_Index_Container.class.php b/libraries/navigation/Nodes/Node_Index_Container.class.php index 97df5a29c3..89035150cf 100644 --- a/libraries/navigation/Nodes/Node_Index_Container.class.php +++ b/libraries/navigation/Nodes/Node_Index_Container.class.php @@ -35,11 +35,10 @@ class Node_Index_Container extends Node ); $this->real_name = 'indexes'; - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new index', 'New') - ); + $new_label = _pgettext('Create new index', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_index_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_index_add.png', $new_label); $new->links = array( 'text' => 'tbl_indexes.php?server=' . $GLOBALS['server'] . '&create_index=1&added_fields=2' diff --git a/libraries/navigation/Nodes/Node_Procedure_Container.class.php b/libraries/navigation/Nodes/Node_Procedure_Container.class.php index 3794fedb46..0e4fe083a9 100644 --- a/libraries/navigation/Nodes/Node_Procedure_Container.class.php +++ b/libraries/navigation/Nodes/Node_Procedure_Container.class.php @@ -35,11 +35,10 @@ class Node_Procedure_Container extends Node ); $this->real_name = 'procedures'; - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new procedure', 'New') - ); + $new_label = _pgettext('Create new procedure', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_routine_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_routine_add.png', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&token=' . $GLOBALS['token'] diff --git a/libraries/navigation/Nodes/Node_Table_Container.class.php b/libraries/navigation/Nodes/Node_Table_Container.class.php index f987e0366d..7a4ece3d18 100644 --- a/libraries/navigation/Nodes/Node_Table_Container.class.php +++ b/libraries/navigation/Nodes/Node_Table_Container.class.php @@ -42,11 +42,10 @@ class Node_Table_Container extends Node $this->real_name = 'tables'; $this->classes = 'tableContainer'; - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new table', 'New') - ); + $new_label = _pgettext('Create new table', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_table_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_table_add.png', $new_label); $new->links = array( 'text' => 'tbl_create.php?server=' . $GLOBALS['server'] . '&db=%2$s&token=' . $GLOBALS['token'], diff --git a/libraries/navigation/Nodes/Node_View_Container.class.php b/libraries/navigation/Nodes/Node_View_Container.class.php index 8915b41994..6eb26d4f8b 100644 --- a/libraries/navigation/Nodes/Node_View_Container.class.php +++ b/libraries/navigation/Nodes/Node_View_Container.class.php @@ -42,11 +42,10 @@ class Node_View_Container extends Node $this->classes = 'viewContainer'; $this->real_name = 'views'; - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new view', 'New') - ); + $new_label = _pgettext('Create new view', 'New'); + $new = PMA_NodeFactory::getInstance('Node', $new_label); $new->isNew = true; - $new->icon = PMA_Util::getImage('b_view_add.png', __('New')); + $new->icon = PMA_Util::getImage('b_view_add.png', $new_label); $new->links = array( 'text' => 'view_create.php?server=' . $GLOBALS['server'] . '&db=%2$s&token=' . $GLOBALS['token'],