admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename translate function

Browse Source
This commit is contained in:
Matt
2021-12-30 17:05:10 -05:00
parent 157a477a10
commit fc690abee9
11 changed files with 159 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/lib/cache_images.py
View File

@@ -18,7 +18,7 @@ from .downloadutils import DownloadUtils
from .loghandler import LazyLogger
from .jsonrpc import JsonRpc, get_value
from .datamanager import DataManager
from .utils import translate
from .utils import translate_string
from .kodi_utils import HomeWindow
from .item_functions import get_art
@@ -70,8 +70,8 @@ class CacheArtwork(threading.Thread):
log.debug("cache_delete_for_links")
progress = xbmcgui.DialogProgress()
progress.create(translate(30281))
progress.update(30, translate(30347))
progress.create(translate_string(30281))
progress.update(30, translate_string(30347))
item_image_url_part = "Items/%s/Images/" % item_id
item_image_url_part = item_image_url_part.replace("/", "%2f")
@@ -82,7 +82,7 @@ class CacheArtwork(threading.Thread):
result = JsonRpc('Settings.GetSettingValue').execute(web_query)
xbmc_webserver_enabled = result['result']['value']
if not xbmc_webserver_enabled:
xbmcgui.Dialog().ok(translate(30294), translate(30295))
xbmcgui.Dialog().ok(translate_string(30294), translate_string(30295))
return
params = {"properties": ["url"]}
@@ -90,7 +90,7 @@ class CacheArtwork(threading.Thread):
textures = json_result.get("result", {}).get("textures", [])
log.debug("texture ids: {0}".format(textures))
progress.update(70, translate(30346))
progress.update(70, translate_string(30346))
delete_count = 0
for texture in textures:
@@ -104,10 +104,10 @@ class CacheArtwork(threading.Thread):
del textures
progress.update(100, translate(30125))
progress.update(100, translate_string(30125))
progress.close()
xbmcgui.Dialog().ok(translate(30281), '{}: {}'.format(translate(30344), delete_count))
xbmcgui.Dialog().ok(translate_string(30281), '{}: {}'.format(translate_string(30344), delete_count))
def cache_artwork_interactive(self):
log.debug("cache_artwork_interactive")
@@ -119,21 +119,21 @@ class CacheArtwork(threading.Thread):
result = JsonRpc('Settings.GetSettingValue').execute(web_query)
xbmc_webserver_enabled = result['result']['value']
if not xbmc_webserver_enabled:
xbmcgui.Dialog().ok(translate(30294), '{} - {}'.format(translate(30295), translate(30355)))
xbmcgui.Dialog().ok(translate_string(30294), '{} - {}'.format(translate_string(30295), translate_string(30355)))
xbmc.executebuiltin('ActivateWindow(servicesettings)')
return
result_report = []
# ask questions
question_delete_unused = xbmcgui.Dialog().yesno(translate(30296), translate(30297))
question_cache_images = xbmcgui.Dialog().yesno(translate(30299), translate(30300))
question_delete_unused = xbmcgui.Dialog().yesno(translate_string(30296), translate_string(30297))
question_cache_images = xbmcgui.Dialog().yesno(translate_string(30299), translate_string(30300))
delete_canceled = False
# now do work - delete unused
if question_delete_unused:
delete_pdialog = xbmcgui.DialogProgress()
delete_pdialog.create(translate(30298), "")
delete_pdialog.create(translate_string(30298), "")
index = 0
params = {"properties": ["url"]}
@@ -171,9 +171,9 @@ class CacheArtwork(threading.Thread):
delete_canceled = True
break
result_report.append(translate(30385) + str(len(textures)))
result_report.append(translate(30386) + str(len(unused_texture_ids)))
result_report.append(translate(30387) + str(index))
result_report.append(translate_string(30385) + str(len(textures)))
result_report.append(translate_string(30386) + str(len(unused_texture_ids)))
result_report.append(translate_string(30387) + str(index))
del textures
del jellyfin_texture_urls
@@ -187,7 +187,7 @@ class CacheArtwork(threading.Thread):
# now do work - cache images
if question_cache_images:
cache_pdialog = xbmcgui.DialogProgress()
cache_pdialog.create(translate(30301), "")
cache_pdialog.create(translate_string(30301), "")
cache_report = self.cache_artwork(cache_pdialog)
cache_pdialog.close()
del cache_pdialog
@@ -196,12 +196,12 @@ class CacheArtwork(threading.Thread):
if len(result_report) > 0:
msg = "\r\n".join(result_report)
xbmcgui.Dialog().textviewer(translate(30125), msg, usemono=True)
xbmcgui.Dialog().textviewer(translate_string(30125), msg, usemono=True)
def cache_artwork_background(self):
log.debug("cache_artwork_background")
dp = xbmcgui.DialogProgressBG()
dp.create(translate(30301), "")
dp.create(translate_string(30301), "")
result_text = None
try:
result_text = self.cache_artwork(dp)
@@ -238,7 +238,7 @@ class CacheArtwork(threading.Thread):
if self.stop_all_activity:
return None
progress.update(0, translate(30359))
progress.update(0, translate_string(30359))
texture_urls = set()
@@ -268,7 +268,7 @@ class CacheArtwork(threading.Thread):
# get the password
xbmc_password = get_value("services.webserverpassword")
progress.update(0, translate(30356))
progress.update(0, translate_string(30356))
params = {"properties": ["url"]}
json_result = JsonRpc('Textures.GetTextures').execute(params)
@@ -278,7 +278,7 @@ class CacheArtwork(threading.Thread):
if self.stop_all_activity:
return
progress.update(0, translate(30357))
progress.update(0, translate_string(30357))
texture_urls = set()
for texture in textures:
@@ -296,7 +296,7 @@ class CacheArtwork(threading.Thread):
if self.stop_all_activity:
return
progress.update(0, translate(30358))
progress.update(0, translate_string(30358))
jellyfin_texture_urls = self.get_jellyfin_artwork(progress)
if jellyfin_texture_urls is None:
@@ -347,7 +347,7 @@ class CacheArtwork(threading.Thread):
break
result_report = []
result_report.append(translate(30302) + str(len(texture_urls)))
result_report.append(translate(30303) + str(len(missing_texture_urls)))
result_report.append(translate(30304) + str(count_done))
result_report.append(translate_string(30302) + str(len(texture_urls)))
result_report.append(translate_string(30303) + str(len(missing_texture_urls)))
result_report.append(translate_string(30304) + str(count_done))
return result_report

