From: Mike Blumenkrantz Date: Tue, 8 Jan 2013 11:23:20 +0000 (+0000) Subject: system default language in wizard now shows language name, patch by thanatermesis X-Git-Tag: submit/efl/20131021.015651~1608 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61c21f3629e1d7092a2a8e512b029fb54570e8d7;p=platform%2Fupstream%2Fenlightenment.git system default language in wizard now shows language name, patch by thanatermesis ticket #2125 SVN revision: 82407 --- diff --git a/ChangeLog b/ChangeLog index d5ee921..df97ceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-01-08 Thanatermesis + + * "System Default" language in wizard now displays which language it is and no longer removes language from list + 2013-01-08 Mike Blumenkrantz * Fixed bug where keyboard resizing of windows would not be possible if timeout was set to zero diff --git a/NEWS b/NEWS index 3474575..beb403e 100644 --- a/NEWS +++ b/NEWS @@ -43,6 +43,7 @@ Improvements: * No backlight dimming when in presentation mode. * Backlight fade time only applies to dimming - undimming is fixed 0.5 . * Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied + * "System Default" language in wizard now displays which language it is and no longer removes language from list Fixes: * Force check changed upon confirmation dialog closure for engine settings. diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index 51a8fd7..b7a63c3 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -180,12 +180,23 @@ wizard_page_show(E_Wizard_Page *pg) } else ic = NULL; - e_widget_ilist_append(ob, ic, _(pair->locale_translation), - NULL, NULL, pair->locale_key); + if (e_intl_language_get()) { - if (!strcmp(pair->locale_key, e_intl_language_get())) sel = i; + if (!strcmp(pair->locale_key, e_intl_language_get())) + { + snprintf(buf, sizeof(buf), "System Default [%s]", pair->locale_translation); + e_widget_ilist_nth_label_set(ob, 0, _(buf)); + e_widget_ilist_nth_icon_set(ob, 0, ic); + sel = 0; + } + else + e_widget_ilist_append(ob, ic, _(pair->locale_translation), + NULL, NULL, pair->locale_key); } + else + e_widget_ilist_append(ob, ic, _(pair->locale_translation), + NULL, NULL, pair->locale_key); } e_widget_ilist_go(ob); e_widget_ilist_thaw(ob);