diff --git a/css/app.css b/css/app.css old mode 100644 new mode 100755 index 1c72e534..9f03fd05 --- a/css/app.css +++ b/css/app.css @@ -1699,6 +1699,9 @@ sidebar .play .movie-detail .side-content .subtitles-list ul li .flag.flag-brazi sidebar .play .movie-detail .side-content .subtitles-list ul li .flag.flag-italian { background-image: url(../images/italian.png); } +sidebar .play .movie-detail .side-content .subtitles-list ul li .flag.flag-russian { + background-image: url(../images/russian.png); +} sidebar .play .movie-detail .side-content a.play-button { background: #286dc4; background-image: linear-gradient(to bottom, #3076ce 0%, #175ab0 100%); diff --git a/images/russian.png b/images/russian.png new file mode 100755 index 00000000..6ae8fc8c Binary files /dev/null and b/images/russian.png differ diff --git a/js/frontend/player.js b/js/frontend/player.js old mode 100644 new mode 100755 index 4e3f3568..a80bdd53 --- a/js/frontend/player.js +++ b/js/frontend/player.js @@ -94,7 +94,8 @@ window.SubtitleLanguages = { 'portuguese': 'Português', 'brazilian' : 'Português-Br', 'dutch' : 'Nederlands', - 'german' : 'Deutsch' + 'german' : 'Deutsch', + 'russian' : 'Русский' }; diff --git a/js/frontend/providers/opensubtitles.js b/js/frontend/providers/opensubtitles.js old mode 100644 new mode 100755 index be63eb58..1d87c554 --- a/js/frontend/providers/opensubtitles.js +++ b/js/frontend/providers/opensubtitles.js @@ -21,7 +21,8 @@ var xmlrpc = require('xmlrpc'), 'dut': 'Dutch', 'fre': 'French', 'ger': 'German', - 'lit': 'Lithuanian' + 'lit': 'Lithuanian', + 'rus': 'Russian' }, token; diff --git a/js/frontend/providers/torrents.js b/js/frontend/providers/torrents.js old mode 100644 new mode 100755 index 026066b9..80aa0f5e --- a/js/frontend/providers/torrents.js +++ b/js/frontend/providers/torrents.js @@ -2,7 +2,7 @@ App.getTorrentsCollection = function (options) { var url = 'http://subapi.com/'; - var supportedLanguages = ['english', 'french', 'dutch', 'portuguese', 'romanian', 'spanish', 'turkish', 'brazilian', 'italian', 'german']; + var supportedLanguages = ['english', 'french', 'dutch', 'portuguese', 'romanian', 'spanish', 'turkish', 'brazilian', 'italian', 'german', 'russian']; if (options.genre) { url += options.genre.toLowerCase() + '.json'; diff --git a/js/frontend/providers/yifysubtitles.js b/js/frontend/providers/yifysubtitles.js old mode 100644 new mode 100755 index 3c6a7674..8d548938 --- a/js/frontend/providers/yifysubtitles.js +++ b/js/frontend/providers/yifysubtitles.js @@ -16,7 +16,8 @@ var request = require('request'), 'portuguese': 'Português', 'brazilian' : 'Português-Br', 'dutch' : 'Nederlands', - 'german' : 'Deutsch' + 'german' : 'Deutsch', + 'russian' : 'Русский' }; App.findSubtitle = function (model, cb, isFallback) { diff --git a/js/frontend/views/sidebar.js b/js/frontend/views/sidebar.js old mode 100644 new mode 100755 index 43806b19..c62d2315 --- a/js/frontend/views/sidebar.js +++ b/js/frontend/views/sidebar.js @@ -124,7 +124,8 @@ App.View.Sidebar = Backbone.View.extend({ "romanian": "ro", "spanish": "es", "turkish": "tr", - "german": "de" + "german": "de", + "russian": "ru" } var noSubForUser = true; diff --git a/language/en.json b/language/en.json old mode 100644 new mode 100755 index 8ed72b58..bb5bd31e --- a/language/en.json +++ b/language/en.json @@ -57,5 +57,6 @@ "dutch": "dutch", "italian": "italian", "danish": "Danish", - "arabic": "Arabic" + "arabic": "Arabic", + "russian": "Russian" } diff --git a/language/ru.json b/language/ru.json index e8999f38..4d942616 100644 --- a/language/ru.json +++ b/language/ru.json @@ -57,5 +57,6 @@ "dutch": "Голландский", "italian": "Итальянский", "danish": "Датский", - "arabic": "Арабский" + "arabic": "Арабский", + "russian": "Русский" } diff --git a/sass/_moviedetails.scss b/sass/_moviedetails.scss old mode 100644 new mode 100755 index 49db0606..c8585c68 --- a/sass/_moviedetails.scss +++ b/sass/_moviedetails.scss @@ -421,6 +421,7 @@ sidebar { &.flag-turkish { background-image: url(../images/turkish.png); } &.flag-brazilian { background-image: url(../images/brazilian.png); } &.flag-italian { background-image: url(../images/italian.png); } + &.flag-russian { background-image: url(../images/russian.png); } } } }