summaryrefslogtreecommitdiff
path: root/includes/locale.inc
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2007-06-22 08:32:28 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2007-06-22 08:32:28 +0000
commitfe8b35f52778b63b96c969da27d2929beee8c1b9 (patch)
treebb7a2a5014006acb1fc893e29299f2dc77918327 /includes/locale.inc
parent39a0ee0264f2e6e88b66e983e53bbf8a98072d3b (diff)
downloadbrdo-fe8b35f52778b63b96c969da27d2929beee8c1b9.tar.gz
brdo-fe8b35f52778b63b96c969da27d2929beee8c1b9.tar.bz2
#153781: Convert all remaining confirm_forms() to deletion api.
Diffstat (limited to 'includes/locale.inc')
-rw-r--r--includes/locale.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/locale.inc b/includes/locale.inc
index 6e8f8ccf5..2fc0c0136 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -393,7 +393,9 @@ function locale_languages_delete_form(&$form_state, $langcode) {
}
else {
$form['langcode'] = array('#type' => 'value', '#value' => $langcode);
- return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages[$langcode]->name))), 'admin/settings/language', t('Deleting a language will remove all interface translations associated with it, and posts in this language will be set to be language neutral. This action cannot be undone.'), t('Delete'), t('Cancel'));
+ $options = array('description' => t('Deleting a language will remove all interface translations associated with it, and posts in this language will be set to be language neutral. This action cannot be undone.'));
+
+ return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages[$langcode]->name))), 'admin/settings/language', $options);
}
}
@@ -1194,7 +1196,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL
else {
// Some real string to import.
$comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
-
+
if (strpos($value['msgid'], "\0")) {
// This string has plural versions.
$english = explode("\0", $value['msgid'], 2);
@@ -1279,7 +1281,7 @@ function _locale_import_one_string_db(&$report, $langcode, $source, $translation
db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $translation, $langcode, $lid, $plid, $plural);
$report[2]++;
}
-
+
return $lid;
}