Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/154248

Change subject: Show an alert to the user if session has expired
......................................................................

Show an alert to the user if session has expired

Not pretty or user friendly at the moment. This can be
improved in follow ups.

Bug: 69314
Change-Id: I077a0bd7e81d049e90b4d888b7438a90742c655d
---
M Resources.php
M i18n/core/en.json
M i18n/core/qqq.json
M resources/js/ext.translate.editor.js
4 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/48/154248/1

diff --git a/Resources.php b/Resources.php
index a863591..133c6b5 100644
--- a/Resources.php
+++ b/Resources.php
@@ -111,6 +111,7 @@
                'tux-editor-message-tools-delete',
                'tux-editor-message-tools-translations',
                'tux-editor-loading',
+               'tux-session-expired',
        ),
        'position' => 'top',
 ) + $resourcePaths;
diff --git a/i18n/core/en.json b/i18n/core/en.json
index dc03f9e..f5b96b3 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -392,5 +392,6 @@
     "translate-statsbar-tooltip-with-fuzzy": "$1% translated, $2% reviewed, 
$3% outdated",
     "translate-search-more-groups-info": "$1 more {{PLURAL:$1|group|groups}}",
     "translate-ulsdep-title": "Configuration error",
-    "translate-ulsdep-body": "Translate extension depends on the 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:UniversalLanguageSelector
 Universal Language Selector extension]."
+    "translate-ulsdep-body": "Translate extension depends on the 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:UniversalLanguageSelector
 Universal Language Selector extension].",
+    "tux-session-expired": "You are no longer logged in. Please login in a 
separate tab or make a copy of unsaved translations, login and return to this 
page."
 }
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index b9ee4fe..e5d8239 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -396,5 +396,6 @@
        "translate-statsbar-tooltip-with-fuzzy": "Descriptive text to show for 
the stats bar for message groups on mouse over.\n\nParameters:\n* $1 - 
percentage of messages translated (does not include outdated)\n* $2 - 
percentage of messages reviewed\n* $3 - percentage of messages outdated (not 
counted as translated)",
        "translate-search-more-groups-info": "Information shown as number of 
message groups matching the query using\n[[Special:SearchTranslations]]\n* $1 - 
number of groups\nSee also:\n* {{msg-mw|Translate-search-more-languages-info}}",
        "translate-ulsdep-title": "Page title",
-       "translate-ulsdep-body": "Error message in page body"
+       "translate-ulsdep-body": "Error message in page body",
+       "tux-session-expired": "Warning shown to the user in a popup when 
translation could not be saved because the session is expired."
 }
diff --git a/resources/js/ext.translate.editor.js 
b/resources/js/ext.translate.editor.js
index 6d78ebb..5828d14 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -211,6 +211,9 @@
                                translateEditor.onSaveSuccess();
                        } ).fail( function ( errorCode, response ) {
                                translateEditor.onSaveFail( response.error && 
response.error.info || 'Unknown error' );
+                               if ( errorCode === 'assertuserfailed' ) {
+                                       alert( mw.msg( 'tux-session-expired' ) 
);
+                               }
                        } );
                },
 

-- 
To view, visit https://gerrit.wikimedia.org/r/154248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I077a0bd7e81d049e90b4d888b7438a90742c655d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to