diff --git a/channels/infoplus.py b/channels/infoplus.py index 63d4da80..77fdcea5 100644 --- a/channels/infoplus.py +++ b/channels/infoplus.py @@ -16,6 +16,10 @@ from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger from platformcode import platformtools +import xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + global mainWindow mainWindow = list() ActoresWindow = None @@ -1509,10 +1513,10 @@ class ActorInfo(xbmcgui.WindowDialog): self.dialog = kwargs.get('dialog') if self.item.contentType == "movie": tipo = "movie" - search = {'url': 'person/%s' % self.id, 'language': 'es', 'append_to_response': 'movie_credits,images'} + search = {'url': 'person/%s' % self.id, 'language': def_lang, 'append_to_response': 'movie_credits,images'} else: tipo = "tv" - search = {'url': 'person/%s' % self.id, 'language': 'es', 'append_to_response': 'tv_credits,images'} + search = {'url': 'person/%s' % self.id, 'language': def_lang, 'append_to_response': 'tv_credits,images'} actor_tmdb = tmdb.Tmdb(discover=search) if not actor_tmdb.result.get("biography") and actor_tmdb.result.get("imdb_id"): @@ -2249,7 +2253,7 @@ def get_recomendations(item, infoLabels, recomendaciones): tipo = item.contentType if tipo != "movie": tipo = "tv" - search = {'url': '%s/%s/recommendations' % (tipo, infoLabels['tmdb_id']), 'language': 'es', 'page': 1} + search = {'url': '%s/%s/recommendations' % (tipo, infoLabels['tmdb_id']), 'language': def_lang, 'page': 1} reco_tmdb = tmdb.Tmdb(discover=search, tipo=tipo, idioma_busqueda="es") for i in range(0, len(reco_tmdb.results)): @@ -2307,8 +2311,8 @@ def fanartv(item, infoLabels, images={}): headers = [['Content-Type', 'application/json']] id_search = infoLabels.get('tvdb_id') if item.contentType != "movie" and not id_search: - search = {'url': 'tv/%s/external_ids' % infoLabels['tmdb_id'], 'language': 'es'} - ob_tmdb = tmdb.Tmdb(discover=search, idioma_busqueda='es') + search = {'url': 'tv/%s/external_ids' % infoLabels['tmdb_id'], 'language': def_lang} + ob_tmdb = tmdb.Tmdb(discover=search, idioma_busqueda=def_lang) id_search = ob_tmdb.result.get("tvdb_id") elif item.contentType == "movie": id_search = infoLabels.get('tmdb_id') diff --git a/channels/search.py b/channels/search.py index f8242748..5c15661e 100644 --- a/channels/search.py +++ b/channels/search.py @@ -14,6 +14,10 @@ from platformcode import config, logger from platformcode import platformtools from core import tmdb +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + link_list = [] max_links = 30 @@ -92,7 +96,7 @@ def sub_menu(item): thumbnail = get_thumb("search_star.png") itemlist.append(Item(channel='tvmoviedb', title=config.get_localized_string(70036), action="search_", - search={'url': 'search/person', 'language': 'es', 'page': 1}, star=True, + search={'url': 'search/person', 'language': def_lang, 'page': 1}, star=True, thumbnail=thumbnail)) itemlist.append(Item(channel=item.channel, action="search", @@ -180,8 +184,8 @@ def setting_channel_new(item): config.get_localized_string(70571), config.get_localized_string(70572), config.get_localized_string(70573), - config.get_localized_string(70574), - config.get_localized_string(70575), + # config.get_localized_string(70574), + # config.get_localized_string(70575), config.get_localized_string(70576) ] presel_values = ['skip', 'actual', 'all', 'none', 'cast', 'lat', 'ita'] @@ -623,7 +627,7 @@ def do_search(item, categories=None): from_action="search", from_channel=element["item"].channel, tecleado=tecleado)) # todos los resultados juntos, en la misma lista else: - title = " [ Resultados del canal %s ] " % channel + title = config.get_localized_string(70697) % channel itemlist.append(Item(title=title, channel="search", action="", folder=False, text_bold=True, from_channel=channel)) for i in element["itemlist"]: @@ -710,7 +714,7 @@ def discover_list(item): tvshow = True new_item = Item(channel='search', title=title, infoLabels=elem, action='search_tmdb', extra=title, - category='Resultados', context ='') + category=config.get_localized_string(70695), context ='') if tvshow: new_item.contentSerieName = title diff --git a/channels/searchall.py b/channels/searchall.py index 82d83ff7..e5339d83 100644 --- a/channels/searchall.py +++ b/channels/searchall.py @@ -283,7 +283,7 @@ def discover_list(item): tvshow = True new_item = Item(channel='searchall', title=title, infoLabels=elem, action='search_tmdb', extra=title, - category='Resultados', context='') + category=config.get_localized_string(70695), context='') if tvshow: new_item.contentSerieName = title diff --git a/channels/side_menu.py b/channels/side_menu.py index 5ee50c5d..d63d59a4 100644 --- a/channels/side_menu.py +++ b/channels/side_menu.py @@ -8,6 +8,10 @@ from platformcode import config, logger from platformcode import launcher import xbmc, xbmcgui, xbmcplugin, xbmcaddon, channelselector +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + media_path = os.path.join(config.get_runtime_path(), "resources/skins/Default/media/side_menu/") menu_settings_path = os.path.join(config.get_data_path(), "settings_channels", 'menu_settings_data.json') @@ -309,7 +313,7 @@ class Main(xbmcgui.WindowXMLDialog): new_item = Item(channel='search', action="search") elif control == config.get_localized_string(70036): new_item = Item(channel='tvmoviedb', title="Buscar actor/actriz", action="search_", - search={'url': 'search/person', 'language': 'es', 'page': 1}, star=True) + search={'url': 'search/person', 'language': def_lang, 'page': 1}, star=True) elif control == config.get_localized_string(70010): new_item = Item(channel='search', action="setting_channel") elif control == '': diff --git a/channels/trailertools.py b/channels/trailertools.py index 17a50200..aa76dad7 100644 --- a/channels/trailertools.py +++ b/channels/trailertools.py @@ -15,6 +15,10 @@ from core.item import Item from platformcode import config, logger from platformcode import platformtools +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + result = None window_select = [] # Para habilitar o no la opción de búsqueda manual @@ -128,7 +132,7 @@ def tmdb_trailers(item, tipo="movie"): itemlist = [] tmdb_search = None if item.infoLabels['tmdb_id']: - tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, idioma_busqueda='es') + tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, idioma_busqueda=def_lang) elif item.infoLabels['year']: tmdb_search = Tmdb(texto_buscado=item.contentTitle, tipo=tipo, year=item.infoLabels['year']) diff --git a/channels/tvmoviedb.py b/channels/tvmoviedb.py index 0db4ce3b..24bc74a2 100644 --- a/channels/tvmoviedb.py +++ b/channels/tvmoviedb.py @@ -547,7 +547,7 @@ def detalles(item): title=config.get_localized_string(70070) % item.infoLabels['originaltitle'])) if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: - tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda='es') + tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda=def_lang) if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle \ and tmdb_lang.result["title"] != item.infoLabels['originaltitle']: tmdb_lang = tmdb_lang.result["title"] @@ -1499,7 +1499,7 @@ def detalles_fa(item): title=config.get_localized_string(70070) % item.infoLabels['originaltitle'])) if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: - tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda='es') + tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda=def_lang) if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle: tmdb_lang = tmdb_lang.result["title"] itemlist.append(item.clone(action="busqueda", title=config.get_localized_string(70066) % tmdb_lang, diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index fdc57505..6befc842 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -278,11 +278,11 @@ def render_items(itemlist, parent_item): else: if 'similar' in parent_item.list_type: if parent_item.contentTitle != '': - breadcrumb = 'Similares (%s)' % parent_item.contentTitle + breadcrumb = config.get_localized_string(70693) + parent_item.contentTitle else: - breadcrumb = 'Similares (%s)' % parent_item.contentSerieName + breadcrumb = config.get_localized_string(70693) + parent_item.contentSerieName else: - breadcrumb = 'Busqueda' + breadcrumb = config.get_localized_string(70693) xbmcplugin.setPluginCategory(handle=int(sys.argv[1]), category=breadcrumb) diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 29669be9..b8491517 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -10450,9 +10450,24 @@ msgid "Disclaimer" msgstr "Disclaimer" msgctxt "#70691" -msgid "Utilizzando la funzione di download dichiari di essere in possesso di una copia fisica e di utilizzare questa funzione come backup dello stesso." -msgstr "Utilizzando la funzione di download dichiari di essere in possesso di una copia fisica e di utilizzare questa funzione come backup dello stesso." - +msgid "Using the download function you declare that you have a physical copy and use this function as a backup of the same." +msgstr "" msgctxt "#70692" -msgid "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" -msgstr "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" \ No newline at end of file +msgid "The KOD team assumes no responsibility for the use that is made of this proposed function" +msgstr "" + +msgctxt "#70693" +msgid "Search" +msgstr "" + +msgctxt "#70694" +msgid "Similar to " +msgstr "" + +msgctxt "#70695" +msgid "Results" +msgstr "" + +msgctxt "#70697" +msgid " [Results of the %s channel] " +msgstr "" \ No newline at end of file diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index ed2106f9..58d53ade 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5444,4 +5444,20 @@ msgstr "Utilizzando la funzione di download dichiari di essere in possesso di un msgctxt "#70692" msgid "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" -msgstr "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" \ No newline at end of file +msgstr "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" + +msgctxt "#70693" +msgid "Search" +msgstr "Ricerca" + +msgctxt "#70694" +msgid "Similar to " +msgstr "Simile a " + +msgctxt "#70695" +msgid "Results" +msgstr "Risultati" + +msgctxt "#70697" +msgid " [Results of the %s channel] " +msgstr " [Risultati del canale %s] " \ No newline at end of file