WebSVN – general – Path Comparison – / – /hostadmiral/ Rev 1048 and /hostadmiral/ Rev 1049

Ignore whitespace Rev 1048 → Rev 1049

/hostadmiral/trunk/build.xml
107,6 → 107,7
src="${src}"
dest="${classes.deploy}"
includes="*/.properties"
excludes="log4j.properties"
/>

<copy todir="${classes.deploy}" file="${src}/log4j.properties" />

 /hostadmiral/trunk/webapp/WEB-INF/struts-config.xml
 ,7 → 572,10
         <controller processorClass="ak.strutsx.RequestProcessorX" />
-        <message-resources parameter="ak.hostadmiral.core.CoreResources" />
+        <message-resources
+                factory="ak.hostadmiral.struts.MultiPropertyMessageResourcesFactory"
+                parameter="ak.hostadmiral.core.CoreResources;ak.hostadmiral.core.PageResources"
+        />
         <!-- ========== Plug-Ins Configuration ================================== -->

 /hostadmiral/trunk/doc/todo.txt
 ,5 → 1,5
 Host Admiral TODO
-====================================================================
+========================================================================================================================
         Transaction control for listners.
 ,8 → 32,6
         Allow admin to define default language for server and domain.
-        Split CoreResources.properties to several files.
         Show domain for user which is in the domain.
         Check, if it's possible to create (or change) an object by admin that the object's owner
 ,7 → 54,7
 Done
---------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
 +       Track database structure version.
 ,3 → 80,5
 +       Different user name schemes, not only user@domain. Define an interface to allow admin
         implement an own one. Implement a few common ones.
++       Split CoreResources.properties to several files.

 /hostadmiral/trunk/src/ak/hostadmiral/struts/MultiPropertyMessageResourcesFactory.java
 ,0 → 1,13
+package ak.hostadmiral.struts;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.PropertyMessageResourcesFactory;
+public class MultiPropertyMessageResourcesFactory
+        extends PropertyMessageResourcesFactory
+{
+    public MessageResources createResources(String config)
+    {
+        return new MultiPropertyMessageResources(this, config, this.returnNull);
+    }
+}

 /hostadmiral/trunk/src/ak/hostadmiral/struts/MultiPropertyMessageResources.java
 ,0 → 1,48
+package ak.hostadmiral.struts;
+import java.util.HashMap;
+import org.apache.struts.util.PropertyMessageResources;
+/**
+ * Extention of PropertyMessageResources to work with multiple
+ * resource files, specified as semicolomn separated list.
+ * Just a hack.
+ */
+public class MultiPropertyMessageResources
+        extends PropertyMessageResources
+{
+        private HashMap[] multiLocales;
+        private String[]  multiConfig;
+    public MultiPropertyMessageResources(MultiPropertyMessageResourcesFactory factory,
+        String config)
+    {
+        super(factory, config);
+        initMultiConfig(config);
+    }
+    public MultiPropertyMessageResources(MultiPropertyMessageResourcesFactory factory,
+        String config, boolean returnNull)
+    {
+        super(factory, config, returnNull);
+        initMultiConfig(config);
+    }
+    protected synchronized void loadLocale(String localeKey)
+    {
+            for(int i = 0; i < multiConfig.length; i++) {
+                config  = multiConfig[i];
+                locales = multiLocales[i];
+                super.loadLocale(localeKey);
+            }
+    }
+        protected void initMultiConfig(String cfg)
+        {
+                this.multiConfig = cfg.split("\\s*;\\s*");
+                this.multiLocales = new HashMap[this.multiConfig.length];
+                for(int i = 0; i < this.multiLocales.length; i++)
+                        this.multiLocales[i] = new HashMap();
+        }
+}

/hostadmiral/trunk/src/ak/hostadmiral/core/CoreResources_ru.properties
File deleted

 /hostadmiral/trunk/src/ak/hostadmiral/core/CoreResources.properties
 ,302 → 57,4
 ak.hostadmiral.core.mail.alias.edit.id.wrong=Please select an alias from the list
-ak.hostadmiral.page.general.errors=There are errors in you input
-ak.hostadmiral.page.general.version=Project version
-ak.hostadmiral.page.general.page.wrong=Wrong page number: {0}
-ak.hostadmiral.page.error.title=Host Admiral - error
-ak.hostadmiral.page.error.back=back
-ak.hostadmiral.page.generalError.title=Host Admiral - error
-ak.hostadmiral.page.generalError.message=There is internal server error occured. Please go back and try again. If the error occurs again continue with the start page.
-ak.hostadmiral.page.generalError.index=start page
-ak.hostadmiral.page.generalError.back=back
-ak.hostadmiral.page.accessDenied.title=Host Admiral - access denied
-ak.hostadmiral.page.accessDenied.message=You have no permission to execute requested action.
-ak.hostadmiral.page.accessDenied.index=start page
-ak.hostadmiral.page.accessDenied.back=back
-ak.hostadmiral.page.index.title=Host Admiral
-ak.hostadmiral.page.index.password_change=change password
-ak.hostadmiral.page.index.user_list=users
-ak.hostadmiral.page.index.system_user_list=system users
-ak.hostadmiral.page.index.domain_list=domains
-ak.hostadmiral.page.index.mail_alias_list=mail aliases
-ak.hostadmiral.page.index.mail_box_list=mail boxes
-ak.hostadmiral.page.index.logout=logout
-ak.hostadmiral.page.index.login=Logged in as
-ak.hostadmiral.page.index.locale=Locale
-ak.hostadmiral.page.system.login.title=Host Admiral - login
-ak.hostadmiral.page.system.login.login=Login
-ak.hostadmiral.page.system.login.password=Password
-ak.hostadmiral.page.system.login.submit=Login
-ak.hostadmiral.page.system.login.reset=Reset
-ak.hostadmiral.page.system.logout.title=Host Admiral - logout
-ak.hostadmiral.page.system.logout.message=You are logged out sucessfully. See you later!
-ak.hostadmiral.page.system.logout.login=start new session
-ak.hostadmiral.page.system.logout.back=return to system
-ak.hostadmiral.page.deleting.title=Delete an object from system
-ak.hostadmiral.page.deleting.delete=delete
-ak.hostadmiral.page.deleting.back=back
-ak.hostadmiral.page.user.password.change.title=Host Admiral - change password
-ak.hostadmiral.page.user.password.change.old_password=Old password
-ak.hostadmiral.page.user.password.change.new_password=New password
-ak.hostadmiral.page.user.password.change.new_password_again=New password again
-ak.hostadmiral.page.user.password.change.submit=submit
-ak.hostadmiral.page.user.password.change.back=back
-ak.hostadmiral.page.user.list.title=Host Admiral - users - list
-ak.hostadmiral.page.user.list.login=Login
-ak.hostadmiral.page.user.list.boss=Boss
-ak.hostadmiral.page.user.list.superuser=Superuser
-ak.hostadmiral.page.user.list.enabled=Enabled
-ak.hostadmiral.page.user.list.delete=delete
-ak.hostadmiral.page.user.list.edit=edit
-ak.hostadmiral.page.user.list.partedit=edit
-ak.hostadmiral.page.user.list.view=view
-ak.hostadmiral.page.user.list.add=add new user
-ak.hostadmiral.page.user.list.back=back
-ak.hostadmiral.page.user.list.logins.failed=failed logins
-ak.hostadmiral.page.user.failedLogins.title=Host Admiral - users - failed logins
-ak.hostadmiral.page.user.failedLogins.login=Login
-ak.hostadmiral.page.user.failedLogins.user.exists=User Exists
-ak.hostadmiral.page.user.failedLogins.time=Login Time
-ak.hostadmiral.page.user.failedLogins.success=Success
-ak.hostadmiral.page.user.failedLogins.ip=IP
-ak.hostadmiral.page.user.failedLogins.back=back
-ak.hostadmiral.page.user.logins.title=Host Admiral - user - logins
-ak.hostadmiral.page.user.logins.login=Logins of user
-ak.hostadmiral.page.user.logins.time=Login Time
-ak.hostadmiral.page.user.logins.success=Success
-ak.hostadmiral.page.user.logins.ip=IP
-ak.hostadmiral.page.user.logins.back=back
-ak.hostadmiral.page.user.edit.title=Host Admiral - user - edit
-ak.hostadmiral.page.user.edit.login=Login
-ak.hostadmiral.page.user.edit.password=Password
-ak.hostadmiral.page.user.edit.password_again=Password again
-ak.hostadmiral.page.user.edit.boss=Boss
-ak.hostadmiral.page.user.edit.boss.empty=-- no boss --
-ak.hostadmiral.page.user.edit.superuser=Superuser
-ak.hostadmiral.page.user.edit.superuser.true=yes
-ak.hostadmiral.page.user.edit.superuser.false=no
-ak.hostadmiral.page.user.edit.locale=Locale
-ak.hostadmiral.page.user.edit.enabled=Enabled
-ak.hostadmiral.page.user.edit.comment=Comment
-ak.hostadmiral.page.user.edit.submit=submit
-ak.hostadmiral.page.user.edit.back=back
-ak.hostadmiral.page.user.edit.logins=login history
-ak.hostadmiral.page.user.view.title=Host Admiral - user - view
-ak.hostadmiral.page.user.view.login=Login
-ak.hostadmiral.page.user.view.boss=Boss
-ak.hostadmiral.page.user.view.boss.empty=[no boss]
-ak.hostadmiral.page.user.view.superuser=Superuser
-ak.hostadmiral.page.user.view.superuser.true=yes
-ak.hostadmiral.page.user.view.superuser.false=no
-ak.hostadmiral.page.user.view.locale=Locale
-ak.hostadmiral.page.user.view.enabled=Enabled
-ak.hostadmiral.page.user.view.enabled.true=yes
-ak.hostadmiral.page.user.view.enabled.false=no
-ak.hostadmiral.page.user.view.comment=Comment
-ak.hostadmiral.page.user.view.back=back
-ak.hostadmiral.page.user.view.logins=login history
-ak.hostadmiral.page.user.partedit.title=Host Admiral - user - edit
-ak.hostadmiral.page.user.partedit.login=Login
-ak.hostadmiral.page.user.partedit.boss=Boss
-ak.hostadmiral.page.user.partedit.boss.empty=[no boss]
-ak.hostadmiral.page.user.partedit.superuser=Superuser
-ak.hostadmiral.page.user.partedit.superuser.true=yes
-ak.hostadmiral.page.user.partedit.superuser.false=no
-ak.hostadmiral.page.user.partedit.locale=Locale
-ak.hostadmiral.page.user.partedit.enabled=Enabled
-ak.hostadmiral.page.user.partedit.enabled.true=yes
-ak.hostadmiral.page.user.partedit.enabled.false=no
-ak.hostadmiral.page.user.partedit.comment=Comment
-ak.hostadmiral.page.user.partedit.submit=submit
-ak.hostadmiral.page.user.partedit.back=back
-ak.hostadmiral.page.user.partedit.logins=login history
-ak.hostadmiral.page.user.system.list.title=Host Admiral - system users - list
-ak.hostadmiral.page.user.system.list.uid=System ID
-ak.hostadmiral.page.user.system.list.name=User name
-ak.hostadmiral.page.user.system.list.owner=Owner
-ak.hostadmiral.page.user.system.list.enabled=Enabled
-ak.hostadmiral.page.user.system.list.delete=delete
-ak.hostadmiral.page.user.system.list.edit=edit
-ak.hostadmiral.page.user.system.list.view=view
-ak.hostadmiral.page.user.system.list.add=add new user
-ak.hostadmiral.page.user.system.list.back=back
-ak.hostadmiral.page.user.system.edit.title=Host Admiral - system user - edit
-ak.hostadmiral.page.user.system.edit.uid=System ID
-ak.hostadmiral.page.user.system.edit.name=User name
-ak.hostadmiral.page.user.system.edit.owner=Owner
-ak.hostadmiral.page.user.system.edit.owner.empty=-- common user --
-ak.hostadmiral.page.user.system.edit.enabled=Enabled
-ak.hostadmiral.page.user.system.edit.comment=Comment
-ak.hostadmiral.page.user.system.edit.submit=submit
-ak.hostadmiral.page.user.system.edit.back=back
-ak.hostadmiral.page.user.system.view.title=Host Admiral - system user - view
-ak.hostadmiral.page.user.system.view.uid=System ID
-ak.hostadmiral.page.user.system.view.name=User name
-ak.hostadmiral.page.user.system.view.owner=Owner
-ak.hostadmiral.page.user.system.view.owner.empty=[common user]
-ak.hostadmiral.page.user.system.view.enabled=Enabled
-ak.hostadmiral.page.user.system.view.enabled.true=yes
-ak.hostadmiral.page.user.system.view.enabled.false=no
-ak.hostadmiral.page.user.system.view.comment=Comment
-ak.hostadmiral.page.user.system.view.back=back
-ak.hostadmiral.page.domain.list.title=Host Admiral - domains - list
-ak.hostadmiral.page.domain.list.name=Name
-ak.hostadmiral.page.domain.list.owner=Owner
-ak.hostadmiral.page.domain.list.enabled=Enabled
-ak.hostadmiral.page.domain.list.delete=delete
-ak.hostadmiral.page.domain.list.view=view
-ak.hostadmiral.page.domain.list.edit=edit
-ak.hostadmiral.page.domain.list.add=add new domain
-ak.hostadmiral.page.domain.list.back=back
-ak.hostadmiral.page.domain.edit.title=Host Admiral - domain - edit
-ak.hostadmiral.page.domain.edit.name=Name
-ak.hostadmiral.page.domain.edit.owner=Owner
-ak.hostadmiral.page.domain.edit.owner.empty=-- please select --
-ak.hostadmiral.page.domain.edit.enabled=Enabled
-ak.hostadmiral.page.domain.edit.comment=Comment
-ak.hostadmiral.page.domain.edit.submit=submit
-ak.hostadmiral.page.domain.edit.back=back
-ak.hostadmiral.page.domain.view.title=Host Admiral - domain - view
-ak.hostadmiral.page.domain.view.name=Name
-ak.hostadmiral.page.domain.view.owner=Owner
-ak.hostadmiral.page.domain.view.enabled=Enabled
-ak.hostadmiral.page.domain.view.enabled.true=yes
-ak.hostadmiral.page.domain.view.enabled.false=no
-ak.hostadmiral.page.domain.view.comment=Comment
-ak.hostadmiral.page.domain.view.back=back
-ak.hostadmiral.page.mail.box.list.title=Host Admiral - mail boxes - list
-ak.hostadmiral.page.mail.box.list.login=Box
-ak.hostadmiral.page.mail.box.list.domain=Domain
-ak.hostadmiral.page.mail.box.list.owner=Owner
-ak.hostadmiral.page.mail.box.list.enabled=Enabled
-ak.hostadmiral.page.mail.box.list.edit=edit
-ak.hostadmiral.page.mail.box.list.view=view
-ak.hostadmiral.page.mail.box.list.delete=delete
-ak.hostadmiral.page.mail.box.list.add=add new mail box
-ak.hostadmiral.page.mail.box.list.back=back
-ak.hostadmiral.page.mail.box.edit.title=Host Admiral - mail box - edit
-ak.hostadmiral.page.mail.box.edit.login=Box
-ak.hostadmiral.page.mail.box.edit.password=Password
-ak.hostadmiral.page.mail.box.edit.password_again=Password again
-ak.hostadmiral.page.mail.box.edit.domain=Domain
-ak.hostadmiral.page.mail.box.edit.domain.empty=-- please select --
-ak.hostadmiral.page.mail.box.edit.owner=Owner
-ak.hostadmiral.page.mail.box.edit.owner.empty=-- create a new user --
-ak.hostadmiral.page.mail.box.edit.systemuser=System user
-ak.hostadmiral.page.mail.box.edit.systemuser.empty=-- please select --
-ak.hostadmiral.page.mail.box.edit.viruscheck=check mails for viruses
-ak.hostadmiral.page.mail.box.edit.spamcheck=check mails for spam
-ak.hostadmiral.page.mail.box.edit.enabled=Enabled
-ak.hostadmiral.page.mail.box.edit.comment=Comment
-ak.hostadmiral.page.mail.box.edit.submit=submit
-ak.hostadmiral.page.mail.box.edit.back=back
-ak.hostadmiral.page.mail.box.view.title=Host Admiral - mail box - view
-ak.hostadmiral.page.mail.box.view.login=Box
-ak.hostadmiral.page.mail.box.view.domain=Domain
-ak.hostadmiral.page.mail.box.view.owner=Owner
-ak.hostadmiral.page.mail.box.view.systemuser=System user
-ak.hostadmiral.page.mail.box.view.systemuser.empty=[default user]
-ak.hostadmiral.page.mail.box.view.viruscheck=check mails for viruses
-ak.hostadmiral.page.mail.box.view.viruscheck.true=yes
-ak.hostadmiral.page.mail.box.view.viruscheck.false=no
-ak.hostadmiral.page.mail.box.view.spamcheck=check mails for spam
-ak.hostadmiral.page.mail.box.view.spamcheck.true=yes
-ak.hostadmiral.page.mail.box.view.spamcheck.false=no
-ak.hostadmiral.page.mail.box.view.enabled=Enabled
-ak.hostadmiral.page.mail.box.view.enabled.true=yes
-ak.hostadmiral.page.mail.box.view.enabled.false=no
-ak.hostadmiral.page.mail.box.view.comment=Comment
-ak.hostadmiral.page.mail.box.view.back=back
-ak.hostadmiral.page.mail.alias.list.title=Host Admiral - mail aliases - list
-ak.hostadmiral.page.mail.alias.list.alias=Alias
-ak.hostadmiral.page.mail.alias.list.domain=Domain
-ak.hostadmiral.page.mail.alias.list.owner=Owner
-ak.hostadmiral.page.mail.alias.list.enabled=Enabled
-ak.hostadmiral.page.mail.alias.list.edit=edit
-ak.hostadmiral.page.mail.alias.list.editdests=edit
-ak.hostadmiral.page.mail.alias.list.view=view
-ak.hostadmiral.page.mail.alias.list.delete=delete
-ak.hostadmiral.page.mail.alias.list.back=back
-ak.hostadmiral.page.mail.alias.list.add=add new mail alias
-ak.hostadmiral.page.mail.alias.edit.title=Host Admiral - mail alias - edit
-ak.hostadmiral.page.mail.alias.edit.address=Address
-ak.hostadmiral.page.mail.alias.edit.domain=Domain
-ak.hostadmiral.page.mail.alias.edit.domain.empty=-- please select --
-ak.hostadmiral.page.mail.alias.edit.owner=Owner
-ak.hostadmiral.page.mail.alias.edit.owner.empty=-- please select --
-ak.hostadmiral.page.mail.alias.edit.enabled=Enabled
-ak.hostadmiral.page.mail.alias.edit.comment=Comment
-ak.hostadmiral.page.mail.alias.edit.header.tomailbox=To mailbox
-ak.hostadmiral.page.mail.alias.edit.header.toexternal=or to external email
-ak.hostadmiral.page.mail.alias.edit.header.enabled=Enabled
-ak.hostadmiral.page.mail.alias.edit.header.comment=Comment
-ak.hostadmiral.page.mail.alias.edit.external=external redirect
-ak.hostadmiral.page.mail.alias.edit.add=add new destination
-ak.hostadmiral.page.mail.alias.edit.delete=delete
-ak.hostadmiral.page.mail.alias.edit.submit=submit
-ak.hostadmiral.page.mail.alias.edit.back=back
-ak.hostadmiral.page.mail.alias.editdest.title=Host Admiral - mail alias - edit
-ak.hostadmiral.page.mail.alias.editdest.address=Address
-ak.hostadmiral.page.mail.alias.editdest.domain=Domain
-ak.hostadmiral.page.mail.alias.editdest.owner=Owner
-ak.hostadmiral.page.mail.alias.editdest.enabled=Enabled
-ak.hostadmiral.page.mail.alias.editdest.enabled.true=yes
-ak.hostadmiral.page.mail.alias.editdest.enabled.false=no
-ak.hostadmiral.page.mail.alias.editdest.comment=Comment
-ak.hostadmiral.page.mail.alias.editdest.header.tomailbox=To mailbox
-ak.hostadmiral.page.mail.alias.editdest.header.toexternal=or to external email
-ak.hostadmiral.page.mail.alias.editdest.header.enabled=Enabled
-ak.hostadmiral.page.mail.alias.editdest.header.comment=Comment
-ak.hostadmiral.page.mail.alias.editdest.external=external redirect
-ak.hostadmiral.page.mail.alias.editdest.add=add new destination
-ak.hostadmiral.page.mail.alias.editdest.delete=delete
-ak.hostadmiral.page.mail.alias.editdest.submit=submit
-ak.hostadmiral.page.mail.alias.editdest.back=back
-ak.hostadmiral.page.mail.alias.view.title=Host Admiral - mail alias - view
-ak.hostadmiral.page.mail.alias.view.address=Address
-ak.hostadmiral.page.mail.alias.view.domain=Domain
-ak.hostadmiral.page.mail.alias.view.owner=Owner
-ak.hostadmiral.page.mail.alias.view.enabled=Enabled
-ak.hostadmiral.page.mail.alias.view.enabled.true=yes
-ak.hostadmiral.page.mail.alias.view.enabled.false=no
-ak.hostadmiral.page.mail.alias.view.comment=Comment
-ak.hostadmiral.page.mail.alias.view.header.tomailbox=To mailbox
-ak.hostadmiral.page.mail.alias.view.header.toexternal=or to external email
-ak.hostadmiral.page.mail.alias.view.header.enabled=Enabled
-ak.hostadmiral.page.mail.alias.view.dest.enabled.true=yes
-ak.hostadmiral.page.mail.alias.view.dest.enabled.false=no
-ak.hostadmiral.page.mail.alias.view.header.comment=Comment
-ak.hostadmiral.page.mail.alias.view.external=external redirect
-ak.hostadmiral.page.mail.alias.view.back=back
 ak.hostadmiral.core.uservalidator.atdomain.login.wrong=User login must end with name of your domain, e.g. me@example.com
