diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-04-15 11:38:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-04-15 11:38:21 +0200 |
| commit | 7d4be1fe195061fa9ff38d2b83480874843d36bb (patch) | |
| tree | b8edaab4ecf042e6d9cce8d3239aca3b61a0ea8e /tests | |
| parent | b487da7c053a129c8e06056e4659ba7928f63c40 (diff) | |
| parent | 68bd70ef376cc3c6a5ac89e5c29f33df9247df9d (diff) | |
| download | forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.gz forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.bz2 forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.tar.xz forums-7d4be1fe195061fa9ff38d2b83480874843d36bb.zip | |
Merge pull request #2286 from nickvergessen/ticket/12388
[ticket/12388] Fix translation of log entries without additional log data
* nickvergessen/ticket/12388:
[ticket/12388] Add tests for lang() use on log actions without data
[ticket/12388] Fix translation of log entries without additional log data
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/log/function_view_log_test.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 9148d23bb4..2ddf7522f4 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -164,7 +164,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'topic_id' => 45, 'viewforum' => '', - 'action' => '{LOG MOD2}', + 'action' => 'LOG_MOD2', 'viewtopic' => '', 'viewlogs' => '', ), @@ -185,7 +185,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'topic_id' => 0, 'viewforum' => '', - 'action' => '{LOG USER}<br />admin', + 'action' => 'LOG_USER admin', ), 9 => array( 'id' => 9, @@ -204,7 +204,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'topic_id' => 0, 'viewforum' => '', - 'action' => '{LOG USER}<br />guest', + 'action' => 'LOG_USER guest', ), ); @@ -331,6 +331,8 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case // Test sprintf() of the data into the action $user->lang = array( 'LOG_INSTALL_INSTALLED' => 'installed: %s', + 'LOG_USER' => 'User<br /> %s', + 'LOG_MOD2' => 'Mod2', ); $phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); |