Permalink
Browse files

[ticket/10345] Return the language key when the key has an empty array

PHPBB3-10345
  • Loading branch information...
1 parent dd99675 commit 65e6ab55302e5d0c30fa86e06a460fed8167b84a @nickvergessen nickvergessen committed Nov 30, 2011
Showing with 10 additions and 0 deletions.
  1. +5 −0 phpBB/includes/session.php
  2. +5 −0 tests/user/lang_test.php
@@ -1862,6 +1862,11 @@ function lang()
$args[0] = $lang;
return call_user_func_array('sprintf', $args);
}
+ else if (sizeof($lang) == 0)
+ {
+ // If the language entry is an empty array, we just return the language key
+ return $args[0];
+ }
// It is an array... now handle different nullar/singular/plural forms
$key_found = false;
View
@@ -38,6 +38,8 @@ public function test_user_lang_sprintf()
1 => '1 post', // 1.x
2 => '%1$.1f posts', // 0.x, 2+.x
),
+ 'ARRY_EMPTY' => array(
+ ),
'dateformat' => array(
'AGO' => array(
1 => '%d second',
@@ -69,6 +71,9 @@ public function test_user_lang_sprintf()
$this->assertEquals($user->lang('ARRY', 2), '2 posts');
$this->assertEquals($user->lang('ARRY', 123), '123 posts');
+ // Empty array returns the language key
+ $this->assertEquals($user->lang('ARRY_EMPTY', 123), 'ARRY_EMPTY');
+
// No 0 key defined
$this->assertEquals($user->lang('ARRY_NO_ZERO', 0), '0 posts');
$this->assertEquals($user->lang('ARRY_NO_ZERO', 1), '1 post');

0 comments on commit 65e6ab5

Please sign in to comment.