Merge Language (endoded) resoueces. skin/skin.*.lng => *.lng

diff --git a/en.lng b/en.lng
index 92e4ca4..77ba110 100644 (file)
--- a/en.lng
+++ b/en.lng
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: en.lng,v 1.31 2004/10/17 13:19:23 henoheno Exp $
+// $Id: en.lng,v 1.32 2004/10/17 13:51:49 henoheno Exp $
 //
 // PukiWiki message file (english)
 
@@ -96,6 +96,31 @@ $_no_subject = 'no subject';
 // No name (article,comment,pcomment)
 $_no_name = '';
 
+/////////////////////////////////////////////////
+// Skin
+/////////////////////////////////////////////////
+
+$_LANG['skin']['add']       = 'Add';
+$_LANG['skin']['backup']    = 'Backup';
+$_LANG['skin']['copy']      = 'Copy';
+$_LANG['skin']['diff']      = 'Diff';
+$_LANG['skin']['edit']      = 'Edit';
+$_LANG['skin']['filelist']  = 'List of page files';    // List of filenames
+$_LANG['skin']['freeze']    = 'Freeze';
+$_LANG['skin']['help']      = 'Help';
+$_LANG['skin']['list']      = 'List of pages';
+$_LANG['skin']['new']       = 'New';
+$_LANG['skin']['recent']    = 'Recent changes';        // RecentChanges
+$_LANG['skin']['refer']     = 'Referer';       // Show list of referer
+$_LANG['skin']['reload']    = 'Reload';
+$_LANG['skin']['rename']    = 'Rename';        // Rename a page (and related)
+$_LANG['skin']['rss']       = 'RSS of recent changes';
+$_LANG['skin']['search']    = 'Search';
+$_LANG['skin']['top']       = 'Front page';    // Top page
+$_LANG['skin']['trackback'] = 'Trackback';     // Show list of trackback
+$_LANG['skin']['unfreeze']  = 'Unfreeze';
+$_LANG['skin']['upload']    = 'Upload';        // Attach a file
+
 ///////////////////////////////////////
 // Plug-in message
 ///////////////////////////////////////

diff --git a/ja.lng b/ja.lng
index 98a0b4c..ed7d9a0 100644 (file)
--- a/ja.lng
+++ b/ja.lng
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: ja.lng,v 1.30 2004/10/17 13:19:23 henoheno Exp $
+// $Id: ja.lng,v 1.31 2004/10/17 13:51:49 henoheno Exp $
 //
 // PukiWiki message file (japanese)
 
@@ -98,6 +98,31 @@ $_no_subject = '̵
 // ̾Á°¤¬Ì¤µ­Æþ¤Î¾ì¹ç¤Îɽµ­ (article, comment, pcomment)
 $_no_name = '';
 
+/////////////////////////////////////////////////
+// Skin
+/////////////////////////////////////////////////
+
+$_LANG['skin']['add']       = 'ÄɲÃ';
+$_LANG['skin']['backup']    = '¥Ð¥Ã¥¯¥¢¥Ã¥×';
+$_LANG['skin']['copy']      = 'Ê£À½';
+$_LANG['skin']['diff']      = 'º¹Ê¬';
+$_LANG['skin']['edit']      = 'ÊÔ½¸';
+$_LANG['skin']['filelist']  = '¥Õ¥¡¥¤¥ë̾°ìÍ÷';        // List of filenames
+$_LANG['skin']['freeze']    = 'Åà·ë';
+$_LANG['skin']['help']      = '¥Ø¥ë¥×';
+$_LANG['skin']['list']      = '°ìÍ÷';  // List of pages
+$_LANG['skin']['new']       = '¿·µ¬';
+$_LANG['skin']['recent']    = 'ºÇ½ª¹¹¿·';      // RecentChanges
+$_LANG['skin']['refer']     = '¥ê¥ó¥¯¸µ';      // Show list of referer
+$_LANG['skin']['reload']    = '¥ê¥í¡¼¥É';
+$_LANG['skin']['rename']    = '̾Á°Êѹ¹';      // Rename a page (and related)
+$_LANG['skin']['rss']       = 'ºÇ½ª¹¹¿·¤ÎRSS'; // RSS of RecentChanges
+$_LANG['skin']['search']    = 'ñ¸ì¸¡º÷';
+$_LANG['skin']['top']       = '¥È¥Ã¥×';        // Top page
+$_LANG['skin']['trackback'] = 'Trackback';     // Show list of trackback
+$_LANG['skin']['unfreeze']  = 'Åà·ë²ò½ü';
+$_LANG['skin']['upload']    = 'źÉÕ';  // Attach a file
+
 ///////////////////////////////////////
 // Plug-in message
 ///////////////////////////////////////

diff --git a/lib/html.php b/lib/html.php
index d00ba06..94817b2 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: html.php,v 1.8 2004/10/16 04:14:00 henoheno Exp $
+// $Id: html.php,v 1.9 2004/10/17 13:51:49 henoheno Exp $
 //
 
 // ËÜʸ¤ò½ÐÎÏ
