[PATCH 1/2] Remove lang-table and localeinfo.py

Vratislav Podzimek vpodzime at redhat.com
Thu Aug 30 12:15:25 UTC 2012


We no longer use lang-table for anything. localeinfo.py is module for
accessing data from lang-table.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 data/lang-table          | 61 ------------------------------------------------
 pyanaconda/localeinfo.py | 56 --------------------------------------------
 2 files changed, 117 deletions(-)
 delete mode 100644 data/lang-table
 delete mode 100644 pyanaconda/localeinfo.py

diff --git a/data/lang-table b/data/lang-table
deleted file mode 100644
index 465c3df..0000000
--- a/data/lang-table
+++ /dev/null
@@ -1,61 +0,0 @@
-Afrikaans	af	True	af_ZA.UTF-8	us	Africa/Johannesburg
-Arabic	ar	False	ar_SA.UTF-8	us	Asia/Riyadh
-Assamese	as	False	as_IN.UTF-8	us	Asia/Kolkata
-Bengali	bn	False	bn_BD.UTF-8	us	Asia/Dhaka
-Bengali(India)	bn_IN	False	bn_IN.UTF-8	us	Asia/Kolkata
-Bulgarian	bg	True	bg_BG.UTF-8	bg_bds-utf8	Europe/Sofia
-Catalan	ca	True	ca_ES.UTF-8	es	Europe/Madrid
-Chinese(Simplified)	zh_CN	False	zh_CN.UTF-8	us	Asia/Shanghai
-Chinese(Traditional)	zh_TW	False	zh_TW.UTF-8	us	Asia/Taipei
-Croatian	hr	True	hr_HR.UTF-8	croat	Europe/Zagreb
-Czech	cs	True	cs_CZ.UTF-8	cz-lat2	Europe/Prague
-Danish	da	True	da_DK.UTF-8	dk	Europe/Copenhagen
-Dutch	nl	True	nl_NL.UTF-8	nl	Europe/Amsterdam
-English	en	True	en_US.UTF-8	us	America/New_York
-Estonian	et	True	et_EE.UTF-8	et	Europe/Tallinn
-Finnish	fi	True	fi_FI.UTF-8	fi	Europe/Helsinki
-French	fr	True	fr_FR.UTF-8	fr-latin9	Europe/Paris
-German	de	True	de_DE.UTF-8	de-latin1-nodeadkeys	Europe/Berlin
-Greek	el	False	el_GR.UTF-8	gr	Europe/Athens
-Gujarati	gu	False	gu_IN.UTF-8	us	Asia/Kolkata
-Hebrew	he	False	he_IL.UTF-8	us	Asia/Jerusalem
-Hindi	hi	False	hi_IN.UTF-8	us	Asia/Kolkata
-Hungarian	hu	True	hu_HU.UTF-8	hu	Europe/Budapest
-Icelandic	is	True	is_IS.UTF-8	is-latin1	Atlantic/Reykjavik
-Iloko	ilo	True	ilo_PH.UTF-8	us	Asia/Manila
-Indonesian	id	True	id_ID.UTF-8	us	Asia/Jakarta
-Italian	it	True	it_IT.UTF-8	it	Europe/Rome
-Japanese	ja	False	ja_JP.UTF-8	jp106	Asia/Tokyo	
-Kannada	kn	False	kn_IN.UTF-8	us	Asia/Kolkata
-Korean	ko	False	ko_KR.UTF-8	us	Asia/Seoul	
-Macedonian	mk	True	mk_MK.UTF-8	mk	Europe/Skopje
-Maithili	mai	False	mai_IN.UTF-8	us	Asia/Kolkata
-Malay	ms	True	ms_MY.UTF-8	us	Asia/Kuala_Lumpur
-Malayalam	ml	False	ml_IN.UTF-8	us	Asia/Kolkata
-Marathi	mr	False	mr_IN.UTF-8	us	Asia/Kolkata
-Nepali	ne	False	ne_NP.UTF-8	us	Asia/Kathmandu
-Norwegian(Bokmål)	nb	True	nb_NO.UTF-8	no	Europe/Oslo
-Northern Sotho	nso	True	nso_ZA.UTF-8	us	Africa/Johannesburg
-Oriya	or	False	or_IN.UTF-8	us	Asia/Kolkata
-Persian	fa	False	fa_IR.UTF-8	us	Asia/Tehran
-Polish	pl	True	pl_PL.UTF-8	pl2	Europe/Warsaw
-Portuguese	pt	True	pt_PT.UTF-8	pt-latin1	Europe/Lisbon
-Portuguese(Brazilian)	pt_BR	True	pt_BR.UTF-8	br-abnt2	America/Sao_Paulo
-Punjabi	pa	False	pa_IN.UTF-8	us	Asia/Kolkata
-Romanian	ro	False	ro_RO.UTF-8	ro	Europe/Bucharest
-Russian	ru	False	ru_RU.UTF-8	ru	Europe/Moscow
-Serbian	sr	True	sr_RS.UTF-8	sr-cy	Europe/Belgrade
-Serbian(Latin)	sr at latin	True	sr_RS.UTF-8 at latin	sr-latin	Europe/Belgrade
-Sinhala	si	False	si_LK.UTF-8	us	Asia/Colombo
-Slovak	sk	True	sk_SK.UTF-8	sk-qwerty	Europe/Bratislava
-Slovenian	sl	True	sl_SI.UTF-8	slovene	Europe/Ljubljana
-Spanish	es	True	es_ES.UTF-8	es	Europe/Madrid
-Swedish	sv	True	sv_SE.UTF-8	sv-latin1	Europe/Stockholm
-Tajik	tg	False	tg_TG.UTF-8	tj	Asia/Dushanbe
-Tamil	ta	False	ta_IN.UTF-8	us	Asia/Kolkata
-Telugu	te	False	te_IN.UTF-8	us	Asia/Kolkata
-Turkish	tr	True	tr_TR.UTF-8	trq	Europe/Istanbul
-Ukrainian	uk	True	uk_UA.UTF-8	ua-utf	Europe/Kiev
-Vietnamese	vi	True	vi_VN.UTF-8	us	Asia/Saigon
-Welsh	cy	True	cy_GB.UTF-8	uk	Europe/London
-Zulu	zu	True	zu_ZA.UTF-8	us	Africa/Johannesburg
diff --git a/pyanaconda/localeinfo.py b/pyanaconda/localeinfo.py
deleted file mode 100644
index 0bb1799..0000000
--- a/pyanaconda/localeinfo.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# __init__.py
-# Locale info used by getlangnames.py and languages.py.
-#
-# Copyright (C) 2011  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-
-
-""" Basic locale operations useful during both Anaconda build time and run time.
-
-    This module can be imported without importing pyanaconda/__init__.py and it
-    is desirable to keep it that way.
-"""
-
-import os
-import string
-
-def get(default):
-    localeInfo = {}
-    # nick -> (name, short name, text mode supported, keyboard, timezone) mapping
-    search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table',
-              '/usr/share/anaconda/lang-table')
-    for path in search:
-        if os.access(path, os.R_OK):
-            f = open(path, "r")
-            for line in f.readlines():
-                string.strip(line)
-                l = string.split(line, '\t')
-
-                # throw out invalid lines
-                if len(l) < 6:
-                    continue
-
-                ts = l[2] == "True"
-
-                localeInfo[l[3]] = (l[0], l[1], ts, l[4], string.strip(l[5]))
-
-            f.close()
-            break
-
-    # Hard code this to prevent errors in the build environment.
-    localeInfo['C'] = localeInfo[default]
-    return localeInfo
-- 
1.7.11.4



More information about the anaconda-patches mailing list