OSDN Git Service

CHANGE: <%locale%>を再整備
authorsakamocchi <o-takashi@sakamocchi.jp>
Sun, 17 Jun 2012 01:54:19 +0000 (10:54 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Sun, 17 Jun 2012 01:54:19 +0000 (10:54 +0900)
XML要素の属性に用いるための<%locale%>を、language-regionを出力するように変更。
管理画面用スキンがja-JPを含んでいたため置換した。

nucleus/libs/BaseActions.php
skins/admin/bookmarklet/skinbackup.xml
skins/admin/default/skinbackup.xml

index 9473d52..7344ffc 100644 (file)
@@ -139,14 +139,14 @@ class BaseActions
        
        /**
         * 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;
        }
        
index 34af75d..662a27f 100644 (file)
@@ -553,7 +553,7 @@ at
 \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
index 539bc33..fa23712 100644 (file)
 ]]></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