@@ -22,7 +22,7 @@ function catbody($title,$page,$body)
        if (! file_exists(SKIN_FILE) || ! is_readable(SKIN_FILE))
                die_message('SKIN_FILE is not found');
 
-       $_LANG = $_LINK = $_IMAGE = array();
+       $_LINK = $_IMAGE = array();
 
        // Add script header when ...
        if ($trackback) {

diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index 1452c53..b141e13 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -2,21 +2,12 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.skin.php,v 1.12 2004/10/17 13:29:52 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.13 2004/10/17 13:51:49 henoheno Exp $
 //
 
 // Prohibit direct access
 if (! defined('UI_LANG')) exit;
 
-// Load language resources
-$skin_lang = 'skin.' . UI_LANG . '.lng';
-$lang = array();
-if (! file_exists(SKIN_DIR . $skin_lang)) {
-       die($skin_lang . ' is not found');  // die_message() causes a loop!
-} else {
-       require_once(SKIN_DIR . $skin_lang);
-}
-
 // Set skin-specific images
 $_IMAGE['skin']['logo']     = 'pukiwiki.png';
 $_IMAGE['skin']['reload']   = 'reload.png';

diff --git a/skin/skin.en.lng b/skin/skin.en.lng
deleted file mode 100644 (file)
index 258dbba..0000000
--- a/skin/skin.en.lng
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/////////////////////////////////////////////////
-// PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: skin.en.lng,v 1.2 2004/10/08 12:14:40 henoheno Exp $
-//
-// PukiWiki message file (japanese)
-
-///////////////////////////////////////
-// pukiwiki.skin.php
-
-$_LANG['skin']['add']       = 'Add';
-$_LANG['skin']['backup']    = 'Backup';
-$_LANG['skin']['copy']      = 'Copy';
-$_LANG['skin']['diff']      = 'Diff';
-$_LANG['skin']['edit']      = 'Edit';
-$_LANG['skin']['filelist']  = 'List of page files';    // List of filenames
-$_LANG['skin']['freeze']    = 'Freeze';
-$_LANG['skin']['help']      = 'Help';
-$_LANG['skin']['list']      = 'List of pages';
-$_LANG['skin']['new']       = 'New';
-$_LANG['skin']['recent']    = 'Recent changes';        // RecentChanges
-$_LANG['skin']['refer']     = 'Referer';       // Show list of referer
-$_LANG['skin']['reload']    = 'Reload';
-$_LANG['skin']['rename']    = 'Rename';        // Rename a page (and related)
-$_LANG['skin']['rss']       = 'RSS of recent changes';
-$_LANG['skin']['search']    = 'Search';
-$_LANG['skin']['top']       = 'Front page';    // Top page
-$_LANG['skin']['trackback'] = 'Trackback';     // Show list of trackback
-$_LANG['skin']['unfreeze']  = 'Unfreeze';
-$_LANG['skin']['upload']    = 'Upload';        // Attach a file
-
-?>

diff --git a/skin/skin.ja.lng b/skin/skin.ja.lng
deleted file mode 100644 (file)
index 69a0021..0000000
--- a/skin/skin.ja.lng
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/////////////////////////////////////////////////
-// PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: skin.ja.lng,v 1.2 2004/10/08 12:14:40 henoheno Exp $
-//
-// PukiWiki message file (japanese)
-
-///////////////////////////////////////
-// pukiwiki.skin.php
-
-$_LANG['skin']['add']       = 'ÄɲÃ';
-$_LANG['skin']['backup']    = '¥Ð¥Ã¥¯¥¢¥Ã¥×';
-$_LANG['skin']['copy']      = 'Ê£À½';
-$_LANG['skin']['diff']      = 'º¹Ê¬';
-$_LANG['skin']['edit']      = 'ÊÔ½¸';
-$_LANG['skin']['filelist']  = '¥Õ¥¡¥¤¥ë̾°ìÍ÷';        // List of filenames
-$_LANG['skin']['freeze']    = 'Åà·ë';
-$_LANG['skin']['help']      = '¥Ø¥ë¥×';
-$_LANG['skin']['list']      = '°ìÍ÷';  // List of pages
-$_LANG['skin']['new']       = '¿·µ¬';
-$_LANG['skin']['recent']    = 'ºÇ½ª¹¹¿·';      // RecentChanges
-$_LANG['skin']['refer']     = '¥ê¥ó¥¯¸µ';      // Show list of referer
-$_LANG['skin']['reload']    = '¥ê¥í¡¼¥É';
-$_LANG['skin']['rename']    = '̾Á°Êѹ¹';      // Rename a page (and related)
-$_LANG['skin']['rss']       = 'ºÇ½ª¹¹¿·¤ÎRSS'; // RSS of RecentChanges
-$_LANG['skin']['search']    = 'ñ¸ì¸¡º÷';
-$_LANG['skin']['top']       = '¥È¥Ã¥×';        // Top page
-$_LANG['skin']['trackback'] = 'Trackback';     // Show list of trackback
-$_LANG['skin']['unfreeze']  = 'Åà·ë²ò½ü';
-$_LANG['skin']['upload']    = 'źÉÕ';  // Attach a file
-
-?>