Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basque language added in subtitles provider #416

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Basque language added in subtitles provider #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3a522a
Open subtitles modified to give Basque language support
urtzai Mar 11, 2014
f2ff932
Master repository merge + language name added in json + OpenSubtitles…
urtzai Mar 11, 2014
559a29a
Yify Subtitles conf changed to get Basque subs
urtzai Mar 11, 2014
c08800c
Indentation fixed
urtzai Mar 11, 2014
2bb61da
Basque localization fixed
urtzai Mar 11, 2014
8d01549
Fixed some translation + 2 spaces
urtzai Mar 12, 2014
4eaccca
Update player.js
urtzai Mar 12, 2014
656d587
Update eu.json
urtzai Mar 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,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-basque {
background-image: url(../images/basque.png);
}
sidebar .play .movie-detail .side-content a.play-button {
background: #286dc4;
background-image: linear-gradient(to bottom, #3076ce 0%, #175ab0 100%);
Expand Down
Binary file added images/basque.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion js/frontend/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ window.SubtitleLanguages = {
'portuguese': 'Português',
'brazilian' : 'Português-Br',
'dutch' : 'Nederlands',
'german' : 'Deutsch'
'german' : 'Deutsch',
'basque' : 'Euskara'
};


Expand Down
3 changes: 2 additions & 1 deletion js/frontend/providers/opensubtitles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ var xmlrpc = require('xmlrpc'),
'tur': 'Turkish',
'dut': 'Dutch',
'fre': 'French',
'ger': 'German'
'ger': 'German',
'eus': 'Basque'
},

token;
Expand Down
3 changes: 2 additions & 1 deletion js/frontend/providers/yifysubtitles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ var request = require('request'),
'portuguese': 'Português',
'brazilian' : 'Português-Br',
'dutch' : 'Nederlands',
'german' : 'Deutsch'
'german' : 'Deutsch',
'basque' : 'Basque'
};

App.findSubtitle = function (model, cb, isFallback) {
Expand Down
3 changes: 2 additions & 1 deletion js/frontend/views/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ App.View.Sidebar = Backbone.View.extend({
"romanian": "ro",
"spanish": "es",
"turkish": "tr",
"german": "de"
"german": "de",
"basque": "eu"
}

var noSubForUser = true;
Expand Down
3 changes: 2 additions & 1 deletion language/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
"dutch": "dutch",
"italian": "italian",
"danish": "Danish",
"arabic": "Arabic"
"arabic": "Arabic",
"basque": "Basque"
}
3 changes: 2 additions & 1 deletion language/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@
"italian": "Italiano",
"romanian": "Romano",
"spanish": "Español",
"turkish": "Turco"
"turkish": "Turco",
"basque": "Vasco"
}
12 changes: 8 additions & 4 deletions language/eu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"legalDisclaimerAccept": "Ulertzen dut, Popcorn Time erabili nahi dut",
"legalDisclaimerCancel": "Popcorn Timetik atera",
"genres": {
"all": "Denentzat",
"all": "Modakoak",
"action": "Akzioa",
"adventure": "Abentura",
"animation": "Animazioa",
"biography": "Biografia",
"comedy": "Komedia",
"crime": "Crimen",
"crime": "Krimena",
"documentary": "Dokumentala",
"drama": "Drama",
"family": "Familiarra",
Expand All @@ -46,13 +46,17 @@
"thriller": "Thriller",
"war": "Belikoa",
"western": "Western"
},
},
"english": "Ingelera",
"portuguese": "Portuguesa",
"dutch": "Nederlandera",
"french": "Frantsesa",
"italian": "Italiera",
"romanian": "Errumaniera",
"spanish": "Gaztelera",
"turkish": "Turkiera"
"turkish": "Turkiera",
"basque": "Euskara",
"swedish": "Suediera",
"danish": "Daniera",
"arabic": "Arabiera"
}
3 changes: 2 additions & 1 deletion language/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,6 @@
"dutch": "Néerlandais",
"italian": "Italien",
"danish": "Danois",
"arabic": "Arabe"
"arabic": "Arabe",
"basque": "Basque"
}
1 change: 1 addition & 0 deletions sass/_moviedetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,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-basque { background-image: url(../images/basque.png); }
}
}
}
Expand Down