Combined Language and InstallTimeLanguage in language.py into a single

class, updated the lang-table format to remove an unused column, and
changed langSupport to instLanguage everywhere to reinforce the class
merge idea.

1 files changed, 46 insertions, 46 deletions

diff --git a/lang-table b/lang-table
index 97eaa2913..83ada6372 100644
--- a/lang-table
+++ b/lang-table
@@ -1,47 +1,47 @@
-Afrikaans	af	latarcyrheb-sun16	af_ZA.UTF-8	us	Africa/Johannesburg	af_ZA.UTF-8
-Amharic		am	none			am_ET.UTF-8	us	Africa/Addis_Ababa	am_ZA.UTF-8
-Arabic		ar	none			ar_SA.UTF-8	us	Asia/Riyadh	ar_SA.UTF-8
-Bengali		bn	none			bn_BD.UTF-8	us	Asia/Dhaka	bn_BD.UTF-8
-Bengali(India)	bn	none			bn_IN.UTF-8	us	Asia/Calcutta	bn_IN.UTF-8
-Bulgarian	bg	latarcyrheb-sun16	bg_BG.UTF-8	bg	Europe/Sofia	bg_BG.UTF-8
-Catalan		ca	latarcyrheb-sun16	ca_ES.UTF-8	es		Europe/Madrid	es_ES.UTF-8
-Chinese(Simplified)	zh_CN	bterm		zh_CN.UTF-8	us              Asia/Shanghai	zh_CN.UTF-8
-Chinese(Traditional)	zh_TW	bterm		zh_TW.UTF-8	us              Asia/Taipei	zh_TW.UTF-8
-Croatian	hr	latarcyrheb-sun16	hr_HR.UTF-8	croat	Europe/Zagreb	hr_HR.UTF-8
-Czech		cs 	latarcyrheb-sun16 	cs_CZ.UTF-8	cz-lat2		Europe/Prague	cs_CZ.UTF-8
-Danish		da	latarcyrheb-sun16	da_DK.UTF-8	dk		Europe/Copenhagen	da_DK.UTF-8
-Dutch		nl	latarcyrheb-sun16	nl_NL.UTF-8	nl		Europe/Amsterdam	nl_NL.UTF-8
-English		en	latarcyrheb-sun16	en_US.UTF-8 	us		America/New_York	en_US.UTF-8
-Estonian	et	latarcyrheb-sun16	et_EE.UTF-8	et		Europe/Tallinn		et_EE.UTF-8
-Finnish		fi	latarcyrheb-sun16	fi_FI.UTF-8	fi		Europe/Helsinki		fi_FI.UTF-8
-French		fr	latarcyrheb-sun16	fr_FR.UTF-8 	fr-latin1	Europe/Paris		fr_FR.UTF-8
-German		de      latarcyrheb-sun16	de_DE.UTF-8	de-latin1-nodeadkeys    Europe/Berlin	de_DE.UTF-8
-Gujarati	gu	none			gu_IN.UTF-8	us			Asia/Calcutta	gu_IN.UTF-8
-Hindi		hi	none			hi_IN.UTF-8	us			Asia/Calcutta	hi_IN.UTF-8
-Hungarian	hu	latarcyrheb-sun16	hu_HU.UTF-8	hu			Europe/Budapest	hu_HU.UTF-8
-Icelandic	is	latarcyrheb-sun16	is_IS.UTF-8 	is-latin1	Atlantic/Reykjavik	is_IS.UTF-8
-Indonesian	id	latarcryheb-sun16	id_ID.UTF-8	us		Asia/Jakarta	id_ID.UTF-8
-Italian		it	latarcyrheb-sun16	it_IT.UTF-8	it		Europe/Rome	it_IT.UTF-8
-Japanese	ja	bterm			ja_JP.UTF-8	jp106		Asia/Tokyo	ja_JP.UTF-8
-Korean		ko	bterm			ko_KR.UTF-8	us		Asia/Seoul	ko_KR.UTF-8
-Macedonian	mk	latarcyrheb-sun16	mk_MK.UTF-8	mk		Europe/Skopje	mk_MK.UTF-8
-Malay		ms	latarcyrheb-sun16	ms_MY.UTF-8	us		Asia/Kuala_Lumpur	ms_MY.UTF-8
-Norwegian	nb	latarcyrheb-sun16	nb_NO.UTF-8	no	Europe/Oslo	nb_NO.UTF-8
+Afrikaans	af	latarcyrheb-sun16	af_ZA.UTF-8	us	Africa/Johannesburg
+Amharic	am	none	am_ET.UTF-8	us	Africa/Addis_Ababa
+Arabic	ar	none	ar_SA.UTF-8	us	Asia/Riyadh
+Bengali	bn	none	bn_BD.UTF-8	us	Asia/Dhaka
+Bengali(India)	bn	none	bn_IN.UTF-8	us	Asia/Calcutta
+Bulgarian	bg	latarcyrheb-sun16	bg_BG.UTF-8	bg	Europe/Sofia
+Catalan	ca	latarcyrheb-sun16	ca_ES.UTF-8	es	Europe/Madrid
+Chinese(Simplified)	zh_CN	bterm	zh_CN.UTF-8	us	Asia/Shanghai
+Chinese(Traditional)	zh_TW	bterm	zh_TW.UTF-8	us	Asia/Taipei
+Croatian	hr	latarcyrheb-sun16	hr_HR.UTF-8	croat	Europe/Zagreb
+Czech	cs	latarcyrheb-sun16	cs_CZ.UTF-8	cz-lat2	Europe/Prague
+Danish	da	latarcyrheb-sun16	da_DK.UTF-8	dk	Europe/Copenhagen
+Dutch	nl	latarcyrheb-sun16	nl_NL.UTF-8	nl	Europe/Amsterdam
+English	en	latarcyrheb-sun16	en_US.UTF-8	us	America/New_York
+Estonian	et	latarcyrheb-sun16	et_EE.UTF-8	et	Europe/Tallinn
+Finnish	fi	latarcyrheb-sun16	fi_FI.UTF-8	fi	Europe/Helsinki
+French	fr	latarcyrheb-sun16	fr_FR.UTF-8	fr-latin1	Europe/Paris
+German	de	latarcyrheb-sun16	de_DE.UTF-8	de-latin1-nodeadkeys	Europe/Berlin
+Gujarati	gu	none	gu_IN.UTF-8	us	Asia/Calcutta
+Hindi	hi	none	hi_IN.UTF-8	us	Asia/Calcutta
+Hungarian	hu	latarcyrheb-sun16	hu_HU.UTF-8	hu	Europe/Budapest
+Icelandic	is	latarcyrheb-sun16	is_IS.UTF-8	is-latin1	Atlantic/Reykjavik
+Indonesian	id	latarcryheb-sun16	id_ID.UTF-8	us	Asia/Jakarta
+Italian	it	latarcyrheb-sun16	it_IT.UTF-8	it	Europe/Rome
+Japanese	ja	bterm	ja_JP.UTF-8	jp106	Asia/Tokyo	
+Korean	ko	bterm	ko_KR.UTF-8	us	Asia/Seoul	
+Macedonian	mk	latarcyrheb-sun16	mk_MK.UTF-8	mk	Europe/Skopje
+Malay	ms	latarcyrheb-sun16	ms_MY.UTF-8	us	Asia/Kuala_Lumpur
+Norwegian	nb	latarcyrheb-sun16	nb_NO.UTF-8	no	Europe/Oslo
 Northern Sotho	nso	latarcyrheb-sun16	nso_ZA.UTF-8	us	Africa/Johannesburg
