XML要素の属性に用いるための<%locale%>を、language-regionを出力するように変更。
管理画面用スキンがja-JPを含んでいたため置換した。
/**
* BaseActions::parse_locale()
- * Parse locale to language-script-region according to RFC 4646
+ * Parse locale to language-region according to RFC 4646
*
* @param void
* @return void
*/
public function parse_locale()
{
- echo preg_replace('#_#', '-', i18n::get_current_locale());
+ echo preg_replace('#(.+)_(.+)_(.+)#', '$1-$3', i18n::get_current_locale());
return;
}
\r
<part name="pagehead">\r
<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
- <html xmlns="http://www.w3.org/1999/xhtml">\r
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%locale%>" lang="<%locale%>">\r
<head>\r
<title><%title%></title>\r
<link rel="stylesheet" type="text/css" href="<%skinfile(/styles/bookmarklet.css)%>" /> \r
]]></part>\r
<part name="pagehead"><![CDATA[\r
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja-JP" lang="ja-JP">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%locale%>" lang="<%locale%>">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />\r
<title><%sitevar(name)%> - Admin</title>\r