better translation and fix bug on user deletion

This commit is contained in:
2010-07-08 20:12:49 +02:00
parent cef0e4eb3c
commit a6475759f1
6 changed files with 205 additions and 144 deletions

View File

@@ -236,7 +236,7 @@ User* Database::LoadUser(const wxString& name)
category.name = set.GetAsString(wxT("name"));
category.color = wxColour(set.GetAsString(wxT("color")));
category.font = set.GetAsString(wxT("font"));
if (category.name != _("Fixe"))
if (category.name != _("Fix"))
user->_categories.push_back(category);
else
user->_categories.insert(user->_categories.begin(), category);
@@ -429,7 +429,7 @@ void Database::DeleteOperations(User* user, int month, int year)
req += wxT("', '") + it->id ;
}
req += wxT("')");
req += wxT(" OR user='") + user->_id + wxT("')");
req += wxT(" OR user='") + user->_id + wxT("'");
req += wxT(" AND year='") + wxString::Format(wxT("%d"), year) + wxT("'");
if (month != -1)
req += wxT(" AND month='") + wxString::Format(wxT("%d"), month) + wxT("'");
@@ -849,7 +849,7 @@ void Database::KillMe(User* user)
req += wxT("', '") + it->id ;
}
req += wxT("')");
req += wxT(" OR user='") + user->_id + wxT("')");
req += wxT(" OR user='") + user->_id + wxT("'");
EXECUTE_SQL_UPDATE(req, );
}