From b1b7e65840c7b7df526bedb7eb5f1a456274b51a Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 12 Apr 2005 08:46:43 +0000 Subject: [PATCH] lang todo list, shutdown cleanly, fix border move status... SVN revision: 14155 --- po/enlightenment.pot | 15 ++++++++------- src/bin/e_border.c | 4 ++-- src/bin/e_intl.c | 22 ++++++++++++++++++---- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/po/enlightenment.pot b/po/enlightenment.pot index ff5a93b9a..46504ac87 100644 --- a/po/enlightenment.pot +++ b/po/enlightenment.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2005-04-11 22:26-0400\n" +"POT-Creation-Date: 2005-04-12 17:46+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -207,8 +207,9 @@ msgstr "" msgid "Edit Icon" msgstr "" -#: src/bin/e_int_menus.c:515 src/modules/battery/e_mod_main.c:563 -#: src/modules/clock/e_mod_main.c:311 src/modules/temperature/e_mod_main.c:723 +#: src/bin/e_int_menus.c:515 src/modules/clock/e_mod_main.c:311 +#: src/modules/temperature/e_mod_main.c:723 +#: src/modules/battery/e_mod_main.c:563 msgid "Edit Mode" msgstr "" @@ -558,10 +559,10 @@ msgstr "" msgid "Microscopic" msgstr "" -#: src/modules/battery/e_mod_main.c:45 src/modules/clock/e_mod_main.c:40 -#: src/modules/dropshadow/e_mod_main.c:77 src/modules/ibar/e_mod_main.c:105 -#: src/modules/pager/e_mod_main.c:79 src/modules/temperature/e_mod_main.c:43 -#: src/modules/test/e_mod_main.c:9 +#: src/modules/test/e_mod_main.c:9 src/modules/dropshadow/e_mod_main.c:77 +#: src/modules/clock/e_mod_main.c:40 src/modules/temperature/e_mod_main.c:43 +#: src/modules/ibar/e_mod_main.c:105 src/modules/battery/e_mod_main.c:45 +#: src/modules/pager/e_mod_main.c:79 msgid "Module API Error" msgstr "" diff --git a/src/bin/e_border.c b/src/bin/e_border.c index d59ab81d9..59cc81b84 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -3629,7 +3629,7 @@ _e_border_move_begin(E_Border *bd) move_obj = edje_object_add(ecore_evas_get(move_ee)); edje_object_file_set(move_obj, e_path_find(path_themes, "default.edj"), "widgets/border/default/move"); - snprintf(buf, sizeof(buf), "9999x9999"); + snprintf(buf, sizeof(buf), "9999 9999"); edje_object_part_text_set(move_obj, "text", buf); edje_object_size_min_calc(move_obj, &w, &h); @@ -3637,7 +3637,7 @@ _e_border_move_begin(E_Border *bd) evas_object_resize(move_obj, w, h); evas_object_show(move_obj); - snprintf(buf, sizeof(buf), "%ix%i", bd->x, bd->y); + snprintf(buf, sizeof(buf), "%i %i", bd->x, bd->y); edje_object_part_text_set(move_obj, "text", buf); ecore_evas_move(move_ee, (bd->zone->w - w) / 2, (bd->zone->h - h) / 2); diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index 563f63352..735989390 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -5,6 +5,11 @@ #include "config.h" /* TODO List: + * + * * load/save language in config so u can change language runtime via a gui and/or ipc + * * add ipc to get/set/list languages, get language name, simplified language string, etc. (so a config tool can be written to display supported languages and be able to select from them) + * * add more language names to the language name list list in e_intl_language_name_get() + * * as we get translations add languages to the simplified lang list (C and en are currently the same, ja is a test translation - incomplete) */ static char *_e_intl_language = NULL; @@ -30,6 +35,13 @@ e_intl_init(void) int e_intl_shutdown(void) { + free(_e_intl_language); + _e_intl_language = NULL; + while (_e_intl_languages) + { + free(_e_intl_languages->data); + _e_intl_languages = evas_list_remove_list(_e_intl_languages, _e_intl_languages); + } return 1; } @@ -37,10 +49,9 @@ void e_intl_language_set(const char *lang) { char buf[4096]; - + if (_e_intl_language) free(_e_intl_language); if (!lang) lang = getenv("LANG"); - /* FIXME: not sure the correct fix, but currenlty segv's if LANG isn't set */ if (!lang) lang = "en"; _e_intl_language = strdup(lang); snprintf(buf, sizeof(buf), "LANG=%s", _e_intl_language); @@ -48,7 +59,7 @@ e_intl_language_set(const char *lang) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALE_DIR); textdomain(PACKAGE); - // XSetLocaleModifiers(""); +// XSetLocaleModifiers(""); bind_textdomain_codeset(PACKAGE, "UTF-8"); } @@ -120,8 +131,11 @@ e_intl_language_simple_get(const char *lang) strncpy(buf, lang, sizeof(buf) - 1); p = strchr(buf, '.'); if (p) *p = 0; + /* do we want to split this inot the different forms of english? + * ie american vs british? or australian? etc. + */ if (ISL("en") || ISL("en_US") || ISL("en_GB") || ISL("en_CA") || - ISL("en_AU") || ISL("en_NZ") || ISL("en_RN")) + ISL("en_AU") || ISL("en_NZ") || ISL("en_RN")) return "en"; if (ISL("ja") || ISL("ja_JP") || ISL("JP")) return "ja";