diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-10-19 15:50:06 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-10-19 15:50:06 +0000 |
commit | bb5078c5ea64dd688f032c3a2720d3b923dd752e (patch) | |
tree | 37a4b3a974da62df74357a51a6f5db02c99c57e4 /apps | |
parent | 1016ee4e809776619fa9e4e773ceb1523bd7bc66 (diff) | |
download | rockbox-bb5078c5ea64dd688f032c3a2720d3b923dd752e.tar.gz rockbox-bb5078c5ea64dd688f032c3a2720d3b923dd752e.zip |
Splash error message when loading language from dir browser fails
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23259 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.c | 15 | ||||
-rw-r--r-- | apps/lang/english.lang | 14 |
2 files changed, 23 insertions, 6 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index d11b45a1f0..2913e3f563 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -545,13 +545,16 @@ int ft_enter(struct tree_context* c) | |||
545 | 545 | ||
546 | case FILE_ATTR_LNG: | 546 | case FILE_ATTR_LNG: |
547 | splash(0, ID2P(LANG_WAIT)); | 547 | splash(0, ID2P(LANG_WAIT)); |
548 | if(!lang_core_load(buf)) { | 548 | if (lang_core_load(buf)) |
549 | set_file(buf, (char *)global_settings.lang_file, | 549 | { |
550 | MAX_FILENAME); | 550 | splash(HZ, ID2P(LANG_LANGUAGE_LOAD_FAILED)); |
551 | talk_init(); /* use voice of same language */ | 551 | break; |
552 | viewportmanager_theme_changed(THEME_LANGUAGE); | ||
553 | splash(HZ, ID2P(LANG_LANGUAGE_LOADED)); | ||
554 | } | 552 | } |
553 | set_file(buf, (char *)global_settings.lang_file, | ||
554 | MAX_FILENAME); | ||
555 | talk_init(); /* use voice of same language */ | ||
556 | viewportmanager_theme_changed(THEME_LANGUAGE); | ||
557 | splash(HZ, ID2P(LANG_LANGUAGE_LOADED)); | ||
555 | break; | 558 | break; |
556 | 559 | ||
557 | #ifdef HAVE_LCD_BITMAP | 560 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 2a2a34c021..e6aeaff380 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -4952,6 +4952,20 @@ | |||
4952 | </voice> | 4952 | </voice> |
4953 | </phrase> | 4953 | </phrase> |
4954 | <phrase> | 4954 | <phrase> |
4955 | id: LANG_LANGUAGE_LOAD_FAILED | ||
4956 | desc: shown when a language has failed to be loaded from the dir browser | ||
4957 | user: core | ||
4958 | <source> | ||
4959 | *: "Language Load Failed" | ||
4960 | </source> | ||
4961 | <dest> | ||
4962 | *: "Language Load Failed" | ||
4963 | </dest> | ||
4964 | <voice> | ||
4965 | *: "Language Load Failed" | ||
4966 | </voice> | ||
4967 | </phrase> | ||
4968 | <phrase> | ||
4955 | id: LANG_VOICE | 4969 | id: LANG_VOICE |
4956 | desc: root of voice menu | 4970 | desc: root of voice menu |
4957 | user: core | 4971 | user: core |