-Persian		fa	none			fa_IR.UTF-8	us	Asia/Tehran	fa_IR.UTF-8
-Polish		pl	latarcyrheb-sun16	pl_PL.UTF-8	pl	Europe/Warsaw	pl_PL.UTF-8
-Portuguese	pt	latarcyrheb-sun16	pt_PT.UTF-8	pt-latin1	Europe/Lisbon	pt_PT.UTF-8
-Portuguese(Brazilian)	pt_BR	latarcyrheb-sun16	pt_BR.UTF-8	br-abnt2	America/Sao_Paulo pt_BR.UTF-8		
-Punjabi		pa	none	pa_IN.UTF-8	us	Asia/Calcutta	pa_IN.UTF-8		
-Russian 	ru 	latarcyrheb-sun16	ru_RU.UTF-8	ru		Europe/Moscow	ru_RU.UTF-8
-Slovak		sk	latarcyrheb-sun16	sk_SK.UTF-8	sk-qerty	Europe/Bratislava	sk_SK.UTF-8
-Slovenian	sl	latarcyrheb-sun16	sl_SI.UTF-8	slovene		Europe/Ljubljana	sl_SI.UTF-8
-Spanish		es	latarcyrheb-sun16	es_ES.UTF-8	es		Europe/Madrid	es_ES.UTF-8
-Swedish 	sv	latarcyrheb-sun16	sv_SE.UTF-8	sv-latin1	Europe/Stockholm	sv_SE.UTF-8
-Tamil		ta	none			ta_IN.UTF-8	us	Asia/Calcutta	ta_IN.UTF-8
-Thai		th	none			th_TH.UTF-8	us	Asia/Bangkok	th_TH.UTF-8	
-Turkish		tr	latarcyrheb-sun16	tr_TR.UTF-8	trq	Europe/Istanbul	tr_TR.UTF-8
-Ukrainian	uk	latarcyrheb-sun16	uk_UA.UTF-8	ua-utf	Europe/Kiev	uk_UA.UTF-8
-Vietnamese	vi	latarcyrheb-sun16	vi_VN.UTF-8	us	Asia/Saigon	vi_VN.UTF-8
-Welsh		cy	latarcyrheb-sun16	cy_GB.UTF-8	uk	Europe/London	cy_GB.UTF-8
-Zulu		zu	latarcyrheb-sun16	zu_ZA.UTF-8	us	Africa/Johannesburg	zu_ZA.UTF-8
+Persian	fa	none	fa_IR.UTF-8	us	Asia/Tehran
+Polish	pl	latarcyrheb-sun16	pl_PL.UTF-8	pl	Europe/Warsaw
+Portuguese	pt	latarcyrheb-sun16	pt_PT.UTF-8	pt-latin1	Europe/Lisbon
+Portuguese(Brazilian)	pt_BR	latarcyrheb-sun16	pt_BR.UTF-8	br-abnt2	America/Sao_Paulo
+Punjabi	pa	none	pa_IN.UTF-8	us	Asia/Calcutta
+Russian	ru	latarcyrheb-sun16	ru_RU.UTF-8	ru	Europe/Moscow
+Slovak	sk	latarcyrheb-sun16	sk_SK.UTF-8	sk-qerty	Europe/Bratislava
+Slovenian	sl	latarcyrheb-sun16	sl_SI.UTF-8	slovene	Europe/Ljubljana
+Spanish	es	latarcyrheb-sun16	es_ES.UTF-8	es	Europe/Madrid
+Swedish	sv	latarcyrheb-sun16	sv_SE.UTF-8	sv-latin1	Europe/Stockholm
+Tamil	ta	none	ta_IN.UTF-8	us	Asia/Calcutta
+Thai	th	none	th_TH.UTF-8	us	Asia/Bangkok
+Turkish	tr	latarcyrheb-sun16	tr_TR.UTF-8	trq	Europe/Istanbul
+Ukrainian	uk	latarcyrheb-sun16	uk_UA.UTF-8	ua-utf	Europe/Kiev
+Vietnamese	vi	latarcyrheb-sun16	vi_VN.UTF-8	us	Asia/Saigon
+Welsh	cy	latarcyrheb-sun16	cy_GB.UTF-8	uk	Europe/London
+Zulu	zu	latarcyrheb-sun16	zu_ZA.UTF-8	us	Africa/Johannesburg