From b75c1e1c8bdc9b0fafaed8b7de8b27dec6fefd66 Mon Sep 17 00:00:00 2001 From: Steven Wittens Date: Thu, 9 Sep 2004 13:36:01 +0000 Subject: Replace hardcoded with a locale dependant one. This is especially important for asian sites where this has an effect on font selection. --- themes/bluemarine/xtemplate.xtmpl | 2 +- themes/chameleon/chameleon.theme | 4 +++- themes/engines/xtemplate/xtemplate.engine | 1 + themes/pushbutton/xtemplate.xtmpl | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'themes') diff --git a/themes/bluemarine/xtemplate.xtmpl b/themes/bluemarine/xtemplate.xtmpl index fbeef1e58..c9a41cd88 100644 --- a/themes/bluemarine/xtemplate.xtmpl +++ b/themes/bluemarine/xtemplate.xtmpl @@ -1,5 +1,5 @@ - + {head_title} diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 154cb2e4b..307d87615 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -24,8 +24,10 @@ function chameleon_page($content, $title = NULL, $breadcrumb = NULL) { drupal_set_breadcrumb($breadcrumb); } + $language = $GLOBALS['locale']; + $output = "\n"; - $output .= "\n"; + $output .= "\n"; $output .= "\n"; $output .= " ". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."\n"; $output .= drupal_get_html_head(); diff --git a/themes/engines/xtemplate/xtemplate.engine b/themes/engines/xtemplate/xtemplate.engine index 2b91f70d7..14bd20a55 100644 --- a/themes/engines/xtemplate/xtemplate.engine +++ b/themes/engines/xtemplate/xtemplate.engine @@ -120,6 +120,7 @@ function xtemplate_page($content, $title = NULL, $breadcrumb = NULL) { global $xtemplate; $xtemplate->template->assign(array( + "language" => $GLOBALS['locale'], "head_title" => (drupal_get_title() ? drupal_get_title() ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")), "head" => drupal_get_html_head(), "styles" => theme_get_styles(), diff --git a/themes/pushbutton/xtemplate.xtmpl b/themes/pushbutton/xtemplate.xtmpl index dbd6bdb9b..a18a8118c 100644 --- a/themes/pushbutton/xtemplate.xtmpl +++ b/themes/pushbutton/xtemplate.xtmpl @@ -1,5 +1,5 @@ - + {head_title} {head} -- cgit v1.2.3