gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

I18N

Browse Source 
- Localized E9.
This commit is contained in:
Paul Beckingham
2011-10-01 13:13:30 -04:00
parent 2c69d4871d
commit 81ca87b7da
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/E9.cpp
View File

@@ -25,11 +25,14 @@
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define L10N // Localization complete.
#include <iostream> #include <iostream>
#include <stdlib.h> #include <stdlib.h>
#include <Context.h> #include <Context.h>
#include <Date.h> #include <Date.h>
#include <Duration.h> #include <Duration.h>
#include <i18n.h>
#include <text.h> #include <text.h>
#include <E9.h> #include <E9.h>
@@ -103,7 +106,7 @@ void E9::eval (const Task& task, std::vector <Arg>& value_stack)
if (arg->_raw == "!") if (arg->_raw == "!")
{ {
if (value_stack.size () < 1) if (value_stack.size () < 1)
throw std::string ("There are no operands for the 'not' operator."); throw format (STRING_E9_NO_OPERANDS, "not");
Arg right = value_stack.back (); Arg right = value_stack.back ();
value_stack.pop_back (); value_stack.pop_back ();
@@ -124,7 +127,7 @@ void E9::eval (const Task& task, std::vector <Arg>& value_stack)
else else
{ {
if (value_stack.size () < 2) if (value_stack.size () < 2)
throw std::string ("There are not enough operands for the '") + arg->_raw + "' operator."; throw format (STRING_E9_INSUFFICIENT_OP, arg->_raw);
Arg right = value_stack.back (); Arg right = value_stack.back ();
value_stack.pop_back (); value_stack.pop_back ();
@@ -148,7 +151,7 @@ void E9::eval (const Task& task, std::vector <Arg>& value_stack)
else if (arg->_raw == "+") operator_add (result, left, right); else if (arg->_raw == "+") operator_add (result, left, right);
else if (arg->_raw == "-") operator_subtract (result, left, right); else if (arg->_raw == "-") operator_subtract (result, left, right);
else else
throw std::string ("Unsupported operator '") + arg->_raw + "'."; throw format (STRING_E9_UNSUPPORTED, arg->_raw);
} }
// Store the result. // Store the result.
@@ -188,7 +191,7 @@ void E9::eval (const Task& task, std::vector <Arg>& value_stack)
// Check for stack remnants. // Check for stack remnants.
if (value_stack.size () != 1) if (value_stack.size () != 1)
throw std::string ("Error: Expression::eval found extra items on the stack."); throw std::string (STRING_E9_MORE_OP);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

6
src/en-US.h
View File

@@ -451,6 +451,12 @@
// Duration // Duration
#define STRING_DURATION_UNRECOGNIZED "The duration '{1}' was not recognized." #define STRING_DURATION_UNRECOGNIZED "The duration '{1}' was not recognized."
// E9
#define STRING_E9_UNSUPPORTED "Unsupported operator '{1}'."
#define STRING_E9_NO_OPERANDS "There are no operands for the '{1}' operator."
#define STRING_E9_INSUFFICIENT_OP "There are not enough operands for the '{1}' operator."
#define STRING_E9_MORE_OP "Found extra operands."
// Errors // Errors
// TODO Move each of these to appropriate section. // TODO Move each of these to appropriate section.
#define STRING_UNKNOWN_ERROR "Unknown error." #define STRING_UNKNOWN_ERROR "Unknown error."