From 2e477101219ee33a0fc2f8f1b581423f647431ec Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 16 Sep 2015 08:35:42 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20more=20strings=20for=20?= =?utf8?q?internationalization=20-=20changed=20some=20language=20bundle=20?= =?utf8?q?keys=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../localization/bundle_de_DE.properties | 36 +++++++++++++------ .../localization/bundle_en_US.properties | 30 ++++++++++++---- .../templates/guest/guest_login_form.tpl | 4 +-- web/customer/login.xhtml | 5 +-- web/customer/lost_passwd.xhtml | 16 ++++----- web/customer/register.xhtml | 4 +-- web/privacy.xhtml | 4 +-- web/terms.xhtml | 4 +-- 8 files changed, 68 insertions(+), 35 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 642caa7e..90e9b875 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -34,7 +34,7 @@ LOGIN_NO_CUSTOMER_NUMBER_MESSAGE=Sie haben keine EMail-Adresse eingegeben. LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. ERROR_AMOUNT_IS_NOT_LONG=Die eingegebene Menge ist keine Zahl. PAGE_TITLE_INDEX_WELCOME=Willkommen! -SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service +SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service: FOLLOWING_PRODUCTS_ARE_AVAILABLE=Folgende Produkte k\u00f6nnen bestellt werden: ADMIN_ADD_ITEM_TO_BASKET=Hinzuf\u00fcgen LINK_TO_BASKET_TITLE=Weiter zum Warenkorb. @@ -46,11 +46,11 @@ TOTAL_ORDER_PRICE=Gesamtsumme: NO_ITEMS_ADDED_TO_BASKET=Es befinden sich derzeit keine Artikel im Warenkorb. ITEM_NOT_ORDERED=Nicht bestellt. PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich -SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration +SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration: PAGE_TITLE_ADMIN_LOGOUT=Ausloggen -SUB_TITLE_ADMIN_LOGOUT=Aus dem Adminbereich ausloggen +SUB_TITLE_ADMIN_LOGOUT=Aus dem Adminbereich ausloggen: PAGE_TITLE_ADMIN_CATEGORY=Kategorien -SUB_TITLE_ADMIN_CATEGORIES=Kategorien administrieren +SUB_TITLE_ADMIN_CATEGORIES=Kategorien administrieren: SELECT_ENTRY=Ausw\u00e4hlen: ADMIN_ENTER_CATEGORY_TITLE=Bezeichnung: ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=z.B. Pizzen @@ -76,8 +76,8 @@ ADMIN_ADD_PRODUCT_NOTICE_LINE3=Keine Tausendertrenner verwenden, auch keine Leer GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihre Kundennummer und Passwort ein: GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie die Ihnen vergebene Kundennummer und das dazugeh\u00f6rige Passwort ein. GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben: -CUSTOMER_NUMBER=Kundennummer: -PASSWORD=Passwort: +ENTER_CUSTOMER_NUMBER=Kundennummer: +ENTER_PASSWORD=Passwort: BUTTON_CUSTOMER_LOGIN=Zum Kundenbereich einloggen LINK_HOME_TITLE=Eingangsseite LINK_HOME=Home @@ -100,16 +100,16 @@ SUB_TITLE_INDEX_SHOW_BASKET=Alle im Warenkorb befindlichen Artikel: GUEST_ITEM_TITLE=Artikel: BUTTON_CHANGE_ITEM_AMOUNT=\u00c4ndern PAGE_TITLE_INDEX_IMPRINT=Impressum -SUB_TITLE_INDEX_IMPRINT=Impressum +SUB_TITLE_INDEX_IMPRINT=Impressum: PAGE_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt -SUB_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt +SUB_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt: GUEST_ITEM_ADDED_TO_BASKET=Der Artikel {0} wurde zum Warenkorb hinzugef\u00fcgt. LINK_CONTINUE_TO_CHECKOUT=Weiter zur Bezahlung PAGE_TITLE_CUSTOMER_CHECKOUT=Weiter zur Bezahlung PAGE_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen -SUB_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen +SUB_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen: GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=Sie k\u00f6nnen hier ohne Anmeldung bezahlen: -SUB_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen +SUB_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen: LINK_CHECKOUT_OPTION_LOGIN=Weiter zum Kundenlogin LINK_CHECKOUT_OPTION_REGISTRATION=Weiter zum neuen Kundenkonto anmelden LINK_CHECKOUT_OPTION_GUEST=Ohne Anmeldung bezahlen @@ -142,3 +142,19 @@ PERSONAL_DATA_CITY=Ort: PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein. PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben: GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Bezahlung ohne Anmeldung +PAGE_TITLE_CUSTOMER_LOGIN=Einloggen +SUB_TITLE_CUSTOMER_LOGIN=Zum Kundenbereich einloggen: +PAGE_TITLE_CUSTOMER_LOST_PASSWORD=Passwort vergessen +SUB_TITLE_CUSTOMER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her: +GUEST_LOST_PASSWORD_TITLE=Sie haben Ihr Passwort vergessen? +GUEST_LOST_PASSWORD_LEGEND_TITLE=Bitte Daten eingeben: +GUEST_LOST_PASSWORD_LEGEND=Bitte Daten eingeben: +ENTER_EMAIL_ADDRESS=Email-Adresse: +GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ... +BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2 +PAGE_TITLE_CUSTOMER_REGISTER=Neukunde +SUB_TITLE_CUSTOMER_REGISTER=Anmelden zum Pizza-Service: +PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen +SUB_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen +PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen +SUB_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index b53afcb0..7cc0c26c 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -44,11 +44,11 @@ TOTAL_ORDER_PRICE=Total: NO_ITEMS_ADDED_TO_BASKET=There are no items in the basket. ITEM_NOT_ORDERED=Not ordered. PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area -SUB_TITLE_ADMIN_WELCOME=Welcome to website administration +SUB_TITLE_ADMIN_WELCOME=Welcome to website administration: PAGE_TITLE_ADMIN_LOGOUT=Logout -SUB_TITLE_ADMIN_LOGOUT=Logout from administration area +SUB_TITLE_ADMIN_LOGOUT=Logout from administration area: PAGE_TITLE_ADMIN_CATEGORY=Categories -SUB_TITLE_ADMIN_CATEGORIES=Administrate categories +SUB_TITLE_ADMIN_CATEGORIES=Administrate categories: SELECT_ENTRY=Select: ADMIN_ENTER_CATEGORY_TITLE=Title: ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=e.g. pizza @@ -74,8 +74,8 @@ ADMIN_ADD_PRODUCT_NOTICE_LINE3=Don't use thousand separators, including spaces. GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your customer number and password: GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned customer number and password. GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data: -CUSTOMER_NUMBER=Customer number: -PASSWORD=Password: +ENTER_CUSTOMER_NUMBER=Customer number: +ENTER_PASSWORD=Password: BUTTON_CUSTOMER_LOGIN=Login to customer area LINK_HOME_TITLE=Home page LINK_HOME=Home @@ -105,9 +105,9 @@ GUEST_ITEM_ADDED_TO_BASKET=The item {0} has been added to the basket. LINK_CONTINUE_TO_CHECKOUT=Continue to checkout PAGE_TITLE_CUSTOMER_CHECKOUT=Continue to checkout PAGE_TITLE_INDEX_CHECKOUT2=Checkout without login -SUB_TITLE_INDEX_CHECKOUT2=Checkout without login +SUB_TITLE_INDEX_CHECKOUT2=Checkout without login: GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=You can checkout without registration -SUB_TITLE_CUSTOMER_CHECKOUT=Choose checkout option +SUB_TITLE_CUSTOMER_CHECKOUT=Choose checkout option: LINK_CHECKOUT_OPTION_LOGIN=Continue to customer login LINK_CHECKOUT_OPTION_REGISTRATION=Continue with new customer registration LINK_CHECKOUT_OPTION_GUEST=Checkout without registration @@ -140,3 +140,19 @@ PERSONAL_DATA_CITY=City: PERSONAL_DATA_LEGEND_TITLE=Please enter your data. PERSONAL_DATA_LEGEND=Please enter your data: GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Payment without registration +PAGE_TITLE_CUSTOMER_LOGIN=Login +SUB_TITLE_CUSTOMER_LOGIN=Login to customer area: +PAGE_TITLE_CUSTOMER_LOST_PASSWORD=Lost password +SUB_TITLE_CUSTOMER_LOST_PASSWORD=Recover your password: +GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password? +GUEST_LOST_PASSWORD_LEGEND_TITLE=Please enter your data: +GUEST_LOST_PASSWORD_LEGEND=Please enter your data: +ENTER_EMAIL_ADDRESS=Email address: +GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ... +BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2 +PAGE_TITLE_CUSTOMER_REGISTER=Register +SUB_TITLE_CUSTOMER_REGISTER=Register at Pizza-Service: +PAGE_TITLE_INDEX_TERMS=Terms & Conditions +SUB_TITLE_INDEX_TERMS=Terms & Conditions +PAGE_TITLE_INDEX_PRIVACY=Privacy +SUB_TITLE_INDEX_PRIVACY=Privacy: diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl index 16ce9729..a1993410 100644 --- a/web/WEB-INF/templates/guest/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/guest_login_form.tpl @@ -16,7 +16,7 @@
- +
@@ -28,7 +28,7 @@
- +
diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml index 142b36f8..c044f109 100644 --- a/web/customer/login.xhtml +++ b/web/customer/login.xhtml @@ -8,18 +8,19 @@ > - Einloggen + #{msg.PAGE_TITLE_CUSTOMER_LOGIN} - Zum Kundenbereich einloggen + #{msg.SUB_TITLE_CUSTOMER_LOGIN}
+ Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden.
diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml index 4a76c6fd..25f95e22 100644 --- a/web/customer/lost_passwd.xhtml +++ b/web/customer/lost_passwd.xhtml @@ -8,14 +8,14 @@ > - Passwort vergessen + #{msg.PAGE_TITLE_CUSTOMER_LOST_PASSWORD} - Stellen Sie Ihr Passwort wieder her. + #{msg.SUB_TITLE_CUSTOMER_LOST_PASSWORD} @@ -23,15 +23,15 @@
- Sie haben Ihr Passwort vergessen? + #{msg.GUEST_LOST_PASSWORD_TITLE}
- Bitte Daten eingeben: + #{msg.GUEST_LOST_PASSWORD_LEGEND}
- +
@@ -42,12 +42,12 @@
- ... oder ... + #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
- +
@@ -61,7 +61,7 @@
- +
diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml index dd1af7b5..2d91ead4 100644 --- a/web/customer/register.xhtml +++ b/web/customer/register.xhtml @@ -8,14 +8,14 @@ > - Neukunde + #{msg.PAGE_TITLE_CUSTOMER_REGISTER} - Anmelden zum Pizza-Service: + #{msg.SUB_TITLE_CUSTOMER_REGISTER} diff --git a/web/privacy.xhtml b/web/privacy.xhtml index f3a5ecf4..77ef917f 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -8,14 +8,14 @@ > - Datenschutzbestimmungen + #{msg.PAGE_TITLE_INDEX_PRIVACY} - Datenschutzbestimmungen + #{msg.SUB_TITLE_INDEX_PRIVACY} diff --git a/web/terms.xhtml b/web/terms.xhtml index 1dfff779..f4aa41c7 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -8,14 +8,14 @@ > - Allgemeine Geschäftsbedingungen + #{msg.PAGE_TITLE_INDEX_TERMS} - Allgemeine Geschäftsbedingungen + #{msg.SUB_TITLE_INDEX_TERMS} -- 2.39.5