Commit 631354b4 authored by omega8cc's avatar omega8cc

Issue #2583119 - Remove any remaining st() and t() and use Drush wrapper dt() everywhere

parent 252aa0c6
......@@ -117,8 +117,8 @@ function install_mail($key, &$message, $params) {
}
if ($custom) {
$message['subject'] = st($mail['subject'], $params['variables']);
$message['body'] = st($mail['body'], $params['variables']);
$message['subject'] = dt($mail['subject'], $params['variables']);
$message['body'] = dt($mail['body'], $params['variables']);
}
else {
$message['subject'] = _user_mail_text('pass_subject', $params['variables']);
......@@ -183,12 +183,12 @@ function install_main() {
}
drush_log(st("Installing Drupal schema"), 'install');
drush_log(dt("Installing Drupal schema"), 'install');
// Load the profile.
require_once "./profiles/$profile/$profile.profile";
drush_log(st("Loading @profile install profile", array("@profile" => $profile)), 'install');
drush_log(dt("Loading @profile install profile", array("@profile" => $profile)), 'install');
drush_log(st("Installing translation : @locale", array("@locale" => $install_locale)), 'install');
drush_log(dt("Installing translation : @locale", array("@locale" => $install_locale)), 'install');
/**
* Handles requirement checking
......@@ -388,6 +388,6 @@ function _install_module_batch($module, $module_name, &$context) {
// steps.
module_enable(array($module));
$context['results'][] = $module;
$context['message'] = st('Installed %module module.', array('%module' => $module_name));
$context['message'] = dt('Installed %module module.', array('%module' => $module_name));
}
install_main();
......@@ -58,8 +58,8 @@ function install_mail($key, &$message, $params) {
}
if ($custom) {
$message['subject'] = st($mail['subject'], $params['variables']);
$message['body'][] = st($mail['body'], $params['variables']);
$message['subject'] = dt($mail['subject'], $params['variables']);
$message['body'][] = dt($mail['body'], $params['variables']);
}
else {
$message['subject'] = _user_mail_text('pass_subject', $params['variables']);
......
......@@ -74,8 +74,8 @@ function install_mail($key, &$message, $params) {
}
if ($custom) {
$message['subject'] = t($mail['subject'], $params['variables']);
$message['body'][] = t($mail['body'], $params['variables']);
$message['subject'] = dt($mail['subject'], $params['variables']);
$message['body'][] = dt($mail['body'], $params['variables']);
}
else {
$message['subject'] = _user_mail_text('pass_subject', $params['variables']);
......
......@@ -3,30 +3,13 @@
/**
* @file
* Define subject and body text for an email to the admin user created
* for a site.
* for a site.
*
* At the very least you will want to send them the one-time login url, !login_url.
*/
$mail = array();
if (drush_drupal_major_version() >= 8) {
$t = 't';
}
else {
$t = 'st';
}
$mail['subject'] = $t('Your new site !site has been created.');
$mail['body'] = $t("!username,
Your new site !site has been created.
You can now login to !site by clicking on this link or copying it into your browser:
!login_url
This is a one-time login, so it can be used only once.
Once you have logged in, you will be redirected to !edit_uri so you can change your password.");
$mail['subject'] = dt('Your new site !site has been created');
$mail['body'] = dt("!username,\n\nYour new site !site has been created.\n\nYou can now login to !site by clicking on this link or copying it into your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nOnce you have logged in, you will be redirected to !edit_uri so you can change your password.");
?>
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