1
resources/lib/datamanager.py
View File

@@ -14,7 +14,6 @@ from .item_functions import extract_item_info
from .kodi_utils import HomeWindow
from .tracking import timer
from .filelock import FileLock
from .utils import translate
import xbmc
import xbmcaddon

4
resources/lib/dialogs.py
View File

@@ -4,7 +4,7 @@ import xbmc
import xbmcgui
from .loghandler import LazyLogger
from .utils import translate
from .utils import translate_string
log = LazyLogger(__name__)
@@ -70,7 +70,7 @@ class ResumeDialog(xbmcgui.WindowXMLDialog):
def onInit(self):
self.action_exitkeys_id = [10, 13]
self.getControl(3010).setLabel(self.resumeTimeStamp)
self.getControl(3011).setLabel(translate(30237))
self.getControl(3011).setLabel(translate_string(30237))
def onFocus(self, controlId):
pass

14
resources/lib/dir_functions.py
View File

@@ -14,7 +14,7 @@ from .kodi_utils import HomeWindow
from .downloadutils import DownloadUtils
from .loghandler import LazyLogger
from .item_functions import add_gui_item, ItemDetails
from .utils import send_event_notification, translate
from .utils import send_event_notification, translate_string
from .tracking import timer
log = LazyLogger(__name__)
@@ -27,7 +27,7 @@ def get_content(url, params):
default_sort = params.get("sort")
media_type = params.get("media_type", None)
if not media_type:
xbmcgui.Dialog().ok(translate(30135), translate(30139))
xbmcgui.Dialog().ok(translate_string(30135), translate_string(30139))
log.debug("URL: {0}".format(url))
log.debug("MediaType: {0}".format(media_type))
@@ -77,8 +77,8 @@ def get_content(url, params):
progress = None
if settings.getSetting('showLoadProgress') == "true":
progress = xbmcgui.DialogProgress()
progress.create(translate(30112))
progress.update(0, translate(30113))
progress.create(translate_string(30112))
progress.update(0, translate_string(30113))
# update url for paging
start_index = 0
@@ -166,7 +166,7 @@ def get_content(url, params):
log.debug("No view id for view type:{0}".format(view_key))
if progress is not None:
progress.update(100, translate(30125))
progress.update(100, translate_string(30125))
progress.close()
return
@@ -289,7 +289,7 @@ def process_directory(url, progress, params, use_cache_data=False):
if progress is not None:
percent_done = (float(current_item) / float(item_count)) * 100
progress.update(int(percent_done), translate(30126) + str(current_item))
progress.update(int(percent_done), translate_string(30126) + str(current_item))
current_item = current_item + 1
if detected_type is not None:
@@ -386,7 +386,7 @@ def process_directory(url, progress, params, use_cache_data=False):
item_details = ItemDetails()
item_details.id = first_season_item.id
item_details.name = translate(30290)
item_details.name = translate_string(30290)
item_details.art = first_season_item.art
item_details.play_count = played
item_details.overlay = overlay

2
resources/lib/downloadutils.py
View File

@@ -19,7 +19,7 @@ from six import ensure_text
from .kodi_utils import HomeWindow
from .loghandler import LazyLogger
from .tracking import timer
from .utils import translate, get_device_id, get_version
from .utils import get_device_id, get_version
log = LazyLogger(__name__)

58
resources/lib/functions.py
View File

