From 756056972ee23e30cfc5ad73789eb7745b2c46ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 31 Oct 2017 19:55:52 +0100 Subject: [PATCH] Please cherry-pick: - added support for local i18n string bundles which may be useful when the application itself has i18n keys that could be "dynamic" (entered by administrator) - all converters are now performing a CDI "lookup" and no EJB calls anymore which is nice for performance - PrimeFaces have an upcoming feature when scripts and maybe CSS can be bundled which improves load performance of the web application - but only with 6.2+ and with older versions this option is safely ignored - removed CSS class "input" and other "2-corner rouded" styles, they may return in form of an own theme? MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .gitignore | 3 ++ .../jfinancials/beans/BaseFinancialsBean.java | 12 ++++- .../FinancialsBasicCompanyDataConverter.java | 18 ++----- .../FinancialsBranchOfficeConverter.java | 18 ++----- .../FinancialsDepartmentConverter.java | 18 ++----- .../employee/FinancialsEmployeeConverter.java | 18 ++----- ...FinancialsCompanyOpeningTimeConverter.java | 18 ++----- .../contact/FinancialsContactConverter.java | 18 ++----- .../country/FinancialsCountryConverter.java | 18 ++----- .../fax/FinancialsFaxNumberConverter.java | 18 ++----- .../FinancialsLandLineNumberConverter.java | 18 ++----- .../FinancialsMobileNumberConverter.java | 18 ++----- .../FinancialsMobileProviderConverter.java | 17 ++----- .../user/FinancialsUserConverter.java | 17 ++----- .../FinancialsCompanyNameValidator.java | 16 ++---- .../FinancialsEmailAddressValidator.java | 16 ++---- .../user/FinancialsUserIdValidator.java | 16 ++---- .../localization/generic_de_DE.properties | 49 +++++++++---------- .../localization/generic_en_US.properties | 41 ++++++++-------- .../localization/local_xx_XX.properties-dist | 15 ++++++ .../contact/admin_form_contact_data.tpl | 20 ++++---- .../form_data/fax/admin_form_fax_data.tpl | 2 +- .../landline/admin_form_landline_data.tpl | 2 +- .../mobile/admin_form_mobile_data.tpl | 4 +- .../form_data/user/admin_form_user_data.tpl | 6 +-- .../admin/panel_grids/fax/admin_fax_data.tpl | 2 +- .../landline/admin_landline_data.tpl | 2 +- .../panel_grids/mobile/admin_mobile_data.tpl | 2 +- .../input/panel_grid/fax_input_panel_grid.tpl | 4 +- .../panel_grid/landline_input_panel_grid.tpl | 4 +- .../panel_grid/mobile_input_panel_grid.tpl | 2 +- .../tags/table_rows/fax_input_table_row.tpl | 4 +- .../table_rows/landline_input_table_row.tpl | 4 +- .../admin_form_basic_company_data.tpl | 36 ++++++++------ .../admin_form_branch_office_data.tpl | 16 +++--- .../admin/country/admin_form_country_data.tpl | 10 ++-- .../department/admin_form_department_data.tpl | 2 +- .../employee/admin_form_employee_data.tpl | 6 +-- .../admin_form_mobile_provider.tpl | 6 +-- web/WEB-INF/templates/base.tpl | 1 + .../templates/contact/form_contact_data.tpl | 22 ++++----- .../guest_email_address_repeat_fields.tpl | 4 +- .../templates/guest/user/guest_login_form.tpl | 4 +- .../register/guest_form_register_page1.tpl | 6 +-- .../register/guest_form_register_single.tpl | 6 +-- .../user/user_enter_current_password.tpl | 2 +- web/WEB-INF/web.xml | 5 ++ .../admin_basic_company_data_list.xhtml | 14 +++--- .../admin_branch_office_list.xhtml | 12 ++--- web/admin/contact/admin_contact_list.xhtml | 4 +- web/admin/country/admin_country_list.xhtml | 4 +- .../department/admin_department_list.xhtml | 14 +++--- web/admin/employee/admin_employee_list.xhtml | 10 ++-- web/admin/fax/admin_fax_list.xhtml | 2 +- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/mobile/admin_mobile_list.xhtml | 2 +- .../admin_mobile_provider_list.xhtml | 6 +-- .../admin_opening_time_list.xhtml | 4 +- web/admin/user/admin_user_delete.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 4 +- web/admin/user/admin_user_lock.xhtml | 2 +- web/guest/user/user_lost_password.xhtml | 4 +- web/guest/user/user_resend_link.xhtml | 2 +- web/resources/css/custom.css | 5 -- web/user/login_user_change_password.xhtml | 4 +- 65 files changed, 262 insertions(+), 401 deletions(-) create mode 100644 src/java/org/mxchange/localization/local_xx_XX.properties-dist diff --git a/.gitignore b/.gitignore index cf4a7c5b..22aa21b2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ nbproject/*~ /*.properties .~lock* .gitcommits + +# Local i18n strings +local_*.properties diff --git a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java index e28f2bd5..607a5b2e 100644 --- a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java +++ b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java @@ -17,6 +17,7 @@ package org.mxchange.jfinancials.beans; import java.util.Locale; +import java.util.MissingResourceException; import java.util.ResourceBundle; import org.mxchange.jcoreee.bean.faces.BaseFacesBean; @@ -46,12 +47,21 @@ public abstract class BaseFinancialsBean extends BaseFacesBean { if (BaseFacesBean.getBundles().isEmpty()) { // Load resource bundles, so it will be loaded from this JAR" // 1) Generic - ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale); + ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.generic", locale); BaseFacesBean.getBundles().add(bundle); // 2) Project-specific bundle = ResourceBundle.getBundle("org.mxchange.localization.project", locale); BaseFacesBean.getBundles().add(bundle); + + // Try the local file + try { + // 3) Local (not committed) + bundle = ResourceBundle.getBundle("org.mxchange.localization.local", locale); + BaseFacesBean.getBundles().add(bundle); + } catch (final MissingResourceException ex) { + // Cannot load it, it is okay here + } } } diff --git a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java index df40a8c2..83e5e504 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.business.basicdata; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException; import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsBasicCompanyDataConverter implements Converter public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (BASIC_DATA_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + BASIC_DATA_CONTROLLER = CDI.current().select(FinancialsBusinessDataWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java index 04e514c7..fe025081 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.business.branchoffice; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsBranchOfficeConverter implements Converter public BranchOffice getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (BRANCH_OFFICE_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - BRANCH_OFFICE_CONTROLLER = (FinancialsBranchOfficeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBranchOfficeWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + BRANCH_OFFICE_CONTROLLER = CDI.current().select(FinancialsBranchOfficeWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java b/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java index a09d3996..79ae0dc7 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.business.department; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundException; import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jfinancials.beans.business.department.FinancialsDepartmentWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsDepartmentConverter implements Converter { public Department getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (DEPARTMENT_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - DEPARTMENT_CONTROLLER = (FinancialsDepartmentWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsDepartmentWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + DEPARTMENT_CONTROLLER = CDI.current().select(FinancialsDepartmentWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java index 1e30c5c4..0c601060 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.business.employee; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jfinancials.beans.business.employee.FinancialsEmployeeWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsEmployeeConverter implements Converter { public Employable getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (EMPLOYEE_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - EMPLOYEE_CONTROLLER = (FinancialsEmployeeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsEmployeeWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + EMPLOYEE_CONTROLLER = CDI.current().select(FinancialsEmployeeWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java index fc2040e4..6afd11da 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.business.opening_time; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jfinancials.beans.business.opening_time.FinancialsOpeningTimeWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsCompanyOpeningTimeConverter implements Converter { public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (CONTACT_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName())); - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); - } + // Get bean from CDI directly + CONTACT_CONTROLLER = CDI.current().select(FinancialsContactWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java index 522a15df..e1fbde72 100644 --- a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.country; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcountry.exceptions.CountryNotFoundException; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jfinancials.beans.country.FinancialsCountryWebRequestBean; @@ -48,16 +44,8 @@ public class FinancialsCountryConverter implements Converter { public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (COUNTRY_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - COUNTRY_CONTROLLER = (FinancialsCountryWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsCountryWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N - } + // Get bean from CDI directly + COUNTRY_CONTROLLER = CDI.current().select(FinancialsCountryWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java index 4a053f09..9c4400ec 100644 --- a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java @@ -16,16 +16,12 @@ */ package org.mxchange.jfinancials.converter.fax; -import javax.faces.application.FacesMessage; +import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean; import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController; import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException; @@ -48,16 +44,8 @@ public class FinancialsFaxNumberConverter implements Converter { public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (USER_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName())); - } catch (final NamingException ex) { - // Throw it again - throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); - } + // Get bean from CDI directly + USER_CONTROLLER = CDI.current().select(FinancialsUserWebRequestBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java index 8d34d0cd..050ea27a 100644 --- a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java @@ -17,14 +17,12 @@ package org.mxchange.jfinancials.validator.business.basicdata; import java.text.MessageFormat; +import javax.enterprise.inject.spi.CDI; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean; import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController; @@ -51,16 +49,8 @@ public class FinancialsCompanyNameValidator extends BaseStringValidator { public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Is the instance there? if (BASIC_DATA_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); - } + // Get bean from CDI directly + BASIC_DATA_CONTROLLER = CDI.current().select(FinancialsBusinessDataWebRequestBean.class).get(); } // All accepted, required fields diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java index 7241549a..4e5a4313 100644 --- a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java @@ -18,14 +18,12 @@ package org.mxchange.jfinancials.validator.emailaddress; import java.text.MessageFormat; import java.util.regex.Pattern; +import javax.enterprise.inject.spi.CDI; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestBean; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; @@ -62,16 +60,8 @@ public class FinancialsEmailAddressValidator extends BaseStringValidator { public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Is the instance there? if (CONTACT_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName())); - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); - } + // Get bean from CDI directly + CONTACT_CONTROLLER = CDI.current().select(FinancialsContactWebRequestBean.class).get(); } // The required field diff --git a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java index 8ef3cd9d..741ad434 100644 --- a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java @@ -17,14 +17,12 @@ package org.mxchange.jfinancials.validator.user; import java.text.MessageFormat; +import javax.enterprise.inject.spi.CDI; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcoreee.validator.number.BaseNumberValidator; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestBean; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; @@ -51,16 +49,8 @@ public class FinancialsUserIdValidator extends BaseNumberValidator { public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Is the instance there? if (USER_CONTROLLER == null) { - try { - // Not yet, attempt lookup - final Context initial = new InitialContext(); - - // Lookup EJB - USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName())); - } catch (final NamingException ex) { - // Throw it again - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); - } + // Get bean from CDI directly + USER_CONTROLLER = CDI.current().select(FinancialsUserWebRequestBean.class).get(); } // All accepted, required fields diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index ac6b5bca..7b5ca976 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -287,7 +287,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl f\u00fcr Gespr\u00e4che ausserh ADMIN_ENTER_COUNTRY_PHONE_CODE=Vorwahl f\u00fcr das Land: ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Beispiel: 49 f\u00fcr Deutschland) BUTTON_ADMIN_ADD_COUNTRY=L\u00e4nderdaten hinzuf\u00fcgen -ADMIN_ID_NUMBER=Id-Nummer: +ADMIN_HEADER_ID_NUMBER=Id-Nummer: ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=L\u00e4ndercode: ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts: ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land: @@ -319,7 +319,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Beispiel: %s@smsmail.anbieter.examp ADMIN_LIST_MOBILE_PROVIDER_NAME=Name: ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Vorwahl: ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Land: -ADMIN_LIST_ENTRY_CREATED=Erstellt: +ADMIN_HEADER_ENTRY_CREATED=Erstellt: ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Editieren oder l\u00f6schen des Handyanbieters ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben: ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen: @@ -791,37 +791,36 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Auflisten von Stammdaten ADMIN_EMPTY_LIST_BASIC_COMPANY_DATA=Es befinden sich keine Stammdaten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. #@TODO Please fix German umlauts! TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=Diese Tabelle listet Stammdaten auf. -ADMIN_BASIC_COMPANY_DATA_ID=Id-Nummer: +ADMIN_HEADER_BASIC_COMPANY_DATA_ID=Id-Nummer: #@TODO Please fix German umlauts! ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Stammdaten des Unternehmens anzeigen. -ADMIN_ASSIGNED_USER=Zugew. Benutzer: +ADMIN_HEADER_ASSIGNED_USER=Zugew. Benutzer: ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen. ADMIN_LINK_ASSIGN=Zuweisen #@TODO Please fix German umlauts! ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen. -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname: -ADMIN_CONTACT_PERSON=Ansprechpartner: +ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Firmenname: +ADMIN_HEADER_COMPANY_CONTACT_PERSON=Ansprechpartner: ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist. ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Zuweisen #@TODO Please fix German umlauts! ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Weisst einen Mitarbeiter als Ansprechpartner des geschaftlichen Kontaktes zu. ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Zeigt das komplette Kontaktprofil an. -ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Anmerkungen: -ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Haupttelefonnummer: -ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Hauptfaxnummer: +ADMIN_BASIC_DATA_COMPANY_COMMENTS=Anmerkungen: +ADMIN_BASIC_DATA_PHONE_NUMBER=Haupttelefonnummer: +ADMIN_BASIC_DATA_FAX_NUMBER=Hauptfaxnummer: #@TODO Please fix German umlauts! ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Geschaeftlichen Kontakt hinzufuegen ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein. #@TODO Please fix German umlauts! ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format. #@TODO Please fix German umlauts! -ADMIN_BASIC_COMPANY_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt: +ADMIN_BASIC_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt: #@TODO Please fix German umlauts! -ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname: -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein. -ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH): -ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse: +ADMIN_BASIC_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. +ADMIN_BASIC_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein. +ADMIN_BASIC_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH): +ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse: #@TODO Please fix German umlauts! BUTTON_ADMIN_ADD_BASIC_COMPANY_DATA=Basisdaten hinzufuegen ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert. @@ -832,8 +831,8 @@ BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezei #@TODO Please fix German umlauts! ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen: ADMIN_FEATURE_UNFINISHED_WARNING=Diese Funktion ist noch nicht fertiggestellt. -ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Steuernummer: -ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Webseiten-URL: +ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER=Steuernummer: +ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL=Webseiten-URL: ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen: #@TODO Please fix German umlauts! ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO=Firmenlogo auswaehlen: @@ -845,12 +844,11 @@ ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE=Mitarbeiter als Kontakt ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Daten des Hauptsitzesz auswaehlen: LINK_COMPANY_WEBSITE_URL_TITLE=Link zur Unternehmenswebseite (neues Fenster) #@TODO Please fix German umlauts! -ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Gruender +ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Gruender #@TODO Please fix German umlauts! ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmensgruenders anzeigen. #@TODO Please fix German umlauts! ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Weisst diesem Firmeneintrag einen Unternehmensgruender zu. -ADMIN_BASIC_COMPANY_DATA_CREATED=Eintrag erstellt ADMIN_USER_NAME_IS_REQUIRED=Bitte vergeben Sie einen Benutzernamen. Dieser muss unique sein. NO_WEBSITE_URL_ENTERED=Keine URL eingegeben. ADMIN_LINK_LIST_BRANCH_OFFICES=Filialen @@ -916,7 +914,7 @@ ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer. ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Editieren von Grunddaten des Unternehmens. #@TODO Please fix German umlauts! ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens. -ADMIN_ACTION_LINKS=Aktionen: +ADMIN_HEADER_ACTION_LINKS=Aktionen: ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Erneut ADMIN_LINK_UNLOCK_SHORT=Entsperren ADMIN_LINK_LOCK_SHORT=Sperren @@ -951,11 +949,11 @@ ADMIN_LIST_MOBILE_PROVIDERS_HEADER=Liste aller Mobilfunkanbieter SELECT_SHOWN_COLUMNS=Angezeigte Spalten ADMIN_LIST_BRANCH_OFFICES_HEADER=Alle Filialen auflisten LABEL_USERS=Benutzer -FILTER_BY_MULTIPLE_USERS_TITLE=Liste durch Auswahl von ein oder mehr Benutzern durchsuchen. +FILTER_BY_MULTIPLE_USERS_TITLE=Liste durch Auswahl von ein oder mehr Benutzern filtern. LABEL_COMPANIES=Unternehmen -FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen durchsuchen. +FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen filtern. LABEL_EMPLOYEES=Mitarbeiter -FILTER_BY_MULTIPLE_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter durchsuchen. +FILTER_BY_MULTIPLE_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter filtern. ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Filialnummer eingeben: #@TODO Please fix German umlauts! ADMIN_SELECT_BRANCH_OFFICE=Filiale auswaehlen: @@ -1027,7 +1025,7 @@ ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Loescht die Abteilung ADMIN_DEPARTMENT_ALREADY_CREATED=Die Abteilung existiert bereits im ausgewaehlten Unternehmen. ADMIN_LIST_DEPARTMENTS_HEADER=Alle Abteilungen auflisten #@TODO Please fix German umlauts! -ADMIN_DEPARTMENT_I18N_KEY=Sprachschluessel: +ADMIN_HEADER_I18N_KEY=Sprachschluessel: ADMIN_ENTER_DEPARTMENT_I18N_KEY=Sprachschluessel fuer Abteilung: ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Abteilungsleiter: ADMIN_ADD_DEPARTMENT_TITLE=Neue Abteilung hinzuf\u00fcgen @@ -1053,7 +1051,7 @@ TABLE_SUMMARY_ADMIN_LIST_OPENING_TIMES=Diese Tabelle listet alle bereits angeleg #@TODO Please fix German umlauts! ADMIN_EMPTY_LIST_OPENING_TIMES=Es befinden sich keine Oeffnungszeiten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. LABEL_WEEK_DAYS=Wochentage -FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE=Liste durch Auswahl von ein oder mehr Wochentagen durchsuchen. +FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE=Liste durch Auswahl von ein oder mehr Wochentagen filtern. #@TODO Please fix German umlauts! ADMIN_LIST_OPENING_TIMES_HEADER=Liste aller Oeffnungszeiten ADMIN_START_WEEK_DAY=Start-Wochentag: @@ -1096,3 +1094,4 @@ ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND=Einzelne Oeffnungzeit der Filiale: ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE=Geben Sie hier eine einzelne Oeffnungszeit der Filiale ein. #@TODO Please fix German umlauts! ADMIN_OPENING_TIME_ALREADY_CREATED=Die Oeffnungzeit wurde bereits hinzugefuegt. +ADMIN_NOT_ASSIGNED=Nicht zugewiesen diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 22c600b8..1f343143 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -265,7 +265,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Prefix for calls outside local city: (m ADMIN_ENTER_COUNTRY_PHONE_CODE=Dial prefix for this country: ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Example: 1 for U.S.A.) BUTTON_ADMIN_ADD_COUNTRY=Add country data -ADMIN_ID_NUMBER=Id number: +ADMIN_HEADER_ID_NUMBER=Id number: ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=Country code: ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside: ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country: @@ -297,7 +297,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Example: %s@smsmail.provider.exampl ADMIN_LIST_MOBILE_PROVIDER_NAME=Name: ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Dial prefix: ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Country: -ADMIN_LIST_ENTRY_CREATED=Created: +ADMIN_HEADER_ENTRY_CREATED=Created: ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Edit or delete mobile provider ADMIN_USER_DATA_ENTER_PASSWORD=Enter password: ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password: @@ -771,31 +771,30 @@ PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=List basic company data CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Lists basic company data ADMIN_EMPTY_LIST_BASIC_COMPANY_DATA=There are currently no basic company data in database. Or your search criteria doesn't match anything. TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=This table lists all basic company data. -ADMIN_BASIC_COMPANY_DATA_ID=Id Number: +ADMIN_HEADER_BASIC_COMPANY_DATA_ID=Id Number: ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Show details of this business contact. -ADMIN_ASSIGNED_USER=Assigned user: +ADMIN_HEADER_ASSIGNED_USER=Assigned user: ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Shows assigned user profile. ADMIN_LINK_ASSIGN=Assign ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account. -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name: -ADMIN_CONTACT_PERSON=Contact person: +ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Company name: +ADMIN_HEADER_COMPANY_CONTACT_PERSON=Contact person: ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Shows a single employee entry who has been assigned as contact person. ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Assign ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Assigns an employee as a contact person for given business contact. ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Shows complete contact profile. -ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Comments: -ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Main phone number: -ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Main fax number: +ADMIN_BASIC_DATA_COMPANY_COMMENTS=Comments: +ADMIN_BASIC_DATA_PHONE_NUMBER=Main phone number: +ADMIN_BASIC_DATA_FAX_NUMBER=Main fax number: ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Add new business contact ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Please enter at least company name including legal status. ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid. -ADMIN_BASIC_COMPANY_DATA_LEGEND=Basic data for business contact: +ADMIN_BASIC_DATA_LEGEND=Basic data for business contact: #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. -ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Enter basic data for a business contact. -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name: -ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status. -ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.): -ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Main email address: +ADMIN_BASIC_DATA_LEGEND_TITLE=Enter basic data for a business contact. +ADMIN_BASIC_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status. +ADMIN_BASIC_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.): +ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS=Main email address: BUTTON_ADMIN_ADD_BASIC_COMPANY_DATA=Add basic data #Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert. ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Wrong request on registration page as the index page serves as registration page. @@ -803,18 +802,17 @@ BUTTON_CHANGE_LOCALE=Change BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output. ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Choose company founder: ADMIN_FEATURE_UNFINISHED_WARNING=This feature is not yet finished. -ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Tax number: -ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Website URL: +ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER=Tax number: +ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL=Website URL: ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Select user to assign with company: ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO=Choose company logo: URL_NOT_MATCHING_REGULAR_EXPRESSION=The entered URL does not match the common form. ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE=Choose employee as contact person: ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Choose headquarters: LINK_COMPANY_WEBSITE_URL_TITLE=Link to company's web site (new window) -ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Founder +ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Founder ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder. ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry. -ADMIN_BASIC_COMPANY_DATA_CREATED=Entry created ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique. NO_WEBSITE_URL_ENTERED=No URL entered. ADMIN_LINK_LIST_BRANCH_OFFICES=Branch offices @@ -868,7 +866,7 @@ ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Deletes a fax number. ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of a fax number. ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company. ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company. -ADMIN_ACTION_LINKS=Actions: +ADMIN_HEADER_ACTION_LINKS=Actions: ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Resend ADMIN_LINK_UNLOCK_SHORT=Unlock ADMIN_LINK_LOCK_SHORT=Lock @@ -954,7 +952,7 @@ ADMIN_LINK_EDIT_DEPARTMENT_TITLE=Edit of a department ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Deletes a department. ADMIN_DEPARTMENT_ALREADY_CREATED=The department already exists in selected company. ADMIN_LIST_DEPARTMENTS_HEADER=List all departments -ADMIN_DEPARTMENT_I18N_KEY=I18n key: +ADMIN_HEADER_I18N_KEY=I18n key: ADMIN_ENTER_DEPARTMENT_I18N_KEY=I18n key for department: ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Department leader: ADMIN_ADD_DEPARTMENT_TITLE=Add new department @@ -1006,3 +1004,4 @@ BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME=Add opening time to branch office ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND=Single opening time of branch office: ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE=Enter single opening time of branch office. ADMIN_OPENING_TIME_ALREADY_CREATED=The opening time has already been added. +ADMIN_NOT_ASSIGNED=Not assigned diff --git a/src/java/org/mxchange/localization/local_xx_XX.properties-dist b/src/java/org/mxchange/localization/local_xx_XX.properties-dist new file mode 100644 index 00000000..ca622629 --- /dev/null +++ b/src/java/org/mxchange/localization/local_xx_XX.properties-dist @@ -0,0 +1,15 @@ +# Copyright (C) 2016, 2017 Roland H\u00e4der +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl index 57ccb99c..d29069f0 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl @@ -16,32 +16,32 @@ - + - + - + - + - + - + - + - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl index c7f5137c..9d88fff9 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl @@ -15,7 +15,7 @@
- +
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl index bda5f4c8..a185be6c 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl @@ -15,7 +15,7 @@
- +
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl index 4637f5dd..a5f194d5 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl @@ -15,7 +15,7 @@
- +
@@ -54,7 +54,7 @@
- +
diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl index 8f38ce10..a986d6cd 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl @@ -14,13 +14,13 @@ - + - + - + diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl index cc9b16cc..f6dace4c 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl @@ -18,7 +18,7 @@ - + diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl index 81292c97..b29634e1 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl @@ -18,7 +18,7 @@ - + diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl index a61cddcb..9152d8fa 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl @@ -17,7 +17,7 @@ - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl index 2f878ff2..6b3f8925 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl @@ -9,11 +9,11 @@ - + - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl index fda61234..4c75c4be 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl @@ -9,11 +9,11 @@ - + - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl index 237d5902..e8a03909 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl @@ -17,7 +17,7 @@ - + diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl index 64a4ddc6..c8863cb1 100644 --- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl @@ -11,10 +11,10 @@ - + - + diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl index a017c5f1..a3138286 100644 --- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl @@ -11,10 +11,10 @@ - + - + diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl index 036d19cc..5f98fa82 100644 --- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl +++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl @@ -1,6 +1,6 @@ - + - - + + - - + + @@ -28,11 +35,11 @@ diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl index 3cfbf3f1..dd6db170 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl @@ -50,7 +50,7 @@ - + @@ -62,37 +62,37 @@ - + - + - + - + - + - + - + diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl index cfe51e9f..d4980f53 100644 --- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl +++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl @@ -22,7 +22,7 @@
- +
@@ -38,7 +38,7 @@
- + @@ -56,7 +56,7 @@
- +
@@ -89,7 +89,7 @@
- +
@@ -105,7 +105,7 @@
- + diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl index 750eff43..add54f3f 100644 --- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl +++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl @@ -11,7 +11,7 @@ - + - + - + @@ -79,7 +79,7 @@ - +
- +
@@ -39,7 +39,7 @@
- +
@@ -51,7 +51,7 @@
- +
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index c5c008f1..bccd00b2 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -22,6 +22,7 @@ + diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 1798080f..34dbce39 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -25,7 +25,7 @@
- +
@@ -41,7 +41,7 @@
- +
@@ -57,7 +57,7 @@
- +
@@ -73,7 +73,7 @@
- +
@@ -89,7 +89,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -119,7 +119,7 @@
- +
@@ -170,11 +170,11 @@
- + - +
@@ -196,11 +196,11 @@
- + - +
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl index da53f249..15d23776 100644 --- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl @@ -12,7 +12,7 @@
- +
@@ -28,7 +28,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl index 01c94d24..05d2b7de 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -24,7 +24,7 @@
- +
@@ -38,7 +38,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index 1f1bb430..9f549db4 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -25,7 +25,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index 924a5103..f5f92bbf 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -27,7 +27,7 @@
- +
@@ -47,7 +47,7 @@
- +
@@ -61,7 +61,7 @@
- +
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl index 1410005c..347ce37a 100644 --- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl +++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl @@ -18,7 +18,7 @@
- +
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 3e85fbc2..05145151 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -12,6 +12,11 @@ primefaces.THEME bootstrap + + Whether PrimeFaces should collect all scripts and bundle it automatically. + primefaces.COLLECT_SCRIPTS + true + Refresh perioid of facelets. javax.faces.FACELETS_REFRESH_PERIOD diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml index f75eb4fa..3f1fb166 100644 --- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml +++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml @@ -47,13 +47,13 @@ - + - + - + @@ -86,7 +86,7 @@ - + - + - + - + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index bac9b466..01d31d8a 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -47,13 +47,13 @@ - + - + - + - + - + - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index f0cce0ac..cab7c664 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index f74bb080..3b7aff02 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -30,7 +30,7 @@ > - + @@ -64,7 +64,7 @@ - + diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index e1a7ce90..a019fee0 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -47,17 +47,17 @@ - + - - + + - + - + - + - + diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml index 73b19972..12f307b9 100644 --- a/web/admin/employee/admin_employee_list.xhtml +++ b/web/admin/employee/admin_employee_list.xhtml @@ -47,7 +47,7 @@ - + @@ -78,7 +78,7 @@ - + - + - + - + diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index 787415fb..46db0f3e 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -28,7 +28,7 @@ > - + diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index 0b0d87de..f2a19b6b 100644 --- a/web/admin/landline/admin_landline_list.xhtml +++ b/web/admin/landline/admin_landline_list.xhtml @@ -28,7 +28,7 @@ > - + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index f224219b..d1c6fef2 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -28,7 +28,7 @@ > - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index b9f44055..89752965 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -44,7 +44,7 @@ - + @@ -81,13 +81,13 @@ - + - + diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml index de7973ff..420f0c60 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -47,7 +47,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index bf764c23..cdb85009 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -46,7 +46,7 @@
- +
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 54f122a8..fdd0c140 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -132,13 +132,13 @@ - + - + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index f6cd92b7..2e20cc4e 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -70,7 +70,7 @@
- +
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index c1a04a22..1da2041d 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -37,7 +37,7 @@
- +
@@ -51,7 +51,7 @@
- +
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index cbbe9069..db76dc5c 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -35,7 +35,7 @@
- +
diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css index e53c08d3..0c03ee1a 100644 --- a/web/resources/css/custom.css +++ b/web/resources/css/custom.css @@ -234,11 +234,6 @@ ul.navbar-horizontal li.footer-copyright { border: 1px solid grey; } -#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset { - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; -} - #menu-content-wrapper { overflow: auto; } diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 3c946f6d..490c7a44 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -42,7 +42,7 @@
- +
@@ -56,7 +56,7 @@
- +
-- 2.39.5