Please cherry-pick:

- tax nunber and website URL of a company is not required, was a copy-paste
  mistake anyway
- fixed other i18n strings in same template
- added missing i18n strings
- minor: removed double space

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index e8015afe219f2abdb412f717b75b9303c0f9ca6e..19256c2bfecbab921b7170e2c67233f5742b120b 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -899,3 +899,11 @@ BUTTON_CHANGE_LOCALE=Aendern
 #@TODO Please fix German umlauts!
 BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezeigte Sprache.
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Fehler: Parameter "labelMessage" nicht gesetzt.
+#@TODO Please fix German umlauts!
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
+ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=Das Hochladen des Firmenlogos ist noch nicht fertig gestellt.
+ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Steuernummer:
+ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
+#@TODO Please fix German umlauts!
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO=Firmenlogo auswaehlen:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 3f687e36836c02c202d08e704fb502381916647b..a98b1dbc4cb788656056e4139c3574a7ee9d3b2f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -874,3 +874,9 @@ ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Wrong request on registration p
 BUTTON_CHANGE_LOCALE=Change
 BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output.
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Error: Parameter "labelMessage" not set.
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Choose company founder:
+ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=The upload of the company logo is currently unfinished.
+ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Tax number:
+ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Website URL:
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Select user to assign with company:
+ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO=Choose company logo:

diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
index 4436316aeff5783bed1797790c1fbea20bbda5ea..3b0981e044ba327a487c303fdb0010f780220575 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
@@ -10,7 +10,7 @@
 
        <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
 
-       <ui:fragment rendered="#{not empty targetController and not empty labelMessage  and (empty rendered or rendered)}">
+       <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
                <h:panelGroup styleClass="table_row" layout="block">
                        <div class="table_left_medium">
                                <h:outputLabel for="mobileNumber" value="#{labelMessage}" />

diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
index adce3cb013ade45b0d351019edec8eb03be67a17..4a462acb40e9fb28532fc2e6c8ee11413671505a 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
@@ -8,7 +8,7 @@
 
        <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
 
-       <ui:fragment rendered="#{not empty targetController  and (empty rendered or rendered)}">
+       <ui:fragment rendered="#{not empty targetController and (empty rendered or rendered)}">
                <h:panelGroup styleClass="table_row" layout="block">
                        <div class="table_left_medium">
                                <h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />

diff --git a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
index 12190a6e8836911c6b9c30dca11e1217dddc271c..fb4cf8ad57cc3aa9c8be6480383d897cff504bba 100644 (file)
--- a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
@@ -48,7 +48,7 @@
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER}" />
+                                       <h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO}" />
                                </div>
 
                                <div class="table_right_medium">
@@ -68,7 +68,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminBusinessDataController.companyTaxNumber}" />
+                                       <h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminBusinessDataController.companyTaxNumber}" />
                                </div>
 
                                <div class="clear"></div>
@@ -84,7 +84,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminBusinessDataController.companyWebsiteUrl}" />
+                                       <h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminBusinessDataController.companyWebsiteUrl}" />
                                </div>
 
                                <div class="clear"></div>
@@ -96,7 +96,7 @@
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="contactCompanyUserOwner" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER}" />
+                                       <h:outputLabel for="contactCompanyUserOwner" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER}" />
                                </div>
 
                                <div class="table_right_medium">