From 8fe4f3585ddeb9f3d044aa77de07b4fdc0151a3b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 19 Dec 2017 17:42:28 +0100 Subject: [PATCH] Improve internationalisation --- .../OSGI-INF/l10n/bundle_de.properties | 1 + .../OSGI-INF/l10n/bundle.properties | 1 + .../OSGI-INF/l10n/bundle_de.properties | 1 + .../org/argeo/cms/widgets/auth/CmsLogin.java | 19 ++++++++++++++----- .../OSGI-INF/l10n/bundle_de.properties | 11 +++++++++++ .../argeo/cms/auth/UserAdminLoginModule.java | 2 +- 6 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_de.properties create mode 100644 org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle.properties create mode 100644 org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle_de.properties create mode 100644 org.argeo.cms/OSGI-INF/l10n/bundle_de.properties diff --git a/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_de.properties b/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_de.properties new file mode 100644 index 000000000..3769714f2 --- /dev/null +++ b/org.argeo.cms.ui.workbench.rap/OSGI-INF/l10n/bundle_de.properties @@ -0,0 +1 @@ +changePassword=Passwort ändern \ No newline at end of file diff --git a/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle.properties b/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle.properties new file mode 100644 index 000000000..3ec4305b9 --- /dev/null +++ b/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle.properties @@ -0,0 +1 @@ +search=Finden \ No newline at end of file diff --git a/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle_de.properties b/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle_de.properties new file mode 100644 index 000000000..8c4ac22ce --- /dev/null +++ b/org.argeo.cms.ui.workbench/OSGI-INF/l10n/bundle_de.properties @@ -0,0 +1 @@ +search=Search \ No newline at end of file diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java index 4af348059..fc9b77689 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java @@ -149,7 +149,6 @@ public class CmsLogin implements CmsStyles, CallbackHandler { Integer textWidth = 120; CmsUtils.style(parent, CMS_USER_MENU); - // new Label(this, SWT.NONE).setText(CmsMsg.username.lead()); usernameT = new Text(credentialsBlock, SWT.BORDER); usernameT.setMessage(username.lead(locale)); @@ -188,8 +187,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler { } /** - * To be overridden in order to provide custome login button and other - * links. + * To be overridden in order to provide custome login button and other links. */ protected void extendsCredentialsBlock(Composite credentialsBlock, Locale selectedLocale, SelectionListener loginSelectionListener) { @@ -290,8 +288,19 @@ public class CmsLogin implements CmsStyles, CallbackHandler { else if (callback instanceof HttpRequestCallback) { ((HttpRequestCallback) callback).setRequest(UiContext.getHttpRequest()); ((HttpRequestCallback) callback).setResponse(UiContext.getHttpResponse()); - } else if (callback instanceof LanguageCallback && localeChoice != null) - ((LanguageCallback) callback).setLocale(localeChoice.getSelectedLocale()); + } else if (callback instanceof LanguageCallback) { + Locale toUse = null; + if (localeChoice != null) + toUse = localeChoice.getSelectedLocale(); + else if (defaultLocale != null) + toUse = defaultLocale; + + if (toUse != null) { + ((LanguageCallback) callback).setLocale(toUse); + UiContext.setLocale(toUse); + } + + } } } diff --git a/org.argeo.cms/OSGI-INF/l10n/bundle_de.properties b/org.argeo.cms/OSGI-INF/l10n/bundle_de.properties new file mode 100644 index 000000000..b2dc5a414 --- /dev/null +++ b/org.argeo.cms/OSGI-INF/l10n/bundle_de.properties @@ -0,0 +1,11 @@ +username=Benutzer +password=Passwort +logout=ausloggen +login=einloggen +register=registrieren + +changePassword=Passwort ändern +currentPassword=Derzeites Passwort +newPassword=Neues passwort +repeatNewPassword=Newes Passwort wiederholen +passwordChanged=Passwort geändert diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java index 68a08c5d9..ebe81b671 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java @@ -95,7 +95,7 @@ public class UserAdminLoginModule implements LoginModule { if (locale == null) locale = Locale.getDefault(); // FIXME add it to Subject - // UiContext.setLocale(locale); +// Locale.setDefault(locale); username = nameCallback.getName(); if (username == null || username.trim().equals("")) { -- 2.30.2