From 06158693c7b846518abfe9d72491fc7376e457f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 19 Oct 2012 19:54:19 -0400
Subject: [feature/controller] Implement a front controller

PHPBB3-10864
---
 phpBB/language/en/app.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 phpBB/language/en/app.php

(limited to 'phpBB/language/en/app.php')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
new file mode 100644
index 0000000000..db7f3164d0
--- /dev/null
+++ b/phpBB/language/en/app.php
@@ -0,0 +1,59 @@
+<?php
+/**
+*
+* app [English]
+*
+* @package language
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'CONTROLLER_ARGUMENT_VALUE_MISSING'	=> 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
+	'CONTROLLER_NOT_SPECIFIED'			=> 'No controller has been specified.',
+	'CONTROLLER_NOT_FOUND'				=> 'The requested page could not be found.',
+	'CONTROLLER_METHOD_NOT_SPECIFIED'	=> 'No method was specified for the controller.',
+	'CONTROLLER_SERVICE_NOT_GIVEN'		=> 'The controller "<strong>%s</strong>" must have a service specified in ./config/routing.yml.',
+	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
+	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
+
+	// Event Listener/Subscriber error messages
+	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
+	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
+
+	// Core error controller messages
+	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
+	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
+	'NOT_AUTHENTICATED_ERROR'			=> 'You must log in to access this page.',
+	'INTERNAL_SERVER_ERROR_ERROR'		=> 'An unknown error occured.',
+));
-- 
cgit v1.2.1


From 5c86a1660d436cf16448ae6c978237833e3e86b7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 20 Oct 2012 17:16:14 -0400
Subject: [feature/controller] Don't allow a kernel listener to be added with
 no method

PHPBB3-10864
---
 phpBB/language/en/app.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en/app.php')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index db7f3164d0..2cbeaa2cba 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -49,6 +49,7 @@ $lang = array_merge($lang, array(
 
 	// Event Listener/Subscriber error messages
 	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
+	'NO_METHOD_ATTRIBUTE'				=> 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
 	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
 
 	// Core error controller messages
-- 
cgit v1.2.1


From 60c0a1dd2ac2c733a670093ad440e3ba6be3be4d Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 15:51:05 -0500
Subject: [feature/controller] Don't use $user->lang() before container
 compilation

PHPBB3-10864
---
 phpBB/language/en/app.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/language/en/app.php')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2cbeaa2cba..2d67246369 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -47,11 +47,6 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
 	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
 
-	// Event Listener/Subscriber error messages
-	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
-	'NO_METHOD_ATTRIBUTE'				=> 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
-	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
-
 	// Core error controller messages
 	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
 	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
-- 
cgit v1.2.1


From 2f50d656481dca3c2aa28cd5035ce0d44e5c4977 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 15:51:32 -0500
Subject: [feature/controller] Remove unused language strings

PHPBB3-10864
---
 phpBB/language/en/app.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/language/en/app.php')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2d67246369..cb56015c30 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -46,10 +46,4 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_SERVICE_NOT_GIVEN'		=> 'The controller "<strong>%s</strong>" must have a service specified in ./config/routing.yml.',
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
 	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
-
-	// Core error controller messages
-	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
-	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
-	'NOT_AUTHENTICATED_ERROR'			=> 'You must log in to access this page.',
-	'INTERNAL_SERVER_ERROR_ERROR'		=> 'An unknown error occured.',
 ));
-- 
cgit v1.2.1