Add 401 and 403 error messages for put saver

Show the user a slightly more useful message for the case where they're not correctly authenticated and try to do a "put" save. (I'm thinking about TiddlyHost, but it should be generally useful.) WIP. Not sure what to do with the translations. Is it better to leave them out entirely? Will it fallback to en-GB automatically? Is there some other standard way to add a placeholder? Should I try filling them in with Google Translate?
TiddlyWiki · Apr 25, 2021 · a24cfe4 · a24cfe4
1 parent ac15334
commit a24cfe4
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 2 deletions.
diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
@@ -28,13 +28,15 @@ Error/EditConflict: File changed on server
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
+Error/Forbidden: Permission denied
 Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
 Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`
 Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
 Error/RetrievingSkinny: Error retrieving skinny tiddler list
 Error/SavingToTWEdit: Error saving to TWEdit
+Error/Unauthorized: Authentication required
 Error/WhileSaving: Error while saving
 Error/XMLHttpRequest: XMLHttpRequest error code
 InternalJavaScriptError/Title: Internal JavaScript Error

diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js
@@ -90,8 +90,11 @@ PutSaver.prototype.save = function(text,method,callback) {
 				// response is textual: "XMLHttpRequest error code: 412"
 				var status = Number(err.substring(err.indexOf(':') + 2, err.length))
 				if(status === 412) { // edit conflict
-					var message = $tw.language.getString("Error/EditConflict");
-					callback(message);
+					callback($tw.language.getString("Error/EditConflict"));
+				} else if(status === 401) { // authentication required
+					callback($tw.language.getString("Error/Unauthorized"));
+				} else if(status === 403) { // permission denied
+					callback($tw.language.getString("Error/Forbidden"));
 				} else {
 					callback(err); // fail
 				}

diff --git a/languages/ar-PS/Misc.multids b/languages/ar-PS/Misc.multids
@@ -27,11 +27,13 @@ Error/Caption: خطأ
 Error/EditConflict: تم تغيير الملف على الخادم
 Error/Filter: خطأ في التصفية
 Error/FilterSyntax: خطأ في بناء الجملة في تعبير عامل التصفية
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: خطأ في التصفية: معامل غير معروف لعامل التصفية 'is'
 
 Error/LoadingPluginLibrary: خطأ في تحميل مكتبة المكونات الإضافية
 
 Error/NetworkErrorAlert: `<h2>''خطأ في الشبكة''</h2> يبدو أن الاتصال بالخادم قد انقطع. قد يشير هذا إلى وجود مشكلة في اتصال الشبكة. يرجى محاولة استعادة اتصال الشبكة قبل المتابعة. <br> <br> '' ستتم مزامنة أي تغييرات غير محفوظة تلقائيًا عند استعادة الاتصال ''.
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: حدث خطأ أثناء الحفظ
 
 InternalJavaScriptError/Hint: حسنا، هذا أمر محرج. من المستحسن إعادة تشغيل تدلي ويكي عن طريق إنعاش المتصفح الخاص بك

diff --git a/languages/ca-ES/Misc.multids b/languages/ca-ES/Misc.multids
@@ -25,12 +25,14 @@ Error/Caption: S'ha produït un error
 Error/EditConflict: El fitxer ha canviat al servidor
 Error/Filter: S'ha produït un error del filtre
 Error/FilterSyntax: S'ha produït un error de sintaxi en l'expressió del filtre
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: S'ha produït un error del filtre: operant desconegut per a l’operador de filtre "is"
 Error/LoadingPluginLibrary: S'ha produït un error en carregar la biblioteca del connector
 Error/NetworkErrorAlert: `<h2>''Error de la xarxa''</h2>Sembla que s'ha perdut la connexió amb el servidor. Això pot indicar un problema amb la vostra connexió de la xarxa. Intenteu restaurar la connectivitat de xarxa abans de continuar.<br><br>' Qualsevol canvi no guardat es sincronitzarà automàticament quan es restableixi la connectivitat''.'
 Error/RecursiveTransclusion: S'ha produït un error de transclusió recursiva en el widget de transclusió
 Error/RetrievingSkinny: S'ha produït un error en recuperar la llista de tiddler parcials
 Error/SavingToTWEdit: S'ha produït un error en desar a TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: S'ha produït un error en desar
 Error/XMLHttpRequest: Codi d'error XMLHttpRequest
 InternalJavaScriptError/Hint: Bé, això és compromès. Es recomana que reinicieu TiddlyWiki actualitzant el navegador

diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids
@@ -29,12 +29,14 @@ Error/Filter: Filter Fehler
 Error/FilterSyntax: Syntax Fehler im Filter-Ausdruck
 Error/FilterRunPrefix: Filter Fehler: Unbekanntes Prefix für Filter lauf
 Error/IsFilterOperator: Filter Fehler: Unbekannter Operand für den 'is' Filter Operator
+Error/Forbidden: Permission denied (translation todo)
 Error/FormatFilterOperator: Filter Fehler: Unbekannter Operand für den 'format' Filter Operator
 Error/LoadingPluginLibrary: Fehler beim Laden der "plugin library"
 Error/NetworkErrorAlert: `<h2>''Netzwerk Fehler''</h2>Es scheint, die Verbindung zum Server ist ausgefallen. Das weist auf Probleme mit der Netzwerkverbindung hin. Bitte versuchen Sie die Verbingung wider herzustellen, bevor Sie weitermachen.<br><br>''Nicht gespeicherte Änderungen werden automatich synchronisiert, sobald die Verbindung wider hergestellt ist.
 Error/RecursiveTransclusion: Recursive Transclusion: Fehler im "transclude widget"
 Error/RetrievingSkinny: Fehler beim Empfangen einer "skinny" Tiddler Liste
 Error/SavingToTWEdit: Fehler beim Speichern mit "TWEdit"
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: Fehler beim Speichern
 Error/XMLHttpRequest: XMLHttpRequest Fehler-Code
 InternalJavaScriptError/Title: Interner JavaScript Fehler

diff --git a/languages/el-GR/Misc.multids b/languages/el-GR/Misc.multids
@@ -25,11 +25,13 @@ Error/Caption: Σφάλμα
 Error/EditConflict: Το αρχείο στον εξυπηρετητή είναι διαφορετικό
 Error/Filter: Σφάλμα φίλτρου
 Error/FilterSyntax: Συντακτικό σφάλμα στην έκφραση του φίλτρου
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: Σφάλμα φίλτρου: Άγνωστος τελεστέος για τον τελεστή φίλτρου 'is'
 Error/LoadingPluginLibrary: Σφάλμα κατά την φόρτωση της βιβλιοθήκης του πρόσθετου
 Error/RecursiveTransclusion: Σφάλμα αναδρομής σε transclusion στο transclude widget
 Error/RetrievingSkinny: Σφάλμα κατά την ανάκληση της skinny tiddler λίστας
 Error/SavingToTWEdit: Σφάλμα κατά την αποθήκευση στο TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: Σφάλμα κατά την αποθήκευση
 Error/XMLHttpRequest: XMLHttpRequest κωδικός σφάλματος
 InternalJavaScriptError/Hint: Λοιπόν, αυτό είναι αδιέξοδο. Συνιστάτε να επανεκκινήσετε το TiddlyWiki κάνοντας ανανέωση στον φυλλομετρητή σας

diff --git a/languages/fa-IR/Misc.multids b/languages/fa-IR/Misc.multids
@@ -25,11 +25,13 @@ Error/Caption: خطا
 Error/EditConflict: فایل در سرور عوض شد
 Error/Filter: خطای فیلتر
 Error/FilterSyntax: در نحوه‌ی بیان فیلتر خطای نحوی وجود داشت
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: خطای فیلتر: عملکرد ناشناخته‌ای برای عملگر 'is' مشخص شده
 Error/LoadingPluginLibrary: خطا در بارگزاری کتاب‌خانه افزونه
 Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
 Error/RetrievingSkinny: طا در دریافت لیست‌های تیدلر لاغر
 Error/SavingToTWEdit: خطا در ذخیره در TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: خطا  در حین ذخیره
 Error/XMLHttpRequest: XMLHttpRequest error code
 InternalJavaScriptError/Hint: اوه این خجالت آوره. پیشنهاد می‌کنیم که با ریفرش کردن مرورگرتون تیدلی‌ویکی رو دوباره باز کنین

diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids
@@ -28,12 +28,14 @@ Error/Filter: Erreur de filtre
 Error/FilterSyntax: Erreur de syntaxe dans l'expression du filtre
 Error/FilterRunPrefix: Erreur de filtre : Préfixe de run inconnu pour le filtre
 Error/IsFilterOperator: Erreur de filtre : Opérande inconnu pour l'opérateur de filtre 'is'
+Error/Forbidden: Permission denied (translation todo)
 Error/FormatFilterOperator: Erreur de filtre : Suffixe inconnu pour l'opérateur de filtre 'format'
 Error/LoadingPluginLibrary: Erreur lors du chargement de la bibliothèque de plugins
 Error/NetworkErrorAlert: `<h2>''Erreur Réseau''</h2>Il semble que la connexion au serveur soit perdue. Cela peut indiquer un problème avec votre connexion réseau. Essayez de rétablir la connectivité du réseau avant de continuer.<br><br>''Toute modification non enregistrée sera automatiquement synchronisée lorsque la connectivité sera rétablie''.`
 Error/RecursiveTransclusion: Erreur dans le widget //transclude// : transclusion récursive
 Error/RetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers partiels
 Error/SavingToTWEdit: Erreur lors de l'enregistrement vers TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: Erreur lors de l'enregistrement
 Error/XMLHttpRequest: Code d'erreur XMLHttpRequest
 InternalJavaScriptError/Title: Erreur interne JavaScript

diff --git a/languages/nl-NL/Misc.multids b/languages/nl-NL/Misc.multids
@@ -27,13 +27,15 @@ Error/EditConflict: Bestand gewijzigd op server
 Error/Filter: Filterfout
 Error/FilterRunPrefix: Filterfout: Onbekend voorvoegsel voor filter 'run'
 Error/FilterSyntax: Syntaxfout in filter expressie
+Error/Forbidden: Permission denied (translation todo)
 Error/FormatFilterOperator: Filterfout: Onbekend achtervoegsel voor de 'format' filter operator
 Error/IsFilterOperator: Filterfout: Onbekende operand voor het 'is' filter
 Error/LoadingPluginLibrary: Fout bij laden van de pluginbibliotheek
 Error/NetworkErrorAlert: `<h2>''Network fout''</h2>De verbinding met de server lijkt verbroken. Mogelijk een probleem met de netwerkverbinding. Herstel de netwerkverbinding voordat verder wordt gegaan.<br><br>''Niet opgeslagen veranderingen worden gesynchroniseerd als de verbinding hersteld is''.`
 Error/RecursiveTransclusion: Recursieve transclusiefout in 'transclude' widget
 Error/RetrievingSkinny: Fout bij ophalen van de 'skinny' tiddlerlijst
 Error/SavingToTWEdit: Fout bij opslaan naar TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: Fout bij opslaan
 Error/XMLHttpRequest: XMLHttpRequest foutcode
 InternalJavaScriptError/Hint: Er is een probleem. Herstart TiddlyWiki door je browser te verversen

diff --git a/languages/pt-PT/Misc.multids b/languages/pt-PT/Misc.multids
@@ -26,11 +26,13 @@ Error/Caption: Erro
 Error/EditConflict: File changed on server
 Error/Filter: Erro de filtro
 Error/FilterSyntax: Erro de sintaxe na expressão do filtro
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: Erro de Filtro: Operando desconhecido para o operador de filtro 'is'
 Error/LoadingPluginLibrary: Erro ao carregar a biblioteca de extensões
 Error/RecursiveTransclusion: Erro de transclusão recursiva na widget de transclusão
 Error/RetrievingSkinny: Erro ao obter a lista simples de tiddlers
 Error/SavingToTWEdit: Erro ao gravar em TWEdit
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: Erro ao gravar
 Error/XMLHttpRequest: Código de erro XMLHttpRequest
 InternalJavaScriptError/Hint: Bem, isto é embaraçoso. Recomenda-se que reinicie a sua TiddlyWiki recarregando o seu navegador

diff --git a/languages/sl-SI/Misc.multids b/languages/sl-SI/Misc.multids
@@ -25,12 +25,14 @@ Error/Caption: Napaka
 Error/EditConflict: Datoteka je spremenjena na strežniku
 Error/Filter: Filter napaka
 Error/FilterSyntax: Sintaktična napaka v izrazu filtra
+Error/Forbidden: Permission denied (translation todo)
 Error/IsFilterOperator: Filter napaka: neznan operand za 'is' operator filtra
 Error/LoadingPluginLibrary: Napaka pri nalaganju knjižnice vtičnikov
 Error/RecursiveTransclusion: Rekurzivna napaka transkluzije v "transclude widget"
 Error/RetrievingSkinny: Napaka pri pridobivanju "skinny" seznama tiddlerjev
 Error/SavingToTWEdit: Napaka pri shranjevanju v TWEdit
 Error/WhileSaving: Napaka med shranjevanjem
+Error/Unauthorized: Authentication required (translation todo)
 Error/XMLHttpRequest: Koda napake XMLHttpRequest
 InternalJavaScriptError/Hint: No, to je neprijetno. Priporočamo, da znova zaženete TiddlyWiki tako, da osvežite brskalnik
 InternalJavaScriptError/Title: Notranja napaka JavaScript

diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids
@@ -28,13 +28,15 @@ Error/EditConflict: 服务器上的文件已更改
 Error/Filter: 筛选器错误
 Error/FilterRunPrefix: 筛选器错误：筛选器 run 的未知首码
 Error/FilterSyntax: 筛选器运算式中的语法错误
+Error/Forbidden: Permission denied (translation todo)
 Error/FormatFilterOperator: 筛选器错误：`format` 筛选器运算符的未知尾码
 Error/IsFilterOperator: 筛选器错误︰'is' 筛选器运算符的未知操作数
 Error/LoadingPluginLibrary: 加载插件程式库时，发生错误
 Error/NetworkErrorAlert: `<h2>''网络错误''</h2>与服务器的连缐似乎已中断。这可能表示您的网络连缐有问题。请尝试恢复网路连缐才能继续。<br><br>''恢复连缐时，所有未保存的更改，将自动同步''。`
 Error/RecursiveTransclusion: 于 transclude 小部件中的递回嵌入错误
 Error/RetrievingSkinny: 简要条目清单撷取错误
 Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误
+Error/Unauthorized: Authentication required (translation todo)
 Error/WhileSaving: 保存时，发生错误
 Error/XMLHttpRequest: XMLHttpRequest 错误代码
 InternalJavaScriptError/Title: 内部的 JavaScript 错误

diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids
@@ -28,6 +28,7 @@ Error/EditConflict: 伺服器上的檔案已更改
 Error/Filter: 篩選器錯誤
 Error/FilterRunPrefix: 篩選器錯誤：篩選器 run 的未知首碼
 Error/FilterSyntax: 篩選器運算式中的語法錯誤
+Error/Forbidden: Permission denied (translation todo)
 Error/FormatFilterOperator: 篩選器錯誤：`format` 篩選器運算子的未知尾碼
 Error/IsFilterOperator: 篩選器錯誤︰'is' 篩選器運算子的未知運算元
 Error/LoadingPluginLibrary: 載入插件程式庫時，發生錯誤
@@ -36,6 +37,7 @@ Error/RecursiveTransclusion: 於 transclude 小工具中的遞迴嵌入錯誤
 Error/RetrievingSkinny: 簡要條目清單擷取錯誤
 Error/SavingToTWEdit: 儲存到 TWEdit 時，發生錯誤
 Error/WhileSaving: 儲存時，發生錯誤
+Error/Unauthorized: Authentication required (translation todo)
 Error/XMLHttpRequest: XMLHttpRequest 錯誤代碼
 InternalJavaScriptError/Title: 內部的 JavaScript 錯誤
 InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啟動 TiddlyWiki