------------------------------------------------------------
revno: 1064
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Thu 2012-02-02 22:09:33 +0100
message:
  iso639() move to Util class
modified:
  assets/apps/installer/library.php
  assets/apps/upgrader/library.php
  libs/Util.php


--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk

Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to 
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'assets/apps/installer/library.php'
--- assets/apps/installer/library.php	2012-02-01 22:40:03 +0000
+++ assets/apps/installer/library.php	2012-02-02 21:09:33 +0000
@@ -22,206 +22,6 @@
  */
 
 
-/** 
- *
- * return english name of iso6391 codec
- * 
- * @param string iso code
- * 
- * @return english name or code.
- */
-
-function iso639($code) {	
-	// source: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-	$iso639 = array(
-		'aa' => 'Afar',
-		'ab' => 'Abkhaz',
-		'ae' => 'Avestan',
-		'af' => 'Afrikaans',
-		'ak' => 'Akan',
-		'am' => 'Amharic',
-		'an' => 'Aragonese',
-		'ar' => 'Arabic',
-		'as' => 'Assamese',
-		'av' => 'Avaric',
-		'ay' => 'Aymara',
-		'az' => 'Azerbaijani',
-		'ba' => 'Bashkir',
-		'be' => 'Belarusian',
-		'bg' => 'Bulgarian',
-		'bh' => 'Bihari',
-		'bi' => 'Bislama',
-		'bm' => 'Bambara',
-		'bn' => 'Bengali',
-		'bo' => 'Tibetan Standard, Tibetan, Central',
-		'br' => 'Breton',
-		'bs' => 'Bosnian',
-		'ca' => 'Catalan; Valencian',
-		'ce' => 'Chechen',
-		'ch' => 'Chamorro',
-		'co' => 'Corsican',
-		'cr' => 'Cree',
-		'cs' => 'Czech',
-		'cu' => 'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic',
-		'cv' => 'Chuvash',
-		'cy' => 'Welsh',
-		'da' => 'Danish',
-		'de' => 'German',
-		'dv' => 'Divehi; Dhivehi; Maldivian;',
-		'dz' => 'Dzongkha',
-		'ee' => 'Ewe',
-		'el' => 'Greek, Modern',
-		'en' => 'English',
-		'eo' => 'Esperanto',
-		'es' => 'Spanish; Castilian',
-		'et' => 'Estonian',
-		'eu' => 'Basque',
-		'fa' => 'Persian',
-		'ff' => 'Fula; Fulah; Pulaar; Pular',
-		'fi' => 'Finnish',
-		'fj' => 'Fijian',
-		'fo' => 'Faroese',
-		'fr' => 'French',
-		'fy' => 'Western Frisian',
-		'ga' => 'Irish',
-		'gd' => 'Scottish Gaelic; Gaelic',
-		'gl' => 'Galician',
-		'gn' => 'GuaranÃ',
-		'gu' => 'Gujarati',
-		'gv' => 'Manx',
-		'ha' => 'Hausa',
-		'he' => 'Hebrew (modern)',
-		'hi' => 'Hindi',
-		'ho' => 'Hiri Motu',
-		'hr' => 'Croatian',
-		'ht' => 'Haitian; Haitian Creole',
-		'hu' => 'Hungarian',
-		'hy' => 'Armenian',
-		'hz' => 'Herero',
-		'ia' => 'Interlingua',
-		'id' => 'Indonesian',
-		'ie' => 'Interlingue',
-		'ig' => 'Igbo',
-		'ii' => 'Nuosu',
-		'ik' => 'Inupiaq',
-		'io' => 'Ido',
-		'is' => 'Icelandic',
-		'it' => 'Italian',
-		'iu' => 'Inuktitut',
-		'ja' => 'Japanese (ja)',
-		'jv' => 'Javanese (jv)',
-		'ka' => 'Georgian',
-		'kg' => 'Kongo',
-		'ki' => 'Kikuyu, Gikuyu',
-		'kj' => 'Kwanyama, Kuanyama',
-		'kk' => 'Kazakh',
-		'kl' => 'Kalaallisut, Greenlandic',
-		'km' => 'Khmer',
-		'kn' => 'Kannada',
-		'ko' => 'Korean',
-		'kr' => 'Kanuri',
-		'ks' => 'Kashmiri',
-		'ku' => 'Kurdish',
-		'kv' => 'Komi',
-		'kw' => 'Cornish',
-		'ky' => 'Kirghiz, Kyrgyz',
-		'la' => 'Latin',
-		'lb' => 'Luxembourgish, Letzeburgesch',
-		'lg' => 'Luganda',
-		'li' => 'Limburgish, Limburgan, Limburger',
-		'ln' => 'Lingala',
-		'lo' => 'Lao',
-		'lt' => 'Lithuanian',
-		'lu' => 'Luba-Katanga',
-		'lv' => 'Latvian',
-		'mg' => 'Malagasy',
-		'mh' => 'Marshallese',
-		'mi' => 'Maori',
-		'mk' => 'Macedonian',
-		'ml' => 'Malayalam',
-		'mn' => 'Mongolian',
-		'mr' => 'Marathi',
-		'ms' => 'Malay',
-		'mt' => 'Maltese',
-		'my' => 'Burmese',
-		'na' => 'Nauru',
-		'nb' => 'Norwegian Bokmål',
-		'nd' => 'North Ndebele',
-		'ne' => 'Nepali',
-		'ng' => 'Ndonga',
-		'nl' => 'Dutch',
-		'nn' => 'Norwegian Nynorsk',
-		'no' => 'Norwegian',
-		'nr' => 'South Ndebele',
-		'nv' => 'Navajo, Navaho',
-		'ny' => 'Chichewa; Chewa; Nyanja',
-		'oc' => 'Occitan',
-		'oj' => 'Ojibwe, Ojibwa',
-		'om' => 'Oromo',
-		'or' => 'Oriya',
-		'os' => 'Ossetian, Ossetic',
-		'pa' => 'Panjabi, Punjabi',
-		'pi' => 'Pali',
-		'pl' => 'Polish',
-		'ps' => 'Pashto, Pushto',
-		'pt' => 'Portuguese',
-		'qu' => 'Quechua',
-		'rm' => 'Romansh',
-		'rn' => 'Kirundi',
-		'ro' => 'Romanian, Moldavian, Moldovan',
-		'ru' => 'Russian',
-		'rw' => 'Kinyarwanda',
-		'sa' => 'Sanskrit (Saṁskṛta)',
-		'sc' => 'Sardinian',
-		'sd' => 'Sindhi',
-		'se' => 'Northern Sami',
-		'sg' => 'Sango',
-		'si' => 'Sinhala, Sinhalese',
-		'sk' => 'Slovak',
-		'sl' => 'Slovene',
-		'sm' => 'Samoan',
-		'sn' => 'Shona',
-		'so' => 'Somali',
-		'sq' => 'Albanian',
-		'sr' => 'Serbian',
-		'ss' => 'Swati',
-		'st' => 'Southern Sotho',
-		'su' => 'Sundanese',
-		'sv' => 'Swedish',
-		'sw' => 'Swahili',
-		'ta' => 'Tamil',
-		'te' => 'Telugu',
-		'tg' => 'Tajik',
-		'th' => 'Thai',
-		'ti' => 'Tigrinya',
-		'tk' => 'Turkmen',
-		'tl' => 'Tagalog',
-		'tn' => 'Tswana',
-		'to' => 'Tonga (Tonga Islands)',
-		'tr' => 'Turkish',
-		'ts' => 'Tsonga',
-		'tt' => 'Tatar',
-		'tw' => 'Twi',
-		'ty' => 'Tahitian',
-		'ug' => 'Uighur, Uyghur',
-		'uk' => 'Ukrainian',
-		'ur' => 'Urdu',
-		'uz' => 'Uzbek',
-		've' => 'Venda',
-		'vi' => 'Vietnamese',
-		'vo' => 'Volapük',
-		'wa' => 'Walloon',
-		'wo' => 'Wolof',
-		'xh' => 'Xhosa',
-		'yi' => 'Yiddish',
-		'yo' => 'Yoruba',
-		'za' => 'Zhuang, Chuang',
-		'zh' => 'Chinese',
-		'zu' => 'Zulu');
-	return  isset($iso639[$code]) ? $iso639[$code] : $code ;
-		
-}
-
 
 /** 
  *
@@ -265,7 +65,7 @@
 	
 	$options = "<option value='en'>English</option>";	
 	foreach ( $translations as $isoCode ){
-		$options .= "<option value='$isoCode'>" . iso639($isoCode) ."</option>\n";
+		$options .= "<option value='$isoCode'>" . Util::iso639($isoCode) ."</option>\n";
 	}	
 	return 
 		"<form id='f_language'><label for='language'>" . $t->t("Select language for installation") ."</label>\n" .

=== modified file 'assets/apps/upgrader/library.php'
--- assets/apps/upgrader/library.php	2012-02-01 22:40:03 +0000
+++ assets/apps/upgrader/library.php	2012-02-02 21:09:33 +0000
@@ -17,210 +17,9 @@
  * @filesource
  *
  *
- * Installer function library
- *
- */
-
-
-/** 
- *
- * return english name of iso6391 code
- * 
- * @param string iso code
- * 
- * @return english name or code.
- */
-
-function iso639($code) {	
-	// source: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-	$iso639 = array(
-		'aa' => 'Afar',
-		'ab' => 'Abkhaz',
-		'ae' => 'Avestan',
-		'af' => 'Afrikaans',
-		'ak' => 'Akan',
-		'am' => 'Amharic',
-		'an' => 'Aragonese',
-		'ar' => 'Arabic',
-		'as' => 'Assamese',
-		'av' => 'Avaric',
-		'ay' => 'Aymara',
-		'az' => 'Azerbaijani',
-		'ba' => 'Bashkir',
-		'be' => 'Belarusian',
-		'bg' => 'Bulgarian',
-		'bh' => 'Bihari',
-		'bi' => 'Bislama',
-		'bm' => 'Bambara',
-		'bn' => 'Bengali',
-		'bo' => 'Tibetan Standard, Tibetan, Central',
-		'br' => 'Breton',
-		'bs' => 'Bosnian',
-		'ca' => 'Catalan; Valencian',
-		'ce' => 'Chechen',
-		'ch' => 'Chamorro',
-		'co' => 'Corsican',
-		'cr' => 'Cree',
-		'cs' => 'Czech',
-		'cu' => 'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic',
-		'cv' => 'Chuvash',
-		'cy' => 'Welsh',
-		'da' => 'Danish',
-		'de' => 'German',
-		'dv' => 'Divehi; Dhivehi; Maldivian;',
-		'dz' => 'Dzongkha',
-		'ee' => 'Ewe',
-		'el' => 'Greek, Modern',
-		'en' => 'English',
-		'eo' => 'Esperanto',
-		'es' => 'Spanish; Castilian',
-		'et' => 'Estonian',
-		'eu' => 'Basque',
-		'fa' => 'Persian',
-		'ff' => 'Fula; Fulah; Pulaar; Pular',
-		'fi' => 'Finnish',
-		'fj' => 'Fijian',
-		'fo' => 'Faroese',
-		'fr' => 'French',
-		'fy' => 'Western Frisian',
-		'ga' => 'Irish',
-		'gd' => 'Scottish Gaelic; Gaelic',
-		'gl' => 'Galician',
-		'gn' => 'GuaranÃ',
-		'gu' => 'Gujarati',
-		'gv' => 'Manx',
-		'ha' => 'Hausa',
-		'he' => 'Hebrew (modern)',
-		'hi' => 'Hindi',
-		'ho' => 'Hiri Motu',
-		'hr' => 'Croatian',
-		'ht' => 'Haitian; Haitian Creole',
-		'hu' => 'Hungarian',
-		'hy' => 'Armenian',
-		'hz' => 'Herero',
-		'ia' => 'Interlingua',
-		'id' => 'Indonesian',
-		'ie' => 'Interlingue',
-		'ig' => 'Igbo',
-		'ii' => 'Nuosu',
-		'ik' => 'Inupiaq',
-		'io' => 'Ido',
-		'is' => 'Icelandic',
-		'it' => 'Italian',
-		'iu' => 'Inuktitut',
-		'ja' => 'Japanese (ja)',
-		'jv' => 'Javanese (jv)',
-		'ka' => 'Georgian',
-		'kg' => 'Kongo',
-		'ki' => 'Kikuyu, Gikuyu',
-		'kj' => 'Kwanyama, Kuanyama',
-		'kk' => 'Kazakh',
-		'kl' => 'Kalaallisut, Greenlandic',
-		'km' => 'Khmer',
-		'kn' => 'Kannada',
-		'ko' => 'Korean',
-		'kr' => 'Kanuri',
-		'ks' => 'Kashmiri',
-		'ku' => 'Kurdish',
-		'kv' => 'Komi',
-		'kw' => 'Cornish',
-		'ky' => 'Kirghiz, Kyrgyz',
-		'la' => 'Latin',
-		'lb' => 'Luxembourgish, Letzeburgesch',
-		'lg' => 'Luganda',
-		'li' => 'Limburgish, Limburgan, Limburger',
-		'ln' => 'Lingala',
-		'lo' => 'Lao',
-		'lt' => 'Lithuanian',
-		'lu' => 'Luba-Katanga',
-		'lv' => 'Latvian',
-		'mg' => 'Malagasy',
-		'mh' => 'Marshallese',
-		'mi' => 'Maori',
-		'mk' => 'Macedonian',
-		'ml' => 'Malayalam',
-		'mn' => 'Mongolian',
-		'mr' => 'Marathi',
-		'ms' => 'Malay',
-		'mt' => 'Maltese',
-		'my' => 'Burmese',
-		'na' => 'Nauru',
-		'nb' => 'Norwegian Bokmål',
-		'nd' => 'North Ndebele',
-		'ne' => 'Nepali',
-		'ng' => 'Ndonga',
-		'nl' => 'Dutch',
-		'nn' => 'Norwegian Nynorsk',
-		'no' => 'Norwegian',
-		'nr' => 'South Ndebele',
-		'nv' => 'Navajo, Navaho',
-		'ny' => 'Chichewa; Chewa; Nyanja',
-		'oc' => 'Occitan',
-		'oj' => 'Ojibwe, Ojibwa',
-		'om' => 'Oromo',
-		'or' => 'Oriya',
-		'os' => 'Ossetian, Ossetic',
-		'pa' => 'Panjabi, Punjabi',
-		'pi' => 'Pali',
-		'pl' => 'Polish',
-		'ps' => 'Pashto, Pushto',
-		'pt' => 'Portuguese',
-		'qu' => 'Quechua',
-		'rm' => 'Romansh',
-		'rn' => 'Kirundi',
-		'ro' => 'Romanian, Moldavian, Moldovan',
-		'ru' => 'Russian',
-		'rw' => 'Kinyarwanda',
-		'sa' => 'Sanskrit (Saṁskṛta)',
-		'sc' => 'Sardinian',
-		'sd' => 'Sindhi',
-		'se' => 'Northern Sami',
-		'sg' => 'Sango',
-		'si' => 'Sinhala, Sinhalese',
-		'sk' => 'Slovak',
-		'sl' => 'Slovene',
-		'sm' => 'Samoan',
-		'sn' => 'Shona',
-		'so' => 'Somali',
-		'sq' => 'Albanian',
-		'sr' => 'Serbian',
-		'ss' => 'Swati',
-		'st' => 'Southern Sotho',
-		'su' => 'Sundanese',
-		'sv' => 'Swedish',
-		'sw' => 'Swahili',
-		'ta' => 'Tamil',
-		'te' => 'Telugu',
-		'tg' => 'Tajik',
-		'th' => 'Thai',
-		'ti' => 'Tigrinya',
-		'tk' => 'Turkmen',
-		'tl' => 'Tagalog',
-		'tn' => 'Tswana',
-		'to' => 'Tonga (Tonga Islands)',
-		'tr' => 'Turkish',
-		'ts' => 'Tsonga',
-		'tt' => 'Tatar',
-		'tw' => 'Twi',
-		'ty' => 'Tahitian',
-		'ug' => 'Uighur, Uyghur',
-		'uk' => 'Ukrainian',
-		'ur' => 'Urdu',
-		'uz' => 'Uzbek',
-		've' => 'Venda',
-		'vi' => 'Vietnamese',
-		'vo' => 'Volapük',
-		'wa' => 'Walloon',
-		'wo' => 'Wolof',
-		'xh' => 'Xhosa',
-		'yi' => 'Yiddish',
-		'yo' => 'Yoruba',
-		'za' => 'Zhuang, Chuang',
-		'zh' => 'Chinese',
-		'zu' => 'Zulu');
-	return  isset($iso639[$code]) ? $iso639[$code] : $code ;
-		
-}
+ * Upgrader function library
+ *
+ */
 
 
 /** 
@@ -267,7 +66,7 @@
 	
 	$options = "<option value='en'>English</option>";	
 	foreach ( $translations as $isoCode ){
-		$options .= "<option value='$isoCode'>" . iso639($isoCode) ."</option>\n";
+		$options .= "<option value='$isoCode'>" . Util::iso639($isoCode) ."</option>\n";
 	}	
 	return 
 		"<form id='f_language'><label for='language'>" . $t->t("Select language for installation") ."</label>\n" .
@@ -358,8 +157,8 @@
 			$revision = config("AIKI-REVISION",0);
 			if ( $revision >= $lastRevision){
 				$step=0;
-				return $t->t("No upgrade is necesary");
-				"<br><em>". t("Installed revision:") . " $reversion </em>";
+				return $t->t("No upgrade is necesary.").
+						"<br><em>". t("Installed revision:") . " $revision </em>";
 			}			
 			if ( $step==0){
 				$step=1;

=== modified file 'libs/Util.php'
--- libs/Util.php	2012-02-01 22:40:03 +0000
+++ libs/Util.php	2012-02-02 21:09:33 +0000
@@ -7,7 +7,7 @@
  * This source file is subject to the AGPL-3.0 license that is bundled
  * with this package in the file LICENSE.
  *
- * @author      Jon Phillips
+ * @author      Jon Phillips, Roger Martin
  * @copyright   (c) 2008-2011 Aiki Lab Pte Ltd
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @link        http://www.aikiframework.org
@@ -32,14 +32,212 @@
 
 class Util {
 
+	/** 
+	 * return english name of iso6391 code
+	 * 
+	 * @param string iso code
+	 * @return english name or code.
+	 * 
+	 */
+
+	public static function iso639($code) {	
+	// source: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+	$iso639 = array(
+		'aa' => 'Afar',
+		'ab' => 'Abkhaz',
+		'ae' => 'Avestan',
+		'af' => 'Afrikaans',
+		'ak' => 'Akan',
+		'am' => 'Amharic',
+		'an' => 'Aragonese',
+		'ar' => 'Arabic',
+		'as' => 'Assamese',
+		'av' => 'Avaric',
+		'ay' => 'Aymara',
+		'az' => 'Azerbaijani',
+		'ba' => 'Bashkir',
+		'be' => 'Belarusian',
+		'bg' => 'Bulgarian',
+		'bh' => 'Bihari',
+		'bi' => 'Bislama',
+		'bm' => 'Bambara',
+		'bn' => 'Bengali',
+		'bo' => 'Tibetan Standard, Tibetan, Central',
+		'br' => 'Breton',
+		'bs' => 'Bosnian',
+		'ca' => 'Catalan; Valencian',
+		'ce' => 'Chechen',
+		'ch' => 'Chamorro',
+		'co' => 'Corsican',
+		'cr' => 'Cree',
+		'cs' => 'Czech',
+		'cu' => 'Old Church Slavonic, Church Slavic, Church Slavonic, Old Bulgarian, Old Slavonic',
+		'cv' => 'Chuvash',
+		'cy' => 'Welsh',
+		'da' => 'Danish',
+		'de' => 'German',
+		'dv' => 'Divehi; Dhivehi; Maldivian;',
+		'dz' => 'Dzongkha',
+		'ee' => 'Ewe',
+		'el' => 'Greek, Modern',
+		'en' => 'English',
+		'eo' => 'Esperanto',
+		'es' => 'Spanish; Castilian',
+		'et' => 'Estonian',
+		'eu' => 'Basque',
+		'fa' => 'Persian',
+		'ff' => 'Fula; Fulah; Pulaar; Pular',
+		'fi' => 'Finnish',
+		'fj' => 'Fijian',
+		'fo' => 'Faroese',
+		'fr' => 'French',
+		'fy' => 'Western Frisian',
+		'ga' => 'Irish',
+		'gd' => 'Scottish Gaelic; Gaelic',
+		'gl' => 'Galician',
+		'gn' => 'GuaranÃ',
+		'gu' => 'Gujarati',
+		'gv' => 'Manx',
+		'ha' => 'Hausa',
+		'he' => 'Hebrew (modern)',
+		'hi' => 'Hindi',
+		'ho' => 'Hiri Motu',
+		'hr' => 'Croatian',
+		'ht' => 'Haitian; Haitian Creole',
+		'hu' => 'Hungarian',
+		'hy' => 'Armenian',
+		'hz' => 'Herero',
+		'ia' => 'Interlingua',
+		'id' => 'Indonesian',
+		'ie' => 'Interlingue',
+		'ig' => 'Igbo',
+		'ii' => 'Nuosu',
+		'ik' => 'Inupiaq',
+		'io' => 'Ido',
+		'is' => 'Icelandic',
+		'it' => 'Italian',
+		'iu' => 'Inuktitut',
+		'ja' => 'Japanese (ja)',
+		'jv' => 'Javanese (jv)',
+		'ka' => 'Georgian',
+		'kg' => 'Kongo',
+		'ki' => 'Kikuyu, Gikuyu',
+		'kj' => 'Kwanyama, Kuanyama',
+		'kk' => 'Kazakh',
+		'kl' => 'Kalaallisut, Greenlandic',
+		'km' => 'Khmer',
+		'kn' => 'Kannada',
+		'ko' => 'Korean',
+		'kr' => 'Kanuri',
+		'ks' => 'Kashmiri',
+		'ku' => 'Kurdish',
+		'kv' => 'Komi',
+		'kw' => 'Cornish',
+		'ky' => 'Kirghiz, Kyrgyz',
+		'la' => 'Latin',
+		'lb' => 'Luxembourgish, Letzeburgesch',
+		'lg' => 'Luganda',
+		'li' => 'Limburgish, Limburgan, Limburger',
+		'ln' => 'Lingala',
+		'lo' => 'Lao',
+		'lt' => 'Lithuanian',
+		'lu' => 'Luba-Katanga',
+		'lv' => 'Latvian',
+		'mg' => 'Malagasy',
+		'mh' => 'Marshallese',
+		'mi' => 'Maori',
+		'mk' => 'Macedonian',
+		'ml' => 'Malayalam',
+		'mn' => 'Mongolian',
+		'mr' => 'Marathi',
+		'ms' => 'Malay',
+		'mt' => 'Maltese',
+		'my' => 'Burmese',
+		'na' => 'Nauru',
+		'nb' => 'Norwegian Bokmål',
+		'nd' => 'North Ndebele',
+		'ne' => 'Nepali',
+		'ng' => 'Ndonga',
+		'nl' => 'Dutch',
+		'nn' => 'Norwegian Nynorsk',
+		'no' => 'Norwegian',
+		'nr' => 'South Ndebele',
+		'nv' => 'Navajo, Navaho',
+		'ny' => 'Chichewa; Chewa; Nyanja',
+		'oc' => 'Occitan',
+		'oj' => 'Ojibwe, Ojibwa',
+		'om' => 'Oromo',
+		'or' => 'Oriya',
+		'os' => 'Ossetian, Ossetic',
+		'pa' => 'Panjabi, Punjabi',
+		'pi' => 'Pali',
+		'pl' => 'Polish',
+		'ps' => 'Pashto, Pushto',
+		'pt' => 'Portuguese',
+		'qu' => 'Quechua',
+		'rm' => 'Romansh',
+		'rn' => 'Kirundi',
+		'ro' => 'Romanian, Moldavian, Moldovan',
+		'ru' => 'Russian',
+		'rw' => 'Kinyarwanda',
+		'sa' => 'Sanskrit (Saṁskṛta)',
+		'sc' => 'Sardinian',
+		'sd' => 'Sindhi',
+		'se' => 'Northern Sami',
+		'sg' => 'Sango',
+		'si' => 'Sinhala, Sinhalese',
+		'sk' => 'Slovak',
+		'sl' => 'Slovene',
+		'sm' => 'Samoan',
+		'sn' => 'Shona',
+		'so' => 'Somali',
+		'sq' => 'Albanian',
+		'sr' => 'Serbian',
+		'ss' => 'Swati',
+		'st' => 'Southern Sotho',
+		'su' => 'Sundanese',
+		'sv' => 'Swedish',
+		'sw' => 'Swahili',
+		'ta' => 'Tamil',
+		'te' => 'Telugu',
+		'tg' => 'Tajik',
+		'th' => 'Thai',
+		'ti' => 'Tigrinya',
+		'tk' => 'Turkmen',
+		'tl' => 'Tagalog',
+		'tn' => 'Tswana',
+		'to' => 'Tonga (Tonga Islands)',
+		'tr' => 'Turkish',
+		'ts' => 'Tsonga',
+		'tt' => 'Tatar',
+		'tw' => 'Twi',
+		'ty' => 'Tahitian',
+		'ug' => 'Uighur, Uyghur',
+		'uk' => 'Ukrainian',
+		'ur' => 'Urdu',
+		'uz' => 'Uzbek',
+		've' => 'Venda',
+		'vi' => 'Vietnamese',
+		'vo' => 'Volapük',
+		'wa' => 'Walloon',
+		'wo' => 'Wolof',
+		'xh' => 'Xhosa',
+		'yi' => 'Yiddish',
+		'yo' => 'Yoruba',
+		'za' => 'Zhuang, Chuang',
+		'zh' => 'Chinese',
+		'zu' => 'Zulu');
+		return  isset($iso639[$code]) ? $iso639[$code] : $code ;
+	}
+
 	/**
-	 * Returns the last revision of aiki if .bzr exists, or 0 assuming this
-     * is a release, since .bzr is stripped out.
+	 * Returns entries of changelog that are greater that given revision
      *
-     * @return number
+     * @param integer $currentRevision
+     * @return string html
 	 */
 
-	public static function get_changelog($actualRevision) {
+	public static function get_changelog($currentRevision) {
 		global $AIKI_ROOT_DIR;        
 		$ret = "No changelog information";
 		$fileWithChanges = "$AIKI_ROOT_DIR/configs/changelog.php";
@@ -48,7 +246,7 @@
 			// Note: create a array $changes with revision=>text.
 			$ret="";
 			foreach ( $changes as $revision => $text ){
-				if ( $actualRevision < $revision ){
+				if ( $currentRevision < $revision ){
 					$ret .= "<div><strong>$revision:</strong> $text</div>\n";
 				}
 			}
@@ -56,6 +254,12 @@
 		return $ret;		
 	}	
 
+	/**
+	 * Returns the last revision of aiki if .bzr exists, or 0 assuming this
+     * is a release, since .bzr is stripped out.
+     *
+     * @return number
+	 */
 
     public static function get_last_revision() {
         global $AIKI_ROOT_DIR;        

_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help   : https://help.launchpad.net/ListHelp

Reply via email to