aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-04-24 10:01:30 -0700
committerNils Adermann <naderman@naderman.de>2013-04-24 10:01:30 -0700
commita33cc92fc8890ccb5910c32d09a66420e7f71215 (patch)
treef618602098ef97be82171746f229ac58cb47cbaf /phpBB
parent453f98f6d3528ee0598581973f8c8a9bbcdcb25a (diff)
parent802fbbb444a580698b130fa54754d26c12321c00 (diff)
downloadforums-a33cc92fc8890ccb5910c32d09a66420e7f71215.tar
forums-a33cc92fc8890ccb5910c32d09a66420e7f71215.tar.gz
forums-a33cc92fc8890ccb5910c32d09a66420e7f71215.tar.bz2
forums-a33cc92fc8890ccb5910c32d09a66420e7f71215.tar.xz
forums-a33cc92fc8890ccb5910c32d09a66420e7f71215.zip
Merge pull request #1358 from MGaetan89/ticket/9975
[ticket/9975] Translate missing style error message
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/session.php2
-rw-r--r--phpBB/language/en/common.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index b93f2ff65e..fe5357f32e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1661,7 +1661,7 @@ class user extends session
if (!$this->theme)
{
- 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
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6dd390ed24..baf398b146 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -391,6 +391,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.',