Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_configure.c e_includes.h e_intl.c Added Files: e_int_config_intl.c e_int_config_intl.h Log Message: Add language selection dialog, A bit of work still required but this is a good start. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.152 retrieving revision 1.153 diff -u -3 -r1.152 -r1.153 --- Makefile.am 14 Sep 2006 15:16:27 -0000 1.152 +++ Makefile.am 21 Sep 2006 10:58:42 -0000 1.153 @@ -99,6 +99,7 @@ e_config_dialog.h \ e_int_config_focus.h \ e_int_config_desks.h \ +e_int_config_intl.h \ e_configure.h \ e_int_border_locks.h \ e_thumb.h \ @@ -278,6 +279,7 @@ e_int_config_exebuf.c \ e_int_config_apps.c \ e_int_config_cfgdialogs.c \ +e_int_config_intl.c \ e_deskpreview.c \ e_exebuf.c \ e_desklock.c \ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- e_configure.c 4 Sep 2006 02:07:46 -0000 1.58 +++ e_configure.c 21 Sep 2006 10:58:42 -0000 1.59 @@ -88,6 +88,8 @@ e_configure_standard_item_add(eco, "enlightenment/applications", _("Applications"), e_int_config_apps); e_configure_standard_item_add(eco, "enlightenment/performance", _("Performance"), e_int_config_performance); e_configure_standard_item_add(eco, "enlightenment/configuration", _("Configuration Dialogs"), e_int_config_cfgdialogs); + e_configure_standard_item_add(eco, "enlightenment/intl", _("Internationalization"), e_int_config_intl); + e_configure_header_item_add(eco, "enlightenment/advanced", _("Advanced")); e_configure_standard_item_add(eco, "enlightenment/startup", _("Startup"), e_int_config_startup); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- e_includes.h 14 Sep 2006 15:16:27 -0000 1.130 +++ e_includes.h 21 Sep 2006 10:58:42 -0000 1.131 @@ -105,6 +105,7 @@ #include "e_int_config_exebuf.h" #include "e_int_config_apps.h" #include "e_int_config_cfgdialogs.h" +#include "e_int_config_intl.h" #include "e_deskpreview.h" #include "e_exebuf.h" #include "e_desklock.h" =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -3 -r1.81 -r1.82 --- e_intl.c 21 Aug 2006 15:06:11 -0000 1.81 +++ e_intl.c 21 Sep 2006 10:58:42 -0000 1.82 @@ -810,7 +810,7 @@ case 3: modifier[tmp_idx] = 0; } - + /* Construct the clean locale string */ /* determine the size */ @@ -830,25 +830,27 @@ clean_locale[0] = 0; /* Put the parts of the string together */ - strcat(clean_locale, language); - loc_mask |= E_LOC_LANG; - + if ((ret_mask & E_LOC_LANG) && language[0] != 0) + { + loc_mask |= E_LOC_LANG; + strcat(clean_locale, language); + } if ((ret_mask & E_LOC_REGION) && territory[0] != 0) { loc_mask |= E_LOC_REGION; - strcat(clean_locale, "_"); + if (clean_locale[0] != 0) strcat(clean_locale, "_"); strcat(clean_locale, territory); } if ((ret_mask & E_LOC_CODESET) && codeset[0] != 0) { loc_mask |= E_LOC_CODESET; - strcat(clean_locale, "."); + if (clean_locale[0] != 0) strcat(clean_locale, "."); strcat(clean_locale, codeset); } if ((ret_mask & E_LOC_MODIFIER) && (modifier[0] != 0)) { loc_mask |= E_LOC_MODIFIER; - strcat(clean_locale, "@"); + if (clean_locale[0] != 0) strcat(clean_locale, "@"); strcat(clean_locale, modifier); } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs