Clean up some leftovers from 22840

svn: r22842
This commit is contained in:
John Ralls 2013-08-09 22:36:36 +00:00
parent 5880dc49f6
commit 1bb33d6d8a

View File

@ -155,8 +155,6 @@ class GrampsLocale(object):
DEFAULT_TRANSLATION_STR = "default" DEFAULT_TRANSLATION_STR = "default"
__first_instance = None __first_instance = None
encoding = None encoding = None
_lang_map = None
_country_map = None
def __new__(cls, localedir=None, lang=None, domain=None, languages=None): def __new__(cls, localedir=None, lang=None, domain=None, languages=None):
if not GrampsLocale.__first_instance: if not GrampsLocale.__first_instance:
@ -591,14 +589,6 @@ class GrampsLocale(object):
translator._language = "en" translator._language = "en"
return translator return translator
def _set_dictionaries(self):
"""
Create a dictionary of language names localized to the
GrampsLocale's primary language, keyed by language and country
code. Note that _lang_map and _country_map are class
variables, so this function is no-op in secondary locales.
"""
def _get_language_string(self, lang_code): def _get_language_string(self, lang_code):
""" """
Given a language code of the form "lang_region", return a text string Given a language code of the form "lang_region", return a text string
@ -798,14 +788,9 @@ class GrampsLocale(object):
return a dictionary of language names : codes for use by language return a dictionary of language names : codes for use by language
pickers. pickers.
''' '''
# langs = {} return {self._get_language_string(code) : code
# for code in self.get_available_translations(): for code in self.get_available_translations()
# lang = self._get_language_string(code) if self._get_language_string(code)}
# if not lang is None:
# langs[lang] = code
# return langs
return {self._get_language_string(code) : code for code in self.get_available_translations() if not self._get_language_string(code) is None}
def trans_objclass(self, objclass_str): def trans_objclass(self, objclass_str):
""" """