From 128e122e92b90ac9e79d5c91e59418f91ecfee95 Mon Sep 17 00:00:00 2001 From: angedam Date: Tue, 14 Aug 2018 16:19:06 +0200 Subject: [PATCH 1/5] update string.po --- .../resources/language/English/strings.po | 24 ++++++++++++++-- .../resources/language/Italian/strings.po | 28 ++++++++++++++++--- .../language/Spanish (Argentina)/strings.po | 23 +++++++++++++-- .../language/Spanish (Mexico)/strings.po | 23 +++++++++++++-- .../resources/language/Spanish/strings.po | 23 +++++++++++++-- 5 files changed, 109 insertions(+), 12 deletions(-) diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po index 9fca45a7..3dfdfe81 100644 --- a/plugin.video.alfa/resources/language/English/strings.po +++ b/plugin.video.alfa/resources/language/English/strings.po @@ -846,7 +846,7 @@ msgid "Enter URL" msgstr "" msgctxt "#60089" -msgid "Enter the URL [Link to server/download]" +msgid "Enter the URL [Link to server / download]" msgstr "" msgctxt "#60090" @@ -1114,7 +1114,7 @@ msgid "Alfa" msgstr "" msgctxt "#60262" -msgid "You can install the Trakt script below, once installed and configured what you see will be automatically synchronized with your account." +msgid "You can install the Trakt script below." msgstr "" msgctxt "#60263" @@ -4767,3 +4767,23 @@ msgctxt "#70516" msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" msgstr "" +msgctxt "#70517" +msgid "Pre-selected currently activated" +msgstr "" + +msgctxt "#70518" +msgid "Pre-select all" +msgstr "" + +msgctxt "#70519" +msgid "Do not pre-select any" +msgstr "" + +msgctxt "#70520" +msgid "AutoPlay allows auto to reproduce the links directly, based on the configuration of your \nfavorite servers and qualities. " +msgstr "" + +msgctxt "#70521" +msgid "You can install the Trakt script below, \nonce installed and configured what \nyou see will be synchronized with your account automatically. \nDo you want to continue?" +msgstr "" + diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index 3c2c5148..1c85670a 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -834,8 +834,8 @@ msgid "Enter URL" msgstr "Inserisci URL" msgctxt "#60089" -msgid "Enter the URL [Link to server/download]" -msgstr "Inserire l'URL [Link a server/download]" +msgid "Enter the URL [Link to server / download]" +msgstr "Inserire l'URL [Link a server / download]" msgctxt "#60090" msgid "Enter the URL [Direct link to video]." @@ -1102,8 +1102,8 @@ msgid "Alfa" msgstr "Alfa" msgctxt "#60262" -msgid "You can install the Trakt script below, once installed and configured what you see will be automatically synchronized with your account." -msgstr "Puoi installare lo script Trakt qui sotto, una volta installato e configurato ciò che vedi sarà sincronizzato automaticamente con il tuo account." +msgid "You can install the Trakt script below." +msgstr "Puoi installare lo script Trakt qui sotto." msgctxt "#60263" msgid "Do you want to continue?" @@ -4755,3 +4755,23 @@ msgctxt "#70516" msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" msgstr "[COLOR aquamarine][B]In Corso %s[/B][/COLOR]" +msgctxt "#70517" +msgid "Pre-selected currently activated" +msgstr "Pre-seleziona attivati attuali" + +msgctxt "#70518" +msgid "Pre-select all" +msgstr "Pre-seleziona tutti" + +msgctxt "#70519" +msgid "Do not pre-select any" +msgstr "Non pre-selezionare nessuno" + +msgctxt "#70520" +msgid "AutoPlay allows auto to reproduce the links directly, based on the configuration of your \nfavorite servers and qualities. " +msgstr "AutoPlay consente di riprodurre automaticamente i collegamenti direttamente, in base alla configurazione dei tuoi \nservers e qualità preferite. " + +msgctxt "#70521" +msgid "You can install the Trakt script below, \nonce installed and configured what \nyou see will be synchronized with your account automatically. \nDo you want to continue?" +msgstr "Puoi installare lo script Trakt qui sotto, \ nuna volta installato e configurato ciò che \nvedrai verrà sincronizzato automaticamente con il tuo account. \nVuoi continuare?" + diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po index 80ea8959..f1436457 100644 --- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po @@ -1114,8 +1114,8 @@ msgid "Alfa" msgstr "Alfa" msgctxt "#60262" -msgid "You can install the Trakt script below, once installed and configured what you see will be automatically synchronized with your account." -msgstr "Puedes instalar el script de Trakt a continuacíon, una vez instalado y configurado lo que veas se sincronizara con tu cuenta automaticamente." +msgid "You can install the Trakt script below." +msgstr "Puedes instalar el script de Trakt a continuacíon." msgctxt "#60263" msgid "Do you want to continue?" @@ -4759,3 +4759,22 @@ msgctxt "#70516" msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" msgstr "[COLOR aquamarine][B]En emisión %s[/B][/COLOR]" +msgctxt "#70517" +msgid "Pre-selected currently activated" +msgstr "Pre-seleccionar activados actualmente" + +msgctxt "#70518" +msgid "Pre-select all" +msgstr "Pre-seleccionar todos" + +msgctxt "#70519" +msgid "Do not pre-select any" +msgstr "No pre-seleccionar ninguno" + +msgctxt "#70520" +msgid "AutoPlay allows auto to reproduce the links directly, based on the configuration of your \nfavorite servers and qualities. " +msgstr "AutoPlay permite auto reproducir los enlaces directamente, basándose en la configuracion de tus \nservidores y calidades favoritas. " + +msgctxt "#70521" +msgid "You can install the Trakt script below, \nonce installed and configured what \nyou see will be synchronized with your account automatically. \nDo you want to continue?" +msgstr "Puedes instalar el script de Trakt a continuacíon, \nuna vez instalado y configurado lo que \veas se sincronizara con tu cuenta automaticamente. \n¿Deseas continuar?" diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po index 80ea8959..f1436457 100644 --- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po @@ -1114,8 +1114,8 @@ msgid "Alfa" msgstr "Alfa" msgctxt "#60262" -msgid "You can install the Trakt script below, once installed and configured what you see will be automatically synchronized with your account." -msgstr "Puedes instalar el script de Trakt a continuacíon, una vez instalado y configurado lo que veas se sincronizara con tu cuenta automaticamente." +msgid "You can install the Trakt script below." +msgstr "Puedes instalar el script de Trakt a continuacíon." msgctxt "#60263" msgid "Do you want to continue?" @@ -4759,3 +4759,22 @@ msgctxt "#70516" msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" msgstr "[COLOR aquamarine][B]En emisión %s[/B][/COLOR]" +msgctxt "#70517" +msgid "Pre-selected currently activated" +msgstr "Pre-seleccionar activados actualmente" + +msgctxt "#70518" +msgid "Pre-select all" +msgstr "Pre-seleccionar todos" + +msgctxt "#70519" +msgid "Do not pre-select any" +msgstr "No pre-seleccionar ninguno" + +msgctxt "#70520" +msgid "AutoPlay allows auto to reproduce the links directly, based on the configuration of your \nfavorite servers and qualities. " +msgstr "AutoPlay permite auto reproducir los enlaces directamente, basándose en la configuracion de tus \nservidores y calidades favoritas. " + +msgctxt "#70521" +msgid "You can install the Trakt script below, \nonce installed and configured what \nyou see will be synchronized with your account automatically. \nDo you want to continue?" +msgstr "Puedes instalar el script de Trakt a continuacíon, \nuna vez instalado y configurado lo que \veas se sincronizara con tu cuenta automaticamente. \n¿Deseas continuar?" diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po index 80ea8959..f1436457 100644 --- a/plugin.video.alfa/resources/language/Spanish/strings.po +++ b/plugin.video.alfa/resources/language/Spanish/strings.po @@ -1114,8 +1114,8 @@ msgid "Alfa" msgstr "Alfa" msgctxt "#60262" -msgid "You can install the Trakt script below, once installed and configured what you see will be automatically synchronized with your account." -msgstr "Puedes instalar el script de Trakt a continuacíon, una vez instalado y configurado lo que veas se sincronizara con tu cuenta automaticamente." +msgid "You can install the Trakt script below." +msgstr "Puedes instalar el script de Trakt a continuacíon." msgctxt "#60263" msgid "Do you want to continue?" @@ -4759,3 +4759,22 @@ msgctxt "#70516" msgid "[COLOR aquamarine][B]In progress %s[/B][/COLOR]" msgstr "[COLOR aquamarine][B]En emisión %s[/B][/COLOR]" +msgctxt "#70517" +msgid "Pre-selected currently activated" +msgstr "Pre-seleccionar activados actualmente" + +msgctxt "#70518" +msgid "Pre-select all" +msgstr "Pre-seleccionar todos" + +msgctxt "#70519" +msgid "Do not pre-select any" +msgstr "No pre-seleccionar ninguno" + +msgctxt "#70520" +msgid "AutoPlay allows auto to reproduce the links directly, based on the configuration of your \nfavorite servers and qualities. " +msgstr "AutoPlay permite auto reproducir los enlaces directamente, basándose en la configuracion de tus \nservidores y calidades favoritas. " + +msgctxt "#70521" +msgid "You can install the Trakt script below, \nonce installed and configured what \nyou see will be synchronized with your account automatically. \nDo you want to continue?" +msgstr "Puedes instalar el script de Trakt a continuacíon, \nuna vez instalado y configurado lo que \veas se sincronizara con tu cuenta automaticamente. \n¿Deseas continuar?" From 67a7904ad91d004a24ad9bba3aab96993acd9d97 Mon Sep 17 00:00:00 2001 From: angedam Date: Tue, 14 Aug 2018 16:20:21 +0200 Subject: [PATCH 2/5] added localized strings --- plugin.video.alfa/core/trakt_tools.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/plugin.video.alfa/core/trakt_tools.py b/plugin.video.alfa/core/trakt_tools.py index 1414a606..0a502b30 100644 --- a/plugin.video.alfa/core/trakt_tools.py +++ b/plugin.video.alfa/core/trakt_tools.py @@ -39,11 +39,11 @@ def auth_trakt(): else: itemlist = [] - title = "Accede a esta página: %s" % item.verify_url + title = config.get_localized_string(60248) % item.verify_url itemlist.append(item.clone(title=title, action="")) - title = "Ingresa este código y acepta: %s" % item.user_code + title = config.get_localized_string(60249) % item.user_code itemlist.append(item.clone(title=title, action="")) - title = "Una vez hecho, pulsa aquí!" + title = config.get_localized_string(60250) itemlist.append(item.clone(title=title, action="token_trakt")) return itemlist except: @@ -107,7 +107,7 @@ def token_trakt(item): config.set_setting("token_trakt", token, "trakt") config.set_setting("refresh_token_trakt", refresh, "trakt") if not item.folder: - platformtools.dialog_notification("Éxito", "Cuenta vinculada correctamente") + platformtools.dialog_notification(config.get_localized_string(60255), config.get_localized_string(60256)) if config.is_xbmc(): import xbmc xbmc.executebuiltin("Container.Refresh") @@ -117,14 +117,14 @@ def token_trakt(item): import traceback logger.error(traceback.format_exc()) if not item.folder: - return platformtools.dialog_notification("Error", "Fallo en el proceso de vinculación") + return platformtools.dialog_notification(config.get_localized_string(60527), config.get_localized_string(60258)) token = "" itemlist = [] if token: - itemlist.append(item.clone("Cuenta vinculada con éxito", action="")) + itemlist.append(item.clone(config.get_localized_string(60256), action="")) else: - itemlist.append(item.clone("Fallo en el proceso de vinculación", action="")) + itemlist.append(item.clone(config.get_localized_string(60260), action="")) return itemlist @@ -276,10 +276,7 @@ def ask_install_script(): from platformcode import platformtools - respuesta = platformtools.dialog_yesno("Alfa", "Puedes instalar el script de Trakt a continuacíon, " - "una vez instalado y configurado lo que " - "veas se sincronizara con tu cuenta automaticamente.", - "¿Deseas continuar?") + respuesta = platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(70521)) if respuesta: xbmc.executebuiltin("InstallAddon(script.trakt)") return From c58e16d097366e326cb5cac423c8a1897147e32e Mon Sep 17 00:00:00 2001 From: angedam Date: Tue, 14 Aug 2018 16:20:49 +0200 Subject: [PATCH 3/5] added localized strings --- plugin.video.alfa/channels/autoplay.py | 68 +++++++++---------------- plugin.video.alfa/channels/setting.py | 2 +- plugin.video.alfa/channels/tvmoviedb.py | 2 +- 3 files changed, 25 insertions(+), 47 deletions(-) diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index f8716bd5..6ba02dca 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -24,7 +24,7 @@ def context(): _context = "" if config.is_xbmc(): - _context = [{"title": "Configurar AutoPlay", + _context = [{"title": config.get_localized_string(60071), "action": "autoplay_config", "channel": "autoplay"}] return _context @@ -53,11 +53,10 @@ def show_option(channel, itemlist, text_color='yellow', thumbnail=None, fanart=N if fanart == None: fanart = 'https://s7.postimg.cc/65ooga04b/Auto_Play.png' - plot_autoplay = 'AutoPlay permite auto reproducir los enlaces directamente, basándose en la configuracion de tus ' \ - 'servidores y calidades favoritas. ' + plot_autoplay = config.get_localized_string(70520) itemlist.append( Item(channel=__channel__, - title="Configurar AutoPlay", + title=config.get_localized_string(60071), action="autoplay_config", text_color=text_color, thumbnail=thumbnail, @@ -163,7 +162,7 @@ def start(itemlist, item): if 'context' not in item: item.context = list() if not filter(lambda x: x['action'] == 'autoplay_config', context): - item.context.append({"title": "Configurar AutoPlay", + item.context.append({"title": config.get_localized_string(60071), "action": "autoplay_config", "channel": "autoplay", "from_channel": item.channel}) @@ -319,20 +318,19 @@ def start(itemlist, item): # Si se han alcanzado el numero maximo de intentos de este servidor # preguntar si queremos seguir probando o lo ignoramos if max_intentos_servers[videoitem.server.lower()] == 0: - text = "Parece que los enlaces de %s no estan funcionando." % videoitem.server.upper() + text = config.get_localized_string(60072)% videoitem.server.upper() if not platformtools.dialog_yesno("AutoPlay", text, - "¿Desea ignorar todos los enlaces de este servidor?"): + config.get_localized_string(60073)): max_intentos_servers[videoitem.server.lower()] = max_intentos # Si no quedan elementos en la lista se informa if autoplay_elem == autoplay_list[-1]: - platformtools.dialog_notification('AutoPlay', 'No hubo enlaces funcionales') + platformtools.dialog_notification('AutoPlay', config.get_localized_string(70173)) else: - platformtools.dialog_notification('AutoPlay No Fue Posible', 'No Hubo Coincidencias') + platformtools.dialog_notification(config.get_localized_string(60074), config.get_localized_string(60075)) if new_options: - platformtools.dialog_notification("AutoPlay", "Nueva Calidad/Servidor disponible en la " - "configuracion", sound=False) + platformtools.dialog_notification("AutoPlay", config.get_localized_string(60076), sound=False) # Restaura si es necesario el valor previo de "Accion y Player Mode" en preferencias if user_config_setting_action != 2: @@ -344,7 +342,7 @@ def start(itemlist, item): return itemlist -def init(channel, list_servers, list_quality, reset=False): +def init(channel, list_servers, list_quality): ''' Comprueba la existencia de canal en el archivo de configuracion de Autoplay y si no existe lo añade. Es necesario llamar a esta funcion al entrar a cualquier canal que incluya la funcion Autoplay. @@ -360,7 +358,6 @@ def init(channel, list_servers, list_quality, reset=False): change = False result = True - if not config.is_xbmc(): # platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi') result = False @@ -372,7 +369,7 @@ def init(channel, list_servers, list_quality, reset=False): change = True autoplay_node = {"AUTOPLAY": {}} - if channel not in autoplay_node or reset: + if channel not in autoplay_node: change = True # Se comprueba que no haya calidades ni servidores duplicados @@ -405,8 +402,8 @@ def init(channel, list_servers, list_quality, reset=False): result, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY') if not result: - heading = "Error al iniciar AutoPlay" - msj = "Consulte su log para obtener mas información." + heading = config.get_localized_string(60077) + msj = config.get_localized_string(60078) icon = 1 platformtools.dialog_notification(heading, msj, icon, sound=False) @@ -472,7 +469,7 @@ def autoplay_config(item): allow_option = True - active_settings = {"id": "active", "label": "AutoPlay (activar/desactivar la auto-reproduccion)", + active_settings = {"id": "active", "label": config.get_localized_string(60079), "color": "0xffffff99", "type": "bool", "default": False, "enabled": allow_option, "visible": allow_option} list_controls.append(active_settings) @@ -483,7 +480,7 @@ def autoplay_config(item): if not status_language: status_language = 0 - set_language = {"id": "language", "label": "Idioma para AutoPlay (Opcional)", "color": "0xffffff99", + set_language = {"id": "language", "label": config.get_localized_string(60080), "color": "0xffffff99", "type": "list", "default": 0, "enabled": "eq(-1,true)", "visible": True, "lvalues": get_languages(item.from_channel)} @@ -503,7 +500,7 @@ def autoplay_config(item): else: enabled = "eq(-3,true)" - custom_servers_settings = {"id": "custom_servers", "label": " Servidores favoritos", "color": "0xff66ffcc", + custom_servers_settings = {"id": "custom_servers", "label": config.get_localized_string(260081), "color": "0xff66ffcc", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(custom_servers_settings) if dict_values['active'] and enabled: @@ -516,7 +513,7 @@ def autoplay_config(item): default = num - 1 if default > len(server_list) - 1: default = 0 - set_servers = {"id": "server_%s" % num, "label": u" \u2665 " +"Servidor Favorito %s" % num, + set_servers = {"id": "server_%s" % num, "label": config.get_localized_string(60082) % num, "color": "0xfffcab14", "type": "list", "default": default, "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True, "lvalues": server_list} @@ -534,7 +531,7 @@ def autoplay_config(item): else: enabled = "eq(-7,true)" - custom_quality_settings = {"id": "custom_quality", "label": " Calidades Favoritas", "color": "0xff66ffcc", + custom_quality_settings = {"id": "custom_quality", "label": config.get_localized_string(60083), "color": "0xff66ffcc", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(custom_quality_settings) if dict_values['active'] and enabled: @@ -548,7 +545,7 @@ def autoplay_config(item): if default > len(quality_list) - 1: default = 0 - set_quality = {"id": "quality_%s" % num, "label": u" \u2665 " + "Calidad Favorita %s" % num, + set_quality = {"id": "quality_%s" % num, "label": config.get_localized_string(60084) % num, "color": "0xfff442d9", "type": "list", "default": default, "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True, "lvalues": quality_list} @@ -560,29 +557,23 @@ def autoplay_config(item): # Plan B dict_values['plan_b'] = settings_node.get('plan_b', False) enabled = "eq(-4,true)|eq(-8,true)" - plan_b = {"id": "plan_b", "label": " Plan B (Si fallan los favoritos prueba otros enlaces)", + plan_b = {"id": "plan_b", "label": config.get_localized_string(70172), "color": "0xffffff99", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(plan_b) # Seccion Prioridades - priority_list = ["Servidor y Calidad", "Calidad y Servidor"] - set_priority = {"id": "priority", "label": " Prioridad (Indica el orden para Auto-Reproducir)", + priority_list = [config.get_localized_string(70174), config.get_localized_string(70175)] + set_priority = {"id": "priority", "label": config.get_localized_string(60085), "color": "0xffffff99", "type": "list", "default": 0, "enabled": True, "visible": "eq(-5,true)+eq(-9,true)+eq(-12,true)", "lvalues": priority_list} list_controls.append(set_priority) dict_values["priority"] = settings_node.get("priority", 0) - - # Abrir cuadro de dialogo platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values, callback='save', - item=item, caption='%s - AutoPlay' % channel_name, - custom_button={'visible': True, - 'function': "reset", - 'close': True, - 'label': 'Reset'}) + item=item, caption='%s - AutoPlay' % channel_name) def save(item, dict_data_saved): @@ -661,16 +652,3 @@ def is_active(): settings_node = channel_node.get('settings', {}) return settings_node.get('active', False) - - -def reset(item, dict): - - channel_name = item.from_channel - channel = __import__('channels.%s' % channel_name, fromlist=["channels.%s" % channel_name]) - list_servers = channel.list_servers - list_quality = channel.list_quality - - init(channel_name, list_servers, list_quality, reset=True) - platformtools.dialog_notification('AutoPlay', '%s: Los datos fueron reiniciados' % item.category) - - return diff --git a/plugin.video.alfa/channels/setting.py b/plugin.video.alfa/channels/setting.py index 806558e9..043d8100 100644 --- a/plugin.video.alfa/channels/setting.py +++ b/plugin.video.alfa/channels/setting.py @@ -553,7 +553,7 @@ def channels_onoff(item): # Diálogo para pre-seleccionar # ---------------------------- - preselecciones = ['Pre-seleccionar activados actualmente', 'Pre-seleccionar todos', 'No pre-seleccionar ninguno'] + preselecciones = [config.get_localized_string(70517), config.get_localized_string(70518), config.get_localized_string(70519)] ret = platformtools.dialog_select(config.get_localized_string(60545), preselecciones) if ret == -1: return False # pedido cancel if ret == 2: preselect = [] diff --git a/plugin.video.alfa/channels/tvmoviedb.py b/plugin.video.alfa/channels/tvmoviedb.py index 12e1b19d..2eabf442 100644 --- a/plugin.video.alfa/channels/tvmoviedb.py +++ b/plugin.video.alfa/channels/tvmoviedb.py @@ -1070,7 +1070,7 @@ def filtro_imdb(item): list_controls.append({'id': 'orden', 'label': config.get_localized_string(70455), 'enabled': True, 'color': '0xFF25AA48', 'type': 'list', 'default': -1, 'visible': True}) orden = [config.get_localized_string(70456), config.get_localized_string(70457), config.get_localized_string(70458), config.get_localized_string(70459), config.get_localized_string(70460), config.get_localized_string(70461), - config.get_localized_string(70462, config.get_localized_string(70463)] + config.get_localized_string(70462), config.get_localized_string(70463)] orden_imdb = ['moviemeter,asc', 'moviemeter,desc', 'year,desc', 'year,asc', 'user_rating,desc', 'user_rating,asc', 'alpha,asc', 'alpha,desc'] From 49e32e1f34e0d683547b25e2ae726fe3cdd17a07 Mon Sep 17 00:00:00 2001 From: angedam Date: Tue, 14 Aug 2018 16:21:13 +0200 Subject: [PATCH 4/5] added localized strings --- plugin.video.alfa/servers/openload.py | 2 +- plugin.video.alfa/servers/speedvideo.py | 2 +- plugin.video.alfa/servers/streamango.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/servers/openload.py b/plugin.video.alfa/servers/openload.py index 81fd95c2..60f7fdda 100644 --- a/plugin.video.alfa/servers/openload.py +++ b/plugin.video.alfa/servers/openload.py @@ -16,7 +16,7 @@ def test_video_exists(page_url): if 'We’re Sorry!' in data: data = httptools.downloadpage(page_url.replace("/embed/", "/f/"), headers=header, cookies=False).data if 'We’re Sorry!' in data: - return False, "[Openload] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Openload" return True, "" diff --git a/plugin.video.alfa/servers/speedvideo.py b/plugin.video.alfa/servers/speedvideo.py index cb4b4d24..cfa37821 100755 --- a/plugin.video.alfa/servers/speedvideo.py +++ b/plugin.video.alfa/servers/speedvideo.py @@ -10,7 +10,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "File was deleted" in data: - return False, "[speedvideo] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Speedvideo" return True, "" diff --git a/plugin.video.alfa/servers/streamango.py b/plugin.video.alfa/servers/streamango.py index 703961e9..cf1e8b3b 100755 --- a/plugin.video.alfa/servers/streamango.py +++ b/plugin.video.alfa/servers/streamango.py @@ -10,7 +10,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "We are unable to find the video" in data: - return False, "[streamango] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Streamango" return True, "" From eb6310a5e2c8e8f67a30dac2cefb573ba55f21c3 Mon Sep 17 00:00:00 2001 From: angedam Date: Tue, 14 Aug 2018 17:41:02 +0200 Subject: [PATCH 5/5] added localized strings --- plugin.video.alfa/channels/autoplay.py | 68 +++++++++++++++++--------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index 6ba02dca..cc1cdf5a 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -24,7 +24,7 @@ def context(): _context = "" if config.is_xbmc(): - _context = [{"title": config.get_localized_string(60071), + _context = [{"title": "Configurar AutoPlay", "action": "autoplay_config", "channel": "autoplay"}] return _context @@ -53,10 +53,11 @@ def show_option(channel, itemlist, text_color='yellow', thumbnail=None, fanart=N if fanart == None: fanart = 'https://s7.postimg.cc/65ooga04b/Auto_Play.png' - plot_autoplay = config.get_localized_string(70520) + plot_autoplay = 'AutoPlay permite auto reproducir los enlaces directamente, basándose en la configuracion de tus ' \ + 'servidores y calidades favoritas. ' itemlist.append( Item(channel=__channel__, - title=config.get_localized_string(60071), + title="Configurar AutoPlay", action="autoplay_config", text_color=text_color, thumbnail=thumbnail, @@ -162,7 +163,7 @@ def start(itemlist, item): if 'context' not in item: item.context = list() if not filter(lambda x: x['action'] == 'autoplay_config', context): - item.context.append({"title": config.get_localized_string(60071), + item.context.append({"title": "Configurar AutoPlay", "action": "autoplay_config", "channel": "autoplay", "from_channel": item.channel}) @@ -318,19 +319,20 @@ def start(itemlist, item): # Si se han alcanzado el numero maximo de intentos de este servidor # preguntar si queremos seguir probando o lo ignoramos if max_intentos_servers[videoitem.server.lower()] == 0: - text = config.get_localized_string(60072)% videoitem.server.upper() + text = "Parece que los enlaces de %s no estan funcionando." % videoitem.server.upper() if not platformtools.dialog_yesno("AutoPlay", text, - config.get_localized_string(60073)): + "¿Desea ignorar todos los enlaces de este servidor?"): max_intentos_servers[videoitem.server.lower()] = max_intentos # Si no quedan elementos en la lista se informa if autoplay_elem == autoplay_list[-1]: - platformtools.dialog_notification('AutoPlay', config.get_localized_string(70173)) + platformtools.dialog_notification('AutoPlay', 'No hubo enlaces funcionales') else: - platformtools.dialog_notification(config.get_localized_string(60074), config.get_localized_string(60075)) + platformtools.dialog_notification('AutoPlay No Fue Posible', 'No Hubo Coincidencias') if new_options: - platformtools.dialog_notification("AutoPlay", config.get_localized_string(60076), sound=False) + platformtools.dialog_notification("AutoPlay", "Nueva Calidad/Servidor disponible en la " + "configuracion", sound=False) # Restaura si es necesario el valor previo de "Accion y Player Mode" en preferencias if user_config_setting_action != 2: @@ -342,7 +344,7 @@ def start(itemlist, item): return itemlist -def init(channel, list_servers, list_quality): +def init(channel, list_servers, list_quality, reset=False): ''' Comprueba la existencia de canal en el archivo de configuracion de Autoplay y si no existe lo añade. Es necesario llamar a esta funcion al entrar a cualquier canal que incluya la funcion Autoplay. @@ -358,6 +360,7 @@ def init(channel, list_servers, list_quality): change = False result = True + if not config.is_xbmc(): # platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi') result = False @@ -369,7 +372,7 @@ def init(channel, list_servers, list_quality): change = True autoplay_node = {"AUTOPLAY": {}} - if channel not in autoplay_node: + if channel not in autoplay_node or reset: change = True # Se comprueba que no haya calidades ni servidores duplicados @@ -402,8 +405,8 @@ def init(channel, list_servers, list_quality): result, json_data = jsontools.update_node(autoplay_node, 'autoplay', 'AUTOPLAY') if not result: - heading = config.get_localized_string(60077) - msj = config.get_localized_string(60078) + heading = "Error al iniciar AutoPlay" + msj = "Consulte su log para obtener mas información." icon = 1 platformtools.dialog_notification(heading, msj, icon, sound=False) @@ -469,7 +472,7 @@ def autoplay_config(item): allow_option = True - active_settings = {"id": "active", "label": config.get_localized_string(60079), + active_settings = {"id": "active", "label": "AutoPlay (activar/desactivar la auto-reproduccion)", "color": "0xffffff99", "type": "bool", "default": False, "enabled": allow_option, "visible": allow_option} list_controls.append(active_settings) @@ -480,7 +483,7 @@ def autoplay_config(item): if not status_language: status_language = 0 - set_language = {"id": "language", "label": config.get_localized_string(60080), "color": "0xffffff99", + set_language = {"id": "language", "label": "Idioma para AutoPlay (Opcional)", "color": "0xffffff99", "type": "list", "default": 0, "enabled": "eq(-1,true)", "visible": True, "lvalues": get_languages(item.from_channel)} @@ -500,7 +503,7 @@ def autoplay_config(item): else: enabled = "eq(-3,true)" - custom_servers_settings = {"id": "custom_servers", "label": config.get_localized_string(260081), "color": "0xff66ffcc", + custom_servers_settings = {"id": "custom_servers", "label": " Servidores favoritos", "color": "0xff66ffcc", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(custom_servers_settings) if dict_values['active'] and enabled: @@ -513,7 +516,7 @@ def autoplay_config(item): default = num - 1 if default > len(server_list) - 1: default = 0 - set_servers = {"id": "server_%s" % num, "label": config.get_localized_string(60082) % num, + set_servers = {"id": "server_%s" % num, "label": u" \u2665 " +"Servidor Favorito %s" % num, "color": "0xfffcab14", "type": "list", "default": default, "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True, "lvalues": server_list} @@ -531,7 +534,7 @@ def autoplay_config(item): else: enabled = "eq(-7,true)" - custom_quality_settings = {"id": "custom_quality", "label": config.get_localized_string(60083), "color": "0xff66ffcc", + custom_quality_settings = {"id": "custom_quality", "label": " Calidades Favoritas", "color": "0xff66ffcc", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(custom_quality_settings) if dict_values['active'] and enabled: @@ -545,7 +548,7 @@ def autoplay_config(item): if default > len(quality_list) - 1: default = 0 - set_quality = {"id": "quality_%s" % num, "label": config.get_localized_string(60084) % num, + set_quality = {"id": "quality_%s" % num, "label": u" \u2665 " + config.get_localized_string(60084) % num, "color": "0xfff442d9", "type": "list", "default": default, "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True, "lvalues": quality_list} @@ -557,23 +560,29 @@ def autoplay_config(item): # Plan B dict_values['plan_b'] = settings_node.get('plan_b', False) enabled = "eq(-4,true)|eq(-8,true)" - plan_b = {"id": "plan_b", "label": config.get_localized_string(70172), + plan_b = {"id": "plan_b", "label": " Plan B (Si fallan los favoritos prueba otros enlaces)", "color": "0xffffff99", "type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(plan_b) # Seccion Prioridades - priority_list = [config.get_localized_string(70174), config.get_localized_string(70175)] - set_priority = {"id": "priority", "label": config.get_localized_string(60085), + priority_list = ["Servidor y Calidad", "Calidad y Servidor"] + set_priority = {"id": "priority", "label": " Prioridad (Indica el orden para Auto-Reproducir)", "color": "0xffffff99", "type": "list", "default": 0, "enabled": True, "visible": "eq(-5,true)+eq(-9,true)+eq(-12,true)", "lvalues": priority_list} list_controls.append(set_priority) dict_values["priority"] = settings_node.get("priority", 0) + + # Abrir cuadro de dialogo platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values, callback='save', - item=item, caption='%s - AutoPlay' % channel_name) + item=item, caption='%s - AutoPlay' % channel_name, + custom_button={'visible': True, + 'function': "reset", + 'close': True, + 'label': 'Reset'}) def save(item, dict_data_saved): @@ -652,3 +661,16 @@ def is_active(): settings_node = channel_node.get('settings', {}) return settings_node.get('active', False) + + +def reset(item, dict): + + channel_name = item.from_channel + channel = __import__('channels.%s' % channel_name, fromlist=["channels.%s" % channel_name]) + list_servers = channel.list_servers + list_quality = channel.list_quality + + init(channel_name, list_servers, list_quality, reset=True) + platformtools.dialog_notification('AutoPlay', '%s: Los datos fueron reiniciados' % item.category) + + return