Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ application/logs/*
!application/logs/.htaccess
/vendor/
/nbproject/private/
/nbproject/
/nbproject/
/.idea/
.idea/
6 changes: 5 additions & 1 deletion system/Common.php
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,11 @@ function single_service(string $name, ...$params)
*
* @return string
*/
function lang(string $line, array $args = [], string $locale = null): string
/* Removed string return type to support array return type as it should be described in documentation
* Documentation Link: https://codeigniter4.github.io/CodeIgniter4/outgoing/localization.html#nested-arrays
* Issue Link: https://github.com/codeigniter4/CodeIgniter4/issues/2075
*/
function lang(string $line, array $args = [], string $locale = null)
{
return Services::language($locale)
->getLine($line, $args);
Expand Down