Skip to content

Instantly share code, notes, and snippets.

@jpustula
Created June 18, 2015 09:44
Show Gist options
  • Save jpustula/3f2e80c04c8afe391bd8 to your computer and use it in GitHub Desktop.
Save jpustula/3f2e80c04c8afe391bd8 to your computer and use it in GitHub Desktop.
diff -x images -crNEB release-3.1.4/language/en/captcha_recaptcha.php release-3.1.5/language/en/captcha_recaptcha.php
*** release-3.1.4/language/en/captcha_recaptcha.php 2015-05-03 17:14:55.000000000 +0200
--- release-3.1.5/language/en/captcha_recaptcha.php 2015-06-14 16:14:07.000000000 +0200
***************
*** 47,52 ****
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
! 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
'RECAPTCHA_SOCKET_ERROR' => 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.',
));
--- 47,52 ----
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
! 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you type the text displayed into the field underneath.',
'RECAPTCHA_SOCKET_ERROR' => 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.',
));
diff -x images -crNEB release-3.1.4/language/en/migrator.php release-3.1.5/language/en/migrator.php
*** release-3.1.4/language/en/migrator.php 2015-05-03 17:14:55.000000000 +0200
--- release-3.1.5/language/en/migrator.php 2015-06-14 16:14:07.000000000 +0200
***************
*** 52,57 ****
--- 52,64 ----
'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %1$s; Time: %2$.2f seconds',
'MIGRATION_SCHEMA_RUNNING' => 'Installing Schema: %s.',
+ 'MIGRATION_INVALID_DATA_MISSING_CONDITION' => 'A migration is invalid. An if statement helper is missing a condition.',
+ 'MIGRATION_INVALID_DATA_MISSING_STEP' => 'A migration is invalid. An if statement helper is missing a valid call to a migration step.',
+ 'MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE' => 'A migration is invalid. A custom callable function could not be called.',
+ 'MIGRATION_INVALID_DATA_UNKNOWN_TYPE' => 'A migration is invalid. An unknown migration tool type was encountered.',
+ 'MIGRATION_INVALID_DATA_UNDEFINED_TOOL' => 'A migration is invalid. An undefined migration tool was encountered.',
+ 'MIGRATION_INVALID_DATA_UNDEFINED_METHOD' => 'A migration is invalid. An undefined migration tool method was encountered.',
+
'MODULE_ERROR' => 'An error occurred 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',
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment