tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

changed: removed Languages::Land enum

Browse Source 
now we set the languages in the config file: option locale_files, sample:
  locale_files = ( en, pl )
it represents the name of locale files (those from locale_dir directory)
renamed config option: locale to locale_default


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@722 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2011-02-24 17:06:12 +00:00
parent 15487b347f
commit ba63c8c661
18 changed files with 268 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
notify/notify.cpp
View File

@@ -79,7 +79,7 @@ void Notify::ReadTemplates()
return;
}
patterns.resize(static_cast<size_t>(Locale::lang_unknown));
patterns.resize(TemplatesFunctions::locale.Size());
for(size_t i=0 ; i<patterns.size() ; ++i)
{
@@ -92,7 +92,7 @@ void Notify::ReadTemplates()
patterns[i][a].Directory(config->txt_templates_dir, config->txt_templates_dir_default);
patterns[i][a].ParseFile(templates_names[a]);
TemplatesFunctions::locale_filter.Filter(patterns[i][a], TemplatesFunctions::locale, static_cast<Locale::Lang>(i));
TemplatesFunctions::locale_filter.Filter(patterns[i][a], TemplatesFunctions::locale, i);
}
}

2
notify/notifypool.h
View File

@@ -50,7 +50,7 @@ struct NotifyUserMsg
{
std::wstring name;
std::wstring email;
Locale::Lang lang;
size_t lang;
};

9
notify/notifythread.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2010, Tomasz Sowa
* Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved.
*
*/
@@ -100,10 +100,7 @@ bool res = false;
{
msg.name = i->name;
msg.email = i->email;
msg.lang = Locale::StrToLang(config->locale_str); // !! bedzie osobno dla kazdego uzytkownika
if( msg.lang == Locale::lang_unknown )
msg.lang = Locale::lang_en;
msg.lang = config->locale_default_index; // !! bedzie osobno dla kazdego uzytkownika
notify_user.insert(notify_user.end(), msg);
res = true;
@@ -163,7 +160,7 @@ void NotifyThread::SendMail()
{
notify_stream.Clear();
size_t lang_index = static_cast<size_t>(TemplatesNotifyFunctions::notify_user_msg.lang);
size_t lang_index = TemplatesNotifyFunctions::notify_user_msg.lang;
size_t template_index = TemplatesNotifyFunctions::notify_msg.template_index;
if( lang_index >= patterns.size() )

2
notify/notifythread.h
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2010, Tomasz Sowa
* Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved.
*
*/