From 95603d488d66be78e631ecfca06f5f9f114624bf Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 16 Oct 2018 23:57:28 +0200 Subject: [PATCH] mb.cpp: fix locale for YT Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8fc2a511dae3949cda875ed2cf9c9331751141dd Author: GetAway Date: 2018-10-16 (Tue, 16 Oct 2018) --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + data/locale/nederlands.locale | 1 + src/gui/moviebrowser/mb.cpp | 8 ++++++-- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/ytparser.cpp | 2 +- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 469ae039e..d82be524f 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2014,6 +2014,7 @@ moviebrowser.option_browser Anzeigeoptionen moviebrowser.reload_at_start Filminfos neu laden bei Start moviebrowser.remount_at_start Filmdepot verbinden bei Start moviebrowser.scan_for_movies Suche Aufnahmen ... +moviebrowser.scan_for_videos Suche YT-Videos ... moviebrowser.serie_auto_create Serien automatisch zuordnen moviebrowser.serie_head Serie moviebrowser.serie_name Name ändern diff --git a/data/locale/english.locale b/data/locale/english.locale index dde414798..c0dd96832 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2014,6 +2014,7 @@ moviebrowser.option_browser Browser Options moviebrowser.reload_at_start Reload movie info at start moviebrowser.remount_at_start Remount at start moviebrowser.scan_for_movies Scan for recordings... +moviebrowser.scan_for_videos Scan for YT-Videos ... moviebrowser.serie_auto_create Serie auto create moviebrowser.serie_head Serie moviebrowser.serie_name Change name diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 40c621a10..2daa6b4a4 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -1576,6 +1576,7 @@ moviebrowser.option_browser Browser Opties moviebrowser.reload_at_start Herlaad film informatie bij het starten moviebrowser.remount_at_start Herkoppelen bij het starten moviebrowser.scan_for_movies Films scannen ... +moviebrowser.scan_for_videos YT-Videos scannen ... moviebrowser.serie_auto_create Series automatisch maken moviebrowser.serie_head Serie moviebrowser.serie_name Verander naam diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index a62a83659..6dd02896d 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -2321,7 +2321,9 @@ void CMovieBrowser::scrollBrowserItem(bool next, bool page) if (show_mode == MB_SHOW_YT && !next && ytparser.HavePrev() && m_pcBrowser->getSelectedLine() == 0) mode = cYTFeedParser::PREV; if (mode >= 0) { - CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES)); + CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, (show_mode == MB_SHOW_YT) + ? g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS) + : g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES), 450); loadBox.paint(); ytparser.Cleanup(); loadYTitles(mode, m_settings.ytsearch, m_settings.ytvid); @@ -4378,7 +4380,9 @@ bool CMovieBrowser::showYTMenu(bool calledExternally) } if (reload) { - CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES)); + CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, (show_mode == MB_SHOW_YT) + ? g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS) + : g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES), 450); loadBox.paint(); ytparser.Cleanup(); loadYTitles(newmode, m_settings.ytsearch, m_settings.ytvid); diff --git a/src/system/locals.h b/src/system/locals.h index 3a63b7ece..8357d4084 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2041,6 +2041,7 @@ typedef enum LOCALE_MOVIEBROWSER_RELOAD_AT_START, LOCALE_MOVIEBROWSER_REMOUNT_AT_START, LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, + LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS, LOCALE_MOVIEBROWSER_SERIE_AUTO_CREATE, LOCALE_MOVIEBROWSER_SERIE_HEAD, LOCALE_MOVIEBROWSER_SERIE_NAME, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 765c1b25e..92c25c9f2 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2041,6 +2041,7 @@ const char * locale_real_names[] = "moviebrowser.reload_at_start", "moviebrowser.remount_at_start", "moviebrowser.scan_for_movies", + "moviebrowser.scan_for_videos", "moviebrowser.serie_auto_create", "moviebrowser.serie_head", "moviebrowser.serie_name", diff --git a/src/system/ytparser.cpp b/src/system/ytparser.cpp index e42f7e032..71f68f8a7 100644 --- a/src/system/ytparser.cpp +++ b/src/system/ytparser.cpp @@ -324,7 +324,7 @@ bool cYTFeedParser::parseFeedJSON(std::string &answer) Json::Value elements = root["items"]; for(unsigned int i=0; igetText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES)); + OnProgress(i, elements.size(), g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS)); #ifdef DEBUG_PARSER printf("=========================================================\n"); printf("Element %d in elements\n", i);