From 4092b63be39453f9a7ce4f985217099ab10aae90 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Wed, 23 Jul 2014 00:35:09 +0530 Subject: [ticket/12656] Use lang keys for CLI command descriptions PHPBB3-12656 --- phpBB/language/en/cli.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index e9eb26b154..ea6952d5e4 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -35,10 +35,21 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'CLI_DESCRIPTION_CRON_LIST' => 'Prints a list of ready and unready cron jobs.', - 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.', - 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', - - 'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.', - 'CLI_DESCRIPTION_OPTION_SAFE_MODE' => 'Run in Safe Mode (without extensions).', + 'CLI_DESCRIPTION_CRON_LIST' => 'Prints a list of ready and unready cron jobs.', + 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.', + 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', + 'CLI_DESCRIPTION_DB_MIGRATE' => 'Updates the database by applying migrations.', + 'CLI_DESCRIPTION_DELETE_CONFIG' => 'Deletes a configuration option', + 'CLI_DESCRIPTION_DISABLE_EXTENSION' => 'Disables the specified extension.', + 'CLI_DESCRIPTION_ENABLE_EXTENSION' => 'Enables the specified extension.', + 'CLI_DESCRIPTION_FIND_MIGRATIONS' => 'Finds migrations that are not depended on.', + 'CLI_DESCRIPTION_GET_CONFIG' => 'Gets a configuration option\'s value', + 'CLI_DESCRIPTION_INCREMENT_CONFIG' => 'Increments a configuration option\'s value', + 'CLI_DESCRIPTION_LIST_EXTENSIONS' => 'Lists all extensions in the database and on the filesystem.', + 'CLI_DESCRIPTION_OPTION_SAFE_MODE' => 'Run in Safe Mode (without extensions).', + 'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.', + 'CLI_DESCRIPTION_PURGE_EXTENSION' => 'Purges the specified extension.', + 'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH' => 'Recalculates the user_email_hash column of the users table.', + 'CLI_DESCRIPTION_SET_ATOMIC_CONFIG' => 'Sets a configuration option\'s value only if the old matches the current value', + 'CLI_DESCRIPTION_SET_CONFIG' => 'Sets a configuration option\'s value' )); -- cgit v1.2.1 From c81438e1f85633dd770fcddd8e332b278338732f Mon Sep 17 00:00:00 2001 From: Dhruv Date: Wed, 23 Jul 2014 01:23:44 +0530 Subject: [ticket/12656] Use lang keys for all CLI strings PHPBB3-12656 --- phpBB/language/en/cli.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index ea6952d5e4..0c6ee1f1f0 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -35,6 +35,18 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( + 'CLI_CONFIG_CANNOT_CACHED' => 'Set this option if the configuration option changes too frequently to be efficiently cached.', + 'CLI_CONFIG_CURRENT' => 'Current configuration value, use 0 and 1 to specify boolean values', + 'CLI_CONFIG_DELETE_SUCCESS' => 'Successfully deleted config %s.', + 'CLI_CONFIG_NEW' => 'New configuration value, use 0 and 1 to specify boolean values', + 'CLI_CONFIG_NOT_EXISTS' => 'Config %s does not exist', + 'CLI_CONFIG_OPTION_NAME' => 'The configuration option\'s name', + 'CLI_CONFIG_PRINT_WITHOUT_NEWLINE' => 'Set this option if the value should be printed without a new line at the end.', + 'CLI_CONFIG_INCREMENT_BY' => 'Amount to increment by', + 'CLI_CONFIG_INCREMENT_SUCCESS' => 'Successfully incremented config %s', + 'CLI_CONFIG_SET_FAILURE' => 'Could not set config %s', + 'CLI_CONFIG_SET_SUCCESS' => 'Successfully set config %s', + 'CLI_DESCRIPTION_CRON_LIST' => 'Prints a list of ready and unready cron jobs.', 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.', 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', @@ -51,5 +63,16 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_PURGE_EXTENSION' => 'Purges the specified extension.', 'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH' => 'Recalculates the user_email_hash column of the users table.', 'CLI_DESCRIPTION_SET_ATOMIC_CONFIG' => 'Sets a configuration option\'s value only if the old matches the current value', - 'CLI_DESCRIPTION_SET_CONFIG' => 'Sets a configuration option\'s value' + 'CLI_DESCRIPTION_SET_CONFIG' => 'Sets a configuration option\'s value', + + 'CLI_EXTENSION_DISABLE_FAILURE' => 'Could not disable extension %s', + 'CLI_EXTENSION_DISABLE_SUCCESS' => 'Successfully disabled extension %s', + 'CLI_EXTENSION_ENABLE_FAILURE' => 'Could not enable extension %s', + 'CLI_EXTENSION_ENABLE_SUCCESS' => 'Successfully enabled extension %s', + 'CLI_EXTENSION_NAME' => 'Name of the extension', + 'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s', + 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purge extension %s', + 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.' + + 'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS' => 'Successfully recalculated all email hashes.' )); -- cgit v1.2.1 From 91b0e75cc7af68e1dcd72b637f9b99d8f139908d Mon Sep 17 00:00:00 2001 From: Dhruv Date: Thu, 24 Jul 2014 01:08:31 +0530 Subject: =?UTF-8?q?[ticket/12656]=20Use=20utf8=20=E2=80=99=20instead=20of?= =?UTF-8?q?=20escaping=20'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHPBB3-12656 --- phpBB/language/en/cli.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 0c6ee1f1f0..cb8cbb55a8 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -40,7 +40,7 @@ $lang = array_merge($lang, array( 'CLI_CONFIG_DELETE_SUCCESS' => 'Successfully deleted config %s.', 'CLI_CONFIG_NEW' => 'New configuration value, use 0 and 1 to specify boolean values', 'CLI_CONFIG_NOT_EXISTS' => 'Config %s does not exist', - 'CLI_CONFIG_OPTION_NAME' => 'The configuration option\'s name', + 'CLI_CONFIG_OPTION_NAME' => 'The configuration option’s name', 'CLI_CONFIG_PRINT_WITHOUT_NEWLINE' => 'Set this option if the value should be printed without a new line at the end.', 'CLI_CONFIG_INCREMENT_BY' => 'Amount to increment by', 'CLI_CONFIG_INCREMENT_SUCCESS' => 'Successfully incremented config %s', @@ -55,15 +55,15 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_DISABLE_EXTENSION' => 'Disables the specified extension.', 'CLI_DESCRIPTION_ENABLE_EXTENSION' => 'Enables the specified extension.', 'CLI_DESCRIPTION_FIND_MIGRATIONS' => 'Finds migrations that are not depended on.', - 'CLI_DESCRIPTION_GET_CONFIG' => 'Gets a configuration option\'s value', - 'CLI_DESCRIPTION_INCREMENT_CONFIG' => 'Increments a configuration option\'s value', + 'CLI_DESCRIPTION_GET_CONFIG' => 'Gets a configuration option’s value', + 'CLI_DESCRIPTION_INCREMENT_CONFIG' => 'Increments a configuration option’s value', 'CLI_DESCRIPTION_LIST_EXTENSIONS' => 'Lists all extensions in the database and on the filesystem.', 'CLI_DESCRIPTION_OPTION_SAFE_MODE' => 'Run in Safe Mode (without extensions).', 'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.', 'CLI_DESCRIPTION_PURGE_EXTENSION' => 'Purges the specified extension.', 'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH' => 'Recalculates the user_email_hash column of the users table.', - 'CLI_DESCRIPTION_SET_ATOMIC_CONFIG' => 'Sets a configuration option\'s value only if the old matches the current value', - 'CLI_DESCRIPTION_SET_CONFIG' => 'Sets a configuration option\'s value', + 'CLI_DESCRIPTION_SET_ATOMIC_CONFIG' => 'Sets a configuration option’s value only if the old matches the current value', + 'CLI_DESCRIPTION_SET_CONFIG' => 'Sets a configuration option’s value', 'CLI_EXTENSION_DISABLE_FAILURE' => 'Could not disable extension %s', 'CLI_EXTENSION_DISABLE_SUCCESS' => 'Successfully disabled extension %s', -- cgit v1.2.1 From ed9fb450de8da791ab7928a04af7c952614c5b14 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Thu, 24 Jul 2014 18:56:52 +0530 Subject: [ticket/12656] Fix syntax in language file PHPBB3-12656 --- phpBB/language/en/cli.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index cb8cbb55a8..d9eede9881 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -72,7 +72,7 @@ $lang = array_merge($lang, array( 'CLI_EXTENSION_NAME' => 'Name of the extension', 'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s', 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purge extension %s', - 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.' + 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.', - 'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS' => 'Successfully recalculated all email hashes.' + 'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS' => 'Successfully recalculated all email hashes.', )); -- cgit v1.2.1 From 8a046743bc083f8ca26d70cc5a1b63bd47b92f57 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sun, 27 Jul 2014 14:56:12 +0530 Subject: [ticket/12656] Fix typo for "purged extension" PHPBB3-12656 --- phpBB/language/en/cli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/cli.php') diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index d9eede9881..eb0f5bb357 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -71,7 +71,7 @@ $lang = array_merge($lang, array( 'CLI_EXTENSION_ENABLE_SUCCESS' => 'Successfully enabled extension %s', 'CLI_EXTENSION_NAME' => 'Name of the extension', 'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s', - 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purge extension %s', + 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purged extension %s', 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.', 'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS' => 'Successfully recalculated all email hashes.', -- cgit v1.2.1