mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 16:35:35 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php
This commit is contained in:
Nils Adermann
2013-04-24 19:13:47 +02:00
parent aaf109e07d a33cc92fc8
commit b3497d955f
2 changed files with 2 additions and 1 deletions
phpBB
includes
user.php
language
en
common.php

2
phpBB/includes/user.php

@ -215,7 +215,7 @@ class phpbb_user extends phpbb_session
if (!$this->style)
{
trigger_error('Could not get style data', E_USER_ERROR);
trigger_error('NO_STYLE_DATA', E_USER_ERROR);
}
// Now parse the cfg file and cache it

1
phpBB/language/en/common.php

@ -454,6 +454,7 @@ $lang = array_merge($lang, array(
'NO_POSTS_TIME_FRAME' => 'No posts exist inside this topic for the selected time frame.',
'NO_FEED_ENABLED' => 'Feeds are not available on this board.',
'NO_FEED' => 'The requested feed is not available.',
'NO_STYLE_DATA' => 'Could not get style data',
'NO_SUBJECT' => 'No subject specified', // Used for posts having no subject defined but displayed within management pages.
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.',