-org.apache.struts.taglib.bean.format.sql.timestamp=dd-MM-yyyy HH:mm:ss.SSS

 /hostadmiral/trunk/src/ak/hostadmiral/core/PageResources.properties
 ,0 → 1,297
+ak.hostadmiral.page.general.errors=There are errors in you input
+ak.hostadmiral.page.general.version=Project version
+ak.hostadmiral.page.general.page.wrong=Wrong page number: {0}
+ak.hostadmiral.page.error.title=Host Admiral - error
+ak.hostadmiral.page.error.back=back
+ak.hostadmiral.page.generalError.title=Host Admiral - error
+ak.hostadmiral.page.generalError.message=There is internal server error occured. Please go back and try again. If the error occurs again continue with the start page.
+ak.hostadmiral.page.generalError.index=start page
+ak.hostadmiral.page.generalError.back=back
+ak.hostadmiral.page.accessDenied.title=Host Admiral - access denied
+ak.hostadmiral.page.accessDenied.message=You have no permission to execute requested action.
+ak.hostadmiral.page.accessDenied.index=start page
+ak.hostadmiral.page.accessDenied.back=back
+ak.hostadmiral.page.index.title=Host Admiral
+ak.hostadmiral.page.index.password_change=change password
+ak.hostadmiral.page.index.user_list=users
+ak.hostadmiral.page.index.system_user_list=system users
+ak.hostadmiral.page.index.domain_list=domains
+ak.hostadmiral.page.index.mail_alias_list=mail aliases
+ak.hostadmiral.page.index.mail_box_list=mail boxes
+ak.hostadmiral.page.index.logout=logout
+ak.hostadmiral.page.index.login=Logged in as
+ak.hostadmiral.page.index.locale=Locale
+ak.hostadmiral.page.system.login.title=Host Admiral - login
+ak.hostadmiral.page.system.login.login=Login
+ak.hostadmiral.page.system.login.password=Password
+ak.hostadmiral.page.system.login.submit=Login
+ak.hostadmiral.page.system.login.reset=Reset
+ak.hostadmiral.page.system.logout.title=Host Admiral - logout
+ak.hostadmiral.page.system.logout.message=You are logged out sucessfully. See you later!
+ak.hostadmiral.page.system.logout.login=start new session
+ak.hostadmiral.page.system.logout.back=return to system
+ak.hostadmiral.page.deleting.title=Delete an object from system
+ak.hostadmiral.page.deleting.delete=delete
+ak.hostadmiral.page.deleting.back=back
+ak.hostadmiral.page.user.password.change.title=Host Admiral - change password
+ak.hostadmiral.page.user.password.change.old_password=Old password
+ak.hostadmiral.page.user.password.change.new_password=New password
+ak.hostadmiral.page.user.password.change.new_password_again=New password again
+ak.hostadmiral.page.user.password.change.submit=submit
+ak.hostadmiral.page.user.password.change.back=back
+ak.hostadmiral.page.user.list.title=Host Admiral - users - list
+ak.hostadmiral.page.user.list.login=Login
+ak.hostadmiral.page.user.list.boss=Boss
+ak.hostadmiral.page.user.list.superuser=Superuser
+ak.hostadmiral.page.user.list.enabled=Enabled
+ak.hostadmiral.page.user.list.delete=delete
+ak.hostadmiral.page.user.list.edit=edit
+ak.hostadmiral.page.user.list.partedit=edit
+ak.hostadmiral.page.user.list.view=view
+ak.hostadmiral.page.user.list.add=add new user
+ak.hostadmiral.page.user.list.back=back
+ak.hostadmiral.page.user.list.logins.failed=failed logins
+ak.hostadmiral.page.user.failedLogins.title=Host Admiral - users - failed logins
+ak.hostadmiral.page.user.failedLogins.login=Login
+ak.hostadmiral.page.user.failedLogins.user.exists=User Exists
+ak.hostadmiral.page.user.failedLogins.time=Login Time
+ak.hostadmiral.page.user.failedLogins.success=Success
+ak.hostadmiral.page.user.failedLogins.ip=IP
+ak.hostadmiral.page.user.failedLogins.back=back
+ak.hostadmiral.page.user.logins.title=Host Admiral - user - logins
+ak.hostadmiral.page.user.logins.login=Logins of user
+ak.hostadmiral.page.user.logins.time=Login Time
+ak.hostadmiral.page.user.logins.success=Success
+ak.hostadmiral.page.user.logins.ip=IP
+ak.hostadmiral.page.user.logins.back=back
+ak.hostadmiral.page.user.edit.title=Host Admiral - user - edit
+ak.hostadmiral.page.user.edit.login=Login
+ak.hostadmiral.page.user.edit.password=Password
+ak.hostadmiral.page.user.edit.password_again=Password again
+ak.hostadmiral.page.user.edit.boss=Boss
+ak.hostadmiral.page.user.edit.boss.empty=-- no boss --
+ak.hostadmiral.page.user.edit.superuser=Superuser
+ak.hostadmiral.page.user.edit.superuser.true=yes
+ak.hostadmiral.page.user.edit.superuser.false=no
+ak.hostadmiral.page.user.edit.locale=Locale
+ak.hostadmiral.page.user.edit.enabled=Enabled
+ak.hostadmiral.page.user.edit.comment=Comment
+ak.hostadmiral.page.user.edit.submit=submit
+ak.hostadmiral.page.user.edit.back=back
+ak.hostadmiral.page.user.edit.logins=login history
+ak.hostadmiral.page.user.view.title=Host Admiral - user - view
+ak.hostadmiral.page.user.view.login=Login
+ak.hostadmiral.page.user.view.boss=Boss
+ak.hostadmiral.page.user.view.boss.empty=[no boss]
+ak.hostadmiral.page.user.view.superuser=Superuser
+ak.hostadmiral.page.user.view.superuser.true=yes
+ak.hostadmiral.page.user.view.superuser.false=no
+ak.hostadmiral.page.user.view.locale=Locale
+ak.hostadmiral.page.user.view.enabled=Enabled
+ak.hostadmiral.page.user.view.enabled.true=yes
+ak.hostadmiral.page.user.view.enabled.false=no
+ak.hostadmiral.page.user.view.comment=Comment
+ak.hostadmiral.page.user.view.back=back
+ak.hostadmiral.page.user.view.logins=login history
+ak.hostadmiral.page.user.partedit.title=Host Admiral - user - edit
+ak.hostadmiral.page.user.partedit.login=Login
+ak.hostadmiral.page.user.partedit.boss=Boss
+ak.hostadmiral.page.user.partedit.boss.empty=[no boss]
+ak.hostadmiral.page.user.partedit.superuser=Superuser
+ak.hostadmiral.page.user.partedit.superuser.true=yes
+ak.hostadmiral.page.user.partedit.superuser.false=no
+ak.hostadmiral.page.user.partedit.locale=Locale
+ak.hostadmiral.page.user.partedit.enabled=Enabled
+ak.hostadmiral.page.user.partedit.enabled.true=yes
+ak.hostadmiral.page.user.partedit.enabled.false=no
+ak.hostadmiral.page.user.partedit.comment=Comment
+ak.hostadmiral.page.user.partedit.submit=submit
+ak.hostadmiral.page.user.partedit.back=back
+ak.hostadmiral.page.user.partedit.logins=login history
+ak.hostadmiral.page.user.system.list.title=Host Admiral - system users - list
+ak.hostadmiral.page.user.system.list.uid=System ID
+ak.hostadmiral.page.user.system.list.name=User name
+ak.hostadmiral.page.user.system.list.owner=Owner
+ak.hostadmiral.page.user.system.list.enabled=Enabled
+ak.hostadmiral.page.user.system.list.delete=delete
+ak.hostadmiral.page.user.system.list.edit=edit
+ak.hostadmiral.page.user.system.list.view=view
+ak.hostadmiral.page.user.system.list.add=add new user
+ak.hostadmiral.page.user.system.list.back=back
+ak.hostadmiral.page.user.system.edit.title=Host Admiral - system user - edit
+ak.hostadmiral.page.user.system.edit.uid=System ID
+ak.hostadmiral.page.user.system.edit.name=User name
+ak.hostadmiral.page.user.system.edit.owner=Owner
+ak.hostadmiral.page.user.system.edit.owner.empty=-- common user --
+ak.hostadmiral.page.user.system.edit.enabled=Enabled
+ak.hostadmiral.page.user.system.edit.comment=Comment
+ak.hostadmiral.page.user.system.edit.submit=submit
+ak.hostadmiral.page.user.system.edit.back=back
+ak.hostadmiral.page.user.system.view.title=Host Admiral - system user - view
+ak.hostadmiral.page.user.system.view.uid=System ID
+ak.hostadmiral.page.user.system.view.name=User name
+ak.hostadmiral.page.user.system.view.owner=Owner
+ak.hostadmiral.page.user.system.view.owner.empty=[common user]
+ak.hostadmiral.page.user.system.view.enabled=Enabled
+ak.hostadmiral.page.user.system.view.enabled.true=yes
+ak.hostadmiral.page.user.system.view.enabled.false=no
+ak.hostadmiral.page.user.system.view.comment=Comment
+ak.hostadmiral.page.user.system.view.back=back
+ak.hostadmiral.page.domain.list.title=Host Admiral - domains - list
+ak.hostadmiral.page.domain.list.name=Name
+ak.hostadmiral.page.domain.list.owner=Owner
+ak.hostadmiral.page.domain.list.enabled=Enabled
+ak.hostadmiral.page.domain.list.delete=delete
+ak.hostadmiral.page.domain.list.view=view
+ak.hostadmiral.page.domain.list.edit=edit
+ak.hostadmiral.page.domain.list.add=add new domain
+ak.hostadmiral.page.domain.list.back=back
+ak.hostadmiral.page.domain.edit.title=Host Admiral - domain - edit
+ak.hostadmiral.page.domain.edit.name=Name
+ak.hostadmiral.page.domain.edit.owner=Owner
+ak.hostadmiral.page.domain.edit.owner.empty=-- please select --
+ak.hostadmiral.page.domain.edit.enabled=Enabled
+ak.hostadmiral.page.domain.edit.comment=Comment
+ak.hostadmiral.page.domain.edit.submit=submit
+ak.hostadmiral.page.domain.edit.back=back
+ak.hostadmiral.page.domain.view.title=Host Admiral - domain - view
+ak.hostadmiral.page.domain.view.name=Name
+ak.hostadmiral.page.domain.view.owner=Owner
+ak.hostadmiral.page.domain.view.enabled=Enabled
+ak.hostadmiral.page.domain.view.enabled.true=yes
+ak.hostadmiral.page.domain.view.enabled.false=no
+ak.hostadmiral.page.domain.view.comment=Comment
+ak.hostadmiral.page.domain.view.back=back
+ak.hostadmiral.page.mail.box.list.title=Host Admiral - mail boxes - list
+ak.hostadmiral.page.mail.box.list.login=Box
+ak.hostadmiral.page.mail.box.list.domain=Domain
+ak.hostadmiral.page.mail.box.list.owner=Owner
+ak.hostadmiral.page.mail.box.list.enabled=Enabled
+ak.hostadmiral.page.mail.box.list.edit=edit
+ak.hostadmiral.page.mail.box.list.view=view
+ak.hostadmiral.page.mail.box.list.delete=delete
+ak.hostadmiral.page.mail.box.list.add=add new mail box
+ak.hostadmiral.page.mail.box.list.back=back
+ak.hostadmiral.page.mail.box.edit.title=Host Admiral - mail box - edit
+ak.hostadmiral.page.mail.box.edit.login=Box
+ak.hostadmiral.page.mail.box.edit.password=Password
+ak.hostadmiral.page.mail.box.edit.password_again=Password again
+ak.hostadmiral.page.mail.box.edit.domain=Domain
+ak.hostadmiral.page.mail.box.edit.domain.empty=-- please select --
+ak.hostadmiral.page.mail.box.edit.owner=Owner
+ak.hostadmiral.page.mail.box.edit.owner.empty=-- create a new user --
+ak.hostadmiral.page.mail.box.edit.systemuser=System user
+ak.hostadmiral.page.mail.box.edit.systemuser.empty=-- please select --
+ak.hostadmiral.page.mail.box.edit.viruscheck=check mails for viruses
+ak.hostadmiral.page.mail.box.edit.spamcheck=check mails for spam
+ak.hostadmiral.page.mail.box.edit.enabled=Enabled
+ak.hostadmiral.page.mail.box.edit.comment=Comment
+ak.hostadmiral.page.mail.box.edit.submit=submit
+ak.hostadmiral.page.mail.box.edit.back=back
+ak.hostadmiral.page.mail.box.view.title=Host Admiral - mail box - view
+ak.hostadmiral.page.mail.box.view.login=Box
+ak.hostadmiral.page.mail.box.view.domain=Domain
+ak.hostadmiral.page.mail.box.view.owner=Owner
+ak.hostadmiral.page.mail.box.view.systemuser=System user
+ak.hostadmiral.page.mail.box.view.systemuser.empty=[default user]
+ak.hostadmiral.page.mail.box.view.viruscheck=check mails for viruses
+ak.hostadmiral.page.mail.box.view.viruscheck.true=yes
+ak.hostadmiral.page.mail.box.view.viruscheck.false=no
+ak.hostadmiral.page.mail.box.view.spamcheck=check mails for spam
+ak.hostadmiral.page.mail.box.view.spamcheck.true=yes
+ak.hostadmiral.page.mail.box.view.spamcheck.false=no
+ak.hostadmiral.page.mail.box.view.enabled=Enabled
+ak.hostadmiral.page.mail.box.view.enabled.true=yes
+ak.hostadmiral.page.mail.box.view.enabled.false=no
+ak.hostadmiral.page.mail.box.view.comment=Comment
+ak.hostadmiral.page.mail.box.view.back=back
+ak.hostadmiral.page.mail.alias.list.title=Host Admiral - mail aliases - list
+ak.hostadmiral.page.mail.alias.list.alias=Alias
+ak.hostadmiral.page.mail.alias.list.domain=Domain
+ak.hostadmiral.page.mail.alias.list.owner=Owner
+ak.hostadmiral.page.mail.alias.list.enabled=Enabled
+ak.hostadmiral.page.mail.alias.list.edit=edit
+ak.hostadmiral.page.mail.alias.list.editdests=edit
+ak.hostadmiral.page.mail.alias.list.view=view
+ak.hostadmiral.page.mail.alias.list.delete=delete
+ak.hostadmiral.page.mail.alias.list.back=back
+ak.hostadmiral.page.mail.alias.list.add=add new mail alias
+ak.hostadmiral.page.mail.alias.edit.title=Host Admiral - mail alias - edit
+ak.hostadmiral.page.mail.alias.edit.address=Address
+ak.hostadmiral.page.mail.alias.edit.domain=Domain
+ak.hostadmiral.page.mail.alias.edit.domain.empty=-- please select --
+ak.hostadmiral.page.mail.alias.edit.owner=Owner
+ak.hostadmiral.page.mail.alias.edit.owner.empty=-- please select --
+ak.hostadmiral.page.mail.alias.edit.enabled=Enabled
+ak.hostadmiral.page.mail.alias.edit.comment=Comment
+ak.hostadmiral.page.mail.alias.edit.header.tomailbox=To mailbox
+ak.hostadmiral.page.mail.alias.edit.header.toexternal=or to external email
+ak.hostadmiral.page.mail.alias.edit.header.enabled=Enabled
+ak.hostadmiral.page.mail.alias.edit.header.comment=Comment
+ak.hostadmiral.page.mail.alias.edit.external=external redirect
+ak.hostadmiral.page.mail.alias.edit.add=add new destination
+ak.hostadmiral.page.mail.alias.edit.delete=delete
+ak.hostadmiral.page.mail.alias.edit.submit=submit
+ak.hostadmiral.page.mail.alias.edit.back=back
+ak.hostadmiral.page.mail.alias.editdest.title=Host Admiral - mail alias - edit
+ak.hostadmiral.page.mail.alias.editdest.address=Address
+ak.hostadmiral.page.mail.alias.editdest.domain=Domain
+ak.hostadmiral.page.mail.alias.editdest.owner=Owner
+ak.hostadmiral.page.mail.alias.editdest.enabled=Enabled
+ak.hostadmiral.page.mail.alias.editdest.enabled.true=yes
+ak.hostadmiral.page.mail.alias.editdest.enabled.false=no
+ak.hostadmiral.page.mail.alias.editdest.comment=Comment
+ak.hostadmiral.page.mail.alias.editdest.header.tomailbox=To mailbox
+ak.hostadmiral.page.mail.alias.editdest.header.toexternal=or to external email
+ak.hostadmiral.page.mail.alias.editdest.header.enabled=Enabled
+ak.hostadmiral.page.mail.alias.editdest.header.comment=Comment
+ak.hostadmiral.page.mail.alias.editdest.external=external redirect
+ak.hostadmiral.page.mail.alias.editdest.add=add new destination
+ak.hostadmiral.page.mail.alias.editdest.delete=delete
+ak.hostadmiral.page.mail.alias.editdest.submit=submit
+ak.hostadmiral.page.mail.alias.editdest.back=back
+ak.hostadmiral.page.mail.alias.view.title=Host Admiral - mail alias - view
+ak.hostadmiral.page.mail.alias.view.address=Address
+ak.hostadmiral.page.mail.alias.view.domain=Domain
+ak.hostadmiral.page.mail.alias.view.owner=Owner
+ak.hostadmiral.page.mail.alias.view.enabled=Enabled
+ak.hostadmiral.page.mail.alias.view.enabled.true=yes
+ak.hostadmiral.page.mail.alias.view.enabled.false=no
+ak.hostadmiral.page.mail.alias.view.comment=Comment
+ak.hostadmiral.page.mail.alias.view.header.tomailbox=To mailbox
+ak.hostadmiral.page.mail.alias.view.header.toexternal=or to external email
+ak.hostadmiral.page.mail.alias.view.header.enabled=Enabled
+ak.hostadmiral.page.mail.alias.view.dest.enabled.true=yes
+ak.hostadmiral.page.mail.alias.view.dest.enabled.false=no
+ak.hostadmiral.page.mail.alias.view.header.comment=Comment
+ak.hostadmiral.page.mail.alias.view.external=external redirect
+ak.hostadmiral.page.mail.alias.view.back=back
+org.apache.struts.taglib.bean.format.sql.timestamp=dd-MM-yyyy HH:mm:ss.SSS

 /hostadmiral/trunk/src/ak/hostadmiral/core/config/ConfigInitParam.java
 ,7 → 34,7
                 StringBuffer valuesStr = new StringBuffer();
                 for(Iterator i = values.iterator(); i.hasNext(); ) {
                         String s = (String)i.next();
-                        if(valuesStr.length() > 0) valuesStr.append(", ");
+                        if(valuesStr.length() > 0) valuesStr.append(";\n\t\t\t\t");
                         valuesStr.append(s);
                 }

/hostadmiral/trunk/src/ak/hostadmiral/core/PageResources_ru.properties
0,0 → 1,3
ak.hostadmiral.page.index.title=Начальник Камчатки

org.apache.struts.taglib.bean.format.sql.timestamp=dd MMM yyyy HH:mm:ss.SSS

Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1048 → Rev 1049

/hostadmiral/trunk/src/log4j.properties
8,3 → 8,4
log4j.logger.ak.hostadmiral=debug

log4j.logger.net.sf.hibernate=error