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

fixed: Config::Text() returned a reference to a local variable (std::string)

Browse Source 
added: 'static' directory with *.css and images
       we have a default layout
moved: locale from data to templates       
       notification templates have its own locale object
added: reload function reloades locale now too
added: 'nice' form of item_info in templates



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@582 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-02-15 00:31:14 +00:00
parent c58031cbf4
commit fa8d8f9ea0
38 changed files with 678 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templatesnotify/Makefile.dep
View File

@@ -12,5 +12,5 @@ templatesnotify.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
templatesnotify.o: ../core/log.h ../core/groups.h ../core/group.h
templatesnotify.o: ../core/functions.h ../core/function.h
templatesnotify.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
templatesnotify.o: ../core/error.h ../core/rebus.h ../core/locale.h
templatesnotify.o: ../core/loadavg.h ../core/log.h
templatesnotify.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
templatesnotify.o: ../core/log.h

13
templatesnotify/templatesnotify.cpp
View File

@@ -21,6 +21,7 @@ namespace TemplatesNotifyFunctions
TemplatesMisc::Patterns patterns;
Ezc::Functions functions;
Locale locale;
LocaleFilter locale_filter;
@@ -74,10 +75,16 @@ void TemplatesNotify::Read()
using namespace TemplatesNotifyFunctions;
using namespace TemplatesMisc;
Locale::Lang lang = Locale::StrToLang(data.locale_str);
if( lang != Locale::lang_unknown )
locale.SetLang(lang);
else
locale.SetLang(Locale::lang_en);
ClearPatterns();
TemplatesMisc::Read(patterns, pat_email_notify, locale_filter, "notify_email.txt", true);
locale.Read(data.locale_dir, data.locale_dir_default);
TemplatesMisc::Read(patterns, pat_email_notify, locale, locale_filter, "notify_email.txt", true);
notify_msg = 0;
}