From cacaffee6e013e43b75212d49960922f88f9f69a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 20:56:42 -0600
Subject: [feature/migrations] Add language strings for migrations errors

Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
---
 phpBB/language/en/migrator.php | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 phpBB/language/en/migrator.php

(limited to 'phpBB/language')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
new file mode 100644
index 0000000000..bc9fbc57af
--- /dev/null
+++ b/phpBB/language/en/migrator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* migrator [English]
+*
+* @package language
+* @copyright (c) 2013 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
+
+$lang = array_merge($lang, array(
+	'CONFIG_ALREADY_EXIST'				=> 'The config setting "%s" unexpectedly already exists.',
+	'CONFIG_NOT_EXIST'					=> 'The config setting "%s" unexpectedly does not exist.',
+
+	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
+
+	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+
+	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
+	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
+	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
+	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
+	'MODULE_NOT_REMOVABLE'				=> 'Module %1$s was unable to be removed: %2$s',
+
+	'PERMISSION_ALREADY_EXIST'			=> 'The permission setting "%s" unexpectedly already exists.',
+	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
+
+	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
+));
-- 
cgit v1.2.1


From f409697137b0b1d01b663bb81d12f6179c3922e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:06:08 -0600
Subject: [feature/migrations] Add explanatory language string for migration
 errors

This should be used if an exception is thrown to inform the user of
what occurred.

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

(limited to 'phpBB/language')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index bc9fbc57af..84074c391c 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 
 	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
-- 
cgit v1.2.1