[Phpgroupware-cvs] phpgwapi/setup default_records.inc.php, 1.12, 1.13 setup.inc.php, 1.59, 1.60 tables_update.inc.php, 1.74, 1.75

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv23904

Modified Files:
        default_records.inc.php setup.inc.php tables_update.inc.php 
Log Message:
iso compliance for language codes

Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/default_records.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** default_records.inc.php     22 Mar 2003 01:27:47 -0000      1.12
--- default_records.inc.php     8 Oct 2003 06:40:13 -0000       1.13
***************
*** 25,29 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bh','Bihari','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bi','Bislama','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bn','Bengali / Bangla','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bo','Tibetan','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('br','Breton','No')");
--- 25,29 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bh','Bihari','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bi','Bislama','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bn','Bengali','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('bo','Tibetan','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('br','Breton','No')");
***************
*** 36,40 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('dz','Bhutani','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('el','Greek','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('en','English / US','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('eo','Esperanto','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('es','Spanish','Yes')");
--- 36,40 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('dz','Bhutani','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('el','Greek','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('en','English','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('eo','Esperanto','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('es','Spanish','Yes')");
***************
*** 48,56 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('fy','Frisian','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ga','Irish','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gd','Gaelic / Scots Gaelic','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gl','Galician','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gn','Guarani','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gu','Gujarati','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ha','Hausa','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('hi','Hindi','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('hr','Croatian','No')");
--- 48,57 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('fy','Frisian','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ga','Irish','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gd','Scots Gaelic','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gl','Galician','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gn','Guarani','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('gu','Gujarati','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ha','Hausa','No')");
+       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('he','Hebrew','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('hi','Hindi','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('hr','Croatian','No')");
***************
*** 60,69 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ie','Interlingue','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ik','Inupiak','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('in','Indonesian','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('is','Icelandic','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('it','Italian','Yes')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('iw','Hebrew','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ja','Japanese','Yes')");
-       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ji','Yiddish','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('jw','Javanese','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ka','Georgian','No')");
--- 61,69 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ie','Interlingue','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ik','Inupiak','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('id','Indonesian','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('is','Icelandic','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('it','Italian','Yes')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('iu', 'Inuktitut', 'No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ja','Japanese','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('jw','Javanese','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ka','Georgian','No')");
***************
*** 138,141 ****
--- 138,142 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('tt','Tatar','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('tw','Twi','No')");
+       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ug', 'Uigur', 'No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('uk','Ukrainian','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ur','Urdu','No')");
***************
*** 145,152 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('wo','Wolof','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('xh','Xhosa','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('yo','Yoruba','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zh','Chinese','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zt','Chinese(Taiwan)','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zu','Zulu','No')");
  
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES 
('phpgwapi','sessions_checkip','True')");
--- 146,155 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('wo','Wolof','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('xh','Xhosa','No')");
+       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('yi','Yiddish','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('yo','Yoruba','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zh','Chinese (Simplified)','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zt','Chinese (Traditional)','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('zu','Zulu','No')");
+ 
  
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config 
(config_app, config_name, config_value) VALUES 
('phpgwapi','sessions_checkip','True')");

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/setup.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** setup.inc.php       21 Jul 2003 18:20:45 -0000      1.59
--- setup.inc.php       8 Oct 2003 06:40:13 -0000       1.60
***************
*** 13,17 ****
        /* Basic information about this app */
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
!       $setup_info['phpgwapi']['version']   = '0.9.15.014';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.23';
        $setup_info['phpgwapi']['enable']    = 3;
--- 13,17 ----
        /* Basic information about this app */
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
!       $setup_info['phpgwapi']['version']   = '0.9.15.015';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.23';
        $setup_info['phpgwapi']['enable']    = 3;
***************
*** 20,24 ****
        $setup_info['phpgwapi']['author'][] = array
        (
!               'name'  => 'phpGroupWare coreteam',
                'email' => 'address@hidden'
        );
--- 20,24 ----
        $setup_info['phpgwapi']['author'][] = array
        (
!               'name'  => 'phpGroupWare Coordinators',
                'email' => 'address@hidden'
        );
***************
*** 26,32 ****
        $setup_info['phpgwapi']['maintainer'][] = array
        (
!               'name'  => 'phpGroupWare coreteam',
                'email' => 'address@hidden',
!               'url'   => 'www.phpgroupware.org/coredevelopers'
        );
  
--- 26,32 ----
        $setup_info['phpgwapi']['maintainer'][] = array
        (
!               'name'  => 'phpGroupWare Coordinators',
                'email' => 'address@hidden',
!               'url'   => 'www.phpgroupware.org/coordinators'
        );
  

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** tables_update.inc.php       21 Jul 2003 18:20:45 -0000      1.74
--- tables_update.inc.php       8 Oct 2003 06:40:13 -0000       1.75
***************
*** 480,482 ****
--- 480,511 ----
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
        }
+ 
+       $test[] = '0.9.15.014';
+       //fix some languages to be ISO 639 compliant
+       //Source: http://www.geo-guide.de/info/tools/languagecode.html
+       function phpgwapi_upgrade0_9_15_014()
+       {
+               //Indonesian code fix
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_id='id' WHERE lang_id='in'");
+               //bn name fix
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_name='Bengali' WHERE lang_id='bn'");
+               //English is English not English US - the US didn't invent it!
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_name='English' WHERE lang_id='en'");
+               //gd name fix
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_name='Scots Gaelic' WHERE lang_id='gd'");
+               //Hebrew code fix
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_id='he' WHERE lang_id='iw'");
+               //Yiddish code fix
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_id='yi' WHERE lang_id='ji'");
+               //Make Chinese names clearer
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_name='Chinese (Simplified)' WHERE lang_id='zh'");
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET lang_name='Chinese (Traditional)' WHERE lang_id='zt'");
+               //Add Missing Languages
+               $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_languages(lang_id, lang_name, available) VALUES('iu', 'Inuktitut', 
'No')");
+               $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_languages(lang_id, lang_name, available) VALUES('ug', 'Uigur', 'No')");
+               
+               $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.015';
+               return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+ 
+       }
  ?>