@@ -16,7 +16,7 @@ import xbmcaddon
import xbmc
from .downloadutils import DownloadUtils, load_user_details
from .utils import send_event_notification, convert_size, translate, get_version
from .utils import send_event_notification, convert_size, translate_string, get_version
from .item_functions import get_art
from .kodi_utils import HomeWindow
from .datamanager import DataManager, clear_cached_server_data
@@ -296,15 +296,15 @@ def delete(item_id):
final_name += item_name
if not item.get("CanDelete", False):
xbmcgui.Dialog().ok(translate(30135), translate(30417), final_name)
xbmcgui.Dialog().ok(translate_string(30135), translate_string(30417), final_name)
return
return_value = xbmcgui.Dialog().yesno(translate(30091), '{}\n{}'.format(final_name, translate(30092)))
return_value = xbmcgui.Dialog().yesno(translate_string(30091), '{}\n{}'.format(final_name, translate_string(30092)))
if return_value:
log.debug('Deleting Item: {0}'.format(item_id))
url = '{server}/Items/' + item_id
progress = xbmcgui.DialogProgress()
progress.create(translate(30052), translate(30053))
progress.create(translate_string(30052), translate_string(30053))
downloadUtils.download_url(url, method="DELETE")
progress.close()
check_for_new_content()
@@ -355,37 +355,37 @@ def show_menu(params):
action_items = []
if result["Type"] in ["Episode", "Movie", "Music", "Video", "Audio", "TvChannel", "Program"]:
li = xbmcgui.ListItem(translate(30314))
li = xbmcgui.ListItem(translate_string(30314))
li.setProperty('menu_id', 'play')
action_items.append(li)
if result["Type"] in ["Season", "MusicAlbum", "Playlist"]:
li = xbmcgui.ListItem(translate(30317))
li = xbmcgui.ListItem(translate_string(30317))
li.setProperty('menu_id', 'play_all')
action_items.append(li)
if result["Type"] in ["Episode", "Movie", "Video", "TvChannel", "Program"]:
li = xbmcgui.ListItem(translate(30275))
li = xbmcgui.ListItem(translate_string(30275))
li.setProperty('menu_id', 'transcode')
action_items.append(li)
if result["Type"] in ["Episode", "Movie", "Music", "Video", "Audio"]:
li = xbmcgui.ListItem(translate(30402))
li = xbmcgui.ListItem(translate_string(30402))
li.setProperty('menu_id', 'add_to_playlist')
action_items.append(li)
if result["Type"] in ("Movie", "Series"):
li = xbmcgui.ListItem(translate(30307))
li = xbmcgui.ListItem(translate_string(30307))
li.setProperty('menu_id', 'play_trailer')
action_items.append(li)
if result["Type"] == "Episode" and result["ParentId"] is not None:
li = xbmcgui.ListItem(translate(30327))
li = xbmcgui.ListItem(translate_string(30327))
li.setProperty('menu_id', 'view_season')
action_items.append(li)
if result["Type"] in ("Series", "Season", "Episode"):
li = xbmcgui.ListItem(translate(30354))
li = xbmcgui.ListItem(translate_string(30354))
li.setProperty('menu_id', 'view_series')
action_items.append(li)
@@ -399,26 +399,26 @@ def show_menu(params):
progress = user_data.get("PlaybackPositionTicks", 0) != 0
played = user_data.get("Played", False)
if not played or progress:
li = xbmcgui.ListItem(translate(30270))
li = xbmcgui.ListItem(translate_string(30270))
li.setProperty('menu_id', 'mark_watched')
action_items.append(li)
if played or progress:
li = xbmcgui.ListItem(translate(30271))
li = xbmcgui.ListItem(translate_string(30271))
li.setProperty('menu_id', 'mark_unwatched')
action_items.append(li)
if user_data.get("IsFavorite", False) is False:
li = xbmcgui.ListItem(translate(30272))
li = xbmcgui.ListItem(translate_string(30272))
li.setProperty('menu_id', 'jellyfin_set_favorite')
action_items.append(li)
else:
li = xbmcgui.ListItem(translate(30273))
li = xbmcgui.ListItem(translate_string(30273))
li.setProperty('menu_id', 'jellyfin_unset_favorite')
action_items.append(li)
can_delete = result.get("CanDelete", False)
if can_delete:
li = xbmcgui.ListItem(translate(30274))
li = xbmcgui.ListItem(translate_string(30274))
li.setProperty('menu_id', 'delete')
action_items.append(li)
@@ -428,20 +428,20 @@ def show_menu(params):
li.setProperty('menu_id', 'safe_delete')
action_items.append(li)
li = xbmcgui.ListItem(translate(30398))
li = xbmcgui.ListItem(translate_string(30398))
li.setProperty('menu_id', 'refresh_server')
action_items.append(li)
li = xbmcgui.ListItem(translate(30281))
li = xbmcgui.ListItem(translate_string(30281))
li.setProperty('menu_id', 'refresh_images')
action_items.append(li)
if result["Type"] in ["Movie", "Series"]:
li = xbmcgui.ListItem(translate(30399))
li = xbmcgui.ListItem(translate_string(30399))
li.setProperty('menu_id', 'hide')
action_items.append(li)
li = xbmcgui.ListItem(translate(30401))
li = xbmcgui.ListItem(translate_string(30401))
li.setProperty('menu_id', 'info')
action_items.append(li)
@@ -668,7 +668,7 @@ def populate_listitem(item_id):
result = downloadUtils.download_url(url)
log.debug("populate_listitem item info: {0}".format(result))
item_title = result.get("Name", translate(30280))
item_title = result.get("Name", translate_string(30280))
list_item = xbmcgui.ListItem(label=item_title)
@@ -775,13 +775,13 @@ def search_results(params):
item_type = item_type.lower()
if item_type == 'movie':
heading_type = translate(30231)
heading_type = translate_string(30231)
content_type = 'movies'
elif item_type == 'series':
heading_type = translate(30229)
heading_type = translate_string(30229)
content_type = 'tvshows'
elif item_type == 'episode':
heading_type = translate(30235)
heading_type = translate_string(30235)
content_type = 'episodes'
params["name_format"] = "Episode|episode_name_format"
elif item_type == "music" or item_type == "audio" or item_type == "musicalbum":
@@ -800,7 +800,7 @@ def search_results(params):
home_window = HomeWindow()
last_search = home_window.get_property("last_search")
kb = xbmc.Keyboard()
kb.setHeading(heading_type.capitalize() + ' ' + translate(30246).lower())
kb.setHeading(heading_type.capitalize() + ' ' + translate_string(30246).lower())
kb.setDefault(last_search)
kb.doModal()
@@ -827,8 +827,8 @@ def search_results(params):
progress = None
if settings.getSetting('showLoadProgress') == "true":
progress = xbmcgui.DialogProgress()
progress.create(translate(30112))
progress.update(0, translate(30113))
progress.create(translate_string(30112))
progress.update(0, translate_string(30113))
# what type of search
if item_type == "person":
@@ -901,7 +901,7 @@ def search_results(params):
xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
if progress is not None:
progress.update(100, translate(30125))
progress.update(100, translate_string(30125))
progress.close()
@@ -1012,7 +1012,7 @@ def play_item_trailer(item_id):
trailer_text.append(name)
dialog = xbmcgui.Dialog()
resp = dialog.select(translate(30308), trailer_text)
resp = dialog.select(translate_string(30308), trailer_text)
if resp > -1:
trailer = trailer_list[resp]
log.debug("SelectedTrailer: {0}".format(trailer))

140
resources/lib/menu_functions.py
View File

@@ -15,7 +15,7 @@ from .downloadutils import DownloadUtils
from .kodi_utils import add_menu_directory_item, HomeWindow
from .loghandler import LazyLogger
from .datamanager import DataManager
from .utils import get_jellyfin_url, translate
from .utils import get_jellyfin_url, translate_string
from .item_functions import get_art
log = LazyLogger(__name__)
@@ -253,7 +253,7 @@ def show_movie_pages(menu_params):
"&mode=GET_CONTENT" +
"&media_type=" + collection["media_type"])
log.debug("addMenuDirectoryItem: {0} - {1} - {2}".format(collection.get('title'), url, collection.get("art")))
add_menu_directory_item(collection.get('title', translate(30250)), url, art=collection.get("art"))
add_menu_directory_item(collection.get('title', translate_string(30250)), url, art=collection.get("art"))
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -334,7 +334,7 @@ def show_genre_list(menu_params):
"&mode=GET_CONTENT" +
"&media_type=" + collection["media_type"])
log.debug("addMenuDirectoryItem: {0} - {1} - {2}".format(collection.get('title'), url, collection.get("art")))
add_menu_directory_item(collection.get('title', translate(30250)), url, art=collection.get("art"))
add_menu_directory_item(collection.get('title', translate_string(30250)), url, art=collection.get("art"))
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -400,7 +400,7 @@ def show_movie_alpha_list(menu_params):
url = (sys.argv[0] + "?url=" + quote(collection['path']) +
"&mode=GET_CONTENT&media_type=" + collection["media_type"])
log.debug("addMenuDirectoryItem: {0} ({1})".format(collection.get('title'), url))
add_menu_directory_item(collection.get('title', translate(30250)), url, art=collection.get("art"))
add_menu_directory_item(collection.get('title', translate_string(30250)), url, art=collection.get("art"))
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -461,7 +461,7 @@ def show_tvshow_alpha_list(menu_params):
url = (sys.argv[0] + "?url=" + quote(collection['path']) +
"&mode=GET_CONTENT&media_type=" + collection["media_type"])
log.debug("addMenuDirectoryItem: {0} ({1})".format(collection.get('title'), url))
add_menu_directory_item(collection.get('title', translate(30250)), url, art=collection.get("art"))
add_menu_directory_item(collection.get('title', translate_string(30250)), url, art=collection.get("art"))
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -470,13 +470,13 @@ def display_main_menu():
handle = int(sys.argv[1])
xbmcplugin.setContent(handle, 'files')
add_menu_directory_item(translate(30406),
add_menu_directory_item(translate_string(30406),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=library")
add_menu_directory_item(translate(30407),
add_menu_directory_item(translate_string(30407),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=show_global_types")
add_menu_directory_item(translate(30408),
add_menu_directory_item(translate_string(30408),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=show_custom_widgets")
add_menu_directory_item(translate(30409),
add_menu_directory_item(translate_string(30409),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=addon_items")
xbmcplugin.endOfDirectory(handle)
@@ -507,9 +507,9 @@ def display_menu(params):
def show_global_types(params):
handle = int(sys.argv[1])
add_menu_directory_item(translate(30256),
add_menu_directory_item(translate_string(30256),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=global_list_movies")
add_menu_directory_item(translate(30261),
add_menu_directory_item(translate_string(30261),
"plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=global_list_tvshows")
xbmcplugin.endOfDirectory(handle)
@@ -531,7 +531,7 @@ def display_homevideos_type(menu_params, view):
base_params["ImageTypeLimit"] = 1
path = get_jellyfin_url("{server}/Users/{userid}/Items", base_params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=homevideos"
add_menu_directory_item(view_name + translate(30405), url)
add_menu_directory_item(view_name + translate_string(30405), url)
# In progress home movies
params = {}
@@ -541,7 +541,7 @@ def display_homevideos_type(menu_params, view):
params["Limit"] = "{ItemLimit}"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=homevideos"
add_menu_directory_item(view_name + translate(30267) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30267) + " (" + show_x_filtered_items + ")", url)
# Recently added
params = {}
@@ -555,21 +555,21 @@ def display_homevideos_type(menu_params, view):
params["Limit"] = "{ItemLimit}"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=homevideos"
add_menu_directory_item(view_name + translate(30268) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30268) + " (" + show_x_filtered_items + ")", url)
xbmcplugin.endOfDirectory(handle)
def display_addon_menu(params):
add_menu_directory_item(translate(30246), "plugin://plugin.video.jellycon/?mode=SEARCH")
add_menu_directory_item(translate(30017), "plugin://plugin.video.jellycon/?mode=SHOW_SERVER_SESSIONS")
add_menu_directory_item(translate(30012), "plugin://plugin.video.jellycon/?mode=CHANGE_USER")
add_menu_directory_item(translate(30011), "plugin://plugin.video.jellycon/?mode=DETECT_SERVER_USER")
add_menu_directory_item(translate(30435), "plugin://plugin.video.jellycon/?mode=DETECT_CONNECTION_SPEED")
add_menu_directory_item(translate(30254), "plugin://plugin.video.jellycon/?mode=SHOW_SETTINGS")
add_menu_directory_item(translate(30395), "plugin://plugin.video.jellycon/?mode=CLEAR_CACHE")
add_menu_directory_item(translate(30293), "plugin://plugin.video.jellycon/?mode=CACHE_ARTWORK")
add_menu_directory_item(translate_string(30246), "plugin://plugin.video.jellycon/?mode=SEARCH")
add_menu_directory_item(translate_string(30017), "plugin://plugin.video.jellycon/?mode=SHOW_SERVER_SESSIONS")
add_menu_directory_item(translate_string(30012), "plugin://plugin.video.jellycon/?mode=CHANGE_USER")
add_menu_directory_item(translate_string(30011), "plugin://plugin.video.jellycon/?mode=DETECT_SERVER_USER")
add_menu_directory_item(translate_string(30435), "plugin://plugin.video.jellycon/?mode=DETECT_CONNECTION_SPEED")
add_menu_directory_item(translate_string(30254), "plugin://plugin.video.jellycon/?mode=SHOW_SETTINGS")
add_menu_directory_item(translate_string(30395), "plugin://plugin.video.jellycon/?mode=CLEAR_CACHE")
add_menu_directory_item(translate_string(30293), "plugin://plugin.video.jellycon/?mode=CACHE_ARTWORK")
add_menu_directory_item("Clone default skin", "plugin://plugin.video.jellycon/?mode=CLONE_SKIN")
handle = int(sys.argv[1])
@@ -579,7 +579,7 @@ def display_addon_menu(params):
def display_tvshow_type(menu_params, view):
handle = int(sys.argv[1])
view_name = translate(30261)
view_name = translate_string(30261)
if view is not None:
view_name = view.get("Name")
@@ -597,7 +597,7 @@ def display_tvshow_type(menu_params, view):
base_params["Recursive"] = True
path = get_jellyfin_url("{server}/Users/{userid}/Items", base_params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=tvshows"
add_menu_directory_item(view_name + translate(30405), url)
add_menu_directory_item(view_name + translate_string(30405), url)
# Favorite TV Shows
params = {}
@@ -605,7 +605,7 @@ def display_tvshow_type(menu_params, view):
params["Filters"] = "IsFavorite"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=tvshows"
add_menu_directory_item(view_name + translate(30414), url)
add_menu_directory_item(view_name + translate_string(30414), url)
# Tv Shows with unplayed
params = {}
@@ -613,7 +613,7 @@ def display_tvshow_type(menu_params, view):
params["IsPlayed"] = False
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=tvshows"
add_menu_directory_item(view_name + translate(30285), url)
add_menu_directory_item(view_name + translate_string(30285), url)
# In progress episodes
params = {}
@@ -626,7 +626,7 @@ def display_tvshow_type(menu_params, view):
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=Episodes&sort=none"
url += "&name_format=" + quote('Episode|episode_name_format')
add_menu_directory_item(view_name + translate(30267) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30267) + " (" + show_x_filtered_items + ")", url)
# Latest Episodes
params = {}
@@ -637,7 +637,7 @@ def display_tvshow_type(menu_params, view):
params["IncludeItemTypes"] = "Episode"
path = get_jellyfin_url("{server}/Users/{userid}/Items/Latest", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=tvshows&sort=none"
add_menu_directory_item(view_name + translate(30288) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30288) + " (" + show_x_filtered_items + ")", url)
# Recently Added
params = {}
@@ -650,7 +650,7 @@ def display_tvshow_type(menu_params, view):
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=Episodes&sort=none"
url += "&name_format=" + quote('Episode|episode_name_format')
add_menu_directory_item(view_name + translate(30268) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30268) + " (" + show_x_filtered_items + ")", url)
# Next Up Episodes
params = {}
@@ -664,19 +664,19 @@ def display_tvshow_type(menu_params, view):
path = get_jellyfin_url("{server}/Shows/NextUp", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=Episodes&sort=none"
url += "&name_format=" + quote('Episode|episode_name_format')
add_menu_directory_item(view_name + translate(30278) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30278) + " (" + show_x_filtered_items + ")", url)
# TV Show Genres
path = "plugin://plugin.video.jellycon/?mode=GENRES&item_type=tvshow"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item(view_name + translate(30325), path)
add_menu_directory_item(view_name + translate_string(30325), path)
# TV Show Alpha picker
path = "plugin://plugin.video.jellycon/?mode=TVSHOW_ALPHA"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item(view_name + translate(30404), path)
add_menu_directory_item(view_name + translate_string(30404), path)
xbmcplugin.endOfDirectory(handle)
@@ -696,7 +696,7 @@ def display_music_type(menu_params, view):
params["IncludeItemTypes"] = "MusicAlbum"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=MusicAlbums"
add_menu_directory_item(view_name + translate(30320), url)
add_menu_directory_item(view_name + translate_string(30320), url)
# recently added
params = {}
@@ -706,7 +706,7 @@ def display_music_type(menu_params, view):
params["Limit"] = "{ItemLimit}"
path = get_jellyfin_url("{server}/Users/{userid}/Items/Latest", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=MusicAlbums"
add_menu_directory_item(view_name + translate(30268) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30268) + " (" + show_x_filtered_items + ")", url)
# recently played
params = {}
@@ -720,7 +720,7 @@ def display_music_type(menu_params, view):
params["SortOrder"] = "Descending"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=MusicAlbum"
add_menu_directory_item(view_name + translate(30349) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30349) + " (" + show_x_filtered_items + ")", url)
# most played
params = {}
@@ -734,7 +734,7 @@ def display_music_type(menu_params, view):
params["SortOrder"] = "Descending"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=MusicAlbum"
add_menu_directory_item(view_name + translate(30353) + " (" + show_x_filtered_items + ")", url)
add_menu_directory_item(view_name + translate_string(30353) + " (" + show_x_filtered_items + ")", url)
# artists
params = {}
@@ -743,7 +743,7 @@ def display_music_type(menu_params, view):
params["ImageTypeLimit"] = 1
path = get_jellyfin_url("{server}/Artists/AlbumArtists", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=MusicArtists"
add_menu_directory_item(view_name + translate(30321), url)
add_menu_directory_item(view_name + translate_string(30321), url)
xbmcplugin.endOfDirectory(handle)
@@ -763,7 +763,7 @@ def display_musicvideos_type(params, view):
params["Fields"] = "{field_filters}"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=musicvideos"
add_menu_directory_item(view_name + translate(30405), url)
add_menu_directory_item(view_name + translate_string(30405), url)
xbmcplugin.endOfDirectory(handle)
@@ -782,7 +782,7 @@ def display_livetv_type(menu_params, view):
params["Fields"] = "{field_filters}"
path = get_jellyfin_url("{server}/LiveTv/Channels", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=livetv"
add_menu_directory_item(view_name + translate(30360), url)
add_menu_directory_item(view_name + translate_string(30360), url)
# programs
params = {}
@@ -793,7 +793,7 @@ def display_livetv_type(menu_params, view):
params["EnableTotalRecordCount"] = False
path = get_jellyfin_url("{server}/LiveTv/Programs/Recommended", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=livetv"
add_menu_directory_item(view_name + translate(30361), url)
add_menu_directory_item(view_name + translate_string(30361), url)
# recordings
params = {}
@@ -804,7 +804,7 @@ def display_livetv_type(menu_params, view):
params["EnableTotalRecordCount"] = False
path = get_jellyfin_url("{server}/LiveTv/Recordings", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=livetv"
add_menu_directory_item(view_name + translate(30362), url)
add_menu_directory_item(view_name + translate_string(30362), url)
xbmcplugin.endOfDirectory(handle)
@@ -813,7 +813,7 @@ def display_movies_type(menu_params, view):
handle = int(sys.argv[1])
xbmcplugin.setContent(handle, 'files')
view_name = translate(30256)
view_name = translate_string(30256)
if view is not None:
view_name = view.get("Name")
@@ -836,7 +836,7 @@ def display_movies_type(menu_params, view):
# All Movies
path = get_jellyfin_url("{server}/Users/{userid}/Items", base_params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies"
add_menu_directory_item('{}{}'.format(view_name, translate(30405)), url)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30405)), url)
# Favorite Movies
params = {}
@@ -846,7 +846,7 @@ def display_movies_type(menu_params, view):
params["Filters"] = "IsFavorite"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies"
add_menu_directory_item('{}{}'.format(view_name, translate(30414)), url)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30414)), url)
# Unwatched Movies
params = {}
@@ -856,7 +856,7 @@ def display_movies_type(menu_params, view):
params["IsPlayed"] = False
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies"
add_menu_directory_item('{}{}'.format(view_name, translate(30285)), url)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30285)), url)
# Recently Watched Movies
params = {}
@@ -869,7 +869,7 @@ def display_movies_type(menu_params, view):
params["Limit"] = "{ItemLimit}"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies&sort=none"
add_menu_directory_item('{}{} ({})'.format(view_name, translate(30349), show_x_filtered_items), url)
add_menu_directory_item('{}{} ({})'.format(view_name, translate_string(30349), show_x_filtered_items), url)
# Resumable Movies
params = {}
@@ -880,7 +880,7 @@ def display_movies_type(menu_params, view):
params["Limit"] = "{ItemLimit}"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies&sort=none"
add_menu_directory_item('{}{} ({})'.format(view_name, translate(30267), show_x_filtered_items), url)
add_menu_directory_item('{}{} ({})'.format(view_name, translate_string(30267), show_x_filtered_items), url)
# Recently Added Movies
params = {}
@@ -892,7 +892,7 @@ def display_movies_type(menu_params, view):
params["Filters"] = "IsNotFolder"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=movies&sort=none"
add_menu_directory_item('{}{} ({})'.format(view_name, translate(30268), show_x_filtered_items), url)
add_menu_directory_item('{}{} ({})'.format(view_name, translate_string(30268), show_x_filtered_items), url)
# Collections
params = {}
@@ -904,49 +904,49 @@ def display_movies_type(menu_params, view):
params["Recursive"] = True
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=boxsets"
add_menu_directory_item('{}{}'.format(view_name, translate(30410)), url)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30410)), url)
# Favorite Collections
params["Filters"] = "IsFavorite"
path = get_jellyfin_url("{server}/Users/{userid}/Items", params)
url = sys.argv[0] + "?url=" + quote(path) + "&mode=GET_CONTENT&media_type=boxsets"
add_menu_directory_item('{}{}'.format(view_name, translate(30415)), url)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30415)), url)
# Genres
path = "plugin://plugin.video.jellycon/?mode=GENRES&item_type=movie"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30325)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30325)), path)
# Pages
path = "plugin://plugin.video.jellycon/?mode=MOVIE_PAGES"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30397)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30397)), path)
# Alpha Picker
path = "plugin://plugin.video.jellycon/?mode=MOVIE_ALPHA"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30404)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30404)), path)
# Years
path = "plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=show_movie_years"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30411)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30411)), path)
# Decades
path = "plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=show_movie_years&group=true"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30412)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30412)), path)
# Tags
path = "plugin://plugin.video.jellycon/?mode=SHOW_ADDON_MENU&type=show_movie_tags"
if view is not None:
path += "&parent_id=" + view.get("Id")
add_menu_directory_item('{}{}'.format(view_name, translate(30413)), path)
add_menu_directory_item('{}{}'.format(view_name, translate_string(30413)), path)
xbmcplugin.endOfDirectory(handle)
@@ -1061,34 +1061,34 @@ def show_widgets():
add_menu_directory_item("All Movies",
'plugin://plugin.video.jellycon/library/movies')
add_menu_directory_item(translate(30257) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30257) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=recent_movies')
add_menu_directory_item(translate(30258) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30258) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=inprogress_movies')
add_menu_directory_item(translate(30269) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30269) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=random_movies')
add_menu_directory_item(translate(30403) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30403) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=movie_recommendations')
add_menu_directory_item(translate(30287) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30287) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=recent_tvshows')
add_menu_directory_item(translate(30263) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30263) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=recent_episodes')
add_menu_directory_item(translate(30264) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30264) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=inprogress_episodes')
add_menu_directory_item(translate(30265) + " (" + show_x_filtered_items + ")",
add_menu_directory_item(translate_string(30265) + " (" + show_x_filtered_items + ")",
'plugin://plugin.video.jellycon/?mode=WIDGET_CONTENT&type=nextup_episodes')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_search():
add_menu_directory_item(translate(30231), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Movie')
add_menu_directory_item(translate(30229), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Series')
add_menu_directory_item(translate(30235), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Episode')
add_menu_directory_item(translate(30337), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Audio')
add_menu_directory_item(translate(30338), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=MusicAlbum')
add_menu_directory_item(translate(30339), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Person')
add_menu_directory_item(translate_string(30231), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Movie')
add_menu_directory_item(translate_string(30229), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Series')
add_menu_directory_item(translate_string(30235), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Episode')
add_menu_directory_item(translate_string(30337), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Audio')
add_menu_directory_item(translate_string(30338), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=MusicAlbum')
add_menu_directory_item(translate_string(30339), 'plugin://plugin.video.jellycon/?mode=NEW_SEARCH&item_type=Person')
xbmcplugin.endOfDirectory(int(sys.argv[1]))

2
resources/lib/play_utils.py
View File

@@ -14,7 +14,7 @@ from six.moves.urllib.parse import urlparse
from .loghandler import LazyLogger
from .downloadutils import DownloadUtils
from .dialogs import ResumeDialog
from .utils import send_event_notification, convert_size, translate, get_device_id
from .utils import send_event_notification, convert_size, get_device_id
from .kodi_utils import HomeWindow
from .datamanager import DataManager, clear_old_cache_data
from .item_functions import extract_item_info, add_gui_item, get_art

42
resources/lib/server_detect.py
View File

@@ -19,7 +19,7 @@ from kodi_six.utils import py2_decode
from .kodi_utils import HomeWindow
from .downloadutils import DownloadUtils, save_user_details, load_user_details
from .loghandler import LazyLogger
from .utils import datetime_from_string, translate, get_version
from .utils import datetime_from_string, translate_string, get_version
log = LazyLogger(__name__)
@@ -136,8 +136,8 @@ def get_server_details():
log.debug("Sending UDP Data: {0}".format(message))
progress = xbmcgui.DialogProgress()
progress.create('{} : {}'.format(__addon_name__, translate(30373)))
progress.update(0, translate(30374))
progress.create('{} : {}'.format(__addon_name__, translate_string(30373)))
progress.update(0, translate_string(30374))
xbmc.sleep(1000)
server_count = 0
@@ -146,7 +146,7 @@ def get_server_details():
while True:
try:
server_count += 1
progress.update(server_count * 10, '{}: {}'.format(translate(30375), server_count))
progress.update(server_count * 10, '{}: {}'.format(translate_string(30375), server_count))
xbmc.sleep(1000)
data, addr = sock.recvfrom(1024)
servers.append(json.loads(data))
@@ -186,7 +186,7 @@ def check_server(force=False, change_user=False, notify=False):
server_list = []
for server in server_info:
server_item = xbmcgui.ListItem(server.get("Name", translate(30063)))
server_item = xbmcgui.ListItem(server.get("Name", translate_string(30063)))
sub_line = server.get("Address")
server_item.setLabel2(sub_line)
server_item.setProperty("address", server.get("Address"))
@@ -195,21 +195,21 @@ def check_server(force=False, change_user=False, notify=False):
server_list.append(server_item)
if len(server_list) > 0:
return_index = xbmcgui.Dialog().select('{} : {}'.format(__addon_name__, translate(30166)),
return_index = xbmcgui.Dialog().select('{} : {}'.format(__addon_name__, translate_string(30166)),
server_list,
useDetails=True)
if return_index != -1:
server_url = server_info[return_index]["Address"]
if not server_url:
return_index = xbmcgui.Dialog().yesno(__addon_name__, '{}\n{}'.format(translate(30282), translate(30370)))
return_index = xbmcgui.Dialog().yesno(__addon_name__, '{}\n{}'.format(translate_string(30282), translate_string(30370)))
if not return_index:
xbmc.executebuiltin("ActivateWindow(Home)")
return
while True:
kb = xbmc.Keyboard()
kb.setHeading(translate(30372))
kb.setHeading(translate_string(30372))
if server_url:
kb.setDefault(server_url)
else:
@@ -225,19 +225,19 @@ def check_server(force=False, change_user=False, notify=False):
log.debug("Testing_Url: {0}".format(public_lookup_url))
progress = xbmcgui.DialogProgress()
progress.create('{} : {}'.format(__addon_name__, translate(30376)))
progress.update(0, translate(30377))
progress.create('{} : {}'.format(__addon_name__, translate_string(30376)))
progress.update(0, translate_string(30377))
result = du.download_url(public_lookup_url, authenticate=False)
progress.close()
if result:
xbmcgui.Dialog().ok('{} : {}'.format(__addon_name__, translate(30167)),
xbmcgui.Dialog().ok('{} : {}'.format(__addon_name__, translate_string(30167)),
server_url)
break
else:
return_index = xbmcgui.Dialog().yesno('{} : {}'.format(__addon_name__, translate(30135)),
return_index = xbmcgui.Dialog().yesno('{} : {}'.format(__addon_name__, translate_string(30135)),
server_url,
translate(30371))
translate_string(30371))
if not return_index:
xbmc.executebuiltin("ActivateWindow(Home)")
return
@@ -334,15 +334,15 @@ def check_server(force=False, change_user=False, notify=False):
selected_id = len(users) - 1
if current_username:
selection_title = translate(30180) + " (" + current_username + ")"
selection_title = translate_string(30180) + " (" + current_username + ")"
else:
selection_title = translate(30180)
selection_title = translate_string(30180)
# add manual login
user_item = xbmcgui.ListItem(translate(30365))
user_item = xbmcgui.ListItem(translate_string(30365))
art = {"Thumb": "DefaultUser.png"}
user_item.setArt(art)
user_item.setLabel2(translate(30366))
user_item.setLabel2(translate_string(30366))
user_item.setProperty("secure", "true")
user_item.setProperty("manual", "true")
users.append(user_item)
@@ -365,7 +365,7 @@ def check_server(force=False, change_user=False, notify=False):
if manual:
kb = xbmc.Keyboard()
kb.setHeading(translate(30005))
kb.setHeading(translate_string(30005))
if current_username:
kb.setDefault(current_username)
kb.doModal()
@@ -385,7 +385,7 @@ def check_server(force=False, change_user=False, notify=False):
# if not saving passwords but have a saved ask to clear it
if not allow_password_saving and saved_password:
clear_password = xbmcgui.Dialog().yesno(translate(30368), translate(30369))
clear_password = xbmcgui.Dialog().yesno(translate_string(30368), translate_string(30369))
if clear_password:
settings.setSetting("saved_user_password_" + hashed_username, "")
@@ -396,7 +396,7 @@ def check_server(force=False, change_user=False, notify=False):
else:
kb = xbmc.Keyboard()
kb.setHeading(translate(30006))
kb.setHeading(translate_string(30006))
kb.setHiddenInput(True)
kb.doModal()
if kb.isConfirmed():
@@ -405,7 +405,7 @@ def check_server(force=False, change_user=False, notify=False):
# should we save the password
if allow_password_saving:
save_password = xbmcgui.Dialog().yesno(translate(30363), translate(30364))
save_password = xbmcgui.Dialog().yesno(translate_string(30363), translate_string(30364))
if save_password:
log.debug("Saving password for fast user switching: {0}".format(hashed_username))
settings.setSetting("saved_user_password_" + hashed_username, kb.getText())

6
resources/lib/trakttokodi.py
View File

@@ -9,7 +9,7 @@ import xbmcgui
from .loghandler import LazyLogger
from .datamanager import DataManager
from .utils import translate
from .utils import translate_string
log = LazyLogger(__name__)
dataManager = DataManager()
@@ -19,11 +19,11 @@ icon = xbmc.translatePath('special://home/addons/plugin.video.jellycon/icon.png'
def not_found(content_string):
xbmcgui.Dialog().notification('JellyCon', '{}: {}'.format(translate(30305), content_string), icon=icon, sound=False)
xbmcgui.Dialog().notification('JellyCon', '{}: {}'.format(translate_string(30305), content_string), icon=icon, sound=False)
def playback_starting(content_string):
xbmcgui.Dialog().notification('JellyCon', '{}: {}'.format(translate(30306), content_string), icon=icon, sound=False)
xbmcgui.Dialog().notification('JellyCon', '{}: {}'.format(translate_string(30306), content_string), icon=icon, sound=False)
def search(item_type, query):

2
resources/lib/utils.py
View File

@@ -105,7 +105,7 @@ def convert_size(size_bytes):
return "%s %s" % (s, size_name[i])
def translate(string_id):
def translate_string(string_id):
try:
addon = xbmcaddon.Addon()
return py2_encode(addon.getLocalizedString(string_id))