Attachment 7663 Details for Bug 28665 – proposed patch

[patch] proposed patch

28665.patch (text/plain), 3.40 KB, created by Jürn Brodersen on 2016-05-13 16:03:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jürn Brodersen

Created: 2016-05-13 16:03:32 CEST

Size: 3.40 KB

patch

obsolete

>Index: de.po
>===================================================================
>--- de.po	(Revision 69324)
>+++ de.po	(Arbeitskopie)
>@@ -946,12 +946,12 @@
> "BenutzermenÃ¼ oben rechts importieren."
> 
> #: umc/dialog/LoginDialog.js:395
>-msgid "Your Browser is outdated"
>+msgid "Your browser is outdated"
> msgstr "Ihr Browser ist veraltet"
> 
> #: umc/dialog/LoginDialog.js:396
> msgid ""
>-"Your Browser is outdated and should be updated. You may continue to use "
>+"Your browser is outdated and should be updated. You may continue to use "
> "Univention Management Console but you may experience performance issues and "
> "other problems."
> msgstr ""
>@@ -959,6 +959,17 @@
> "Univention Management Console benutzen, aber es kann zu Geschwindigkeits- "
> "und anderen Problemen kommen."
> 
>+#: umc/dialog/LoginDialog.js:418
>+msgid "Cookies disabled"
>+msgstr "Cookies deaktiviert"
>+
>+#: umc/dialog/LoginDialog.js:419
>+msgid ""
>+"Please enable cookies in your browser to use Univention Management Console."
>+msgstr ""
>+"Bitte aktivieren sie Cookies in Ihrem Browser um Univention Management Console"
>+" nutzen zu kÃ¶nnen."
>+
> #: umc/dialog/LoginDialog.js:402
> msgid "Your session has been closed due to inactivity. Please login again."
> msgstr ""
>Index: dialog/LoginDialog.js
>===================================================================
>--- dialog/LoginDialog.js	(Revision 69324)
>+++ dialog/LoginDialog.js	(Arbeitskopie)
>@@ -74,6 +74,11 @@
> 
> 		open: false,
> 
>+		noCookieMsg: {
>+			title: _('Cookies disabled'),
>+			msg: _('Please enable cookies in your browser to use Univention Management Console.')
>+		},
>+
> 		postMixInProperties: function() {
> 			this.inherited(arguments);
> 			this._currentResult = {};
>@@ -202,7 +207,7 @@
> 			// if username is specified, we need to auto fill the username
> 			if (tools.status('username')) {
> 				attr.set('umcLoginUsername', 'value', tools.status('username'));
>-			};
>+			}
> 		},
> 
> 		_watchFormSubmits: function() {
>@@ -210,6 +215,12 @@
> 				var form = dom.byId(name);
> 				on(form, 'submit', lang.hitch(this, function(evt) {
> 					evt.preventDefault();
>+					if (!navigator.cookieEnabled) {
>+						require(['umc/dialog'], lang.hitch(this, function(umcDialog) {
>+							umcDialog.alert(this.noCookieMsg.msg, this.noCookieMsg.title);
>+						}));
>+						return;
>+					}
> 					if (name == 'umcLoginForm') {
> 						this._submitFakeForm();
> 					}
>@@ -410,10 +421,15 @@
> 			// Chrome has no long term support version. Chromium 37 is supported through
> 			// Ubuntu 12.04 LTS (2016-01-27).
> 			// Apple has no long term support for safari. The latest version is 9 (2016-01-27)
>-				title = _('Your Browser is outdated') + ((title == '') ? title : '<br>' + title);
>-				msg = _('Your Browser is outdated and should be updated. You may continue to use Univention Management Console but you may experience performance issues and other problems.') + ((msg == '') ? msg : '<br>' + msg);
>+				title = _('Your browser is outdated') + ((title === '') ? title : '<br>' + title);
>+				msg = _('Your browser is outdated and should be updated. You may continue to use Univention Management Console but you may experience performance issues and other problems.') + ((msg === '') ? msg : '<br>' + msg);
> 			}
> 
>+			if (!navigator.cookieEnabled) {
>+				title = this.noCookieMsg.title;
>+				msg = this.noCookieMsg.msg;
>+			}
>+
> 			if (tools.status('setupGui')) {
> 				// user has already logged in before, show message for relogin
> 				title = _('Session timeout');

Actions: View | Diff

Attachments on bug 28665: 7663