remove encoding from japanese and slovak lang names

diff --git a/lang/Makefile b/lang/Makefile
index 75aca1af94ddf95b4ab4a323dd36475f88302ef3..e617fa5754681fab484b6633f33f2264e4b5d026 100644 (file)
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -6,7 +6,7 @@
 # It is important to fix first and last lines of the file <?php and ?>
 # using 'awk'
 # 
-# $Id: Makefile,v 1.21 2003/05/04 03:56:28 chriskl Exp $
+# $Id: Makefile,v 1.22 2003/05/07 01:20:03 chriskl Exp $
 #
 DESTDIR=./recoded
 
@@ -58,22 +58,18 @@ french:
                awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
                > ${DESTDIR}/french.php
 
-japanese: japanese-euc
-
-japanese-euc:
-       cat japanese-euc.php | recode euc-jp..html | \
+japanese:
+       cat japanese.php | recode euc-jp..html | \
                awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
-               > ${DESTDIR}/japanese-euc.php
+               > ${DESTDIR}/japanese.php
 
 russian:
        cat russian.php | recode koi8..html | \
                awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
                > ${DESTDIR}/russian.php
 
-slovak: slovak-1250
-
-slovak-1250:
-       cat slovak-1250.php | recode cp1250..html | \
+slovak:
+       cat slovak.php | recode cp1250..html | \
                awk '{ gsub("&gt;",">"); gsub("&lt;","<"); print $0}' \
                > ${DESTDIR}/slovak.php
 

diff --git a/lang/japanese-euc.php b/lang/japanese.php
similarity index 99%
rename from lang/japanese-euc.php
rename to lang/japanese.php
index 90b49cb24b74dff4a7acbbc8c920f1002363d84c..a07b267bf12e35ed6c1707361722b2a2f777aad4 100644 (file)
--- a/lang/japanese-euc.php
+++ b/lang/japanese.php
@@ -4,7 +4,7 @@
         * Japanese language file for phpPgAdmin.
         * @maintainer Tadashi Jokagi [elf2000@users.sourceforge.net]
         *
-        * $Id: japanese-euc.php,v 1.3 2003/04/13 08:24:24 jmpoure Exp $
+        * $Id: japanese.php,v 1.1 2003/05/07 01:20:03 chriskl Exp $
         */
 
        // Language and character set

diff --git a/lang/recoded/japanese-euc.php b/lang/recoded/japanese.php
similarity index 99%
rename from lang/recoded/japanese-euc.php
rename to lang/recoded/japanese.php
index 7034e00684159b6481b2fa772b336e56d3bd8432..243c5d8f857b84d393170824662d630a083e7ea9 100644 (file)
--- a/lang/recoded/japanese-euc.php
+++ b/lang/recoded/japanese.php
@@ -4,13 +4,14 @@
         * Japanese language file for phpPgAdmin.
         * @maintainer Tadashi Jokagi [elf2000@users.sourceforge.net]
         *
-        * $Id: japanese-euc.php,v 1.2 2003/04/11 04:47:52 chriskl Exp $
+        * $Id: japanese.php,v 1.1 2003/05/07 01:20:04 chriskl Exp $
         */
 
        // Language and character set
        $lang['applang'] = '日本語(EUC-JP)';
        $lang['appcharset'] = 'EUC-JP';
-
+       $lang['applocale'] = 'ja_JP';
+  
        // Basic strings
        $lang['strintro'] = 'ようこそphpPgAdminへ。';
        $lang['strlogin'] = 'ログイン';

diff --git a/lang/slovak-1250.php b/lang/slovak.php
similarity index 97%
rename from lang/slovak-1250.php
rename to lang/slovak.php
index f7c1f1a7a943d6329a2de49f7cc391dcba971528..212fd8cf306f9514c253c9dbc2af411bd5787190 100644 (file)
--- a/lang/slovak-1250.php
+++ b/lang/slovak.php
@@ -4,7 +4,7 @@
         * Slovenska lokalizacia phpPgAdmin-u.\r
         *                                      ado(at)nirvanaclub.sk\r
         *\r
-        * $Id: slovak-1250.php,v 1.1 2003/04/17 06:11:42 chriskl Exp $\r
+        * $Id: slovak.php,v 1.1 2003/05/07 01:20:03 chriskl Exp $\r
         */\r
 \r
        // Language and character set\r

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index f936cc96c2b7121ae863ff65f0b79ef80a44e494..24b008e3252c743e18f2ef46bf1efb1c6f97981c 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.42 2003/05/04 03:56:28 chriskl Exp $
+        * $Id: lib.inc.php,v 1.43 2003/05/07 01:20:02 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -41,7 +41,7 @@
                'french' => 'Français',
                'german' => 'Deutsch',
                'italian' => 'Italiano',
-               'japanese-euc' => '日本語',
+               'japanese' => '日本語',
                'polish' => 'Polski',
                'russian' => 'Русский',
                'slovak' => 'Slovensky',