From 2eb42e0281e985b57f9cb9d9e3b750c20e73d69b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 28 Oct 2017 18:34:03 +0200 Subject: [PATCH] Please cherry-pick: - renamed bundle -> generic as this is no longer the only language bundle - renamed namespace from widgets to core as also other custom widgets (JSF tags) may come MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...e_de_DE.properties => generic_de_DE.properties} | 0 ...e_en_US.properties => generic_en_US.properties} | 0 .../form_data/contact/admin_form_contact_data.tpl | 12 ++++++------ .../admin/form_data/fax/admin_form_fax_data.tpl | 4 ++-- .../landline/admin_form_landline_data.tpl | 4 ++-- .../form_data/mobile/admin_form_mobile_data.tpl | 2 +- .../admin/form_data/user/admin_form_user_data.tpl | 2 +- .../links/mini/country/admin_country_links.tpl | 2 +- .../tags/admin/links/mini/fax/admin_fax_links.tpl | 2 +- .../links/mini/landline/admin_landline_links.tpl | 2 +- .../admin/links/mini/mobile/admin_mobile_links.tpl | 2 +- .../admin_mobile_provider_links.tpl | 2 +- .../tags/admin/panel_grids/fax/admin_fax_data.tpl | 1 - .../panel_grids/landline/admin_landline_data.tpl | 1 - .../admin/panel_grids/mobile/admin_mobile_data.tpl | 1 - .../tags/input/panel_grid/fax_input_panel_grid.tpl | 6 +++--- .../input/panel_grid/landline_input_panel_grid.tpl | 6 +++--- .../tags/profile/user/user_profile_link.tpl | 4 ++-- .../tags/table_rows/fax_input_table_row.tpl | 4 ++-- .../tags/table_rows/landline_input_table_row.tpl | 4 ++-- .../admin_form_basic_company_data.tpl | 8 ++++---- .../admin_form_branch_office_data.tpl | 8 ++++---- .../branch_office/admin_form_opening_time.tpl | 2 +- .../admin/contact/admin_show_contact_data.tpl | 4 ++-- .../department/admin_form_department_data.tpl | 2 +- .../admin/employee/admin_form_employee_data.tpl | 4 ++-- .../templates/admin/fax/admin_fax_add_show.tpl | 6 +++--- .../admin/fax/admin_form_add_contact_fax.tpl | 6 +++--- .../landline/admin_form_add_contact_landline.tpl | 6 +++--- .../admin/landline/admin_landline_add_show.tpl | 6 +++--- .../admin/mobile/admin_form_add_contact_mobile.tpl | 6 +++--- .../admin/mobile/admin_mobile_add_show.tpl | 6 +++--- .../mobile_provider/admin_form_mobile_provider.tpl | 4 ++-- .../admin/opening_time/admin_form_opening_time.tpl | 2 +- .../admin/user/admin_form_user_personal_data.tpl | 6 +++--- .../templates/admin/user/admin_show_user_data.tpl | 4 ++-- .../admin/user/admin_show_user_data_mini.tpl | 4 ++-- web/WEB-INF/templates/base.tpl | 2 +- .../templates/contact/form_contact_data.tpl | 14 +++++++------- web/WEB-INF/templates/login/user/user_base.tpl | 4 ++-- .../admin_basic_company_data_list.xhtml | 2 +- .../branch_office/admin_branch_office_list.xhtml | 2 +- web/admin/contact/admin_contact_delete.xhtml | 4 ++-- web/admin/contact/admin_contact_edit.xhtml | 6 +++--- web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 4 ++-- web/admin/contact/admin_contact_show.xhtml | 4 ++-- .../contact/unlink/admin_contact_fax_unlink.xhtml | 8 ++++---- .../unlink/admin_contact_landline_unlink.xhtml | 8 ++++---- .../unlink/admin_contact_mobile_unlink.xhtml | 8 ++++---- web/admin/department/admin_department_list.xhtml | 2 +- web/admin/employee/admin_employee_list.xhtml | 2 +- web/admin/fax/admin_fax_delete.xhtml | 6 +++--- web/admin/fax/admin_fax_edit.xhtml | 6 +++--- web/admin/fax/admin_fax_list.xhtml | 2 +- web/admin/fax/admin_fax_show.xhtml | 4 ++-- web/admin/landline/admin_landline_delete.xhtml | 6 +++--- web/admin/landline/admin_landline_edit.xhtml | 6 +++--- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 4 ++-- web/admin/mobile/admin_mobile_delete.xhtml | 6 +++--- web/admin/mobile/admin_mobile_edit.xhtml | 6 +++--- web/admin/mobile/admin_mobile_list.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 4 ++-- .../opening_time/admin_opening_time_list.xhtml | 2 +- web/admin/user/admin_user_activity_log.xhtml | 4 ++-- web/admin/user/admin_user_delete.xhtml | 4 ++-- web/admin/user/admin_user_edit.xhtml | 6 +++--- web/admin/user/admin_user_export.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 2 +- web/admin/user/admin_user_lock.xhtml | 4 ++-- .../user/admin_user_resend_confirmation_link.xhtml | 4 ++-- web/admin/user/admin_user_show.xhtml | 4 ++-- web/admin/user/admin_user_unlock.xhtml | 4 ++-- web/guest/user/user_confirm_account.xhtml | 6 +++--- web/guest/user/user_list.xhtml | 4 ++-- web/guest/user/user_login.xhtml | 4 ++-- web/guest/user/user_lost_password.xhtml | 4 ++-- web/guest/user/user_profile.xhtml | 8 ++++---- web/guest/user/user_register.xhtml | 6 +++--- web/guest/user/user_register_done.xhtml | 4 ++-- web/guest/user/user_register_page2.xhtml | 4 ++-- web/guest/user/user_resend_done.xhtml | 4 ++-- web/guest/user/user_resend_link.xhtml | 4 ++-- web/user/login_contact_data_saved.xhtml | 6 +++--- web/user/login_data_saved.xhtml | 4 ++-- web/user/login_user_change_email_address.xhtml | 4 ++-- web/user/login_user_change_password.xhtml | 6 +++--- web/user/login_user_change_personal_data.xhtml | 4 ++-- web/user/login_user_contact_data_saved.xhtml | 6 +++--- web/user/login_user_data_saved.xhtml | 4 ++-- 91 files changed, 193 insertions(+), 196 deletions(-) rename src/java/org/mxchange/localization/{bundle_de_DE.properties => generic_de_DE.properties} (100%) rename src/java/org/mxchange/localization/{bundle_en_US.properties => generic_en_US.properties} (100%) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties similarity index 100% rename from src/java/org/mxchange/localization/bundle_de_DE.properties rename to src/java/org/mxchange/localization/generic_de_DE.properties diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties similarity index 100% rename from src/java/org/mxchange/localization/bundle_en_US.properties rename to src/java/org/mxchange/localization/generic_en_US.properties 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 d0cce9ad..a3e3da2e 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 @@ -1,7 +1,7 @@ - + @@ -44,16 +44,16 @@ - + - + - + - + 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 8a8d2c01..c7f5137c 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 @@ -1,7 +1,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 2453119c..bda5f4c8 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 @@ -1,7 +1,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 6589d2cb..4637f5dd 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 @@ -1,7 +1,7 @@ - - + + 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 517ebe42..fda61234 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 @@ -1,13 +1,13 @@ - - + + diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl index 38a6f1bb..1c2d1016 100644 --- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl +++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl @@ -1,13 +1,13 @@ - + 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 5d7bbcba..64a4ddc6 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 @@ -1,7 +1,7 @@ @@ -10,7 +10,7 @@ - + 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 c61aac21..a017c5f1 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 @@ -1,7 +1,7 @@ @@ -10,7 +10,7 @@ - + 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 b7ffdec1..51cb1094 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,7 +1,7 @@ - diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl index b64846ec..240aa491 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_opening_time.tpl @@ -1,7 +1,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 cb76dbc6..1eb97de6 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 @@ -1,7 +1,7 @@ - + diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl index 2492f9da..2d5dc78e 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl @@ -1,16 +1,16 @@ - + - + diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index 671722d5..3d69f03b 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -1,13 +1,13 @@ - + @@ -37,7 +37,7 @@ - + - + - +
- + @@ -194,7 +194,7 @@
- + @@ -215,7 +215,7 @@ - + @@ -225,7 +225,7 @@ - +
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index 003c28b1..8950ed2d 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -2,7 +2,7 @@ @@ -15,7 +15,7 @@ - + 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 ac3f5c4f..c4509108 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 @@ -1,7 +1,7 @@ - + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index ddae0a2f..ad35c2b9 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@
- +
- +
- +
- +
- +
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index aaa6a208..5875d50e 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@
- +
- +
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 8eecabeb..83861bd9 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@
- +
- +
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 975a7dc9..a58dcc1d 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@
- + - +