From 88e65d6fa91bf1c3e60faff005ab93a844bbdf0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Aug 2016 17:52:18 +0200 Subject: [PATCH] Continued with i18n: - added _NUMBER to most phone-number related stuff - added missing i18n strings for fax/land-line --- .../localization/bundle_de_DE.properties | 38 ++++++++++++------- .../localization/bundle_en_US.properties | 38 ++++++++++++------- .../admin/fax/admin_form_fax_data.tpl | 4 +- .../landline/admin_form_landline_data.tpl | 4 +- .../admin/mobile/admin_form_mobile_data.tpl | 4 +- web/admin/fax/admin_fax_edit.xhtml | 8 ++-- web/admin/landline/admin_landline_edit.xhtml | 10 +++-- web/admin/mobile/admin_mobile_delete.xhtml | 6 +-- web/admin/mobile/admin_mobile_edit.xhtml | 10 +++-- web/admin/mobile/admin_mobile_list.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 4 +- 11 files changed, 79 insertions(+), 49 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 89cce75e..6d511c0f 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -406,18 +406,18 @@ ADMIN_LINK_DELETE_SHORT=L\u00f6schen ADMIN_LINK_DELETE_SHORT_TITLE=Eintrag l\u00f6schen. ADMIN_LINK_UNLINK_SHORT=Abtrennen ADMIN_LINK_UNLINK_SHORT_TITLE=Entfernt Verkn\u00fcpfung zum Eintrag. -PAGE_TITLE_ADMIN_DELETE_MOBILE=Mobiletelefoneintrag l\u00f6schen -CONTENT_TITLE_ADMIN_DELETE_MOBILE=Mobiletelefoneintrag l\u00f6schen: -PAGE_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren -CONTENT_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren: -PAGE_TITLE_ADMIN_SHOW_MOBILE=Mobiletelefoneintrag anzeigen -CONTENT_TITLE_ADMIN_SHOW_MOBILE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes: +PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Mobiletelefoneintrag l\u00f6schen +CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Mobiletelefoneintrag l\u00f6schen: +PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Mobiletelefoneintrag editieren +CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Mobiletelefoneintrag editieren: +PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER=Mobiletelefoneintrag anzeigen +CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER=Anzeigen eines Mobiltelefoneintrags eines Kontaktes: PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon: ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen: -TABLE_SUMMARY_ADMIN_SHOW_MOBILE=Ein einzelner Mobiletelefoneintrag. +TABLE_SUMMARY_ADMIN_SHOW_MOBILE_NUMBER=Ein einzelner Mobiletelefoneintrag. TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. ADMIN_HEADER_SHOW_MOBILE_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt. @@ -598,25 +598,25 @@ CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren: ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt. ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Fehler: Instanz 'mobile' in Bean-Helper nicht gesetzt. -CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=Mobiltelefonnummern auflisten: +CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Mobiltelefonnummern auflisten: ADMIN_LIST_MOBILE_EMPTY=Es sind keine Mobilfunknummern gespeichert. ADMIN_MENU_PHONE_NUMBERS_TITLE=Telefonnummern: LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Handynummern ... LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE=Alle Mobilfunknummern auflisten. ADMIN_SHOW_PHONE_CREATED=Erstellt: ADMIN_SHOW_PHONE_UPDATED=Zuletzt ge\u00e4ndert: -ADMIN_EDIT_MOBILE_TITLE=Mobiltelefoneintrag editieren: -ADMIN_MOBILE_DATA_LEGEND=Mobiltelefonnummerdaten editeren: +ADMIN_EDIT_MOBILE_NUMBER_TITLE=Mobiltelefoneintrag {0} editieren: +ADMIN_MOBILE_NUMBER_DATA_LEGEND=Mobiltelefonnummerdaten editeren: ADMIN_EDIT_MOBILE_PROVIDER=Mobilfunkanbieter \u00e4ndern: ADMIN_EDIT_MOBILE_NUMBER=Rufnummer \u00e4ndern: -BUTTON_ADMIN_EDIT_MOBILE=Mobiltelefonnumer \u00e4ndern +BUTTON_ADMIN_EDIT_MOBILE_NUMBER=Mobiltelefonnumer \u00e4ndern ADMIN_LINK_LOCK_USER=Benutzeraccount sperren ADMIN_LINK_LOCK_USER_TITLE=Sperren von freigeschalteten Benutzeraccounts, mit Angabe eines Sperrgrundes. -ADMIN_MOBILE_DATA_LEGEND_TITLE=Mobilfunknummer und -anbieter ab\u00e4ndern. +ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE=Daten der Mobilfunknummer und des Mobilfunkanbieters. ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren, da es noch nicht best\u00e4tigt ist. ADMIN_MOBILE_PROVIDER_REQUIRED=Bitte einen Mobilfunkanbieter ausw\u00e4hlen. ADMIN_MOBILE_NUMBER_REQUIRED=Bitte Mobilfunknummer angeben. -BUTTON_ADMIN_DELETE_MOBILE=Mobilfunknummer l\u00f6schen +BUTTON_ADMIN_DELETE_MOBILE_NUMBER=Mobilfunknummer l\u00f6schen ADMIN_DELETE_MOBILE_DATA_NOTICE=Wenn Sie die Mobilfunknummer l\u00f6schen, steht diese nicht mehr im System zur Verf\u00fcgung. Bitte \u00fcberlegen Sie genau, ob Sie dies wollen. ADMIN_DELETE_MOBILE_TITLE=Wollen Sie die Mobilfunknummer wirklich l\u00f6schen? ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI=Die Tabelle enth\u00e4lt die wichtigsten Daten zum Konakt (minimalisierte Ansicht). @@ -689,3 +689,15 @@ ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET=Fehler: Instanz 'faxNumber' in Bean-Helper PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Faxnummer vom Kontakt abtrennen CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Faxnummer vom Kontakt abtrennen: ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE=Wollen Sie wirklich die Faxnummer vom Kontakt abtrennen? +PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER=Festnetznummer \u00e4ndern +CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER=Festnetznummer \u00e4ndern: +PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER=Faxnummer editieren +CONTENT_TITLE_ADMIN_EDIT_FAX_NUMBER=Faxnummer editieren: +ADMIN_EDIT_LAND_LINE_NUMBER_TITLE=Festnetznummer {0} editieren: +ADMIN_EDIT_FAX_NUMBER_TITLE=Faxnummer {0} editieren: +ADMIN_LAND_LINE_NUMBER_DATA_LEGEND=Daten der Festnetznummer: +ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE=Daten der Festnetznummer. +ADMIN_FAX_NUMBER_DATA_LEGEND=Daten der Faxnummer: +ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE=Daten der Faxnummer. +ADMIN_EDIT_LAND_LINE_NUMBER=Festnetznummer \u00e4ndern: +ADMIN_EDIT_FAX_NUMBER=Faxnummer \u00e4ndern: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index f9e28eea..6039ab38 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -389,18 +389,18 @@ ADMIN_LINK_DELETE_SHORT=Delete ADMIN_LINK_DELETE_SHORT_TITLE=Delete entry. ADMIN_LINK_UNLINK_SHORT=Unlink ADMIN_LINK_UNLINK_SHORT_TITLE=Removes link to entry. -PAGE_TITLE_ADMIN_DELETE_MOBILE=Delete mobile entry -CONTENT_TITLE_ADMIN_DELETE_MOBILE=Delete mobile entry: -PAGE_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry -CONTENT_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry: -PAGE_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry -CONTENT_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry: +PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Delete mobile entry +CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER=Delete mobile entry: +PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Edit mobile entry +CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER=Edit mobile entry: +PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER=Show mobile entry +CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER=Show mobile entry: PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Remove link contact-mobile CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER=Remove link between contact-mobile: ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider: -TABLE_SUMMARY_ADMIN_SHOW_MOBILE=A single mobile entry. +TABLE_SUMMARY_ADMIN_SHOW_MOBILE_NUMBER=A single mobile entry. TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=This table shows links of of this mobile number to all contacts. ADMIN_HEADER_SHOW_MOBILE_LINKS=All links for mobile number id {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set. @@ -598,25 +598,25 @@ CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account: ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Error: Instance 'contact' not set in bean helper. ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Error: Instance 'mobile' in bean helper not set. -CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=List mobile phone numbers: +CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=List mobile phone numbers: ADMIN_LIST_MOBILE_EMPTY=No mobile numbers are saved. ADMIN_MENU_PHONE_NUMBERS_TITLE=Phone numbers: LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Mobile numbers ... LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE=List all mobile numbers. ADMIN_SHOW_PHONE_CREATED=Created: ADMIN_SHOW_PHONE_UPDATED=Last changed: -ADMIN_EDIT_MOBILE_TITLE=Edit mobile entry: -ADMIN_MOBILE_DATA_LEGEND=Edit mobile data: +ADMIN_EDIT_MOBILE_NUMBER_TITLE=Edit mobile entry {0}: +ADMIN_MOBILE_NUMBER_DATA_LEGEND=Edit mobile data: ADMIN_EDIT_MOBILE_PROVIDER=Change mobile phone provider: ADMIN_EDIT_MOBILE_NUMBER=Change call number: -BUTTON_ADMIN_EDIT_MOBILE=Edit mobile number +BUTTON_ADMIN_EDIT_MOBILE_NUMBER=Edit mobile number ADMIN_LINK_LOCK_USER=Lock user account ADMIN_LINK_LOCK_USER_TITLE=Locking of confirmed user account with lock reason. -ADMIN_MOBILE_DATA_LEGEND_TITLE=Change mobile number and provider. +ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE=Data of mobile number and provider. ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock user account, it is still unconfirmed. ADMIN_MOBILE_PROVIDER_REQUIRED=Please choose a mobile provider. ADMIN_MOBILE_NUMBER_REQUIRED=Please enter a mobile number. -BUTTON_ADMIN_DELETE_MOBILE=Delete mobile number +BUTTON_ADMIN_DELETE_MOBILE_NUMBER=Delete mobile number ADMIN_DELETE_MOBILE_DATA_NOTICE=If you delete the mobile number, it won't be available anymore for anything. Please consider carefully if you really want this. ADMIN_DELETE_MOBILE_TITLE=Do you really want to delete the mobile number? ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI=The table contains the most important data from contact (minimalized view). @@ -689,3 +689,15 @@ ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET=Error: Instance 'faxNumber' not set in bean PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Unlink fax number from contact CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER=Unlink fax number from contact: ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE=Do you really want to unlink the fax number from contact? +PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER=Edit land-line number +CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER=Edit land-line number: +PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER=Edit fax number +CONTENT_TITLE_ADMIN_EDIT_FAX_NUMBER=Edit fax number: +ADMIN_EDIT_LAND_LINE_NUMBER_TITLE=Edit land-line number {0}: +ADMIN_EDIT_FAX_NUMBER_TITLE=Edit fax number {0}: +ADMIN_LAND_LINE_NUMBER_DATA_LEGEND=Data of land-line number: +ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE=Data of land-line number. +ADMIN_FAX_NUMBER_DATA_LEGEND=Data of fax number: +ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE=Data of fax number. +ADMIN_EDIT_LAND_LINE_NUMBER=Change land-line number: +ADMIN_EDIT_FAX_NUMBER=Change fax number: diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl index f281248d..61fc9f37 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl @@ -9,8 +9,8 @@
- - + +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl index cb9c7bf4..9d20b223 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl @@ -9,8 +9,8 @@
- - + +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl index 9524d066..d6533f3d 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl @@ -9,8 +9,8 @@
- - + +
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index c700ac1c..296641bb 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -23,14 +23,16 @@
- #{msg.ADMIN_EDIT_FAX_TITLE} + + +
- +
- +
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 6269f8ea..af623c74 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -13,24 +13,26 @@ - #{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE} + #{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER} - #{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE} + #{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}
- #{msg.ADMIN_EDIT_LAND_LINE_TITLE} + + +
- +
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index f98c0c41..536a64d3 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -12,10 +12,10 @@ - #{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE} + #{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER} - #{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE} + #{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER} @@ -37,7 +37,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 33a13144..ba915567 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -13,24 +13,26 @@ - #{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE} + #{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER} - #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE} + #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}
- #{msg.ADMIN_EDIT_MOBILE_TITLE} + + +
- +
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index 0f0f6df1..0284acf1 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE} + #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER} diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 77639b32..1fbe6f19 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -12,10 +12,10 @@ - #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE} + #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER} - #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE} + #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER} -- 2.39.5