Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_intl.c
Log Message:
lang todo list, shutdown cleanly, fix border move status...
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- e_border.c 11 Apr 2005 20:25:51 -0000 1.129
+++ e_border.c 12 Apr 2005 08:46:43 -0000 1.130
@@ -3629,7 +3629,7 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_intl.c 12 Apr 2005 06:34:17 -0000 1.6
+++ e_intl.c 12 Apr 2005 08:46:43 -0000 1.7
@@ -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 @@
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 @@
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 @@
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALE_DIR);
textdomain(PACKAGE);
- // XSetLocaleModifiers("");
+// XSetLocaleModifiers("");
bind_textdomain_codeset(PACKAGE, "UTF-8");
}
@@ -120,8 +131,11 @@
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";
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
