diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-09 12:40:19 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-09 12:40:19 (GMT) |
| commit | bb2d4a21543bec8a25d9b0e5d3a571083dcce69b (patch) | |
| tree | d27dc759e1d442ee0c4da545a0dab61a76bd73e3 | |
| parent | b8ec205b3edf31b5f65ad8d0b80d42e9c2251561 (diff) | |
| parent | 7622f1afbc6bf6b5680a8ae1d9bf5b19273dc5a7 (diff) | |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
| -rw-r--r-- | extensions/cpsection/aboutcomputer/model.py | 2 | ||||
| -rw-r--r-- | extensions/cpsection/language/model.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py index 73787bb..17bbbe0 100644 --- a/extensions/cpsection/aboutcomputer/model.py +++ b/extensions/cpsection/aboutcomputer/model.py @@ -157,7 +157,7 @@ def get_model_laptop(): model = model.rstrip('\x00') if _is_model_change_required(): - model_converter = { 'XO-4 HS Touch' : 'XO Duo' } + model_converter = { 'XO-4 HS Touch' : 'XO-duo' } if model in model_converter.keys(): model = model_converter[model] diff --git a/extensions/cpsection/language/model.py b/extensions/cpsection/language/model.py index 17de6bb..812a4bf 100644 --- a/extensions/cpsection/language/model.py +++ b/extensions/cpsection/language/model.py @@ -47,9 +47,12 @@ def read_all_languages(): #FIXME: This is a temporary workaround for locales that are essential to # OLPC, but are not in Glibc yet. - locales.append(('Kreyol', 'Haiti', 'ht_HT.utf8')) - locales.append(('Dari', 'Afghanistan', 'fa_AF.utf8')) - locales.append(('Pashto', 'Afghanistan', 'ps_AF.utf8')) + from gi.repository import GConf + client = GConf.Client.get_default() + if client.get_bool('/desktop/sugar/extensions/language/show_additional_olpc_languages'): + locales.append(('Kreyol', 'Haiti', 'ht_HT.utf8')) + locales.append(('Dari', 'Afghanistan', 'fa_AF.utf8')) + locales.append(('Pashto', 'Afghanistan', 'ps_AF.utf8')) locales.sort() return locales |