Commit 1a416d44 authored by webchick's avatar webchick

Issue #1838310 follow-up by tim.plunkett: Remove remaining incidents of st().

parent 4d51cdf4
......@@ -1508,7 +1508,7 @@ function install_select_language(&$install_state) {
return;
}
else {
throw new Exception(st('Sorry, you must select a language to continue the installation.'));
throw new Exception(t('Sorry, you must select a language to continue the installation.'));
}
}
}
......@@ -1697,7 +1697,7 @@ function install_get_localization_release() {
* Indicates that there are no profiles available.
*/
function install_no_profile_error() {
drupal_set_title(st('No profiles available'));
drupal_set_title(t('No profiles available'));
return t('We were unable to find any installation profiles. Installation profiles tell us what modules to enable and what schema to install in the database. A profile is necessary to continue with the installation process.');
}
......@@ -1707,7 +1707,7 @@ function install_no_profile_error() {
function install_already_done_error() {
global $base_url;
drupal_set_title(st('Drupal already installed'));
drupal_set_title(t('Drupal already installed'));
return t('<ul><li>To start over, you must empty your existing database, delete your active configuration, and copy <em>default.settings.php</em> over <em>settings.php</em>.</li><li>To install to a different database, edit the appropriate <em>settings.php</em> file in the <em>sites</em> folder.</li><li>To locate your active configuration, view the appropriate <em>settings.php</em> file in the <em>sites</em> folder.</em></li></li><li>To upgrade an existing installation, proceed to the <a href="@base-url/core/update.php">update script</a>.</li><li>View your <a href="@base-url">existing site</a>.</li></ul>', array('@base-url' => $base_url));
}
......@@ -1727,7 +1727,7 @@ function install_load_profile(&$install_state) {
$install_state['profile_info'] = install_profile_info($install_state['parameters']['profile'], $install_state['parameters']['langcode']);
}
else {
throw new Exception(st('Sorry, the profile you have chosen cannot be loaded.'));
throw new Exception(t('Sorry, the profile you have chosen cannot be loaded.'));
}
}
......
......@@ -309,11 +309,11 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
// Write the new settings file.
if (file_put_contents(DRUPAL_ROOT . '/' . $settings_file, $buffer) === FALSE) {
throw new Exception(st('Failed to modify %settings. Verify the file permissions.', array('%settings' => $settings_file)));
throw new Exception(t('Failed to modify %settings. Verify the file permissions.', array('%settings' => $settings_file)));
}
}
else {
throw new Exception(st('Failed to open %settings. Verify the file permissions.', array('%settings' => $settings_file)));
throw new Exception(t('Failed to open %settings. Verify the file permissions.', array('%settings' => $settings_file)));
}
}
......@@ -474,7 +474,7 @@ function drupal_install_config_directories() {
// itself. But if it somehow fails anyway, the installation cannot proceed.
// Bail out using a similar error message as in system_requirements().
if (!install_ensure_config_directory($config_type)) {
throw new Exception(st('The directory %directory could not be created or could not be made writable. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see the <a href="@handbook_url">online handbook</a>.', array(
throw new Exception(t('The directory %directory could not be created or could not be made writable. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see the <a href="@handbook_url">online handbook</a>.', array(
'%directory' => config_get_config_directory($config_type),
'@handbook_url' => 'http://drupal.org/server-permissions',
)));
......
......@@ -161,7 +161,7 @@ function checkBinaryOutput() {
'%needed_value' => 'escape',
'!query' => "<code>" . $query . "</code>",
);
$this->fail(st("The %setting setting is currently set to '%current_value', but needs to be '%needed_value'. Change this by running the following query: !query", $replacements));
$this->fail(t("The %setting setting is currently set to '%current_value', but needs to be '%needed_value'. Change this by running the following query: !query", $replacements));
}
}
}
......@@ -229,10 +229,10 @@ function initializeDatabase() {
LANGUAGE \'sql\'
');
$this->pass(st('PostgreSQL has initialized itself.'));
$this->pass(t('PostgreSQL has initialized itself.'));
}
catch (\Exception $e) {
$this->fail(st('Drupal could not be correctly setup with the existing database. Revise any errors.'));
$this->fail(t('Drupal could not be correctly setup with the existing database. Revise any errors.'));
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment