Merge branch 'master' of https://github.com/add-ons/plugin.video.redb…

…ull.tv

README.md

@@ -32,55 +32,107 @@ content available on [Red Bull TV](https://www.redbull.com/discover).
 </table>
 
 ## Releases
-### v3.2.0
-- Support VOD playback from EPG via context menu
-- Add YouTube integration (requires YouTube add-on)
-- Improve channel listing
-- New add-on icon
+### v3.2.0 (2020-10-29)
+- Support VOD playback from EPG via context menu (@piejanssens)
+- Add YouTube integration (@piejanssens)
+- Improve channel listing (@piejanssens)
+- New add-on icon (@piejanssens)
 
 ### v3.1.0
-- IPTV Manager support
+- IPTV Manager support (@piejanssens)
 
 ### v3.0.0
-- Harder, Better, Faster, Stronger
+→ https://github.com/add-ons/plugin.video.redbull.tv
+- Harder, Better, Faster, Stronger (@piejanssens)
 
 ### v2.0.2 (2018-01-12)
+- Fix redirects (@andy-g)
+- Migrate from strings.xml to strings.po (@andy-g)
 
 ### v2.0.1 (2017-10-22)
+- Update API (@andy-g)
 
 ### v2.0.0 (2017-10-21)
-
-### v1.2.2
-
-### v1.2.1
-
-### v1.2.0
-
-### v1.1.0
-
-### v1.0.1
+- Initial commit to official Krypton repository (@andy-g)
 
 ### v0.1.0 (2017-09-22)
-- Moved RedbullTV functionality into a RedbullTV2 Client
-- Add settings to specify preferred video resolution
-- Added Unit Tests
-- Added Integration Tests
-- Added Continuous Integration with Travis CI
+→ https://github.com/andy-g/kodi.plugin.video.redbulltv2
+- Moved RedbullTV functionality into a RedbullTV2 Client (@andy-g)
+- Add settings to specify preferred video resolution (@andy-g)
+- Added Unit Tests (@any-g)
+- Added Integration Tests (@andy-g)
+- Added Continuous Integration with Travis CI (@andy-g)
 
 ### v0.0.5 (2017-04-13)
-- Added search function
+- Added search function (@nedge2k)
 
 ### v0.0.4 (2017-03-23)
-- Code cleanup/refactoring
-- Added thumbnailimage and summary to directories
+- Code cleanup/refactoring (@nedge2k)
+- Added thumbnail image and summary to directories (@nedge2k)
 
 ### v0.0.3 (2017-03-12)
-- Fixed compatibility issue with Kodi forks (like SPMC) using python 2.6
-- Added error handling for when the server url errors out
+- Fixed compatibility issue with Kodi forks (like SPMC) using python 2.6 (@nedge2k)
+- Added error handling for when the server url errors out (@nedge2k)
 
 ### v0.0.2 (2017-03-11)
-- Fixed issue with scheduled event streams not appearing in lists
-- Added plugin icon/fanart
+- Fixed issue with scheduled event streams not appearing in lists (@nedge2k)
+- Added plugin icon/fanart (@nedge2k)
 
 ### v0.0.1 (2017-03-11)
+→ https://github.com/nedge2k/kodi.plugin.video.redbulltv2
 - Initial Release
+
+### v1.2.2 (2017-02-04)
+- [upd] addon.xml (@NEOhidra)
+
+### v1.2.1 (2015-12-07)
+→ https://github.com/NEOhidra/plugin.video.redbull.tv
+- [upd] addon.xml (@NEOhidra)
+
+### v1.2.0 (2015-05-15)
+- ADD: ask for video quality (optional) (@bromix)
+- ADD: caching (@bromix)
+- UPD: code cleaning (@bromix)
+- UPD: kodion (@bromix)
+- FIX: don't provide selectable streams for upcoming live events (@bromix)
+- FIX: find LIVE stream (@bromix)
+
+### v1.1.0 (2015-04-26)
+- ADD: support for 'Live' events (@bromix)
+- ADD: support for 'Replays' and 'Upcoming' events (@bromix)
+- ADD: 'Latest Films' (@bromix)
+- ADD: 'Recently Added' (@bromix)
+- FIX: show correct 'Featured Shows' (@bromix)
+- FIX: corrected url for 'Featured' (@bromix)
+
+### v1.0.1 (2015-04-22)
+- UPD: public release (@bromix)
+
+### v1.0.0~beta2 (2015-04-21)
+- UPD: Optimized navigation in 'sports' (@bromix)
+
+### v1.0.0~beta1 (2015-04-16)
+→ https://github.com/bromix/plugin.video.redbull.tv
+- ADD: Initial release (@bromix)
+
+### v2.0.5 (2013-11-09)
+- Fixed show playback (@AddonScriptorDE)
+- Changed show listing (@AddonScriptorDE)
+
+### v2.0.4 (2013-08-11)
+- Fixed event playback (@AddonScriptorDE)
+- Added autoplay mode for events (@AddonScriptorDE)
+
+### v1.0.3 (2012-07-13)
+- Added live events (@AddonScriptorDE)
+
+### v1.0.2 (2012-07-08)
+- Added <disclaimer> tag to addon.xml (@AddonScriptorDE)
+- Added setting to force view mode (@AddonScriptorDE)
+
+### v1.0.1 (2012-07-08)
+- Fixed small bug with wrong labels (@AddonScriptorDE)
+
+### v1.0.0 (2012-07-07)
+→ https://github.com/AddonScriptorDE/plugin.video.redbull_tv
+- First Try (@AddonScriptorDE)

resources/language/resource.language.en_gb/strings.po

@@ -46,30 +46,22 @@ msgid "Error"
 msgstr ""
 
 msgctxt "#30221"
-msgid "Error getting data from Redbull server."
+msgid "Error getting data from Redbull server.[BR]Try again shortly."
 msgstr ""
 
 msgctxt "#30222"
-msgid "Try again shortly"
+msgid "No Results"
 msgstr ""
 
 msgctxt "#30223"
-msgid "No Results"
+msgid "No results found.[BR]Please try another menu or search string."
 msgstr ""
 
 msgctxt "#30224"
-msgid "No results found"
-msgstr ""
-
-msgctxt "#30225"
-msgid "Please try another menu or search string"
-msgstr ""
-
-msgctxt "#30226"
 msgid "Upcoming Event"
 msgstr ""
 
-msgctxt "#30227"
+msgctxt "#30225"
 msgid "This event is scheduled to start on:"
 msgstr ""
 

resources/language/resource.language.nl_nl/strings.po

@@ -45,30 +45,22 @@ msgid "Error"
 msgstr "Fout"
 
 msgctxt "#30221"
-msgid "Error getting data from Redbull server."
-msgstr "Fout bij het ophalen van data van de Redbull server"
+msgid "Error getting data from Redbull server.[BR]Try again shortly."
+msgstr "Fout bij het ophalen van data van de Redbull server[BR]Probeer later opnieuw."
 
 msgctxt "#30222"
-msgid "Try again shortly"
-msgstr "Probeer later opnieuw"
-
-msgctxt "#30223"
 msgid "No Results"
 msgstr "Geen resultaat"
 
-msgctxt "#30224"
-msgid "No results found"
-msgstr "Geen resultaat gevonden"
-
-msgctxt "#30225"
-msgid "Please try another menu or search string"
-msgstr "Probeer een ander menu of zoekopdracht"
+msgctxt "#30223"
+msgid "No results found.[BR]Please try another menu or search string."
+msgstr "Geen resultaat gevonden.[BR]Probeer een ander menu of zoekopdracht."
 
-msgctxt "#30226"
+msgctxt "#30224"
 msgid "Upcoming Event"
 msgstr "Volgend evenement"
 
-msgctxt "#30227"
+msgctxt "#30225"
 msgid "This event is scheduled to start on:"
 msgstr "Dit evenement is gepland om te starten op:"
 

resources/lib/addon.py

@@ -146,8 +146,7 @@ def build_menu(items_url):
  try:
  content = redbull.get_content(items_url)
  except IOError:
- # Error getting data from Redbull server
- ok_dialog(localize(30220), localize(30221), localize(30222))
+ ok_dialog(localize(30220), localize(30221)) # Error getting data from Redbull server
  return
 
  if content.get('links'):
@@ -167,7 +166,7 @@ def build_menu(items_url):
  list_items.append(generate_list_item(item, PRODUCT))
 
  if not list_items:
- ok_dialog(localize(30223), localize(30224), localize(30225))
+ ok_dialog(localize(30222), localize(30223)) # No results found
  return
 
  for list_item in list_items:
@@ -191,7 +190,7 @@ def generate_list_item(element, element_type):
  elif element.get('type') == 'video' and element.get('status').get('label') == 'Upcoming':
  info_labels['premiered'] = element.get('status').get('start_time')
  from time import timezone
- list_item.setPath('/notify/' + localize(30026), localize(30027), element.get('event_date') + ' (GMT+' + str(timezone / 3600 * -1))
+ list_item.setPath('/notify/' + localize(30024), localize(30025), element.get('event_date') + ' (GMT+' + str(timezone / 3600 * -1))
  elif element_type == COLLECTION:
  list_item.setPath(plugin.url_for(browse_collection, uid=uid))
  elif element_type == PRODUCT: