Просмотр исходного кода

Merge pull request #902 from jitsi/fix-authentication-failed-msg

Fixes message for authentication failed.
master
yanas 9 лет назад
Родитель
Сommit
0bf6d52eef
2 измененных файлов: 8 добавлений и 5 удалений
  1. 4
    3
      lang/main.json
  2. 4
    2
      modules/UI/UI.js

+ 4
- 3
lang/main.json Просмотреть файл

197
         "lockMessage": "Failed to lock the conference.",
197
         "lockMessage": "Failed to lock the conference.",
198
         "warning": "Warning",
198
         "warning": "Warning",
199
         "passwordNotSupported": "Room passwords are currently not supported.",
199
         "passwordNotSupported": "Room passwords are currently not supported.",
200
-        "sorry": "Sorry",
201
-        "internalError": "Internal application error [setRemoteDescription]",
200
+        "internalErrorTitle": "Internal error",
201
+        "internalError": "Oups! Something went wrong. The following error occurred: [setRemoteDescription]",
202
         "unableToSwitch": "Unable to switch video stream.",
202
         "unableToSwitch": "Unable to switch video stream.",
203
         "SLDFailure": "Oops! Something went wrong and we failed to mute! (SLD Failure)",
203
         "SLDFailure": "Oops! Something went wrong and we failed to mute! (SLD Failure)",
204
         "SRDFailure": "Oops! Something went wrong and we failed to stop video! (SRD Failure)",
204
         "SRDFailure": "Oops! Something went wrong and we failed to stop video! (SRD Failure)",
246
         "password": "Enter password",
246
         "password": "Enter password",
247
         "userPassword": "user password",
247
         "userPassword": "user password",
248
         "token": "token",
248
         "token": "token",
249
-        "tokenAuthFailed": "Failed to authenticate with XMPP server: invalid token",
249
+        "tokenAuthFailedTitle": "Authentication problem",
250
+        "tokenAuthFailed": "Sorry, you're not allowed to join this call.",
250
         "displayNameRequired": "Please enter your display name",
251
         "displayNameRequired": "Please enter your display name",
251
         "extensionRequired": "Extension required:",
252
         "extensionRequired": "Extension required:",
252
         "firefoxExtensionPrompt": "You need to install a Firefox extension in order to use screen sharing. Please try again after you <a href='__url__'>get it from here</a>!",
253
         "firefoxExtensionPrompt": "You need to install a Firefox extension in order to use screen sharing. Please try again after you <a href='__url__'>get it from here</a>!",

+ 4
- 2
modules/UI/UI.js Просмотреть файл

1152
 };
1152
 };
1153
 
1153
 
1154
 UI.notifyTokenAuthFailed = function () {
1154
 UI.notifyTokenAuthFailed = function () {
1155
-    messageHandler.showError("dialog.error", "dialog.tokenAuthFailed");
1155
+    messageHandler.showError(   "dialog.tokenAuthFailedTitle",
1156
+                                "dialog.tokenAuthFailed");
1156
 };
1157
 };
1157
 
1158
 
1158
 UI.notifyInternalError = function () {
1159
 UI.notifyInternalError = function () {
1159
-    messageHandler.showError("dialog.sorry", "dialog.internalError");
1160
+    messageHandler.showError(   "dialog.internalErrorTitle",
1161
+                                "dialog.internalError");
1160
 };
1162
 };
1161
 
1163
 
1162
 UI.notifyFocusDisconnected = function (focus, retrySec) {
1164
 UI.notifyFocusDisconnected = function (focus, retrySec) {

Загрузка…
Отмена
Сохранить