aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Keys.cc2
-rw-r--r--src/MenuCreator.cc2
-rw-r--r--src/Screen.cc4
3 files changed, 7 insertions, 1 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 0a40a87..2fb11f9 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -223,6 +223,7 @@ int Keys::t_key::newindex(lua::state *l)
223 } else if(l->isnil(3)) 223 } else if(l->isnil(3))
224 k2.reset(); 224 k2.reset();
225 else { 225 else {
226 _FB_USES_NLS;
226 throw KeyError(_FB_CONSOLETEXT(Keys, Bad3rdArg, "3rd argument is not a command.", 227 throw KeyError(_FB_CONSOLETEXT(Keys, Bad3rdArg, "3rd argument is not a command.",
227 "3rd argument is not a command.")); 228 "3rd argument is not a command."));
228 } 229 }
@@ -578,6 +579,7 @@ void Keys::reload() {
578 l.call(0, 0); 579 l.call(0, 0);
579 } 580 }
580 catch(std::runtime_error &e) { 581 catch(std::runtime_error &e) {
582 _FB_USES_NLS;
581 cerr << _FB_CONSOLETEXT(Keys, LoadError, "Error loading keys file: ", 583 cerr << _FB_CONSOLETEXT(Keys, LoadError, "Error loading keys file: ",
582 "Actual error message follows") << e.what() << endl; 584 "Actual error message follows") << e.what() << endl;
583 loadDefaults(l); 585 loadDefaults(l);
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 9898b61..56b90c0 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -194,6 +194,7 @@ createMenu_(FbTk::Menu &inject_into, lua::state &l, FbTk::StringConvertor &conv,
194void 194void
195insertMenuItem(lua::state &l, FbTk::Menu &menu, FbTk::StringConvertor &parent_conv, 195insertMenuItem(lua::state &l, FbTk::Menu &menu, FbTk::StringConvertor &parent_conv,
196 FbTk::AutoReloadHelper *reloader) { 196 FbTk::AutoReloadHelper *reloader) {
197 _FB_USES_NLS;
197 lua::stack_sentry s(l, -1); 198 lua::stack_sentry s(l, -1);
198 l.checkstack(1); 199 l.checkstack(1);
199 200
@@ -318,6 +319,7 @@ MenuCreator::createMenu(FbTk::Menu &inject_into, lua::state &l, FbTk::AutoReload
318 lua::stack_sentry s(l, -1); 319 lua::stack_sentry s(l, -1);
319 320
320 if(l.type(-1) != lua::TTABLE) { 321 if(l.type(-1) != lua::TTABLE) {
322 _FB_USES_NLS;
321 cerr << _FB_CONSOLETEXT(Menu, MenuNotTable, "Warning: Menu is not a lua table", 323 cerr << _FB_CONSOLETEXT(Menu, MenuNotTable, "Warning: Menu is not a lua table",
322 "Menu is not a lua table") << endl; 324 "Menu is not a lua table") << endl;
323 return; 325 return;
diff --git a/src/Screen.cc b/src/Screen.cc
index 250857b..36c2c6b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1370,6 +1370,7 @@ void BScreen::rereadMenu() {
1370 MenuCreator::createMenu(*m_rootmenu, l, m_rootmenu->reloadHelper()); 1370 MenuCreator::createMenu(*m_rootmenu, l, m_rootmenu->reloadHelper());
1371 } 1371 }
1372 catch(std::runtime_error &e) { 1372 catch(std::runtime_error &e) {
1373 _FB_USES_NLS;
1373 cerr << _FB_CONSOLETEXT(Menu, RootLoad, "Loading root menu failed: ", 1374 cerr << _FB_CONSOLETEXT(Menu, RootLoad, "Loading root menu failed: ",
1374 "Actual error message follows this string") << e.what() << endl; 1375 "Actual error message follows this string") << e.what() << endl;
1375 } 1376 }
@@ -1407,7 +1408,8 @@ void BScreen::rereadWindowMenu() {
1407 MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper()); 1408 MenuCreator::createMenu(*m_windowmenu, l, m_windowmenu->reloadHelper());
1408 } 1409 }
1409 catch(std::runtime_error &e) { 1410 catch(std::runtime_error &e) {
1410 cerr << _FB_CONSOLETEXT(Menu, RootLoad, "Loading window menu failed: ", 1411 _FB_USES_NLS;
1412 cerr << _FB_CONSOLETEXT(Menu, WindowLoad, "Loading window menu failed: ",
1411 "Actual error message follows this string") << e.what() << endl; 1413 "Actual error message follows this string") << e.what() << endl;
1412 } 1414 }
1413} 1415}