summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Boyer2008-10-05 21:28:16 (GMT)
committerSam Boyer2008-10-05 21:28:16 (GMT)
commit2a7feeb7a4d025103120ec09dbbd0223bf18dea1 (patch)
tree38a22cc53b531ca506a5a622638a66e660e28f48
parent86c71bb4dd7e0ea9060124c135480cefdad52701 (diff)
#315835 by SamLerner, sdboyer: various i18n bugfixes.
-rw-r--r--contexts/node.inc2
-rw-r--r--contexts/node_edit_form.inc2
-rw-r--r--includes/display-layout-settings.inc4
-rw-r--r--panels.install6
-rw-r--r--panels_mini/panels_mini.admin.inc2
-rw-r--r--panels_mini/panels_mini.module2
-rw-r--r--panels_page/panels_page.admin.inc6
7 files changed, 12 insertions, 12 deletions
diff --git a/contexts/node.inc b/contexts/node.inc
index 54b96ad..3f00a20 100644
--- a/contexts/node.inc
+++ b/contexts/node.inc
@@ -95,7 +95,7 @@ function panels_context_node_settings_form($conf, $external = FALSE) {
if (!empty($conf['nid'])) {
$info = db_fetch_object(db_query("SELECT * FROM {node} n WHERE n.nid = %d", $conf['nid']));
if ($info) {
- $link = l("'$info->title' [node id: $info->nid]", "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
+ $link = l(t("'%title' [node id %nid]", array('%title' => $info->title, '%nid' => $info->nid)), "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
$form['node']['#description'] = t('Currently set to !link', array('!link' => $link));
}
}
diff --git a/contexts/node_edit_form.inc b/contexts/node_edit_form.inc
index b479ec8..5ac7eef 100644
--- a/contexts/node_edit_form.inc
+++ b/contexts/node_edit_form.inc
@@ -87,7 +87,7 @@ function panels_context_node_edit_form_settings_form($conf, $external = FALSE) {
if (!empty($conf['nid'])) {
$info = db_fetch_object(db_query("SELECT * FROM {node} WHERE nid = %d", $conf['nid']));
if ($info) {
- $link = l("'$info->title' [node id: $info->nid]", "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
+ $link = l(t("'%title' [node id %nid]", array('%title' => $info->title, '%nid' => $info->nid)), "node/$info->nid", array('target' => '_blank', 'title' => t('Open in new window')));
$form['node']['#description'] = t('Currently set to !link', array('!link' => $link));
}
}
diff --git a/includes/display-layout-settings.inc b/includes/display-layout-settings.inc
index 44c7a96..82a9cbb 100644
--- a/includes/display-layout-settings.inc
+++ b/includes/display-layout-settings.inc
@@ -94,7 +94,7 @@ function panels_edit_layout_settings_form(&$form_state) {
);
if (isset($title) && is_string($title)) {
- $form['display_title']['title']['#description'] .= t(" If you leave this field blank, then the default title, '@title', will be used instead.", array('@title' => $title));
+ $form['display_title']['title']['#description'] .= " " . t("If you leave this field blank, then the default title, '@title', will be used instead.", array('@title' => $title));
}
}
@@ -279,7 +279,7 @@ function panels_edit_layout_settings_form_submit($form, &$form_state) {
$display->panel_settings = $form_state['values']['panel_settings'];
panels_save_display($display);
- drupal_set_message("Your layout settings have been saved.");
+ drupal_set_message(t("Your layout settings have been saved."));
}
// ------------------------------------------------------------------
diff --git a/panels.install b/panels.install
index cc0cd7d..106bef5 100644
--- a/panels.install
+++ b/panels.install
@@ -138,9 +138,9 @@ function panels_schema_1() {
*/
function panels_install() {
db_query("UPDATE {system} SET weight = 10 WHERE name = 'panels'");
- drupal_set_message(t('Please keep in mind that this is an Alpha release of Panels for Drupal 6, and is NOT intended for use on production sites.'));
- drupal_set_message(t('Additionally, the upgrade path from Drupal 5 has NOT been resolved, and should not be attempted.'));
- drupal_set_message(t('Bug reports are encouraged, especially when they come with patches! The !link has details on filing issues.', array('!link' => l('Panels project page', 'http://drupal.org/project/panels'))));
+ drupal_set_message(st('Please keep in mind that this is an Alpha release of Panels for Drupal 6, and is NOT intended for use on production sites.'));
+ drupal_set_message(st('Additionally, the upgrade path from Drupal 5 has NOT been resolved, and should not be attempted.'));
+ drupal_set_message(st('Bug reports are encouraged, especially when they come with patches! The <a href="@link">Panels project page</a> has details on filing issues.', array('@link' => 'http://drupal.org/project/panels')));
drupal_install_schema('panels');
}
diff --git a/panels_mini/panels_mini.admin.inc b/panels_mini/panels_mini.admin.inc
index aa30491..8e81036 100644
--- a/panels_mini/panels_mini.admin.inc
+++ b/panels_mini/panels_mini.admin.inc
@@ -371,7 +371,7 @@ function panels_mini_add_page($layout = NULL) {
$panel_mini->name = '';
$panel_mini->category = '';
- drupal_set_title('Add mini panel');
+ drupal_set_title(t('Add mini panel'));
return panels_mini_edit($panel_mini);
}
diff --git a/panels_mini/panels_mini.module b/panels_mini/panels_mini.module
index 4f2e4a4..4b2cabc 100644
--- a/panels_mini/panels_mini.module
+++ b/panels_mini/panels_mini.module
@@ -91,7 +91,7 @@ function panels_mini_content_types() {
'icon' => 'icon_contrib_block.png',
'path' => panels_get_path("content_types/block"),
'description' => filter_xss_admin($mini->title),
- 'category' => array(t(!empty($mini->category) ? $mini->category : 'Mini panel'), -8),
+ 'category' => array(!empty($mini->category) ? filter_xss_admin($mini->category) : t('Mini panel'), -8),
);
if (!empty($mini->requiredcontexts)) {
$types[$mini->name]['required context'] = array();
diff --git a/panels_page/panels_page.admin.inc b/panels_page/panels_page.admin.inc
index 0ab8246..539097e 100644
--- a/panels_page/panels_page.admin.inc
+++ b/panels_page/panels_page.admin.inc
@@ -608,7 +608,7 @@ function panels_page_export_page(&$form_state, $panel_page) {
$code = panels_page_export($panel_page);
$lines = substr_count($code, "\n");
$form = array('output' => array(
- '#title' => t("Export of '@title' ", array('@title' => $panel_page->title)),
+ '#title' => t("Export of '@title'", array('@title' => $panel_page->title)),
'#type' => 'textarea',
'#default_value' => $code,
'#rows' => $lines,
@@ -889,8 +889,8 @@ function panels_page_admin_view(&$form_state) {
if ($args_missing = max($required_args - count($args), 0)) {
$value = $url;
$description = format_plural($args_missing,
- t('1 argument is missing to generate a valid URL.'),
- t('%count arguments are missing to generate a valid URL.', array('%count' => $args_missing))
+ '1 argument is missing to generate a valid URL.',
+ '@count arguments are missing to generate a valid URL.'
);
}
else {