From b75a2224d4337c9ee343c7cd8abf5c2090507f97 Mon Sep 17 00:00:00 2001
From: Dmitri Samoilov <dmitri@zinosoft.com>
Date: Wed, 12 Mar 2014 15:11:43 +0200
Subject: [PATCH] Added Russian subtitles language

---
 css/app.css                            |   3 +++
 images/russian.png                     | Bin 0 -> 17904 bytes
 js/frontend/player.js                  |   3 ++-
 js/frontend/providers/opensubtitles.js |   3 ++-
 js/frontend/providers/torrents.js      |   2 +-
 js/frontend/providers/yifysubtitles.js |   3 ++-
 js/frontend/views/sidebar.js           |   3 ++-
 language/en.json                       |   3 ++-
 language/ru.json                       |   3 ++-
 sass/_moviedetails.scss                |   1 +
 10 files changed, 17 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 css/app.css
 create mode 100755 images/russian.png
 mode change 100644 => 100755 js/frontend/player.js
 mode change 100644 => 100755 js/frontend/providers/opensubtitles.js
 mode change 100644 => 100755 js/frontend/providers/torrents.js
 mode change 100644 => 100755 js/frontend/providers/yifysubtitles.js
 mode change 100644 => 100755 js/frontend/views/sidebar.js
 mode change 100644 => 100755 language/en.json
 mode change 100644 => 100755 sass/_moviedetails.scss

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 0000000000000000000000000000000000000000..6ae8fc8cb978f00a8c3f84b082f2492e4b6ff19b
GIT binary patch
literal 17904
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

literal 0
HcmV?d00001

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); }
               }
             }
           }