From bb5078c5ea64dd688f032c3a2720d3b923dd752e Mon Sep 17 00:00:00 2001
From: Tomer Shalev <shalev.tomer@gmail.com>
Date: Mon, 19 Oct 2009 15:50:06 +0000
Subject: 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
---
 apps/filetree.c        | 15 +++++++++------
 apps/lang/english.lang | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'apps')

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)
 
             case FILE_ATTR_LNG:
                 splash(0, ID2P(LANG_WAIT));
-                if(!lang_core_load(buf)) {
-                    set_file(buf, (char *)global_settings.lang_file,
-                             MAX_FILENAME);
-                    talk_init(); /* use voice of same language */
-                    viewportmanager_theme_changed(THEME_LANGUAGE);
-                    splash(HZ, ID2P(LANG_LANGUAGE_LOADED));
+                if (lang_core_load(buf))
+                {
+                    splash(HZ, ID2P(LANG_LANGUAGE_LOAD_FAILED));
+                    break;
                 }
+                set_file(buf, (char *)global_settings.lang_file,
+                        MAX_FILENAME);
+                talk_init(); /* use voice of same language */
+                viewportmanager_theme_changed(THEME_LANGUAGE);
+                splash(HZ, ID2P(LANG_LANGUAGE_LOADED));
                 break;
 
 #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
@@ -4951,6 +4951,20 @@
     *: "New Language"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_LANGUAGE_LOAD_FAILED
+  desc: shown when a language has failed to be loaded from the dir browser
+  user: core
+  <source>
+    *: "Language Load Failed"
+  </source>
+  <dest>
+    *: "Language Load Failed"
+  </dest>
+  <voice>
+    *: "Language Load Failed"
+  </voice>
+</phrase>
 <phrase>
   id: LANG_VOICE
   desc: root of voice menu
-- 
cgit v1.2.3