aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-12-10 14:09:10 -0500
committerDavid King <imkingdavid@gmail.com>2012-12-10 14:09:10 -0500
commita9db155c28aa4885c1eef70dffe037172222f91d (patch)
treec8cf9c258b1acbc7fe3a2ff2825a5bdc52595f58 /phpBB/language
parenteaa0319867783868a761c9ede5398d52351c38d5 (diff)
parent0446886f91376c258df3729287824e505ff788b3 (diff)
downloadforums-a9db155c28aa4885c1eef70dffe037172222f91d.tar
forums-a9db155c28aa4885c1eef70dffe037172222f91d.tar.gz
forums-a9db155c28aa4885c1eef70dffe037172222f91d.tar.bz2
forums-a9db155c28aa4885c1eef70dffe037172222f91d.tar.xz
forums-a9db155c28aa4885c1eef70dffe037172222f91d.zip
Merge remote-tracking branch 'p/feature/template-events' into develop
# By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/common.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index fbb7b40d41..6277457af7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -186,6 +186,8 @@ $lang = array_merge($lang, array(
'ERR_CONNECTING_SERVER' => 'Error connecting to the server.',
'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
+ 'ERR_TEMPLATE_EVENT_LOCATION' => 'The specified template event location <em>[%s]</em> is improperly formatted.',
+ 'ERR_TEMPLATE_COMPILATION' => 'The file could not be compiled: %s',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.',
'ERR_WATCHING' => 'An error occured while trying to subscribe.',