diff options
| author | RblSb <msrblsb@gmail.com> | 2020-03-04 20:41:43 +0300 |
|---|---|---|
| committer | RblSb <msrblsb@gmail.com> | 2020-03-04 20:41:43 +0300 |
| commit | 6e28381de77265f8b6a24cdd9c583d1d27d8d7b2 (patch) | |
| tree | 4a960040204580999774bfffea23634c19d02c9c /res | |
| parent | 4155b95cce55e1176aecb1531b9c06344a2e81b5 (diff) | |
Playlist config limits
Diffstat (limited to 'res')
| -rw-r--r-- | res/client.js | 7 | ||||
| -rw-r--r-- | res/langs/en.json | 7 | ||||
| -rw-r--r-- | res/langs/ru.json | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/res/client.js b/res/client.js index e785320..d603436 100644 --- a/res/client.js +++ b/res/client.js @@ -998,8 +998,6 @@ client_Main.prototype = { this.onLogin(data.login.clients,data.login.clientName); break; case "LoginError": - var text = StringTools.replace(Lang.get("usernameError"),"$MAX","" + this.config.maxLoginLength); - this.serverMessage(4,text); this.showGuestLoginPanel(); break; case "Logout": @@ -1039,6 +1037,11 @@ client_Main.prototype = { case "Rewind": this.player.setTime(data.rewind.time); break; + case "ServerMessage": + var id = data.serverMessage.textId; + var text = id == "usernameError" ? StringTools.replace(Lang.get(id),"$MAX","" + this.config.maxLoginLength) : Lang.get(id); + this.serverMessage(4,text); + break; case "SetLeader": ClientTools.setLeader(this.clients,data.setLeader.clientName); this.updateUserList(); diff --git a/res/langs/en.json b/res/langs/en.json index ef70b8c..375bd79 100644 --- a/res/langs/en.json +++ b/res/langs/en.json @@ -5,7 +5,12 @@ "joined": "joined", "online": "online", "nothingPlaying": "Nothing Playing", - "usernameError": "Username must be from 1 to $MAX characters and don't repeat another's. Characters &^<>'\" are not allowed.", + "usernameError": "Username length must be from 1 to $MAX characters and don't repeat another's. Characters &^<>'\" are not allowed.", + "passwordMatchError": "Wrong password.", + "accessError": "Access Error.", + "totalVideoLimitError": "Playlist video limit has been reached.", + "userVideoLimitError": "Playlist video limit per user has been reached.", + "videoAlreadyExistsError": "The video already exists in playlist.", "addVideoError": "Failed to add video.", "rawVideo": "Raw video", "videos": "videos", diff --git a/res/langs/ru.json b/res/langs/ru.json index 112e931..a52142f 100644 --- a/res/langs/ru.json +++ b/res/langs/ru.json @@ -6,6 +6,11 @@ "online": "онлайн", "nothingPlaying": "Ничего не играет", "usernameError": "Ник должен быть от 1 до $MAX символов и не повторять чужие. Символы &^<>'\" запрещены.", + "passwordMatchError": "Неправильный пароль.", + "accessError": "Ошибка доступа.", + "totalVideoLimitError": "Был достингут лимит видео в плейлисте.", + "userVideoLimitError": "Был достингут лимит видео на пользователя.", + "videoAlreadyExistsError": "Видео уже имеется в плейлисте.", "addVideoError": "Не удалось добавить видео.", "rawVideo": "Исходное видео", "videos": "видео", |