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

Fix lang() signature #2261

Merged
merged 1 commit into from
Sep 23, 2019
Merged

Fix lang() signature #2261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions system/Common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,16 +433,16 @@ function single_service(string $name, ...$params)
if (! function_exists('lang'))
{
/**
* A convenience method to translate a string and format it
* with the intl extension's MessageFormatter object.
* A convenience method to translate a string or array of them and format
* the result with the intl extension's MessageFormatter.
*
* @param string $line
* @param array $args
* @param string $locale
* @param string|[] $line
* @param array $args
* @param string $locale
*
* @return string
*/
function lang(string $line, array $args = [], string $locale = null): string
function lang(string $line, array $args = [], string $locale = null)
{
return Services::language($locale)
->getLine($line, $args);
Expand Down Expand Up @@ -1085,7 +1085,6 @@ function dd(...$vars)
}
}


//--------------------------------------------------------------------

if (! function_exists('trace'))
Expand Down