Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Deprecated Global Translate Function "__()" #2333

Closed
wants to merge 4 commits into from
Closed

Remove Deprecated Global Translate Function "__()" #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a64f187
refactor: Removed the only remaining usage of deprecated global trans…
Sdfendor Feb 15, 2022
4872b5d
refactor: Removed deprecated global translation function.
Sdfendor Feb 15, 2022
c97fcde
Merge branch '20.0' into remove_deprecated_global_translate_function
sreichel Aug 8, 2022
8f6823e
Merge branch 'next' into remove_deprecated_global_translate_function
kiatng Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions app/code/core/Mage/Core/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ function destruct($object)
unset($object);
}

/**
* Translator function
*
* @return string
* @deprecated 1.3
*/
function __()
{
return Mage::app()->getTranslator()->translate(func_get_args());
}

/**
* Tiny function to enhance functionality of ucwords
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Varien/Io/Sftp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Varien_Io_Sftp extends Varien_Io_Abstract implements Varien_Io_Interface
* @param string $args[username] Remote username
* @param string $args[password] Connection password
* @param int $args[timeout] Connection timeout [=10]
*
* @throws Exception
*/
public function open(array $args = [])
{
Expand All @@ -53,7 +53,7 @@ public function open(array $args = [])
}
$this->_connection = new \phpseclib3\Net\SFTP($host, $port, $args['timeout']);
if (!$this->_connection->login($args['username'], $args['password'])) {
throw new Exception(sprintf(__("Unable to open SFTP connection as %s@%s", $args['username'], $args['host'])));
throw new Exception(sprintf('Unable to open SFTP connection as %s@%s', $args['username'], $args['host']));
}
}

Expand Down